INTEGRATION: CWS configure3 (1.55.6); FILE MERGED

2004/11/03 12:03:18 rene 1.55.6.7: minor typo
2004/11/03 11:41:19 rene 1.55.6.6: #i36561# configure needs to check for epm
2004/11/02 13:19:30 rene 1.55.6.5: #o23779# Patch to use system libs (berkeleydb, curl, freetype, nas, myspell. altlinuxhyph, neon, sane.h, (x)render(proto).h, unixodbc headers, mspack)

oops actually add the AC_ARG_WITH for system-libs...
2004/11/02 13:14:53 rene 1.55.6.4: #o23779# Patch to use system libs (berkeleydb, curl, freetype, nas, myspell. altlinuxhyph, neon, sane.h, (x)render(proto).h, unixodbc headers, mspack)

implement a --with-system-libs enabling all other --with-system-* (except mozilla, python and the header ones) and enable ovveriding specific ones with --wiothout-system-* then
2004/11/01 11:04:41 rene 1.55.6.3: #i29991# soltools fails with header/type errors (680)

try to recover and detect a right JAVA_HOME when JAVA_HOME=/usr and we discover
the alternatives system as used in Debian and newer SuSEs
2004/11/01 11:00:54 rene 1.55.6.2: RESYNC: (1.55-1.56); FILE MERGED
2004/10/28 13:04:49 rene 1.55.6.1: #i23779# Patch to use system libs (berkeleydb, curl, freetype, nas, myspell. altlinuxhyph, neon, sane.h, (x)render(proto).h, unixodbc headers, mspack)

add library checks for expat and jpeg

1 files changed, 244 insertions, 28 deletions

diff --git a/config_office/configure b/config_office/configure
index 65b3aa876e1d..9976c7d506dd 100755
--- a/config_office/configure
+++ b/config_office/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.74  .
+# From configure.in Revision .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59.
 #
