Index: configure
===================================================================
RCS file: /data2/cvsroot/mapserver/configure,v
retrieving revision 1.135
diff -u -r1.135 configure
--- configure	27 Feb 2006 20:22:06 -0000	1.135
+++ configure	1 Mar 2006 11:50:59 -0000
@@ -272,7 +272,7 @@
 PACKAGE_BUGREPORT=
 
 ac_unique_file="Makefile.in"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB LEX LEXLIB LEX_OUTPUT_ROOT YACC XTRALIBS CPP EGREP C_PIC STRINGS MS_VERSION FT_BIN ZLIB_ENABLED ZLIB_INC ZLIB_LIB JPEG_ENABLED JPEG_INC JPEG_LIB ICONV_ENABLED ICONV_INC ICONV_LIB GD_DEF GD_INC GD_LIB GD_STATIC MAKE_GD MAKE_GD_CLEAN PDF_ENABLED PDF_INC PDF_LIB EPPL_ENABLED EPPL_OBJ PROJ_ENABLED PROJ_INC PROJ_LIBS THREAD_FLAG THREAD_LIB SDE_ENABLED SDE_INC SDE_LIB MPATROL_ENABLED MPATROL_INC MPATROL_LIB GEOS_CONFIG GEOS_ENABLED GEOS_INC GEOS_LIB GDAL_CONFIG GDAL_ENABLED OGR_ENABLED GDAL_INC GDAL_LIB TIFF_ENABLED TIFF_INC TIFF_LIB PG_CONFIG POSTGIS_ENABLED POSTGIS_INC POSTGIS_LIB MY_CONFIG MYGIS_ENABLED MYGIS_INC MYGIS_LIB ORACLESPATIAL_ENABLED ORACLESPATIAL_INC ORACLESPATIAL_LIB MING_ENABLED MING_INC MING_LIB WMS_SVR_ENABLED WFS_SVR_ENABLED WCS_SVR_ENABLED LIBCURL_CONFIG WMS_LYR_ENABLED WFS_LYR_ENABLED CURL_INC CURL_LIB FASTCGI_ENABLED FASTCGI_INC FASTCGI_LIB HTTPD MS_INC MS_LIB IGNORE_MISSING_DATA USE_POINT_Z_M DEBUG_FLAGS LD_SHARED SO_EXT PHP_VERSION_FLAG PHP_SRC_DIR PHP_CC PHP_LD PHP_REGEX_INC PHP_REGEX_OBJ USE_PHP_REGEX MAKE_PHPMS MAKE_PHPMS_CLEAN APACHE_INC ALL_ENABLED ALL_INC ALL_LIB ALL_STATIC_LIB RPATHS LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB LEX LEXLIB LEX_OUTPUT_ROOT YACC XTRALIBS CPP EGREP C_PIC STRINGS MS_VERSION FT_BIN ZLIB_ENABLED ZLIB_INC ZLIB_LIB JPEG_ENABLED JPEG_INC JPEG_LIB ICONV_ENABLED ICONV_INC ICONV_LIB GD_DEF GD_INC GD_LIB GD_STATIC MAKE_GD MAKE_GD_CLEAN PDF_ENABLED PDF_INC PDF_LIB EPPL_ENABLED EPPL_OBJ PROJ_ENABLED PROJ_INC PROJ_LIBS THREAD_FLAG THREAD_LIB SDE_ENABLED SDE_INC SDE_LIB MPATROL_ENABLED MPATROL_INC MPATROL_LIB GEOS_CONFIG GEOS_ENABLED GEOS_INC GEOS_LIB GDAL_CONFIG GDAL_ENABLED OGR_ENABLED GDAL_INC GDAL_LIB TIFF_ENABLED TIFF_INC TIFF_LIB PG_CONFIG POSTGIS_ENABLED POSTGIS_INC POSTGIS_LIB MY_CONFIG MYGIS_ENABLED MYGIS_INC MYGIS_LIB ORACLESPATIAL_ENABLED ORACLESPATIAL_INC ORACLESPATIAL_LIB MING_ENABLED MING_INC MING_LIB WMS_SVR_ENABLED WFS_SVR_ENABLED WCS_SVR_ENABLED LIBCURL_CONFIG WMS_LYR_ENABLED WFS_LYR_ENABLED CURL_INC CURL_LIB FASTCGI_ENABLED FASTCGI_INC FASTCGI_LIB HTTPD MS_INC MS_LIB IGNORE_MISSING_DATA USE_POINT_Z_M DEBUG_FLAGS LD_SHARED SO_EXT PHP_VERSION_FLAG PHP_SRC_DIR PHP_CC PHP_LD PHP_REGEX_INC PHP_REGEX_OBJ USE_PHP_REGEX MAKE_PHPMS MAKE_PHPMS_CLEAN APACHE_INC OS_INCLUDE_DIR ALL_ENABLED ALL_INC ALL_LIB ALL_STATIC_LIB RPATHS LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -889,6 +889,10 @@
                           on a system where PHP was built as an Apache
                           module statically linked into the httpd executable.
                           DIR is the path to the apache include files.
