--- psiconv/trunk/configure	1999/10/27 14:29:40	19
+++ psiconv/trunk/configure	2000/07/14 20:44:40	49
@@ -22,6 +22,10 @@
 ac_help="$ac_help
   --disable-libtool-lock  avoid locking (might break parallel builds)"
 ac_help="$ac_help
+  --enable-compile-warnings=[no/minimum/yes]       Turn on compiler warnings."
+ac_help="$ac_help
+  --enable-iso-c          Try to warn if code is not ISO C "
+ac_help="$ac_help
   --with-imagemagick      enable ImageMagick (default = yes)"
 ac_help="$ac_help
   --disable-html-docs     Disable generation of HTML 3.2 docs (default: on)"
@@ -31,10 +35,6 @@
   --enable-ascii-docs     Enable generation of ASCII docs (default: off)"
 ac_help="$ac_help
   --enable-rtf-docs       Enable generation of RTF docs (default: off)"
-ac_help="$ac_help
-  --enable-compile-warnings=[no/minimum/yes]       Turn on compiler warnings."
-ac_help="$ac_help
-  --enable-iso-c          Try to warn if code is not ISO C "
 
 # Initialize some variables set by options.
 # The variables have the same names as the options, with
@@ -715,7 +715,7 @@
 
 PACKAGE=psiconv
 
-VERSION=0.5.0a
+VERSION=0.6.1
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1241,9 +1241,8 @@
   echo "$ac_t""no" 1>&6
 fi
 test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
-
 echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1247: checking if the linker ($LD) is GNU ld" >&5
+echo "configure:1246: checking if the linker ($LD) is GNU ld" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1259,7 +1258,7 @@
 
 
 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:1263: checking for BSD-compatible nm" >&5
+echo "configure:1262: checking for BSD-compatible nm" >&5
 if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1294,9 +1293,8 @@
 NM="$ac_cv_path_NM"
 echo "$ac_t""$NM" 1>&6
 
-
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1300: checking whether ln -s works" >&5
+echo "configure:1298: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1317,6 +1315,11 @@
 fi
 
 
+case "$target" in
+NONE) lt_target="$host" ;;
+*) lt_target="$target" ;;
+esac
+
 # Check for any special flags to pass to ltconfig.
 libtool_flags="--cache-file=$cache_file"
 test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
@@ -1337,11 +1340,11 @@
 
 # Some flags need to be propagated to the compiler or linker for good
 # libtool support.
-case "$host" in
+case "$lt_target" in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 1344 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:1345: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  echo '#line 1347 "configure"' > conftest.$ac_ext
+  if { (eval echo configure:1348: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     case "`/usr/bin/file conftest.o`" in
     *32-bit*)
       LD="${LD-ld} -32"
@@ -1362,19 +1365,19 @@
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:1366: checking whether the C compiler needs -belf" >&5
+echo "configure:1369: checking whether the C compiler needs -belf" >&5
 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1371 "configure"
+#line 1374 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_cc_needs_belf=yes
 else
@@ -1452,7 +1455,7 @@
 LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
 DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
 ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
+$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
 || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
 
 # Reload cache, that may have been modified by ltconfig
@@ -1476,6 +1479,70 @@
 exec 5>>./config.log
 
 
+# Check whether --enable-compile-warnings or --disable-compile-warnings was given.
+if test "${enable_compile_warnings+set}" = set; then
+  enableval="$enable_compile_warnings"
+  :
+else
+  enable_compile_warnings=minimum
+fi
+
+
+echo $ac_n "checking what warning flags to pass to the C compiler""... $ac_c" 1>&6
+echo "configure:1493: checking what warning flags to pass to the C compiler" >&5
+warnCFLAGS=
+if test "x$GCC" != xyes; then
+  enable_compile_warnings=no
+fi
+if test "x$enable_compile_warnings" != "xno"; then
+  if test "x$GCC" = "xyes"; then
+    case " $CFLAGS " in
+    *\ \	-Wall\ \	*) ;;
+    *) warnCFLAGS="-Wall -Wunused" ;;
+    esac
+
+    ## -W is not all that useful.  And it cannot be controlled
+    ## with individual -Wno-xxx flags, unlike -Wall
+    if test "x$enable_compile_warnings" = "xyes"; then
+      warnCFLAGS="$warnCFLAGS -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith"
+    fi
+  fi
+fi
+echo "$ac_t""$warnCFLAGS" 1>&6
+
+# Check whether --enable-iso-c or --disable-iso-c was given.
+if test "${enable_iso_c+set}" = set; then
+  enableval="$enable_iso_c"
+  :
+else
+  enable_iso_c=no
+fi
+
+
+echo $ac_n "checking what language compliance flags to pass to the C compiler""... $ac_c" 1>&6
+echo "configure:1524: checking what language compliance flags to pass to the C compiler" >&5
+complCFLAGS=
+if test "x$enable_iso_c" != "xno"; then
+  if test "x$GCC" = "xyes"; then
+    case " $CFLAGS " in
+    *\ \	-ansi\ \	*) ;;
+    *) complCFLAGS="$complCFLAGS -ansi" ;;
+    esac
+
+    case " $CFLAGS " in
+    *\ \	-pedantic\ \	*) ;;
+    *) complCFLAGS="$complCFLAGS -pedantic" ;;
+    esac
+  fi
+fi
+echo "$ac_t""$complCFLAGS" 1>&6
+if test "x$cflags_set" != "xyes"; then
+  CFLAGS="$CFLAGS $warnCFLAGS $complCFLAGS"
+  cflags_set=yes
+  
+fi
+
+
 # Check whether --with-imagemagick or --without-imagemagick was given.
 if test "${with_imagemagick+set}" = set; then
   withval="$with_imagemagick"
@@ -1485,27 +1552,27 @@
 fi
 
 if test x"$IMAGEMAGICK" != xno ; then
