INTEGRATION: CWS configure21 (1.183.2); FILE MERGED

2007/07/26 13:26:32 hjs 1.183.2.14: #i78148# don't set HUNSPELL_LIBS when not using system hunspell
2007/07/12 13:40:18 rene 1.183.2.13: i79536# we need dmake >= 4.7
2007/07/10 11:13:57 rene 1.183.2.12: #i79389# don't look for libkedui.la, look for the .so
2007/07/09 09:27:29 rene 1.183.2.11: #i79386# use both instead of gnu only
2007/07/05 19:36:25 rene 1.183.2.10: RESYNC: (1.190-1.194); FILE MERGED
2007/06/27 15:11:07 rene 1.183.2.9: RESYNC: (1.186-1.190); FILE MERGED
2007/06/07 22:40:31 rene 1.183.2.8: i65979# supprt more dbs, remove now-unneeded db.jar check
2007/06/07 21:44:23 rene 1.183.2.7: #i76717# fix --with-system-mozilla
2007/06/05 12:52:49 rene 1.183.2.6: RESYNC: (1.183-1.186); FILE MERGED
2007/05/06 16:08:48 rene 1.183.2.5: support --hash-style= from binutils
2007/05/06 15:36:45 rene 1.183.2.4: #i76717# make --with-xulrunner et al. to --wioth-mozilla=xulrunner and make
xulrunner default
#i10000# fix internal sndfile build
#i79396# add $(SNDFILE_CFLAGS)
2007/04/23 21:34:21 rene 1.183.2.3: #i76354# support portaudio v19
2007/04/23 21:10:14 rene 1.183.2.2: support pkg-config for system-hunspell
2007/04/23 21:03:10 rene 1.183.2.1: #i73936# use pkg-config for sndfile detection

1 files changed, 291 insertions, 357 deletions

