Sync configure with configure.ac

diff --git a/configure b/configure
index 3274ec0018caf29b5e72e7ce90df13d9e4103d90..d20cdcd1bb6d197e9c2873fa905cb03f2daabdf0 100755 (executable)
--- a/configure
+++ b/configure
@@ -733,7 +733,6 @@ XML_LIBS
 XML_DELEGATE_FALSE
 XML_DELEGATE_TRUE
 xml2_config
-WMF_LIBS_DEPS
 WMF_LIBS
 WMF_DELEGATE_FALSE
 WMF_DELEGATE_TRUE
@@ -3584,7 +3583,7 @@ MAGICK_LIBRARY_CURRENT_MIN=`expr $MAGICK_LIBRARY_CURRENT - $MAGICK_LIBRARY_AGE`
 
 MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE
 
-MAGICK_SVN_REVISION=5041
+MAGICK_SVN_REVISION=exported
 
 
 
@@ -30021,6 +30020,7 @@ fi
 
 
 
+if test "$have_zlib" == 'yes'; then
 #
 # Check for PNG delegate library.
 #
@@ -30040,7 +30040,8 @@ fi
 have_png='no'
 PNG_LIBS=''
 
-if test "$with_png" != 'no'; then
+if test "$with_png" != 'no'
+then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5
 $as_echo "-------------------------------------------------------------" >&6; }
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PNG support " >&5
@@ -30116,7 +30117,8 @@ $as_echo "yes" >&6; }
           fi
         fi
 
-        if test $passed -gt 0 -a $failed -le 0; then
+        if test $passed -gt 0 -a $failed -le 0
+        then
           if test "1${var}" = '15' ; then
             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_get_io_ptr in -lpng15" >&5
 $as_echo_n "checking for png_get_io_ptr in -lpng15... " >&6; }
@@ -30382,18 +30384,18 @@ fi
 $as_echo_n "checking if ${pnglib} package is complete... " >&6; }
             if test $passed -gt 0 ; then
               if test $failed -gt 0 ; then
-               { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- some components failed test" >&5
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- some components failed test" >&5
 $as_echo "no -- some components failed test" >&6; }
-                     have_png='no (failed tests)'
+               have_png='no (failed tests)'
               else
-               PNG_LIBS="-l${pnglib}"
-                     LIBS="$PNG_LIBS $LIBS"
+               PNG_LIBS="-l${pnglib}"
+               LIBS="$PNG_LIBS $LIBS"
 
 $as_echo "#define PNG_DELEGATE 1" >>confdefs.h
 
-                     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-                     have_png='yes'
+               have_png='yes'
               fi
             fi
           fi
@@ -30412,6 +30414,10 @@ else
 fi
 
 
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: PNG requires zlib support" >&5
+$as_echo "PNG requires zlib support" >&6; }
+fi
 
 
 #
@@ -31114,89 +31120,30 @@ fi
 
 have_wmf='no'
 WMF_LIBS=''
-WMF_LIBS_DEPS=''
-OLIBS="$LIBS"
 if test "$with_wmf" != 'no'; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5
 $as_echo "-------------------------------------------------------------" >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for WMF" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for WMF" >&5
 $as_echo_n "checking for WMF... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
 $as_echo "" >&6; }