+  --with-os-name=name     os specific include subdirectory (defaults to linux)
+			  Use it to compile Java mapscript on solaris or other oses.
+			  Useful values are linux, solaris
+
 
 Some influential environment variables:
   CC          C compiler command
@@ -10566,6 +10570,34 @@
 fi
 
 
+echo "$as_me:$LINENO: checking if --with-os-name specified" >&5
+echo $ECHO_N "checking if --with-os-name specified... $ECHO_C" >&6
+
+# Check whether --with-os-name or --without-os-name was given.
+if test "${with_os_name+set}" = set; then
+  withval="$with_os_name"
+
+fi;
+if test -n "$with_os_name" ; then
+OS_INCLUDE_DIR="${with_os_name}"
+echo "$as_me:$LINENO: result: yes ($OS_INCLUDE_DIR)" >&5
+echo "${ECHO_T}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
+echo "$as_me:$LINENO: result: no, but it seems to be $OS_INCLUDE_DIR" >&5
+echo "${ECHO_T}no, but it seems to be $OS_INCLUDE_DIR" >&6
+fi
+
+OS_INCLUDE_DIR=$OS_INCLUDE_DIR
+
+
 
 ALL_ENABLED=$ALL_ENABLED
 
@@ -11324,6 +11356,7 @@
 s,@MAKE_PHPMS@,$MAKE_PHPMS,;t t
 s,@MAKE_PHPMS_CLEAN@,$MAKE_PHPMS_CLEAN,;t t
 s,@APACHE_INC@,$APACHE_INC,;t t
+s,@OS_INCLUDE_DIR@,$OS_INCLUDE_DIR,;t t
 s,@ALL_ENABLED@,$ALL_ENABLED,;t t
 s,@ALL_INC@,$ALL_INC,;t t
 s,@ALL_LIB@,$ALL_LIB,;t t
Index: configure.in
===================================================================
RCS file: /data2/cvsroot/mapserver/configure.in,v
retrieving revision 1.137
diff -u -r1.137 configure.in
--- configure.in	27 Feb 2006 20:18:40 -0000	1.137
+++ configure.in	1 Mar 2006 11:51:02 -0000
@@ -2041,6 +2041,34 @@
   AC_MSG_RESULT([yes ($RPATHS)])
 fi
 
+dnl ---------------------------------------------------------------------
+dnl Check operating system (used by Java Mapscript and possibily
+dnl other maspcripts)
+dnl ---------------------------------------------------------------------
+
+AC_MSG_CHECKING([if --with-os-name specified])
+AC_ARG_WITH(os-name,
+[  --with-os-name=name     os specific include subdirectory (defaults to linux)
+			  Use it to compile Java mapscript on solaris or other oses.
+			  Useful values are linux, solaris
+],,)
+if test -n "$with_os_name" ; then
+OS_INCLUDE_DIR="${with_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, but it seems to be $OS_INCLUDE_DIR])
+fi
+
+AC_SUBST(OS_INCLUDE_DIR, $OS_INCLUDE_DIR)
 
 dnl ---------------------------------------------------------------------
 dnl Generate output files
Index: mapscript/java/Makefile.in
===================================================================
RCS file: /data2/cvsroot/mapserver/mapscript/java/Makefile.in,v
retrieving revision 1.6
diff -u -r1.6 Makefile.in
--- mapscript/java/Makefile.in	15 Feb 2006 15:49:46 -0000	1.6
+++ mapscript/java/Makefile.in	1 Mar 2006 11:51:02 -0000
@@ -191,7 +191,7 @@
 JAVAC=javac
 JAVA=java
 JAR=jar
-JAVA_INCLUDE=-I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux
+JAVA_INCLUDE=-I${JAVA_HOME}/include -I${JAVA_HOME}/include/@OS_INCLUDE_DIR@
 
 CC=gcc