diff --git a/config_office/configure b/config_office/configure
index 7fdddc18fe09..63a79554961a 100755
--- a/config_office/configure
+++ b/config_office/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision .
+# From configure.in Revision: 1.199.2.13  .
 # 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 LOCAL_SOLENV UPD SOURCEVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP VC_STANDARD ENABLE_WERROR ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS DISABLE_STRIP ENABLE_CUPS ENABLE_FONTCONFIG WITH_BINFILTER ENABLE_DIRECTX DISABLE_ACTIVEX ENABLE_RPATH WITH_MYSPELL_DICTS USE_SHELL WITH_MINGWIN CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT LFS_CFLAGS SHELLPATH GCC_HOME COMPATH GCCVER HAVE_GCC_VISIBILITY_FEATURE ENABLE_PCH GNUMAKE _cc PERL MSPDB_PATH COMEX USE_MINGW MIDL_PATH CSC_PATH FRAME_HOME CPP EGREP ENABLE_VBA VBA_EXTENSION PAM NEW_SHADOW_API PAM_LINK CRYPT_LINK CXX CXXFLAGS ac_ct_CXX GXX_INCLUDE_PATH MINGW_LIB_INCLUDE_PATH EXCEPTIONS CXXCPP STLPORT4 USE_SYSTEM_STL ALLOC BUILD_VER_STRING SOLAR_JAVA JAVAINTERPRETER JAVACOMPILER JAVACISGCJ JAVADOC AWTLIB JAVAAOTCOMPILER JAVA_HOME JDK DMAKE BUILD_DMAKE EPM DPKG PKGMK BUILD_EPM PKGFORMAT RPM MINGWCXX ac_ct_MINGWCXX MINGWSTRIP ac_ct_MINGWSTRIP BUILD_UNOWINREG SYSTEM_STDLIBS SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG FREETYPE_CFLAGS FREETYPE_LIBS SYSTEM_FREETYPE LIBWPD_CFLAGS LIBWPD_LIBS SYSTEM_LIBWPD USE_FT_EMBOLDEN LIBXSLT_CFLAGS LIBXSLT_LIBS XSLTPROC SYSTEM_LIBXSLT 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 HOME SYSTEM_DB DB_VERSION DB_INCLUDES DB_JAR SYSTEM_HSQLDB HSQLDB_JAR SYSTEM_BSH BSH_JAR SYSTEM_XML_APIS XML_APIS_JAR SYSTEM_XERCES XERCES_JAR SERIALIZER_JAR SYSTEM_XALAN XALAN_JAR CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_BOOST SYSTEM_ODBC_HEADERS WITH_MOZILLA WITH_LDAP WITH_OPENLDAP MOZILLAXPCOM_CFLAGS MOZILLAXPCOM_LIBS MOZ_NSPR_CFLAGS MOZ_NSPR_LIBS NSPR_LIB MOZ_NSS_CFLAGS MOZ_NSS_LIBS NSS_LIB MOZILLA_VERSION MOZILLA_TOOLKIT MOZGTK2_CFLAGS MOZGTK2_LIBS MOZLIBREQ_CFLAGS MOZLIBREQ_LIBS BUILD_MOZAB SYSTEM_MOZILLA MOZ_FLAVOUR MOZ_INC MOZ_LIB MOZ_LIB_XPCOM MOZ_LDAP_CFLAGS SYSTEM_SANE_HEADER SYSTEM_GENBRK SYSTEM_GENCCODE SYSTEM_GENCMN SYSTEM_ICU X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB DISABLE_XAW XAU_LIBS SYSTEM_XRENDER_HEADERS XRENDER_LINK XMKMF PATHEXTRA SYSTEM_NAS NAS_INCLUDES ENABLE_NAS ENABLE_PASF SYSTEM_PORTAUDIO SYSTEM_SNDFILE BUILD_TYPE DISABLE_NEON NEON_CFLAGS NEON_LIBS SYSTEM_NEON NEON_VERSION ENABLE_AGG AGG_CFLAGS AGG_LIBS SYSTEM_AGG AGG_VERSION SYSTEM_HUNSPELL HUNSPELL_CFLAGS SYSTEM_HYPH SYSTEM_MYTHES PSDK_HOME DIRECTXSDK_HOME DIRECTXSDK_LIB NSIS_PATH BISON FLEX PATCH GNUCP GNUPATCH CYGWIN_PATH ML_EXE ASM_HOME ZIP UNZIP ZIP_HOME WITH_GPC ENABLE_GTK ENABLE_HEADLESS ENABLE_KDE GNOMEVFS_CFLAGS GNOMEVFS_LIBS GCONF_CFLAGS GCONF_LIBS ENABLE_GNOMEVFS GTK_CFLAGS GTK_LIBS GLIB_CFLAGS GLIB_LIBS ENABLE_SYSTRAY_GTK CAIRO_CFLAGS CAIRO_LIBS ENABLE_CAIRO SYSTEM_CAIRO MOC KDE_CFLAGS KDE_LIBS ENABLE_LOCKDOWN LIBSN_CFLAGS LIBSN_LIBS WITH_LIBSN GOBJECT_CFLAGS GOBJECT_LIBS ENABLE_EVOAB2 ENABLE_KAB WITH_FONTOOO SYSTEM_MSPACK WITH_FONTS WITHOUT_PPDS WITHOUT_AFMS SCPDEFS USE_XINERAMA XINERAMA_LINK SIZEOF_LONG ANT ANT_HOME ANT_LIB WITH_LANG WITH_POOR_HELP_LOCALIZATIONS WITH_DICT INTRO_BITMAPS ABOUT_BITMAPS OOO_VENDOR UNIXWRAPPERNAME ENABLE_STATIC_GTK LOCAL_SOLVER 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 LOCAL_SOLENV UPD SOURCEVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP VC_STANDARD ENABLE_WERROR ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS DISABLE_STRIP ENABLE_CUPS ENABLE_FONTCONFIG WITH_BINFILTER ENABLE_DIRECTX DISABLE_ACTIVEX ENABLE_RPATH WITH_MYSPELL_DICTS USE_SHELL WITH_MINGWIN CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT LFS_CFLAGS SHELLPATH GCC_HOME COMPATH GCCVER HAVE_GCC_VISIBILITY_FEATURE ENABLE_PCH GNUMAKE _cc HAVE_LD_HASH_STYLE PERL MSPDB_PATH COMEX USE_MINGW MIDL_PATH CSC_PATH FRAME_HOME CPP EGREP ENABLE_VBA VBA_EXTENSION PAM NEW_SHADOW_API PAM_LINK CRYPT_LINK CXX CXXFLAGS ac_ct_CXX GXX_INCLUDE_PATH MINGW_LIB_INCLUDE_PATH EXCEPTIONS CXXCPP STLPORT4 USE_SYSTEM_STL ALLOC BUILD_VER_STRING SOLAR_JAVA JAVAINTERPRETER JAVACOMPILER JAVACISGCJ JAVADOC AWTLIB JAVAAOTCOMPILER JAVA_HOME JDK DMAKE BUILD_DMAKE EPM DPKG PKGMK BUILD_EPM PKGFORMAT RPM MINGWCXX ac_ct_MINGWCXX MINGWSTRIP ac_ct_MINGWSTRIP BUILD_UNOWINREG SYSTEM_STDLIBS SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG FREETYPE_CFLAGS FREETYPE_LIBS SYSTEM_FREETYPE LIBWPD_CFLAGS LIBWPD_LIBS SYSTEM_LIBWPD USE_FT_EMBOLDEN LIBXSLT_CFLAGS LIBXSLT_LIBS XSLTPROC SYSTEM_LIBXSLT 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 HOME SYSTEM_DB DB_VERSION DB_INCLUDES DB_JAR SYSTEM_HSQLDB HSQLDB_JAR SYSTEM_BSH BSH_JAR SYSTEM_XML_APIS XML_APIS_JAR SYSTEM_XERCES XERCES_JAR SERIALIZER_JAR SYSTEM_XALAN XALAN_JAR CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_BOOST SYSTEM_ODBC_HEADERS WITH_MOZILLA WITH_LDAP WITH_OPENLDAP MOZILLAXPCOM_CFLAGS MOZILLAXPCOM_LIBS MOZ_NSPR_CFLAGS MOZ_NSPR_LIBS NSPR_LIB MOZ_NSS_CFLAGS MOZ_NSS_LIBS NSS_LIB MOZILLA_VERSION MOZILLA_TOOLKIT MOZGTK2_CFLAGS MOZGTK2_LIBS MOZLIBREQ_CFLAGS MOZLIBREQ_LIBS BUILD_MOZAB SYSTEM_MOZILLA MOZ_FLAVOUR MOZ_INC MOZ_LIB MOZ_LIB_XPCOM MOZ_LDAP_CFLAGS SYSTEM_SANE_HEADER SYSTEM_GENBRK SYSTEM_GENCCODE SYSTEM_GENCMN SYSTEM_ICU X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB DISABLE_XAW XAU_LIBS SYSTEM_XRENDER_HEADERS XRENDER_LINK XMKMF PATHEXTRA SYSTEM_NAS NAS_INCLUDES ENABLE_NAS SNDFILE_CFLAGS SNDFILE_LIBS ENABLE_PASF PA_VER SYSTEM_PORTAUDIO SYSTEM_SNDFILE BUILD_TYPE DISABLE_NEON NEON_CFLAGS NEON_LIBS SYSTEM_NEON NEON_VERSION ENABLE_AGG AGG_CFLAGS AGG_LIBS SYSTEM_AGG AGG_VERSION HUNSPELL_CFLAGS HUNSPELL_LIBS SYSTEM_HUNSPELL SYSTEM_HYPH SYSTEM_MYTHES PSDK_HOME DIRECTXSDK_HOME DIRECTXSDK_LIB NSIS_PATH BISON FLEX PATCH GNUCP GNUPATCH CYGWIN_PATH ML_EXE ASM_HOME ZIP UNZIP ZIP_HOME WITH_GPC ENABLE_GTK ENABLE_HEADLESS ENABLE_KDE GNOMEVFS_CFLAGS GNOMEVFS_LIBS GCONF_CFLAGS GCONF_LIBS ENABLE_GNOMEVFS GTK_CFLAGS GTK_LIBS GLIB_CFLAGS GLIB_LIBS ENABLE_SYSTRAY_GTK CAIRO_CFLAGS CAIRO_LIBS ENABLE_CAIRO SYSTEM_CAIRO MOC KDE_CFLAGS KDE_LIBS ENABLE_LOCKDOWN LIBSN_CFLAGS LIBSN_LIBS WITH_LIBSN GOBJECT_CFLAGS GOBJECT_LIBS ENABLE_EVOAB2 ENABLE_KAB WITH_FONTOOO SYSTEM_MSPACK WITH_FONTS WITHOUT_PPDS WITHOUT_AFMS SCPDEFS USE_XINERAMA XINERAMA_LINK SIZEOF_LONG ANT ANT_HOME ANT_LIB WITH_LANG WITH_POOR_HELP_LOCALIZATIONS WITH_DICT INTRO_BITMAPS ABOUT_BITMAPS OOO_VENDOR UNIXWRAPPERNAME ENABLE_STATIC_GTK LOCAL_SOLVER LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -1039,12 +1039,6 @@ Optional Packages:
                           Usage: --with-package-format="builtin" or
                                  --with-package-format="extsn"
 
