[mapserver-commits] r13227 - trunk/mapserver
svn at osgeo.org
svn at osgeo.org
Fri Mar 9 12:27:31 EST 2012
Author: tbonfort
Date: 2012-03-09 09:27:31 -0800 (Fri, 09 Mar 2012)
New Revision: 13227
Modified:
trunk/mapserver/configure
trunk/mapserver/configure.in
Log:
add preliminary --enable-java-mapscript configure flag (#4234)
Modified: trunk/mapserver/configure
===================================================================
--- trunk/mapserver/configure 2012-03-09 16:48:43 UTC (rev 13226)
+++ trunk/mapserver/configure 2012-03-09 17:27:31 UTC (rev 13227)
@@ -903,6 +903,7 @@
with_php
enable_internal_ld_detect
with_ld_shared
+enable_java_mapscript
with_java_include_os_name
enable_python_mapscript
with_python
@@ -1561,6 +1562,7 @@
Use perl -V output to figure the command to use to
link php_mapscript.so. Try this only if the default
internal macro didn't work.
+ --enable-java-mapscript Specify if java mapscript should be configured
--enable-python-mapscript build the python mapscript module.
Optional Packages:
@@ -1641,13 +1643,13 @@
--with-ld-shared=CMD Specify link command to use to build shared libs
--without-ld-shared Disable shared library support
--with-java-include-os-name=dirname
- (AUTODETECTED)
- Use this option only if building of Java Mapscript
- fails because os-dependent headers are not found.
- dirname is the name of subdirectory of the Java
- installation where os-dependent include files are
- found (for instance linux or solaris).
- Only used by Java mapscript.
+ (AUTODETECTED)
+ Use this option only if building of Java Mapscript
+ fails because os-dependent headers are not found.
+ dirname is the name of subdirectory of the Java
+ installation where os-dependent include files are
+ found (for instance linux or solaris).
+ Only used by Java mapscript.
--with-python[=PATH] Specify python binary (PATH is path to python)
Some influential environment variables:
@@ -22325,7 +22327,17 @@
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if --with-java-include-os-name specified" >&5
+# Check whether --enable-java-mapscript was given.
+if test "${enable_java_mapscript+set}" = set; then :
+ enableval=$enable_java_mapscript;
+else
+ enable_java_mapscript=no
+fi
+
+
+if test "x$enable_java_mapscript" == "xyes" ; then
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if --with-java-include-os-name specified" >&5
$as_echo_n "checking if --with-java-include-os-name specified... " >&6; }
# Check whether --with-java-include-os-name was given.
@@ -22333,26 +22345,26 @@
withval=$with_java_include_os_name;
fi
-if test -n "${with_java_include_os_name}" ; then
-OS_INCLUDE_DIR="${with_java_include_os_name}"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($OS_INCLUDE_DIR)" >&5
+ if test -n "${with_java_include_os_name}" ; then
+ OS_INCLUDE_DIR="${with_java_include_os_name}"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($OS_INCLUDE_DIR)" >&5
$as_echo "yes ($OS_INCLUDE_DIR)" >&6; }
-else
-OUR_OSNAME=`uname -s`
-case "${OUR_OSNAME}" in
-[Ll]inux) OS_INCLUDE_DIR="linux" ;;
-[sS]olaris*) OS_INCLUDE_DIR="solaris" ;;
-[sS]unOS*) OS_INCLUDE_DIR="solaris" ;;
-[Ww]in*) OS_INCLUDE_DIR="win32" ;;
-*) OS_INCLUDE_DIR="linux" ;;
-esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no, autodetected $OS_INCLUDE_DIR" >&5
+ else
+ OUR_OSNAME=`uname -s`
+ case "${OUR_OSNAME}" in
+ [Ll]inux) OS_INCLUDE_DIR="linux" ;;
+ [sS]olaris*) OS_INCLUDE_DIR="solaris" ;;
+ [sS]unOS*) OS_INCLUDE_DIR="solaris" ;;
+ [Ww]in*) OS_INCLUDE_DIR="win32" ;;
+ *) OS_INCLUDE_DIR="linux" ;;
+ esac
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, autodetected $OS_INCLUDE_DIR" >&5
$as_echo "no, autodetected $OS_INCLUDE_DIR" >&6; }
-fi
+ fi
-if test -z $JAVAC; then
- JAVAC="javac"
-fi
+ if test -z $JAVAC; then
+ JAVAC="javac"
+ fi
JNI_INCLUDE_DIRS=""
@@ -22463,10 +22475,11 @@
done
fi
-for JNI_INCLUDE_DIR in $JNI_INCLUDE_DIRS
-do
- JAVA_INCLUDE="$JAVA_INCLUDE -I$JNI_INCLUDE_DIR"
-done
+ for JNI_INCLUDE_DIR in $JNI_INCLUDE_DIRS
+ do
+ JAVA_INCLUDE="$JAVA_INCLUDE -I$JNI_INCLUDE_DIR"
+ done
+fi
JAVA_INCLUDE=$JAVA_INCLUDE
@@ -22474,6 +22487,7 @@
+
# Check whether --enable-python-mapscript was given.
if test "${enable_python_mapscript+set}" = set; then :
enableval=$enable_python_mapscript;
Modified: trunk/mapserver/configure.in
===================================================================
--- trunk/mapserver/configure.in 2012-03-09 16:48:43 UTC (rev 13226)
+++ trunk/mapserver/configure.in 2012-03-09 17:27:31 UTC (rev 13227)
@@ -2697,43 +2697,50 @@
dnl other mapscripts)
dnl ---------------------------------------------------------------------
-AC_MSG_CHECKING([if --with-java-include-os-name specified])
-AC_ARG_WITH(java-include-os-name,
-[ --with-java-include-os-name=dirname
- (AUTODETECTED)
- Use this option only if building of Java Mapscript
- fails because os-dependent headers are not found.
- dirname is the name of subdirectory of the Java
- installation where os-dependent include files are
- found (for instance linux or solaris).
- Only used by Java mapscript.],,)
-if test -n "${with_java_include_os_name}" ; then
-OS_INCLUDE_DIR="${with_java_include_os_name}"
-AC_MSG_RESULT([yes ($OS_INCLUDE_DIR)])
-else
-dnl might break on Windows???
-OUR_OSNAME=`uname -s`
-case "${OUR_OSNAME}" in
-[[Ll]inux]) OS_INCLUDE_DIR="linux" ;;
-[[sS]olaris*]) OS_INCLUDE_DIR="solaris" ;;
-[[sS]unOS*]) OS_INCLUDE_DIR="solaris" ;;
-[[Ww]in*]) OS_INCLUDE_DIR="win32" ;;
-*) OS_INCLUDE_DIR="linux" ;;
-esac
-AC_MSG_RESULT([no, autodetected $OS_INCLUDE_DIR])
-fi
+AC_ARG_ENABLE(java-mapscript,
+[ --enable-java-mapscript Specify if java mapscript should be configured],,[enable_java_mapscript=no])
-if test -z $JAVAC; then
- JAVAC="javac"
+if test "x$enable_java_mapscript" == "xyes" ; then
+
+ AC_MSG_CHECKING([if --with-java-include-os-name specified])
+ AC_ARG_WITH(java-include-os-name,
+ [ --with-java-include-os-name=dirname
+ (AUTODETECTED)
+ Use this option only if building of Java Mapscript
+ fails because os-dependent headers are not found.
+ dirname is the name of subdirectory of the Java
+ installation where os-dependent include files are
+ found (for instance linux or solaris).
+ Only used by Java mapscript.],,)
+ if test -n "${with_java_include_os_name}" ; then
+ OS_INCLUDE_DIR="${with_java_include_os_name}"
+ AC_MSG_RESULT([yes ($OS_INCLUDE_DIR)])
+ else
+ dnl might break on Windows???
+ OUR_OSNAME=`uname -s`
+ case "${OUR_OSNAME}" in
+ [[Ll]inux]) OS_INCLUDE_DIR="linux" ;;
+ [[sS]olaris*]) OS_INCLUDE_DIR="solaris" ;;
+ [[sS]unOS*]) OS_INCLUDE_DIR="solaris" ;;
+ [[Ww]in*]) OS_INCLUDE_DIR="win32" ;;
+ *) OS_INCLUDE_DIR="linux" ;;
+ esac
+ AC_MSG_RESULT([no, autodetected $OS_INCLUDE_DIR])
+ fi
+
+ if test -z $JAVAC; then
+ JAVAC="javac"
+ fi
+ AX_JNI_INCLUDE_DIR
+ for JNI_INCLUDE_DIR in $JNI_INCLUDE_DIRS
+ do
+ JAVA_INCLUDE="$JAVA_INCLUDE -I$JNI_INCLUDE_DIR"
+ done
fi
-AX_JNI_INCLUDE_DIR
-for JNI_INCLUDE_DIR in $JNI_INCLUDE_DIRS
-do
- JAVA_INCLUDE="$JAVA_INCLUDE -I$JNI_INCLUDE_DIR"
-done
AC_SUBST(JAVA_INCLUDE,$JAVA_INCLUDE)
+
AC_DEFUN([PYTHON_CHECK],[
AC_MSG_CHECKING(if python path is provided)
More information about the mapserver-commits
mailing list