Changeset 77


Ignore:
Timestamp:
Jan 16, 2011, 12:28:46 AM (10 years ago)
Author:
djay
Message:

Fix autotools for MacOS X (specific macos keywords for activating java).

Location:
trunk/zoo-kernel
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/zoo-kernel/Makefile.in

    r50 r77  
     1OS:=$(shell uname -s)
     2ifeq ($(OS),Darwin)
     3        MACOS_LD_FLAGS=-lintl -framework SystemConfiguration -framework CoreFoundation
     4        MACOS_CFLAGS=-arch i386 -arch ppc -arch x86_64
     5endif
     6
    17JAVACFLAGS=@JAVA_CPPFLAGS@
    28JAVALDFLAGS=@JAVA_LDFLAGS@
     
    410JAVA_FILE=@JAVA_FILE@
    511
    6 CFLAGS=-I../thirds/cgic206 -I. -DLINUX_FREE_ISSUE #-DDEBUG #-DDEBUG_SERVICE_CONF
     12CFLAGS=${MACOS_CFLAGS} -I../thirds/cgic206 -I. -DLINUX_FREE_ISSUE #-DDEBUG #-DDEBUG_SERVICE_CONF
    713
    814PHPCFLAGS=@PHP_CPPFLAGS@
     
    9197zoo_loader.cgi: zoo_loader.c zoo_service_loader.o  ulinet.o service.h lex.sr.o service_conf.tab.o service_conf.y ulinet.o main_conf_read.tab.o lex.cr.o service_internal.o ${PYTHON_FILE}   ${PHP_FILE} ${JAVA_FILE} ${JS_FILE} ${PERL_FILE}
    9298        g++ -g -O2 -Wall ${JSCFLAGS} ${PHPCFLAGS}  ${PERLCFLAGS}   ${JAVACFLAGS} ${XML2CFLAGS} ${PYTHONCFLAGS} ${CFLAGS} -c zoo_loader.c  -fno-common -DPIC -o zoo_loader.o
    93         g++  ${JSCFLAGS} ${GDAL_CFLAGS} ${XML2CFLAGS} ${PHPCFLAGS} ${PERLCFLAGS} ${JAVACFLAGS} ${PYTHONCFLAGS} ${CFLAGS} zoo_loader.o zoo_service_loader.o service_internal.o ${PYTHON_FILE}  ${PERL_FILE} ${PHP_FILE}  ${JS_FILE} ${JAVA_FILE} ulinet.o lex.cr.o lex.sr.o service_conf.tab.o main_conf_read.tab.o -o zoo_loader.cgi -lcurl -L../thirds/cgic206 -lcgic -lcurl ${GDAL_LIBS} ${XML2LDFLAGS} ${PYTHONLDFLAGS} ${PERLLDFLAGS}  ${PHPLDFLAGS} ${JAVALDFLAGS} ${JSLDFLAGS} -lfcgi -lcrypto
     99        g++  ${JSCFLAGS} ${GDAL_CFLAGS} ${XML2CFLAGS} ${PHPCFLAGS} ${PERLCFLAGS} ${JAVACFLAGS} ${PYTHONCFLAGS} ${CFLAGS} zoo_loader.o zoo_service_loader.o service_internal.o ${PYTHON_FILE}  ${PERL_FILE} ${PHP_FILE}  ${JS_FILE} ${JAVA_FILE} ulinet.o lex.cr.o lex.sr.o service_conf.tab.o main_conf_read.tab.o -o zoo_loader.cgi -lcurl -L../thirds/cgic206 -lcgic -lcurl ${GDAL_LIBS} ${XML2LDFLAGS} ${PYTHONLDFLAGS} ${PERLLDFLAGS}  ${PHPLDFLAGS} ${JAVALDFLAGS} ${JSLDFLAGS} -lfcgi -lcrypto ${MACOS_LD_FLAGS}
    94100
    95101install:
  • trunk/zoo-kernel/configure.ac

    r75 r77  
    1 #AC_PREREQ([2.63])
    2 AC_INIT([ZOO Kernel], [0.0.1], [bugs@zoo-project.org])
    3 #AM_INIT_AUTOMAKE
    4 #AC_CONFIG_HEADERS([config.h])
     1AC_INIT([ZOO Kernel], [1.2.0], [bugs@zoo-project.org])
    52
    63# Checks for programs.
     
    7067AC_SUBST([GDAL_LIBS])
    7168
    72 
    73 
    74 
    7569# ===========================================================================
    7670# Detect if libxml2 is installed
     
    10296fi
    10397
    104 
    10598# Extract the linker and include flags
    10699XML2_LDFLAGS=`$XML2CONFIG --libs`
     
    121114AC_SUBST([XML2_LDFLAGS])
    122115
    123 
    124 
    125 
    126116# ===========================================================================
    127117# Detect if python is installed
    128118# ===========================================================================
    129 
    130 
    131 
    132119
    133120AC_ARG_WITH([python],
     
    176163# ===========================================================================
    177164
    178 
    179 
    180 
    181165AC_ARG_WITH([php],
    182166        [AS_HELP_STRING([--with-php=PATH], [To enabled php support or specify an alternative directory for php installation,  disabled by default])],
     
    220204AC_SUBST([PHP_FILE])
    221205
    222 
    223206# ===========================================================================
    224207# Detect if perl is installed
    225208# ===========================================================================
    226 
    227209
    228210AC_ARG_WITH([perl],
     
    266248# ===========================================================================
    267249
    268 
    269 
    270250AC_ARG_WITH([java],
    271251        [AS_HELP_STRING([--with-java=PATH], [To enabled java support, specify a JDK_HOME,  disabled by default])],
     
    285265                AC_MSG_ERROR([you must specify a parameter to --with-java, e.g. --with-java=/path/to/java])
    286266        fi
     267
    287268        # Extract the linker and include flags
    288         if test -d "$JDKHOME/jre/lib/i386";
    289         then
    290                 JAVA_LDFLAGS="-L$JDKHOME/jre/lib/i386/client/ -ljvm -lpthread"
    291                 JAVA_CPPFLAGS="-I$JDKHOME/include -I$JDKHOME/include/linux"
    292         else
    293                 JAVA_LDFLAGS="-L$JDKHOME/jre/lib/amd64/client/ -ljvm -lpthread"
    294                 JAVA_CPPFLAGS="-I$JDKHOME/include -I$JDKHOME/include/linux"
     269        if test "x$JDKHOME" = "xmacos";
     270        then
     271                JAVA_LDFLAGS="-framework JavaVM"
     272                JAVA_CPPFLAGS="-I/Developer//SDKs/MacOSX10.6.sdk/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers/"
     273        else
     274                if test -d "$JDKHOME/jre/lib/i386";
     275                then
     276                        JAVA_LDFLAGS="-L$JDKHOME/jre/lib/i386/client/ -ljvm -lpthread"
     277                        JAVA_CPPFLAGS="-I$JDKHOME/include -I$JDKHOME/include/linux"
     278                else
     279                        JAVA_LDFLAGS="-L$JDKHOME/jre/lib/amd64/client/ -ljvm -lpthread"
     280                        JAVA_CPPFLAGS="-I$JDKHOME/include -I$JDKHOME/include/linux"
     281                fi
    295282        fi
    296283
     
    304291        LIBS_SAVE="$LIBS"
    305292        LIBS="$JAVA_LDFLAGS"
    306         # Shouldn't we get java here rather than java5 :) ??
    307         AC_CHECK_LIB([jvm], [JNI_CreateJavaVM], [], [AC_MSG_ERROR([could not find libjava])], [])
    308         #AC_CHECK_LIB([jvm], [main], [], [AC_MSG_ERROR([could not find libjava])], [])
     293        if test "x$JDKHOME" != "xmacos";
     294        then
     295                AC_CHECK_LIB([jvm], [JNI_CreateJavaVM], [], [AC_MSG_ERROR([could not find libjava])], [])
     296        fi
    309297
    310298        AC_SUBST([JAVA_CPPFLAGS])
     
    314302AC_SUBST([JAVA_ENABLED])
    315303AC_SUBST([JAVA_FILE])
    316 
    317 
    318 
    319 
    320304
    321305# ===========================================================================
     
    359343        CPPFLAGS="$JS_CPPFLAGS"
    360344
    361 
    362345        #AC_CHECK_HEADERS([jsapi.h],
    363346        #                [], [AC_MSG_ERROR([could not find headers include related to libjs])])
     
    376359AC_SUBST([JS_FILE])
    377360
    378 
    379 
    380 
    381 
    382 
    383361AC_CONFIG_FILES([Makefile])
    384362AC_OUTPUT
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