-  echo $ac_n "checking for MagickWarning in -lMagick""... $ac_c" 1>&6
-echo "configure:1490: checking for MagickWarning in -lMagick" >&5
-ac_lib_var=`echo Magick'_'MagickWarning | sed 'y%./+-%__p_%'`
+  echo $ac_n "checking for ConstituteImage in -lMagick""... $ac_c" 1>&6
+echo "configure:1557: checking for ConstituteImage in -lMagick" >&5
+ac_lib_var=`echo Magick'_'ConstituteImage | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-lMagick  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1498 "configure"
+#line 1565 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char MagickWarning();
+char ConstituteImage();
 
 int main() {
-MagickWarning()
+ConstituteImage()
 ; return 0; }
 EOF
-if { (eval echo configure:1509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1542,7 +1609,7 @@
 
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1546: checking how to run the C preprocessor" >&5
+echo "configure:1613: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -1557,13 +1624,13 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1561 "configure"
+#line 1628 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1567: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1634: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1574,13 +1641,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1578 "configure"
+#line 1645 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1584: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1651: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1591,13 +1658,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 1595 "configure"
+#line 1662 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1601: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1668: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1622,12 +1689,12 @@
 echo "$ac_t""$CPP" 1>&6
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1626: checking for ANSI C header files" >&5
+echo "configure:1693: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1631 "configure"
+#line 1698 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -1635,7 +1702,7 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1639: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1706: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1652,7 +1719,7 @@
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1656 "configure"
+#line 1723 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -1670,7 +1737,7 @@
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1674 "configure"
+#line 1741 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -1691,7 +1758,7 @@
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 1695 "configure"
+#line 1762 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1702,7 +1769,7 @@
 exit (0); }
 
 EOF
-if { (eval echo configure:1706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -1729,17 +1796,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1733: checking for $ac_hdr" >&5
+echo "configure:1800: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1738 "configure"
+#line 1805 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1743: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1810: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1767,12 +1834,12 @@
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:1771: checking for working const" >&5
+echo "configure:1838: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1776 "configure"
+#line 1843 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -1821,7 +1888,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:1825: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1892: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -1842,12 +1909,12 @@
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:1846: checking for size_t" >&5
+echo "configure:1913: checking for size_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1851 "configure"
+#line 1918 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -1877,7 +1944,7 @@
 
 
 echo $ac_n "checking size of char""... $ac_c" 1>&6
-echo "configure:1881: checking size of char" >&5
+echo "configure:1948: checking size of char" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1885,7 +1952,7 @@
   ac_cv_sizeof_char=1
 else
   cat > conftest.$ac_ext <<EOF
-#line 1889 "configure"
+#line 1956 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -1896,7 +1963,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:1900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_char=`cat conftestval`
 else
@@ -1916,7 +1983,7 @@
 
 
 echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:1920: checking size of short" >&5
+echo "configure:1987: checking size of short" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1924,7 +1991,7 @@
   ac_cv_sizeof_short=1
 else
   cat > conftest.$ac_ext <<EOF
-#line 1928 "configure"
+#line 1995 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -1935,7 +2002,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:1939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_short=`cat conftestval`
 else
@@ -1955,7 +2022,7 @@
 
 
 echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:1959: checking size of int" >&5
+echo "configure:2026: checking size of int" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1963,7 +2030,7 @@
   ac_cv_sizeof_int=2
 else
   cat > conftest.$ac_ext <<EOF
-#line 1967 "configure"
+#line 2034 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -1974,7 +2041,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:1978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_int=`cat conftestval`
 else
@@ -1994,7 +2061,7 @@
 
 
 echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:1998: checking size of long" >&5
+echo "configure:2065: checking size of long" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2002,7 +2069,7 @@
   ac_cv_sizeof_long=4
 else
   cat > conftest.$ac_ext <<EOF
-#line 2006 "configure"
+#line 2073 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -2013,7 +2080,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:2017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_long=`cat conftestval`
 else
@@ -2034,7 +2101,7 @@
 
 
 echo $ac_n "checking for an 8 bit integer type""... $ac_c" 1>&6
-echo "configure:2038: checking for an 8 bit integer type" >&5
+echo "configure:2105: checking for an 8 bit integer type" >&5
 if test $ac_cv_sizeof_char -ge 1 ; then
   INT_8_BIT=char
   echo "$ac_t""char" 1>&6
@@ -2052,7 +2119,7 @@
 fi
 
 echo $ac_n "checking for a 16 bit integer type""... $ac_c" 1>&6
-echo "configure:2056: checking for a 16 bit integer type" >&5
+echo "configure:2123: checking for a 16 bit integer type" >&5
 if test $ac_cv_sizeof_char -ge 2 ; then
   INT_16_BIT=char
   echo "$ac_t""char" 1>&6
@@ -2070,7 +2137,7 @@
 fi
 
 echo $ac_n "checking for a 32 bit integer type""... $ac_c" 1>&6
-echo "configure:2074: checking for a 32 bit integer type" >&5
+echo "configure:2141: checking for a 32 bit integer type" >&5
 if test $ac_cv_sizeof_char -ge 4 ; then
   INT_32_BIT=char
   echo "$ac_t""char" 1>&6
@@ -2092,12 +2159,12 @@
 
 
 echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:2096: checking for vprintf" >&5
+echo "configure:2163: checking for vprintf" >&5
 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2101 "configure"
+#line 2168 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vprintf(); below.  */
@@ -2120,7 +2187,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2191: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_vprintf=yes"
 else
@@ -2144,12 +2211,12 @@
 
 if test "$ac_cv_func_vprintf" != yes; then
 echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:2148: checking for _doprnt" >&5
+echo "configure:2215: checking for _doprnt" >&5
 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2153 "configure"
+#line 2220 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char _doprnt(); below.  */
@@ -2172,7 +2239,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func__doprnt=yes"
 else
@@ -2199,12 +2266,12 @@
 for ac_func in strdup
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2203: checking for $ac_func" >&5
+echo "configure:2270: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2208 "configure"
+#line 2275 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2227,7 +2294,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2248,18 +2315,20 @@
  
 else
   echo "$ac_t""no" 1>&6
+LIBOBJS="$LIBOBJS ${ac_func}.${ac_objext}"
 fi
 done
 
-for ac_func in strdup
+
+for ac_func in getopt_long
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2258: checking for $ac_func" >&5
+echo "configure:2327: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2263 "configure"
+#line 2332 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2282,7 +2351,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2303,7 +2372,7 @@
  
 else
   echo "$ac_t""no" 1>&6
-LIBOBJS="$LIBOBJS ${ac_func}.${ac_objext}"
+LIBOBJS="$LIBOBJS getopt.o getopt1.o"
 fi
 done
 
@@ -2397,68 +2466,6 @@
   RTFDOCS_FALSE=
 fi
 
-# Check whether --enable-compile-warnings or --disable-compile-warnings was given.
-if test "${enable_compile_warnings+set}" = set; then
-  enableval="$enable_compile_warnings"
-  :
-else
-  enable_compile_warnings=minimum
-fi
-
-
-echo $ac_n "checking what warning flags to pass to the C compiler""... $ac_c" 1>&6
-echo "configure:2411: checking what warning flags to pass to the C compiler" >&5
-warnCFLAGS=
-if test "x$GCC" != xyes; then
-  enable_compile_warnings=no
-fi
-if test "x$enable_compile_warnings" != "xno"; then
-  if test "x$GCC" = "xyes"; then
-    case " $CFLAGS " in
-    *\ \	-Wall\ \	*) ;;
-    *) warnCFLAGS="-Wall -Wunused" ;;
-    esac
-
-    ## -W is not all that useful.  And it cannot be controlled
-    ## with individual -Wno-xxx flags, unlike -Wall
-    if test "x$enable_compile_warnings" = "xyes"; then
-      warnCFLAGS="$warnCFLAGS -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith"
-    fi
-  fi
-fi
-echo "$ac_t""$warnCFLAGS" 1>&6
-
-# Check whether --enable-iso-c or --disable-iso-c was given.
-if test "${enable_iso_c+set}" = set; then
-  enableval="$enable_iso_c"
-  :
-else
-  enable_iso_c=no
-fi
-
-
-echo $ac_n "checking what language compliance flags to pass to the C compiler""... $ac_c" 1>&6
-echo "configure:2442: checking what language compliance flags to pass to the C compiler" >&5
-complCFLAGS=
-if test "x$enable_iso_c" != "xno"; then
-  if test "x$GCC" = "xyes"; then
-    case " $CFLAGS " in
-    *\ \	-ansi\ \	*) ;;
-    *) complCFLAGS="$complCFLAGS -ansi" ;;
-    esac
-
-    case " $CFLAGS " in
-    *\ \	-pedantic\ \	*) ;;
-    *) complCFLAGS="$complCFLAGS -pedantic" ;;
-    esac
-  fi
-fi
-echo "$ac_t""$complCFLAGS" 1>&6
-if test "x$cflags_set" != "xyes"; then
-  CFLAGS="$CFLAGS $warnCFLAGS $complCFLAGS"
-  cflags_set=yes
-  
-fi
 
 trap '' 1 2 15
 cat > confcache <<\EOF
@@ -2616,10 +2623,9 @@
 s%@build_os@%$build_os%g
 s%@RANLIB@%$RANLIB%g
 s%@CC@%$CC%g
-s%@LD@%$LD%g
-s%@NM@%$NM%g
 s%@LN_S@%$LN_S%g
 s%@LIBTOOL@%$LIBTOOL%g
+s%@cflags_set@%$cflags_set%g
 s%@LIB_MAGICK@%$LIB_MAGICK%g
 s%@CPP@%$CPP%g
 s%@INT_8_BIT@%$INT_8_BIT%g
@@ -2634,7 +2640,6 @@
 s%@ASCIIDOCS_FALSE@%$ASCIIDOCS_FALSE%g
 s%@RTFDOCS_TRUE@%$RTFDOCS_TRUE%g
 s%@RTFDOCS_FALSE@%$RTFDOCS_FALSE%g
-s%@cflags_set@%$cflags_set%g
 
 CEOF
 EOF