-  --with-firefox          Use Firefox instead of Mozilla Suite for building.
-                          Only honoured with --with-system-mozilla
-
-  --with-xulrunner        Use XULRunner instead of Mozilla Suite for building.
-                          Only honoured with --with-system-mozilla
-
   --without-fonts         Removes Bitstream Vera fonts from
                           openoffice.org installation set, for people building
                           for specific distributions where the fonts are known
@@ -1112,7 +1106,6 @@ Optional Packages:
 
   --with-system-db        Use berkeley db already on system
 
-  --with-db-jar=JARFILE   Specify path to jarfile manually
   --with-system-hsqldb    Use hsqldb already on system
 
   --with-hsqldb-jar=JARFILE   Specify path to jarfile manually
@@ -1159,7 +1152,9 @@ Optional Packages:
 
   --with-system-mozilla   Use mozilla already on system. Note that some
                           components cannot be built against a contemporary
-                          mozilla
+                          mozilla. The flavour used can be specified by
+                          --with-system-mozilla=<flavour>. Supported are:
+                          xulrunner (default), firefox, seamonkey, mozilla
 
   --with-stlport4         The location that STLport4 is installed in. The STL
                           header files are assumed to be in
@@ -1879,18 +1874,6 @@ else
   enable_mozilla="yes"
 fi;
 
-# Check whether --with-firefox or --without-firefox was given.
-if test "${with_firefox+set}" = set; then
-  withval="$with_firefox"
-
-fi;
-
-# Check whether --with-xulrunner or --without-xulrunner was given.
-if test "${with_xulrunner+set}" = set; then
-  withval="$with_xulrunner"
-
-fi;
-
 # Check whether --with-fonts or --without-fonts was given.
 if test "${with_fonts+set}" = set; then
   withval="$with_fonts"
@@ -2221,13 +2204,6 @@ if test "${with_system_db+set}" = set; then
 
 fi;
 
-# Check whether --with-db-jar or --without-db-jar was given.
-if test "${with_db_jar+set}" = set; then
-  withval="$with_db_jar"
-   DB_JAR="$withval"
-
-fi;
-
 # Check whether --with-system-hsqldb or --without-system-hsqldb was given.
 if test "${with_system_hsqldb+set}" = set; then
   withval="$with_system_hsqldb"
@@ -2397,7 +2373,9 @@ fi;
 # Check whether --with-system-mozilla or --without-system-mozilla was given.
 if test "${with_system_mozilla+set}" = set; then
   withval="$with_system_mozilla"
-
+  WITH_SYSTEM_MOZILLA=$withval
+else
+  WITH_SYSTEM_MOZILLA=no
 fi;
 
 # Check whether --with-stlport4 or --without-stlport4 was given.
@@ -5793,6 +5771,72 @@ echo "${ECHO_T}checked" >&6
    fi
 fi
 
+if test "$GCC" = "yes"; then
+   echo "$as_me:$LINENO: checking for --hash-style=both linker support " >&5
+echo $ECHO_N "checking for --hash-style=both linker support ... $ECHO_C" >&6
+   hash_style_ldflags_save=$LDFLAGS
+   LDFLAGS="$LDFLAGS -Wl,--hash-style=both"
+   cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+   #include <stdio.h>
+
+int
+main ()
+{
+
+    printf ("hello world\n");
+
+  ;
+  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_c_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
+  HAVE_LD_HASH_STYLE=TRUE
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+HAVE_LD_HASH_STYLE=FALSE
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+   if test "z$HAVE_LD_HASH_STYLE" = "zTRUE"; then
+     echo "$as_me:$LINENO: result: found " >&5
+echo "${ECHO_T}found " >&6
+   else
+     echo "$as_me:$LINENO: result: not found " >&5
+echo "${ECHO_T}not found " >&6
+   fi
+   LDFLAGS=$hash_style_ldflags_save
+fi
+
+
 if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then
    if test "$CC" = "cc"; then
       for ac_prog in cc
@@ -10410,20 +10454,20 @@ echo "${ECHO_T}yes" >&6
 echo $ECHO_N "checking the dmake version... $ECHO_C" >&6
        DMAKE_VERSION=`$DMAKE -V | $SED -n 's/.*Version \([0-9.]\+\).*/\1/p'`
        if test "$DMAKE_VERSION" = "4.10"; then
-	 echo "$as_me:$LINENO: result: too old. >= 4.6 is needed. (Your old 4.1 version identifies itself as 4.10, PL 0.)" >&5
-echo "${ECHO_T}too old. >= 4.6 is needed. (Your old 4.1 version identifies itself as 4.10, PL 0.)" >&6
+	 echo "$as_me:$LINENO: result: too old. >= 4.7 is needed. (Your old 4.1 version identifies itself as 4.10, PL 0.)" >&5
+echo "${ECHO_T}too old. >= 4.7 is needed. (Your old 4.1 version identifies itself as 4.10, PL 0.)" >&6
 	 echo "A newer dmake will be built on ./bootstrap"
 	 BUILD_DMAKE=YES
        elif test "`echo $DMAKE_VERSION | cut -d'.' -f1`" -gt "4"; then
-	 echo "$as_me:$LINENO: result: OK, >= 4.6" >&5
-echo "${ECHO_T}OK, >= 4.6" >&6
+	 echo "$as_me:$LINENO: result: OK, >= 4.7" >&5
+echo "${ECHO_T}OK, >= 4.7" >&6
        elif test "`echo $DMAKE_VERSION | cut -d'.' -f1`" = "4" && \
-	    test "`echo $DMAKE_VERSION | cut -d'.' -f2`" -ge "6"; then
-	 echo "$as_me:$LINENO: result: OK, >= 4.6" >&5
-echo "${ECHO_T}OK, >= 4.6" >&6
+	    test "`echo $DMAKE_VERSION | cut -d'.' -f2`" -ge "7"; then
+	 echo "$as_me:$LINENO: result: OK, >= 4.7" >&5
+echo "${ECHO_T}OK, >= 4.7" >&6
        else
-	 echo "$as_me:$LINENO: result: too old. >= 4.6 is needed" >&5
-echo "${ECHO_T}too old. >= 4.6 is needed" >&6
+	 echo "$as_me:$LINENO: result: too old. >= 4.7 is needed" >&5
+echo "${ECHO_T}too old. >= 4.7 is needed" >&6
 	 echo "A newer dmake will be built on ./bootstrap"
 	 BUILD_DMAKE=YES
        fi
@@ -13105,8 +13149,7 @@ fi
 
     echo "$as_me:$LINENO: checking whether db is at least 4.1" >&5
 echo $ECHO_N "checking whether db is at least 4.1... $ECHO_C" >&6
-    # FIXME: Will db 4.3 work? Can't test it since the 4.3 java bindings are not packaged :/
-    for v in 1 2; do
+    for v in 1 2 3 4 5; do
        if test "$cross_compiling" = yes; then
   { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 See \`config.log' for more details." >&5
@@ -13234,101 +13277,6 @@ echo "$as_me: error: db not installed or functional" >&2;}
 fi
 ac_cv_lib_db=ac_cv_lib_db_main
 
-     if test "$SOLAR_JAVA" = "TRUE"; then
-       if test -z "$DB_JAR"; then
-         # three different naming methods *grumble* Are there even more?
-         echo "$as_me:$LINENO: checking for /usr/share/java/db.jar" >&5
-echo $ECHO_N "checking for /usr/share/java/db.jar... $ECHO_C" >&6
-if test "${ac_cv_file__usr_share_java_db_jar+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
-if test -r "/usr/share/java/db.jar"; then
-  ac_cv_file__usr_share_java_db_jar=yes
-else
-  ac_cv_file__usr_share_java_db_jar=no
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_db_jar" >&5
-echo "${ECHO_T}$ac_cv_file__usr_share_java_db_jar" >&6
-if test $ac_cv_file__usr_share_java_db_jar = yes; then
-   JARVER=0
-else
-
-             as_ac_File=`echo "ac_cv_file_/usr/share/java/db-$DB_VERSION.jar" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for /usr/share/java/db-$DB_VERSION.jar" >&5
-echo $ECHO_N "checking for /usr/share/java/db-$DB_VERSION.jar... $ECHO_C" >&6
-if eval "test \"\${$as_ac_File+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
-if test -r "/usr/share/java/db-$DB_VERSION.jar"; then
-  eval "$as_ac_File=yes"
-else
-  eval "$as_ac_File=no"
-fi
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
-if test `eval echo '${'$as_ac_File'}'` = yes; then
-   JARVER=1
-else
-   as_ac_File=`echo "ac_cv_file_/usr/share/java/libdb$DB_VERSION-java.jar" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for /usr/share/java/libdb$DB_VERSION-java.jar" >&5
-echo $ECHO_N "checking for /usr/share/java/libdb$DB_VERSION-java.jar... $ECHO_C" >&6
-if eval "test \"\${$as_ac_File+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
-if test -r "/usr/share/java/libdb$DB_VERSION-java.jar"; then
-  eval "$as_ac_File=yes"
-else
-  eval "$as_ac_File=no"
-fi
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
-if test `eval echo '${'$as_ac_File'}'` = yes; then
-   JARVER_LONGSTYLE=1
-else
-   { { echo "$as_me:$LINENO: error: db$DB_VERSION_MAJOR Java bindings not found" >&5
-echo "$as_me: error: db$DB_VERSION_MAJOR Java bindings not found" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-
-
-
-fi
-
-
-
-fi
-
-         if test "$JARVER" = "1"; then
-           DB_JAR=/usr/share/java/jar-$DB_VERSION.jar
-         else
-           DB_JAR=/usr/share/java/db.jar
-         fi
-         if test "$JARVER_LONGSTYLE" = "1"; then
-           DB_JAR=/usr/share/java/libdb$DB_VERSION-java.jar
-         fi
-	  if test -z "$DB_JAR"; then
-	    { { echo "$as_me:$LINENO: error: libdb $DB_VERSION jar not found. Install it or specify path with --with-db-jar=/path/to/jar" >&5
-echo "$as_me: error: libdb $DB_VERSION jar not found. Install it or specify path with --with-db-jar=/path/to/jar" >&2;}
-   { (exit 1); exit 1; }; }
-	  fi
-       fi
-    fi
     SCPDEFS="$SCPDEFS -DSYSTEM_DB"
 else
     echo "$as_me:$LINENO: result: internal" >&5
@@ -14776,12 +14724,16 @@ echo "${ECHO_T}external" >&6
     SYSTEM_MOZILLA=YES
     echo "$as_me:$LINENO: checking which Mozilla flavour to use" >&5
 echo $ECHO_N "checking which Mozilla flavour to use... $ECHO_C" >&6
-    if test -n "$with_firefox" && test "$with_firefox" != "no"; then
-      MOZ_FLAVOUR=firefox
-    elif test -n "$with_xulrunner" && test "$with_xulrunner" != "no"; then
+    if test -n "$with_system_mozilla" && test "$with_system_mozilla" = "xulrunner"; then
       MOZ_FLAVOUR=xulrunner
-    else
+    elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "seamonkey"; then
+      MOZ_FLAVOUR=seamonkey
+    elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "firefox"; then
+      MOZ_FLAVOUR=firefox
+    elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "mozilla"; then
       MOZ_FLAVOUR=mozilla
+    else
+      MOZ_FLAVOUR=xulrunner
     fi
     tmp=`echo $MOZ_FLAVOUR | $PERL -e 'print ucfirst(<STDIN>);'`
     echo "$as_me:$LINENO: result: $tmp" >&5
@@ -19055,237 +19007,114 @@ echo $ECHO_N "checking which sndfile to use... $ECHO_C" >&6
 		test "$with_system_sndfile" != "no"; then
 	   echo "$as_me:$LINENO: result: external" >&5
 echo "${ECHO_T}external" >&6
-	   if test "${ac_cv_header_sndfile_h+set}" = set; then
-  echo "$as_me:$LINENO: checking for sndfile.h" >&5
-echo $ECHO_N "checking for sndfile.h... $ECHO_C" >&6
-if test "${ac_cv_header_sndfile_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_sndfile_h" >&5
-echo "${ECHO_T}$ac_cv_header_sndfile_h" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking sndfile.h usability" >&5
-echo $ECHO_N "checking sndfile.h usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <sndfile.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 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_objext'
-  { (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_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+  succeeded=no
 
-# Is the header present?
-echo "$as_me:$LINENO: checking sndfile.h presence" >&5
-echo $ECHO_N "checking sndfile.h presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sndfile.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
+  if test -z "$PKG_CONFIG"; then
+    # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; 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_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # 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_PKG_CONFIG="$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
 
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: sndfile.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: sndfile.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sndfile.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: sndfile.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: sndfile.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: sndfile.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sndfile.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: sndfile.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sndfile.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: sndfile.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sndfile.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: sndfile.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sndfile.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: sndfile.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sndfile.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: sndfile.h: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+  ;;
 esac
-echo "$as_me:$LINENO: checking for sndfile.h" >&5
-echo $ECHO_N "checking for sndfile.h... $ECHO_C" >&6
-if test "${ac_cv_header_sndfile_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_header_sndfile_h=$ac_header_preproc
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header_sndfile_h" >&5
-echo "${ECHO_T}$ac_cv_header_sndfile_h" >&6
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
-fi
-if test $ac_cv_header_sndfile_h = yes; then
-  :
+if test -n "$PKG_CONFIG"; then
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { { echo "$as_me:$LINENO: error: sndfile header not found. install sndfile" >&5
-echo "$as_me: error: sndfile header not found. install sndfile" >&2;}
-   { (exit 1); exit 1; }; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
+  fi
 
+  if test "$PKG_CONFIG" = "no" ; then
+     echo "*** The pkg-config script could not be found. Make sure it is"
+     echo "*** in your path, or set the PKG_CONFIG environment variable"
+     echo "*** to the full path to pkg-config."
+     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+  else
+     PKG_CONFIG_MIN_VERSION=0.9.0
+     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+        echo "$as_me:$LINENO: checking for sndfile" >&5
+echo $ECHO_N "checking for sndfile... $ECHO_C" >&6
 
-echo "$as_me:$LINENO: checking for sf_open in -lsndfile" >&5
-echo $ECHO_N "checking for sf_open in -lsndfile... $ECHO_C" >&6
-if test "${ac_cv_lib_sndfile_sf_open+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsndfile  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+        if $PKG_CONFIG --exists "sndfile" ; then
+            echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+            succeeded=yes
 
-/* 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 sf_open ();
-int
-main ()
-{
-sf_open ();
-  ;
-  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_sndfile_sf_open=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+            echo "$as_me:$LINENO: checking SNDFILE_CFLAGS" >&5
+echo $ECHO_N "checking SNDFILE_CFLAGS... $ECHO_C" >&6
+            SNDFILE_CFLAGS=`$PKG_CONFIG --cflags "sndfile"`
+            echo "$as_me:$LINENO: result: $SNDFILE_CFLAGS" >&5
+echo "${ECHO_T}$SNDFILE_CFLAGS" >&6
+
+            echo "$as_me:$LINENO: checking SNDFILE_LIBS" >&5
+echo $ECHO_N "checking SNDFILE_LIBS... $ECHO_C" >&6
+            SNDFILE_LIBS=`$PKG_CONFIG --libs "sndfile"`
+            echo "$as_me:$LINENO: result: $SNDFILE_LIBS" >&5
+echo "${ECHO_T}$SNDFILE_LIBS" >&6
+        else
+            SNDFILE_CFLAGS=""
+            SNDFILE_LIBS=""
+            ## If we have a custom action on failure, don't print errors, but
+            ## do set a variable so people can do so.
+            SNDFILE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "sndfile"`
+            echo $SNDFILE_PKG_ERRORS
+        fi
 
-ac_cv_lib_sndfile_sf_open=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_sndfile_sf_open" >&5
-echo "${ECHO_T}$ac_cv_lib_sndfile_sf_open" >&6
-if test $ac_cv_lib_sndfile_sf_open = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBSNDFILE 1
-_ACEOF
 
-  LIBS="-lsndfile $LIBS"
 
-else
-  { { echo "$as_me:$LINENO: error: sndfile library not found or functional" >&5
-echo "$as_me: error: sndfile library not found or functional" >&2;}
+     else
+        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+        echo "*** See http://www.freedesktop.org/software/pkgconfig"
+     fi
+  fi
+
+  if test $succeeded = yes; then
+     :
+  else
+     { { echo "$as_me:$LINENO: error: Library requirements (sndfile) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+echo "$as_me: error: Library requirements (sndfile) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
    { (exit 1); exit 1; }; }
-fi
+  fi
 
 	   SYSTEM_SNDFILE=YES
 	else
            echo "$as_me:$LINENO: result: internal" >&5
 echo "${ECHO_T}internal" >&6
 	   SYSTEM_SNDFILE=NO
+       SNDFILE_LIBS=-lsndfile
 	    BUILD_TYPE="$BUILD_TYPE SNDFILE"
 	fi
+
+   PA_VER=18
 	echo "$as_me:$LINENO: checking which portaudio to use" >&5
 echo $ECHO_N "checking which portaudio to use... $ECHO_C" >&6
 	if test -n "$with_system_portaudio" -o -n "$with_system_libs" && \
@@ -19529,10 +19358,8 @@ int
 main ()
 {
 
-void main(int argc, char **argv) {
 	 /* Pa_GetVersion() only exists in v19, so this fails to build with v18 */
         int v = Pa_GetVersion();
-}
 
   ;
   return 0;
@@ -19560,15 +19387,14 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  { { echo "$as_me:$LINENO: error: portaudio too new. you need v18" >&5
-echo "$as_me: error: portaudio too new. you need v18" >&2;}
-   { (exit 1); exit 1; }; }
+  PA_VER=19; echo "$as_me:$LINENO: result: OK, v$PA_VER" >&5
+echo "${ECHO_T}OK, v$PA_VER" >&6
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-echo "$as_me:$LINENO: result: OK, v18" >&5
-echo "${ECHO_T}OK, v18" >&6
+echo "$as_me:$LINENO: result: OK, v$PA_VER" >&5
+echo "${ECHO_T}OK, v$PA_VER" >&6
 fi
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
@@ -19588,6 +19414,9 @@ fi
 
 
 
+
+
+
 echo "$as_me:$LINENO: checking whether to build neon" >&5
 echo $ECHO_N "checking whether to build neon... $ECHO_C" >&6
 if test "$enable_neon" = "no"; then
@@ -19975,7 +19804,104 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-    if test "${ac_cv_header_hunspell_hxx+set}" = set; then
+
+  succeeded=no
+
+  if test -z "$PKG_CONFIG"; then
+    # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; 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_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # 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_PKG_CONFIG="$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_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
+if test -n "$PKG_CONFIG"; then
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  fi
+
+  if test "$PKG_CONFIG" = "no" ; then
+     echo "*** The pkg-config script could not be found. Make sure it is"
+     echo "*** in your path, or set the PKG_CONFIG environment variable"
+     echo "*** to the full path to pkg-config."
+     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+  else
+     PKG_CONFIG_MIN_VERSION=0.9.0
+     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+        echo "$as_me:$LINENO: checking for hunspell" >&5
+echo $ECHO_N "checking for hunspell... $ECHO_C" >&6
+
+        if $PKG_CONFIG --exists "hunspell" ; then
+            echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+            succeeded=yes
+
+            echo "$as_me:$LINENO: checking HUNSPELL_CFLAGS" >&5
+echo $ECHO_N "checking HUNSPELL_CFLAGS... $ECHO_C" >&6
+            HUNSPELL_CFLAGS=`$PKG_CONFIG --cflags "hunspell"`
+            echo "$as_me:$LINENO: result: $HUNSPELL_CFLAGS" >&5
+echo "${ECHO_T}$HUNSPELL_CFLAGS" >&6
+
+            echo "$as_me:$LINENO: checking HUNSPELL_LIBS" >&5
+echo $ECHO_N "checking HUNSPELL_LIBS... $ECHO_C" >&6
+            HUNSPELL_LIBS=`$PKG_CONFIG --libs "hunspell"`
+            echo "$as_me:$LINENO: result: $HUNSPELL_LIBS" >&5
+echo "${ECHO_T}$HUNSPELL_LIBS" >&6
+        else
+            HUNSPELL_CFLAGS=""
+            HUNSPELL_LIBS=""
+            ## If we have a custom action on failure, don't print errors, but
+            ## do set a variable so people can do so.
+            HUNSPELL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "hunspell"`
+
+        fi
+
+
+
+     else
+        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+        echo "*** See http://www.freedesktop.org/software/pkgconfig"
+     fi
+  fi
+
+  if test $succeeded = yes; then
+     HUNSPELL_PC="TRUE"
+  else
+     HUNSPELL_PC=""
+  fi
+
+    if test "$HUNSPELL_PC" != "TRUE"; then
+      if test "${ac_cv_header_hunspell_hxx+set}" = set; then
   echo "$as_me:$LINENO: checking for hunspell.hxx" >&5
 echo $ECHO_N "checking for hunspell.hxx... $ECHO_C" >&6
 if test "${ac_cv_header_hunspell_hxx+set}" = set; then
@@ -20116,7 +20042,7 @@ if test $ac_cv_header_hunspell_hxx = yes; then
   :
 else
 
-    if test "${ac_cv_header_hunspell_hunspell_hxx+set}" = set; then
+      if test "${ac_cv_header_hunspell_hunspell_hxx+set}" = set; then
   echo "$as_me:$LINENO: checking for hunspell/hunspell.hxx" >&5
 echo $ECHO_N "checking for hunspell/hunspell.hxx... $ECHO_C" >&6
 if test "${ac_cv_header_hunspell_hunspell_hxx+set}" = set; then
@@ -20338,6 +20264,8 @@ echo "$as_me: error: hunspell library not found." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
+      HUNSPELL_LIBS=-lhunspell
+     fi
 else
     echo "$as_me:$LINENO: result: internal" >&5
 echo "${ECHO_T}internal" >&6
@@ -20346,6 +20274,7 @@ fi
 
 
 
+
 echo "$as_me:$LINENO: checking which altlinuxhyph to use" >&5
 echo $ECHO_N "checking which altlinuxhyph to use... $ECHO_C" >&6
 if test -n "$with_system_altlinuxhyph" && test "$with_system_altlinuxyph" != "no"; then
@@ -22564,7 +22493,7 @@ if test "$test_kde" = "yes" -a "$ENABLE_KDE" = "TRUE" ; then
         qt_test_include="qstyle.h"
     qt_test_library="libqt-mt.so"
     kde_test_include="ksharedptr.h"
-    kde_test_library="libkdeui.la"
+    kde_test_library="libkdeui.so"
 
         echo "$as_me:$LINENO: checking for Qt headers" >&5
 echo $ECHO_N "checking for Qt headers... $ECHO_C" >&6
@@ -25078,6 +25007,7 @@ s,@HAVE_GCC_VISIBILITY_FEATURE@,$HAVE_GCC_VISIBILITY_FEATURE,;t t
 s,@ENABLE_PCH@,$ENABLE_PCH,;t t
 s,@GNUMAKE@,$GNUMAKE,;t t
 s,@_cc@,$_cc,;t t
+s,@HAVE_LD_HASH_STYLE@,$HAVE_LD_HASH_STYLE,;t t
 s,@PERL@,$PERL,;t t
 s,@MSPDB_PATH@,$MSPDB_PATH,;t t
 s,@COMEX@,$COMEX,;t t
@@ -25223,7 +25153,10 @@ s,@PATHEXTRA@,$PATHEXTRA,;t t
 s,@SYSTEM_NAS@,$SYSTEM_NAS,;t t
 s,@NAS_INCLUDES@,$NAS_INCLUDES,;t t
 s,@ENABLE_NAS@,$ENABLE_NAS,;t t
+s,@SNDFILE_CFLAGS@,$SNDFILE_CFLAGS,;t t
+s,@SNDFILE_LIBS@,$SNDFILE_LIBS,;t t
 s,@ENABLE_PASF@,$ENABLE_PASF,;t t
+s,@PA_VER@,$PA_VER,;t t
 s,@SYSTEM_PORTAUDIO@,$SYSTEM_PORTAUDIO,;t t
 s,@SYSTEM_SNDFILE@,$SYSTEM_SNDFILE,;t t
 s,@BUILD_TYPE@,$BUILD_TYPE,;t t
@@ -25237,8 +25170,9 @@ s,@AGG_CFLAGS@,$AGG_CFLAGS,;t t
 s,@AGG_LIBS@,$AGG_LIBS,;t t
 s,@SYSTEM_AGG@,$SYSTEM_AGG,;t t
 s,@AGG_VERSION@,$AGG_VERSION,;t t
-s,@SYSTEM_HUNSPELL@,$SYSTEM_HUNSPELL,;t t
 s,@HUNSPELL_CFLAGS@,$HUNSPELL_CFLAGS,;t t
+s,@HUNSPELL_LIBS@,$HUNSPELL_LIBS,;t t
+s,@SYSTEM_HUNSPELL@,$SYSTEM_HUNSPELL,;t t
 s,@SYSTEM_HYPH@,$SYSTEM_HYPH,;t t
 s,@SYSTEM_MYTHES@,$SYSTEM_MYTHES,;t t
 s,@PSDK_HOME@,$PSDK_HOME,;t t