Changeset 740

Timestamp:

Aug 28, 2015, 12:09:15 PM (9 years ago)

Author:

djay

Message:

Fix FASTCGI location using the --with-fastcgi option.

Location:

trunk/zoo-project/zoo-kernel

Files:

• ZOOMakefile.opts.in (modified) (2 diffs)
• configure.ac (modified) (2 diffs)

trunk/zoo-project/zoo-kernel/ZOOMakefile.opts.in

@@ -21 +21 @@
 
 CGI_DIR=@CGI_DIR@
+
+FCGI_CFLAGS=@FCGI_CPPFLAGS@
+FCGI_LDFLAGS=@FCGI_LDFLAGS@
 
 YAML_CFLAGS=@YAML_CPPFLAGS@
@@ -93 +96 @@
 SAGA_FILE=@SAGA_FILE@
 
-CFLAGS=@RELY_ON_DB@ @DEB_DEF@ -fpic ${YAML_CFLAGS} ${MACOS_CFLAGS} ${MS_CFLAGS} -I../../thirds/cgic206 -I. -DLINUX_FREE_ISSUE #-DDEBUG #-DDEBUG_SERVICE_CONF
-LDFLAGS=-lzoo_service @DEFAULT_LIBS@ -L../../thirds/cgic206 -lcgic ${GDAL_LIBS} ${XML2LDFLAGS} ${PYTHONLDFLAGS} ${PERLLDFLAGS}  ${PHPLDFLAGS} ${JAVALDFLAGS} ${JSLDFLAGS} -lfcgi -lcrypto -luuid ${MS_LDFLAGS} ${MACOS_LD_FLAGS} ${MACOS_LD_NET_FLAGS} ${YAML_LDFLAGS} ${OTBLDFLAGS} ${SAGA_LDFLAGS}
+CFLAGS=@RELY_ON_DB@ @DEB_DEF@ -fpic ${FCGI_CFLAGS} ${YAML_CFLAGS} ${MACOS_CFLAGS} ${MS_CFLAGS} -I../../thirds/cgic206 -I. -DLINUX_FREE_ISSUE #-DDEBUG #-DDEBUG_SERVICE_CONF
+LDFLAGS=-lzoo_service @DEFAULT_LIBS@ -L../../thirds/cgic206 -lcgic ${GDAL_LIBS} ${XML2LDFLAGS} ${PYTHONLDFLAGS} ${PERLLDFLAGS}  ${PHPLDFLAGS} ${JAVALDFLAGS} ${JSLDFLAGS}  ${FCGI_LDFLAGS} -lcrypto -luuid ${MS_LDFLAGS} ${MACOS_LD_FLAGS} ${MACOS_LD_NET_FLAGS} ${YAML_LDFLAGS} ${OTBLDFLAGS} ${SAGA_LDFLAGS}
 

trunk/zoo-project/zoo-kernel/configure.ac

@@ -105 +105 @@
 
 # Extract the linker and include flags
-FCGI_LDFLAGS="-L$FCGIPATH/lib"
+FCGI_LDFLAGS="-L$FCGIPATH/lib -lfcgi"
 FCGI_CPPFLAGS="-I$FCGIPATH/include"
 
@@ -409 +409 @@
         LIBS_SAVE="$LIBS"
         LIBS="$PYTHON_LDFLAGS"
-        PY_LIB=`$PYTHONCONFIG --libs | sed -e 's/^.*\(python2\..\)$/\1/'`
+        PY_LIB=`$PYTHONCONFIG --libs | sed \
+                              -e 's/.*\(python[[0-9]]\.[[0-9]]\).*/\1/'`
         AC_CHECK_LIB([$PY_LIB], [PyObject_CallObject], [], [AC_MSG_ERROR([could not find libpython])], [])
-        AC_SUBST([PYTHON_CPPFLAGS])
-        AC_SUBST([PYTHON_LDFLAGS])
         LIBS="$LIBS_SAVE"
 fi
 
+AC_SUBST([PYTHON_CPPFLAGS])
+AC_SUBST([PYTHON_LDFLAGS])
 AC_SUBST([PYTHON_ENABLED])
 AC_SUBST([PYTHON_FILE])