@@ -309,7 +309,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-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 AWK SED OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP ENABLE_VCTK VC_STANDARD ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS ENABLE_CUPS ENABLE_FONTCONFIG ENABLE_DIRECTX NETTOOLKIT ENABLE_RPATH USE_SHELL CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH GNUMAKE _cc MSPDB_PATH COMEX MIDL_PATH CSC_PATH NMAKE_PATH WDEVENV_PATH FRAME_HOME CPP EGREP CXX CXXFLAGS ac_ct_CXX GXX_INCLUDE_PATH EXCEPTIONS CXXCPP STLPORT4 USE_SYSTEM_STL SOLAR_JAVA JAVAC JAVA XSLTPROC JAVA_HOME JDK XMKMF PERL TCSH DMAKE BUILD_DMAKE SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG FREETYPE_CFLAGS FREETYPE_LIBS SYSTEM_FREETYPE LIBXML_CFLAGS LIBXML_LIBS SYSTEM_LIBXML PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir SYSTEM_PYTHON PYTHON_CFLAGS PYTHON_LIBS SYSTEM_DB3 SABLOTCONFIG SYSTEM_SABLOT SABLOT_LIBS CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_ODBC_HEADERS MOZILLA_CFLAGS MOZILLA_LIBS MOZILLABASE_CFLAGS MOZILLABASE_LIBS SYSTEM_MOZILLA SYSTEM_GENBRK SYSTEM_GENCCODE SYSTEM_ICU X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB SYSTEM_NAS NAS_INCLUDES NEON_CONFIG SYSTEM_NEON NEON_LIBS NEON_CFLAGS PSDK_HOME DIRECTXSDK_HOME EXTRA_DOTNET_FILES BISON FLEX PATCH GNUPATCH GNUCP CYGWIN_PATH ML_EXE ASM_HOME ZIP ZIP_HOME LIBART_CFLAGS LIBART_LIBS WITH_LIBART WITH_GPC ENABLE_GTK ENABLE_KDE GTK_CFLAGS GTK_LIBS GDKPIXBUF_CFLAGS GDKPIXBUF_LIBS KDE_CFLAGS KDE_LIBS LIBSN_CFLAGS LIBSN_LIBS WITH_LIBSN WITH_MOZILLA WITH_FONTS SCPDEFS USE_XINERAMA XINERAMA_LINK ANT ANT_HOME ANT_LIB UPD SOURCEVERSION LOCAL_SOLENV LOCAL_SOLVER WITH_LANG WITH_DICT ENABLE_STATIC_GTK GCC_HOME WITH_MINGWIN 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 AWK SED OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP ENABLE_VCTK VC_STANDARD ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS ENABLE_CUPS ENABLE_FONTCONFIG ENABLE_DIRECTX NETTOOLKIT ENABLE_RPATH USE_SHELL CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH GNUMAKE _cc MSPDB_PATH COMEX MIDL_PATH CSC_PATH NMAKE_PATH WDEVENV_PATH FRAME_HOME CPP EGREP CXX CXXFLAGS ac_ct_CXX GXX_INCLUDE_PATH EXCEPTIONS CXXCPP STLPORT4 USE_SYSTEM_STL SOLAR_JAVA JAVAC JAVA XSLTPROC JAVA_HOME JDK XMKMF PERL TCSH DMAKE BUILD_DMAKE EPM SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG FREETYPE_CFLAGS FREETYPE_LIBS SYSTEM_FREETYPE LIBXML_CFLAGS LIBXML_LIBS SYSTEM_LIBXML PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir SYSTEM_PYTHON PYTHON_CFLAGS PYTHON_LIBS SYSTEM_DB3 SABLOTCONFIG SYSTEM_SABLOT SABLOT_LIBS CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_ODBC_HEADERS MOZILLA_CFLAGS MOZILLA_LIBS MOZILLABASE_CFLAGS MOZILLABASE_LIBS SYSTEM_MOZILLA SYSTEM_GENBRK SYSTEM_GENCCODE SYSTEM_ICU X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB SYSTEM_NAS NAS_INCLUDES NEON_CONFIG SYSTEM_NEON NEON_LIBS NEON_CFLAGS PSDK_HOME DIRECTXSDK_HOME EXTRA_DOTNET_FILES BISON FLEX PATCH GNUPATCH GNUCP CYGWIN_PATH ML_EXE ASM_HOME ZIP ZIP_HOME LIBART_CFLAGS LIBART_LIBS WITH_LIBART WITH_GPC ENABLE_GTK ENABLE_KDE GTK_CFLAGS GTK_LIBS GDKPIXBUF_CFLAGS GDKPIXBUF_LIBS KDE_CFLAGS KDE_LIBS LIBSN_CFLAGS LIBSN_LIBS WITH_LIBSN WITH_MOZILLA WITH_FONTS SCPDEFS USE_XINERAMA XINERAMA_LINK ANT ANT_HOME ANT_LIB UPD SOURCEVERSION LOCAL_SOLENV LOCAL_SOLVER WITH_LANG WITH_DICT ENABLE_STATIC_GTK GCC_HOME WITH_MINGWIN LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -954,6 +954,10 @@ Optional Packages:
                           for specific distributions where the fonts are known
                           to be already available
 
+  --with-system-libs      Use libs already on system -- enables all
+			   --with-system-* flags except mozilla, python and
+			   odbc-headers
+
   --with-system-zlib      Use zlib already on system
 
   --with-system-jpeg      Use jpeg already on system
@@ -1707,6 +1711,12 @@ if test "${enable_rpath+set}" = set; then
 
 fi;
 
+# Check whether --with-system-libs or --without-system-libs was given.
+if test "${with_system_libs+set}" = set; then
+  withval="$with_system_libs"
+
+fi;
+
 # Check whether --with-system-zlib or --without-system-zlib was given.
 if test "${with_system_zlib+set}" = set; then
   withval="$with_system_zlib"
@@ -6369,12 +6379,22 @@ echo "$as_me: error: xsltproc is required when building with --disable-java." >&
 fi
 # check if JAVA_HOME was (maybe incorrectly?) set automatically to /usr
 if test "$JAVA_HOME" == "/usr" -a "x$with_jdk_home" == "x"; then
-   { echo "$as_me:$LINENO: WARNING: JAVA_HOME is set to /usr - this is very likely to be incorrect" >&5
+
+   if basename $(readlink $(readlink $JAVAC)) >/dev/null 2>/dev/null; then
+	# try to recover first by looking whether we have a alternatives
+	# system as in Debian or newer SuSEs where following /usr/bin/javac
+	# over /etc/alternatives/javac leads to the right bindir where we
+	# just need to strip a bit away to get a valid JAVA_HOME
+	JAVA_HOME=$(readlink $(readlink $JAVAC) | $SED -e s,/bin/javac$,,)
+   else
+	# else warn
+   	{ echo "$as_me:$LINENO: WARNING: JAVA_HOME is set to /usr - this is very likely to be incorrect" >&5
 echo "$as_me: WARNING: JAVA_HOME is set to /usr - this is very likely to be incorrect" >&2;}
-   { echo "$as_me:$LINENO: WARNING: if this is the case, please inform the correct JAVA_HOME with --with-jdk-home" >&5
+   	{ echo "$as_me:$LINENO: WARNING: if this is the case, please inform the correct JAVA_HOME with --with-jdk-home" >&5
 echo "$as_me: WARNING: if this is the case, please inform the correct JAVA_HOME with --with-jdk-home" >&2;}
-   echo "JAVA_HOME is set to /usr - this is very likely to be incorrect" >> warn
-   echo "if this is the case, please inform the correct JAVA_HOME with --with-jdk-home" >> warn
+   	echo "JAVA_HOME is set to /usr - this is very likely to be incorrect" >> warn
+   	echo "if this is the case, please inform the correct JAVA_HOME with --with-jdk-home" >> warn
+    fi
 fi
 # now check if $JAVA_HOME is really valid
 if test ! -d "$JAVA_HOME/jre" -a "x$with_jdk_home" == "x"; then
@@ -7111,9 +7131,56 @@ echo "${ECHO_T}no" >&6
 fi
 
 
+# Extract the first word of "epm", so it can be a program name with args.
+set dummy epm; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_EPM+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $EPM in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_EPM="$EPM" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_EPM="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  test -z "$ac_cv_path_EPM" && ac_cv_path_EPM="no"
+  ;;
+esac
+fi
+EPM=$ac_cv_path_EPM
+
+if test -n "$EPM"; then
+  echo "$as_me:$LINENO: result: $EPM" >&5
+echo "${ECHO_T}$EPM" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+if test "$EPM" = "no"; then
+   { { echo "$as_me:$LINENO: error: epm is needed for native installers. install epm" >&5
+echo "$as_me: error: epm is needed for native installers. install epm" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
 echo "$as_me:$LINENO: checking which zlib to use" >&5
 echo $ECHO_N "checking which zlib to use... $ECHO_C" >&6
-if test -n "$with_system_zlib"; then
+if test -n "$with_system_zlib" -o -n "$with_system_libs" && \
+	test "$with_system_zlib" != "no"; then
     echo "$as_me:$LINENO: result: external" >&5
 echo "${ECHO_T}external" >&6
     SYSTEM_ZLIB=YES
@@ -7344,7 +7411,8 @@ fi
 
 echo "$as_me:$LINENO: checking which jpeg to use" >&5
 echo $ECHO_N "checking which jpeg to use... $ECHO_C" >&6
-if test -n "$with_system_jpeg"; then
+if test -n "$with_system_jpeg" -o -n "$with_system_libs" && \
+	test "$with_system_jpeg" != "no"; then
     echo "$as_me:$LINENO: result: external" >&5
 echo "${ECHO_T}external" >&6
     SYSTEM_JPEG=YES
@@ -7494,7 +7562,77 @@ echo "$as_me: error: jpeg.h not found. install libjpeg" >&2;}
 fi
 
 
-    # TODO: add lib check here
+    echo "$as_me:$LINENO: checking for jpeg_resync_to_restart in -ljpeg" >&5
+echo $ECHO_N "checking for jpeg_resync_to_restart in -ljpeg... $ECHO_C" >&6
+if test "${ac_cv_lib_jpeg_jpeg_resync_to_restart+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ljpeg  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char jpeg_resync_to_restart ();
+int
+main ()
+{
+jpeg_resync_to_restart ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_jpeg_jpeg_resync_to_restart=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_jpeg_jpeg_resync_to_restart=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_resync_to_restart" >&5
+echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_resync_to_restart" >&6
+if test $ac_cv_lib_jpeg_jpeg_resync_to_restart = yes; then
+   JPEG3RDLIB=-ljpeg
+else
+  echo "$as_me:$LINENO: checking jpeg library not found or fuctional" >&5
+echo $ECHO_N "checking jpeg library not found or fuctional... $ECHO_C" >&6
+fi
+
 else
     echo "$as_me:$LINENO: result: internal" >&5
 echo "${ECHO_T}internal" >&6
@@ -7504,7 +7642,8 @@ fi
 
 echo "$as_me:$LINENO: checking which expat to use" >&5
 echo $ECHO_N "checking which expat to use... $ECHO_C" >&6
-if test -n "$with_system_expat"; then
+if test -n "$with_system_expat" -o -n "$with_system_libs" && \
+	test "$with_system_expat" != "no"; then
     echo "$as_me:$LINENO: result: external" >&5
 echo "${ECHO_T}external" >&6
     SYSTEM_EXPAT=YES
@@ -7654,7 +7793,83 @@ echo "$as_me: error: expat.h not found. install expat" >&2;}
 fi
 
 
-    # TODO: add lib check here
+
+echo "$as_me:$LINENO: checking for XML_ParserCreate in -lexpat" >&5
+echo $ECHO_N "checking for XML_ParserCreate in -lexpat... $ECHO_C" >&6
+if test "${ac_cv_lib_expat_XML_ParserCreate+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lexpat  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char XML_ParserCreate ();
+int
+main ()
+{
+XML_ParserCreate ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_expat_XML_ParserCreate=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_expat_XML_ParserCreate=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_expat_XML_ParserCreate" >&5
+echo "${ECHO_T}$ac_cv_lib_expat_XML_ParserCreate" >&6
+if test $ac_cv_lib_expat_XML_ParserCreate = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBEXPAT 1
+_ACEOF
+
+  LIBS="-lexpat $LIBS"
+
+else
+  echo "$as_me:$LINENO: result: expat library not found or functional." >&5
+echo "${ECHO_T}expat library not found or functional." >&6
+fi
+
 else
     echo "$as_me:$LINENO: result: internal" >&5
 echo "${ECHO_T}internal" >&6
@@ -7664,7 +7879,8 @@ fi
 
 echo "$as_me:$LINENO: checking which freetype to use" >&5
 echo $ECHO_N "checking which freetype to use... $ECHO_C" >&6
-if test -n "$with_system_freetype"; then
+if test -n "$with_system_freetype" -o -n "$with_system_libs" && \
+	test "$with_system_freetype" != "no"; then
     echo "$as_me:$LINENO: result: external" >&5
 echo "${ECHO_T}external" >&6
     SYSTEM_FREETYPE=YES
@@ -7777,7 +7993,8 @@ fi
 
 echo "$as_me:$LINENO: checking which libxml to use" >&5
 echo $ECHO_N "checking which libxml to use... $ECHO_C" >&6
-if test -n "$with_system_libxml"; then
+if test -n "$with_system_libxml" -o -n "$with_system_libs" && \
+	test "$with_system_libxml" != "no"; then
     echo "$as_me:$LINENO: result: external" >&5
 echo "${ECHO_T}external" >&6
     SYSTEM_LIBXML=YES
@@ -8135,7 +8352,8 @@ fi
 
 echo "$as_me:$LINENO: checking which db to use" >&5
 echo $ECHO_N "checking which db to use... $ECHO_C" >&6
-if test -n "$with_system_db3"; then
+if test -n "$with_system_db3" -o -n "$with_system_libs" && \
+	test "$with_system_db3" != "no"; then
     SYSTEM_DB3=YES
     echo "$as_me:$LINENO: result: external" >&5
 echo "${ECHO_T}external" >&6
@@ -8300,7 +8518,8 @@ fi
 
 echo "$as_me:$LINENO: checking which sablot to use" >&5
 echo $ECHO_N "checking which sablot to use... $ECHO_C" >&6
-if test -n "$with_system_sablot"; then
+if test -n "$with_system_sablot" -o -n "$with_system_libs" && \
+	test "$with_system_sablot" != "no"; then
    echo "$as_me:$LINENO: result: external" >&5
 echo "${ECHO_T}external" >&6
    SYSTEM_SABLOT=YES
@@ -8362,7 +8581,8 @@ fi
 
 echo "$as_me:$LINENO: checking which curl to use" >&5
 echo $ECHO_N "checking which curl to use... $ECHO_C" >&6
-if test -n "$with_system_curl"; then
+if test -n "$with_system_curl" -o -n "$with_system_libs" && \
+	test "$with_system_curl" != "no"; then
    echo "$as_me:$LINENO: result: external" >&5
 echo "${ECHO_T}external" >&6
    SYSTEM_CURL=YES
@@ -8804,7 +9024,8 @@ fi
 
 echo "$as_me:$LINENO: checking which icu to use" >&5
 echo $ECHO_N "checking which icu to use... $ECHO_C" >&6
-if test -n "$with_system_icu"; then
+if test -n "$with_system_icu" -o -n "$with_system_libs" && \
+	test "$with_system_icu" != "no"; then
    echo "$as_me:$LINENO: result: external" >&5
 echo "${ECHO_T}external" >&6
    SYSTEM_ICU=YES
@@ -10615,7 +10836,8 @@ XLIB="$x_libraries"
 
 echo "$as_me:$LINENO: checking which nas to use" >&5
 echo $ECHO_N "checking which nas to use... $ECHO_C" >&6
-if test -n "$with_system_nas" -o -n "$with_system_libs"; then
+if test -n "$with_system_nas" -o -n "$with_system_libs" && \
+	test "$with_system_nas" != "no"; then
     echo "$as_me:$LINENO: result: external" >&5
 echo "${ECHO_T}external" >&6
     SYSTEM_NAS=YES
@@ -10823,8 +11045,8 @@ fi
 
 echo "$as_me:$LINENO: checking which neon to use" >&5
 echo $ECHO_N "checking which neon to use... $ECHO_C" >&6
-if test -z "$without_system_neon"; then
-    if test -n "$with_system_neon" -o -n "$with_system_libs"; then
+if test -n "$with_system_neon" -o -n "$with_system_libs" && \
+	test "$with_system_neon" != "no"; then
         echo "$as_me:$LINENO: result: external" >&5
 echo "${ECHO_T}external" >&6
         # Extract the first word of "neon-config", so it can be a program name with args.
@@ -10887,14 +11109,7 @@ echo "${ECHO_T}yes" >&6
 echo "$as_me: error: no. neon 0.24.x is API-incompatible. use 0.23.x" >&2;}
    { (exit 1); exit 1; }; }
            fi
-        fi
-    else
-        echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
-        SYSTEM_NEON=NO
-        NEON_LIBS=-lneon
-        NEON_CFLAGS=
-    fi
+	fi
 else
     echo "$as_me:$LINENO: result: internal" >&5
 echo "${ECHO_T}internal" >&6
@@ -13426,6 +13641,7 @@ s,@PERL@,$PERL,;t t
 s,@TCSH@,$TCSH,;t t
 s,@DMAKE@,$DMAKE,;t t
 s,@BUILD_DMAKE@,$BUILD_DMAKE,;t t
+s,@EPM@,$EPM,;t t
 s,@SYSTEM_ZLIB@,$SYSTEM_ZLIB,;t t
 s,@SYSTEM_JPEG@,$SYSTEM_JPEG,;t t
 s,@SYSTEM_EXPAT@,$SYSTEM_EXPAT,;t t