-  have_libwmf='no'
-  have_libwmflite='no'
-  have_libwmf_ipa_h='no'
-  ac_fn_c_check_header_compile "$LINENO" "libwmf/ipa.h" "ac_cv_header_libwmf_ipa_h" "$FT2BUILD_H
-"
-if test "x$ac_cv_header_libwmf_ipa_h" = xyes; then :
-  have_libwmf_ipa_h='yes'
-fi
-
-
-  if test "$have_libwmf_ipa_h" = 'yes'; then
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wmf_lite_create in -lwmflite" >&5
-$as_echo_n "checking for wmf_lite_create in -lwmflite... " >&6; }
-if ${ac_cv_lib_wmflite_wmf_lite_create+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lwmflite  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char wmf_lite_create ();
-int
-main ()
-{
-return wmf_lite_create ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_wmflite_wmf_lite_create=yes
+    failed=0
+    passed=0
+    ac_fn_c_check_header_mongrel "$LINENO" "libwmf/eps.h" "ac_cv_header_libwmf_eps_h" "$ac_includes_default"
+if test "x$ac_cv_header_libwmf_eps_h" = xyes; then :
+  passed=`expr $passed + 1`
 else
-  ac_cv_lib_wmflite_wmf_lite_create=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_wmflite_wmf_lite_create" >&5
-$as_echo "$ac_cv_lib_wmflite_wmf_lite_create" >&6; }
-if test "x$ac_cv_lib_wmflite_wmf_lite_create" = xyes; then :
-  have_libwmflite='yes'
+  failed=`expr $failed + 1`
 fi
 
-    if test "$have_libwmflite" = 'yes'; then
 
-$as_echo "#define HasWMFlite 1" >>confdefs.h
-
-      WMF_LIBS='-lwmflite'
-      LIBS="$WMF_LIBS $LIBS"
-      have_wmf='yes'
-    else
-      WMF_LIBS_DEPS=''
-      WMF_CONFIG_LIBS=`libwmf-config --libs`
-      for lib in xml2 expat freetype jpeg png z
-      do
-        testlib="-l${lib}"
-        echo "$WMF_CONFIG_LIBS" | grep -- "$testlib" > /dev/null && WMF_LIBS_DEPS="$WMF_LIBS_DEPS $testlib"
-      done
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wmf_api_create in -lwmf" >&5
-$as_echo_n "checking for wmf_api_create in -lwmf... " >&6; }
-if ${ac_cv_lib_wmf_wmf_api_create+:} false; then :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wmf_eps_function in -lwmf" >&5
+$as_echo_n "checking for wmf_eps_function in -lwmf... " >&6; }
+if ${ac_cv_lib_wmf_wmf_eps_function+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lwmf $WMF_LIBS_DEPS $LIBS"
+LIBS="-lwmf "-lwmflite" $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -31206,56 +31153,53 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char wmf_api_create ();
+char wmf_eps_function ();
 int
 main ()
 {
-return wmf_api_create ();
+return wmf_eps_function ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_wmf_wmf_api_create=yes
+  ac_cv_lib_wmf_wmf_eps_function=yes
 else
-  ac_cv_lib_wmf_wmf_api_create=no
+  ac_cv_lib_wmf_wmf_eps_function=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_wmf_wmf_api_create" >&5
-$as_echo "$ac_cv_lib_wmf_wmf_api_create" >&6; }
-if test "x$ac_cv_lib_wmf_wmf_api_create" = xyes; then :
-  have_libwmf='yes'
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_wmf_wmf_eps_function" >&5
+$as_echo "$ac_cv_lib_wmf_wmf_eps_function" >&6; }
+if test "x$ac_cv_lib_wmf_wmf_eps_function" = xyes; then :
+  passed=`expr $passed + 1`
+else
+  failed=`expr $failed + 1`
 fi
 
-      if test "$have_libwmf" = 'yes'; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if WMF package is complete" >&5
+$as_echo_n "checking if WMF package is complete... " >&6; }
+    if test $passed -gt 0; then
+        if test $failed -gt 0; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- some components failed test" >&5
+$as_echo "no -- some components failed test" >&6; }
+            have_wmf='no (failed tests)'
+        else
+            WMF_LIBS='-lwmf -lwmflite'
+            LIBS="$WMF_LIBS $LIBS"
 
 $as_echo "#define WMF_DELEGATE 1" >>confdefs.h
 
-        WMF_LIBS='-lwmf'
-        LIBS="$WMF_LIBS $LIBS"
-        have_wmf='yes'
-      else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- some components failed test" >&5
-$as_echo "no -- some components failed test" >&6; }
-        have_wmf='no (failed tests)'
-        have_wmflite='no (failed tests)'
-        LIBS="$OLIBS"
-        WMF_LIBS=''
-      fi
-    fi
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if WMF package is complete" >&5
-$as_echo_n "checking if WMF package is complete... " >&6; }
-if test "$have_wmf" = 'yes'; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+            have_wmf='yes'
+        fi
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
+    fi
 fi
  if test "$have_wmf" = 'yes'; then
   WMF_DELEGATE_TRUE=
@@ -31270,7 +31214,6 @@ fi
 
 
 
-
 #
 # Check for XML delegate library.
 #