Changeset 77 for trunk

Timestamp:

Jan 16, 2011, 12:28:46 AM (14 years ago)

Author:

djay

Message:

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

Location:

trunk/zoo-kernel

Files:

• Makefile.in (modified) (3 diffs)
• configure.ac (modified) (12 diffs)

trunk/zoo-kernel/Makefile.in

@@ +1 @@
+OS:=$(shell uname -s)
+ifeq ($(OS),Darwin)
+        MACOS_LD_FLAGS=-lintl -framework SystemConfiguration -framework CoreFoundation
+        MACOS_CFLAGS=-arch i386 -arch ppc -arch x86_64
+endif
+
 JAVACFLAGS=@JAVA_CPPFLAGS@
 JAVALDFLAGS=@JAVA_LDFLAGS@
@@ -4 +10 @@
 JAVA_FILE=@JAVA_FILE@
 
-CFLAGS=-I../thirds/cgic206 -I. -DLINUX_FREE_ISSUE #-DDEBUG #-DDEBUG_SERVICE_CONF
+CFLAGS=${MACOS_CFLAGS} -I../thirds/cgic206 -I. -DLINUX_FREE_ISSUE #-DDEBUG #-DDEBUG_SERVICE_CONF
 
 PHPCFLAGS=@PHP_CPPFLAGS@
@@ -91 +97 @@
 zoo_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}
         g++ -g -O2 -Wall ${JSCFLAGS} ${PHPCFLAGS}  ${PERLCFLAGS}   ${JAVACFLAGS} ${XML2CFLAGS} ${PYTHONCFLAGS} ${CFLAGS} -c zoo_loader.c  -fno-common -DPIC -o zoo_loader.o
-        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
+        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}
 
 install:

trunk/zoo-kernel/configure.ac

@@ -1 @@
-#AC_PREREQ([2.63])
-AC_INIT([ZOO Kernel], [0.0.1], [bugs@zoo-project.org])
-#AM_INIT_AUTOMAKE
-#AC_CONFIG_HEADERS([config.h])
+AC_INIT([ZOO Kernel], [1.2.0], [bugs@zoo-project.org])
 
 # Checks for programs.
@@ -70 +67 @@
 AC_SUBST([GDAL_LIBS])
 
-
-
-
 # ===========================================================================
 # Detect if libxml2 is installed
@@ -102 +96 @@
 fi
 
-
 # Extract the linker and include flags 
 XML2_LDFLAGS=`$XML2CONFIG --libs`
@@ -121 +114 @@
 AC_SUBST([XML2_LDFLAGS])
 
-
-
-
 # ===========================================================================
 # Detect if python is installed
 # ===========================================================================
-
-
-
 
 AC_ARG_WITH([python], 
@@ -176 +163 @@
 # ===========================================================================
 
-
-
-
 AC_ARG_WITH([php], 
         [AS_HELP_STRING([--with-php=PATH], [To enabled php support or specify an alternative directory for php installation,  disabled by default])], 
@@ -220 +204 @@
 AC_SUBST([PHP_FILE])
 
-
 # ===========================================================================
 # Detect if perl is installed
 # ===========================================================================
-
 
 AC_ARG_WITH([perl], 
@@ -266 +248 @@
 # ===========================================================================
 
-
-
 AC_ARG_WITH([java], 
         [AS_HELP_STRING([--with-java=PATH], [To enabled java support, specify a JDK_HOME,  disabled by default])], 
@@ -285 +265 @@
                 AC_MSG_ERROR([you must specify a parameter to --with-java, e.g. --with-java=/path/to/java])
         fi
+
         # Extract the linker and include flags
-        if test -d "$JDKHOME/jre/lib/i386";
-        then
-                JAVA_LDFLAGS="-L$JDKHOME/jre/lib/i386/client/ -ljvm -lpthread"
-                JAVA_CPPFLAGS="-I$JDKHOME/include -I$JDKHOME/include/linux"
-        else
-                JAVA_LDFLAGS="-L$JDKHOME/jre/lib/amd64/client/ -ljvm -lpthread"
-                JAVA_CPPFLAGS="-I$JDKHOME/include -I$JDKHOME/include/linux"
+        if test "x$JDKHOME" = "xmacos";
+        then
+                JAVA_LDFLAGS="-framework JavaVM"
+                JAVA_CPPFLAGS="-I/Developer//SDKs/MacOSX10.6.sdk/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers/"
+        else
+                if test -d "$JDKHOME/jre/lib/i386";
+                then
+                        JAVA_LDFLAGS="-L$JDKHOME/jre/lib/i386/client/ -ljvm -lpthread"
+                        JAVA_CPPFLAGS="-I$JDKHOME/include -I$JDKHOME/include/linux"
+                else
+                        JAVA_LDFLAGS="-L$JDKHOME/jre/lib/amd64/client/ -ljvm -lpthread"
+                        JAVA_CPPFLAGS="-I$JDKHOME/include -I$JDKHOME/include/linux"
+                fi
         fi
 
@@ -304 +291 @@
         LIBS_SAVE="$LIBS"
         LIBS="$JAVA_LDFLAGS"
-        # Shouldn't we get java here rather than java5 :) ??
-        AC_CHECK_LIB([jvm], [JNI_CreateJavaVM], [], [AC_MSG_ERROR([could not find libjava])], [])
-        #AC_CHECK_LIB([jvm], [main], [], [AC_MSG_ERROR([could not find libjava])], [])
+        if test "x$JDKHOME" != "xmacos";
+        then
+                AC_CHECK_LIB([jvm], [JNI_CreateJavaVM], [], [AC_MSG_ERROR([could not find libjava])], [])
+        fi
 
         AC_SUBST([JAVA_CPPFLAGS])
@@ -314 +302 @@
 AC_SUBST([JAVA_ENABLED])
 AC_SUBST([JAVA_FILE])
-
-
-
-
 
 # ===========================================================================
@@ -359 +343 @@
         CPPFLAGS="$JS_CPPFLAGS"
 
-
         #AC_CHECK_HEADERS([jsapi.h],
         #                [], [AC_MSG_ERROR([could not find headers include related to libjs])])
@@ -376 +359 @@
 AC_SUBST([JS_FILE])
 
-
-
-
-
-
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT