Changeset 740 for trunk/zoo-project


Ignore:
Timestamp:
Aug 28, 2015, 12:09:15 PM (7 years ago)
Author:
djay
Message:

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

Location:
trunk/zoo-project/zoo-kernel
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/zoo-project/zoo-kernel/ZOOMakefile.opts.in

    r673 r740  
    2121
    2222CGI_DIR=@CGI_DIR@
     23
     24FCGI_CFLAGS=@FCGI_CPPFLAGS@
     25FCGI_LDFLAGS=@FCGI_LDFLAGS@
    2326
    2427YAML_CFLAGS=@YAML_CPPFLAGS@
     
    9396SAGA_FILE=@SAGA_FILE@
    9497
    95 CFLAGS=@RELY_ON_DB@ @DEB_DEF@ -fpic ${YAML_CFLAGS} ${MACOS_CFLAGS} ${MS_CFLAGS} -I../../thirds/cgic206 -I. -DLINUX_FREE_ISSUE #-DDEBUG #-DDEBUG_SERVICE_CONF
    96 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}
     98CFLAGS=@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
     99LDFLAGS=-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}
    97100
  • trunk/zoo-project/zoo-kernel/configure.ac

    r675 r740  
    105105
    106106# Extract the linker and include flags
    107 FCGI_LDFLAGS="-L$FCGIPATH/lib"
     107FCGI_LDFLAGS="-L$FCGIPATH/lib -lfcgi"
    108108FCGI_CPPFLAGS="-I$FCGIPATH/include"
    109109
     
    409409        LIBS_SAVE="$LIBS"
    410410        LIBS="$PYTHON_LDFLAGS"
    411         PY_LIB=`$PYTHONCONFIG --libs | sed -e 's/^.*\(python2\..\)$/\1/'`
     411        PY_LIB=`$PYTHONCONFIG --libs | sed \
     412                              -e 's/.*\(python[[0-9]]\.[[0-9]]\).*/\1/'`
    412413        AC_CHECK_LIB([$PY_LIB], [PyObject_CallObject], [], [AC_MSG_ERROR([could not find libpython])], [])
    413         AC_SUBST([PYTHON_CPPFLAGS])
    414         AC_SUBST([PYTHON_LDFLAGS])
    415414        LIBS="$LIBS_SAVE"
    416415fi
    417416
     417AC_SUBST([PYTHON_CPPFLAGS])
     418AC_SUBST([PYTHON_LDFLAGS])
    418419AC_SUBST([PYTHON_ENABLED])
    419420AC_SUBST([PYTHON_FILE])
Note: See TracChangeset for help on using the changeset viewer.

Search

Context Navigation

ZOO Sponsors

http://www.zoo-project.org/trac/chrome/site/img/geolabs-logo.pnghttp://www.zoo-project.org/trac/chrome/site/img/neogeo-logo.png http://www.zoo-project.org/trac/chrome/site/img/apptech-logo.png http://www.zoo-project.org/trac/chrome/site/img/3liz-logo.png http://www.zoo-project.org/trac/chrome/site/img/gateway-logo.png

Become a sponsor !

Knowledge partners

http://www.zoo-project.org/trac/chrome/site/img/ocu-logo.png http://www.zoo-project.org/trac/chrome/site/img/gucas-logo.png http://www.zoo-project.org/trac/chrome/site/img/polimi-logo.png http://www.zoo-project.org/trac/chrome/site/img/fem-logo.png http://www.zoo-project.org/trac/chrome/site/img/supsi-logo.png http://www.zoo-project.org/trac/chrome/site/img/cumtb-logo.png

Become a knowledge partner

Related links

http://zoo-project.org/img/ogclogo.png http://zoo-project.org/img/osgeologo.png