diff options
author | drochner <drochner@pkgsrc.org> | 2005-08-26 09:29:00 +0000 |
---|---|---|
committer | drochner <drochner@pkgsrc.org> | 2005-08-26 09:29:00 +0000 |
commit | 4084b1fbd00b7b0675c333349fb0ce49c38f1acb (patch) | |
tree | d839b2183896993222e7f99b01710a2b48c09414 | |
parent | 4e16ce597dc793f02a9249d56affe6e58d3bb3bc (diff) | |
download | pkgsrc-4084b1fbd00b7b0675c333349fb0ce49c38f1acb.tar.gz |
remove stale patchfiles
-rw-r--r-- | graphics/pstoedit/patches/patch-aa | 20 | ||||
-rw-r--r-- | graphics/pstoedit/patches/patch-ab | 1757 | ||||
-rw-r--r-- | graphics/pstoedit/patches/patch-ac | 22 | ||||
-rw-r--r-- | graphics/pstoedit/patches/patch-ad | 56 | ||||
-rw-r--r-- | graphics/pstoedit/patches/patch-ae | 24 | ||||
-rw-r--r-- | graphics/pstoedit/patches/patch-af | 13 |
6 files changed, 0 insertions, 1892 deletions
diff --git a/graphics/pstoedit/patches/patch-aa b/graphics/pstoedit/patches/patch-aa deleted file mode 100644 index f602e6c589a..00000000000 --- a/graphics/pstoedit/patches/patch-aa +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2002/05/07 13:18:27 itohy Exp $ - ---- configure.in.orig Sat Dec 29 01:34:30 2001 -+++ configure.in Fri Mar 22 13:15:31 2002 -@@ -19,6 +19,15 @@ - AC_PROG_INSTALL - AC_PATH_PROG(GS,gs,gs) - -+dnl Look for extra libraries used by libplotter -+AC_PATH_XTRA -+AC_SUBST(X_CFLAGS) -+DEPLIBS="`$LIBTOOL -n cc -o xx xx.o $LIBPLOTTERLA | tr ' ' '\012' | sed -e '/^-[[LWl]]/!d' -e '/^-lplotter$/d' | tr '\012' ' '`" -+ -+LDLIBS="$DEPLIBS $LDLIBS" -+LIBS="$DEPLIBS" -+CPPFLAGS="$X_CFLAGS $CPPFLAGS" -+ - dnl Look for various optional libraries. - AC_CHECK_LIB(dl,main,[LDL=-ldl],[LDL=]) - AC_SUBST(LDL) diff --git a/graphics/pstoedit/patches/patch-ab b/graphics/pstoedit/patches/patch-ab deleted file mode 100644 index c582e7bdf58..00000000000 --- a/graphics/pstoedit/patches/patch-ab +++ /dev/null @@ -1,1757 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2003/05/06 23:03:11 seb Exp $ - ---- configure.orig 2003-05-06 21:14:14.000000000 +0000 -+++ configure -@@ -618,6 +618,10 @@ EOF - - cat <<\EOF - -+X features: -+ --x-includes=DIR X include files are in DIR -+ --x-libraries=DIR X library files are in DIR -+ - System types: - --build=BUILD configure for building on BUILD [guessed] - --host=HOST build programs to run on HOST [BUILD] -@@ -635,6 +639,11 @@ Optional Features: - Wrap (i.e. prefix) compiler invocations with PROGRAM - (e.g. \"insure\" or \"purify\") - -+Optional Packages: -+ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] -+ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) -+ --with-x use the X Window System -+ - Some influential environment variables: - CXX C++ compiler command - CXXFLAGS C++ compiler flags -@@ -985,10 +994,7 @@ build_cpu=`echo $ac_cv_build | sed 's/^\ - build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` - build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - --test -z "$build_alias" && -- build_alias=$ac_cv_build -- --echo "$as_me:991: checking host system type" >&5 -+echo "$as_me:997: checking host system type" >&5 - echo $ECHO_N "checking host system type... $ECHO_C" >&6 - if test "${ac_cv_host+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -1009,9 +1015,6 @@ host_cpu=`echo $ac_cv_host | sed 's/^\([ - host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` - host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - --test -z "$host_alias" && -- host_alias=$ac_cv_host -- - ac_ext=cc - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -1628,150 +1631,6 @@ else - echo "${ECHO_T}no" >&6 - fi - --echo "$as_me:1631: checking for main in -ldl" >&5 --echo $ECHO_N "checking for main in -ldl... $ECHO_C" >&6 --if test "${ac_cv_lib_dl_main+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-ldl $LIBS" --cat >conftest.$ac_ext <<_ACEOF --#line 1639 "configure" --#include "confdefs.h" -- --int --main () --{ --main (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:1651: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:1654: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:1657: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:1660: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_lib_dl_main=yes --else -- echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --ac_cv_lib_dl_main=no --fi --rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --echo "$as_me:1671: result: $ac_cv_lib_dl_main" >&5 --echo "${ECHO_T}$ac_cv_lib_dl_main" >&6 --if test $ac_cv_lib_dl_main = yes; then -- LDL=-ldl --else -- LDL= --fi -- --echo "$as_me:1679: checking for main in -lming" >&5 --echo $ECHO_N "checking for main in -lming... $ECHO_C" >&6 --if test "${ac_cv_lib_ming_main+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lming $LIBS" --cat >conftest.$ac_ext <<_ACEOF --#line 1687 "configure" --#include "confdefs.h" -- --int --main () --{ --main (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:1699: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:1702: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:1705: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:1708: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_lib_ming_main=yes --else -- echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --ac_cv_lib_ming_main=no --fi --rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --echo "$as_me:1719: result: $ac_cv_lib_ming_main" >&5 --echo "${ECHO_T}$ac_cv_lib_ming_main" >&6 --if test $ac_cv_lib_ming_main = yes; then -- LMING=-lming --else -- LMING= --fi -- --echo "$as_me:1727: checking for main in -lplotter" >&5 --echo $ECHO_N "checking for main in -lplotter... $ECHO_C" >&6 --if test "${ac_cv_lib_plotter_main+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lplotter $LIBS" --cat >conftest.$ac_ext <<_ACEOF --#line 1735 "configure" --#include "confdefs.h" -- --int --main () --{ --main (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:1747: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:1750: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:1753: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:1756: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_lib_plotter_main=yes --else -- echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --ac_cv_lib_plotter_main=no --fi --rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --echo "$as_me:1767: result: $ac_cv_lib_plotter_main" >&5 --echo "${ECHO_T}$ac_cv_lib_plotter_main" >&6 --if test $ac_cv_lib_plotter_main = yes; then -- LPLOTTER=-lplotter --else -- LPLOTTER= --fi -- - ac_ext=cc - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -1968,17 +1827,108 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - --echo "$as_me:1971: checking for plotter.h" >&5 --echo $ECHO_N "checking for plotter.h... $ECHO_C" >&6 --if test "${ac_cv_header_plotter_h+set}" = set; then -+echo "$as_me:1830: checking for X" >&5 -+echo $ECHO_N "checking for X... $ECHO_C" >&6 -+ -+# Check whether --with-x or --without-x was given. -+if test "${with_x+set}" = set; then -+ withval="$with_x" -+ -+fi; -+# $have_x is `yes', `no', `disabled', or empty when we do not yet know. -+if test "x$with_x" = xno; then -+ # The user explicitly disabled X. -+ have_x=disabled -+else -+ if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then -+ # Both variables are already set. -+ have_x=yes -+ else -+ if test "${ac_cv_have_x+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -+ # One or both of the vars are not set, and there is no cached value. -+ac_x_includes=no ac_x_libraries=no -+rm -fr conftest.dir -+if mkdir conftest.dir; then -+ cd conftest.dir -+ # Make sure to not put "make" in the Imakefile rules, since we grep it out. -+ cat >Imakefile <<'EOF' -+acfindx: -+ @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"' -+EOF -+ if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then -+ # GNU make sometimes prints "make[1]: Entering...", which would confuse us. -+ eval `${MAKE-make} acfindx 2>/dev/null | grep -v make` -+ # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. -+ for ac_extension in a so sl; do -+ if test ! -f $ac_im_usrlibdir/libX11.$ac_extension && -+ test -f $ac_im_libdir/libX11.$ac_extension; then -+ ac_im_usrlibdir=$ac_im_libdir; break -+ fi -+ done -+ # Screen out bogus values from the imake configuration. They are -+ # bogus both because they are the default anyway, and because -+ # using them would break gcc on systems where it needs fixed includes. -+ case $ac_im_incroot in -+ /usr/include) ;; -+ *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; -+ esac -+ case $ac_im_usrlibdir in -+ /usr/lib | /lib) ;; -+ *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; -+ esac -+ fi -+ cd .. -+ rm -fr conftest.dir -+fi -+ -+# Standard set of common directories for X headers. -+# Check X11 before X11Rn because it is often a symlink to the current release. -+ac_x_header_dirs=' -+/usr/X11/include -+/usr/X11R6/include -+/usr/X11R5/include -+/usr/X11R4/include -+ -+/usr/include/X11 -+/usr/include/X11R6 -+/usr/include/X11R5 -+/usr/include/X11R4 -+ -+/usr/local/X11/include -+/usr/local/X11R6/include -+/usr/local/X11R5/include -+/usr/local/X11R4/include -+ -+/usr/local/include/X11 -+/usr/local/include/X11R6 -+/usr/local/include/X11R5 -+/usr/local/include/X11R4 -+ -+/usr/X386/include -+/usr/x386/include -+/usr/XFree86/include/X11 -+ -+/usr/include -+/usr/local/include -+/usr/unsupported/include -+/usr/athena/include -+/usr/local/x11r5/include -+/usr/lpp/Xamples/include -+ -+/usr/openwin/include -+/usr/openwin/share/include' -+ -+if test "$ac_x_includes" = no; then -+ # Guess where to find include files, by looking for Intrinsic.h. -+ # First, try using that file with no special directory specified. - cat >conftest.$ac_ext <<_ACEOF --#line 1977 "configure" -+#line 1927 "configure" - #include "confdefs.h" --#include <plotter.h> -+#include <X11/Intrinsic.h> - _ACEOF --if { (eval echo "$as_me:1981: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:1931: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err -@@ -1995,173 +1945,1306 @@ else - ac_cpp_err=yes - fi - if test -z "$ac_cpp_err"; then -- ac_cv_header_plotter_h=yes -+ # We can compile using X headers with no special include directory. -+ac_x_includes= - else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 -- ac_cv_header_plotter_h=no -+ for ac_dir in $ac_x_header_dirs; do -+ if test -r "$ac_dir/X11/Intrinsic.h"; then -+ ac_x_includes=$ac_dir -+ break -+ fi -+done - fi - rm -f conftest.err conftest.$ac_ext --fi --echo "$as_me:2006: result: $ac_cv_header_plotter_h" >&5 --echo "${ECHO_T}$ac_cv_header_plotter_h" >&6 --if test $ac_cv_header_plotter_h = yes; then -- PLOTCOMPILEFLAGS="-DHAVE_LIBPLOTTER" --else -- PLOTCOMPILEFLAGS="" --fi -+fi # $ac_x_includes = no - --echo "$as_me:2014: checking for version of \"lib plot\" " >&5 --echo $ECHO_N "checking for version of \"lib plot\" ... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --#line 2017 "configure" -+if test "$ac_x_libraries" = no; then -+ # Check for the libraries. -+ # See if we find them without any special options. -+ # Don't add to $LIBS permanently. -+ ac_save_LIBS=$LIBS -+ LIBS="-lXt $LIBS" -+ cat >conftest.$ac_ext <<_ACEOF -+#line 1970 "configure" - #include "confdefs.h" --#include <plotter.h> -- typedef int Point; -+#include <X11/Intrinsic.h> - int - main () - { -- -+XtMalloc (0) - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:2030: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:1982: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:2033: \$? = $ac_status" >&5 -+ echo "$as_me:1985: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:2036: \"$ac_try\"") >&5 -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:1988: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:2039: \$? = $ac_status" >&5 -+ echo "$as_me:1991: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- echo "$as_me:2041: result: you seem to have a newer version " >&5 --echo "${ECHO_T}you seem to have a newer version " >&6 -+ LIBS=$ac_save_LIBS -+# We can link X programs with no special library path. -+ac_x_libraries= - else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 --PLOTCOMPILEFLAGS="$PLOTCOMPILEFLAGS -DOLD_LIBPLOTTER"; --echo "$as_me:2047: result: you seem to have a older version " >&5 --echo "${ECHO_T}you seem to have a older version " >&6 -+LIBS=$ac_save_LIBS -+for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` -+do -+ # Don't even attempt the hair of trying to link an X program! -+ for ac_extension in a so sl; do -+ if test -r $ac_dir/libXt.$ac_extension; then -+ ac_x_libraries=$ac_dir -+ break 2 -+ fi -+ done -+done - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+fi # $ac_x_libraries = no - --echo "$as_me:2052: checking for mingpp.h" >&5 --echo $ECHO_N "checking for mingpp.h... $ECHO_C" >&6 --if test "${ac_cv_header_mingpp_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --#line 2058 "configure" --#include "confdefs.h" --#include <mingpp.h> --_ACEOF --if { (eval echo "$as_me:2062: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- egrep -v '^ *\+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:2068: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_cxx_preproc_warn_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_cv_header_mingpp_h=yes -+if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then -+ # Didn't find X anywhere. Cache the known absence of X. -+ ac_cv_have_x="have_x=no" - else -- echo "$as_me: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- ac_cv_header_mingpp_h=no --fi --rm -f conftest.err conftest.$ac_ext -+ # Record where we found X for the cache. -+ ac_cv_have_x="have_x=yes \ -+ ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries" - fi --echo "$as_me:2087: result: $ac_cv_header_mingpp_h" >&5 --echo "${ECHO_T}$ac_cv_header_mingpp_h" >&6 --if test $ac_cv_header_mingpp_h = yes; then -- MINGCOMPILEFLAGS="-DHAVE_LIBMING" --else -- MINGCOMPILEFLAGS="" - fi - --echo "$as_me:2095: checking for libemf.h" >&5 --echo $ECHO_N "checking for libemf.h... $ECHO_C" >&6 --if test "${ac_cv_header_libemf_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --#line 2101 "configure" --#include "confdefs.h" --#include <libemf.h> --_ACEOF --if { (eval echo "$as_me:2105: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- egrep -v '^ *\+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:2111: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_cxx_preproc_warn_flag -- else -- ac_cpp_err= - fi -+ eval "$ac_cv_have_x" -+fi # $with_x != no -+ -+if test "$have_x" != yes; then -+ echo "$as_me:2029: result: $have_x" >&5 -+echo "${ECHO_T}$have_x" >&6 -+ no_x=yes - else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_cv_header_libemf_h=yes --else -- echo "$as_me: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- ac_cv_header_libemf_h=no -+ # If each of the values was on the command line, it overrides each guess. -+ test "x$x_includes" = xNONE && x_includes=$ac_x_includes -+ test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries -+ # Update the cache value to reflect the command line values. -+ ac_cv_have_x="have_x=yes \ -+ ac_x_includes=$x_includes ac_x_libraries=$x_libraries" -+ echo "$as_me:2039: result: libraries $x_libraries, headers $x_includes" >&5 -+echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 - fi --rm -f conftest.err conftest.$ac_ext --fi --echo "$as_me:2130: result: $ac_cv_header_libemf_h" >&5 --echo "${ECHO_T}$ac_cv_header_libemf_h" >&6 --if test $ac_cv_header_libemf_h = yes; then -- EMFCOMPILEFLAGS="drvwmf.o emflib.o" -+ -+if test "$no_x" = yes; then -+ # Not all programs may use this symbol, but it does not hurt to define it. -+ -+cat >>confdefs.h <<\EOF -+#define X_DISPLAY_MISSING 1 -+EOF -+ -+ X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= - else -- EMFCOMPILEFLAGS="" --fi -+ if test -n "$x_includes"; then -+ X_CFLAGS="$X_CFLAGS -I$x_includes" -+ fi - --echo "$as_me:2138: checking for built-in \"bool\" datatype" >&5 --echo $ECHO_N "checking for built-in \"bool\" datatype... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --#line 2141 "configure" -+ # It would also be nice to do this for all -L options, not just this one. -+ if test -n "$x_libraries"; then -+ X_LIBS="$X_LIBS -L$x_libraries" -+ # For Solaris; some versions of Sun CC require a space after -R and -+ # others require no space. Words are not sufficient . . . . -+ case `(uname -sr) 2>/dev/null` in -+ "SunOS 5"*) -+ echo "$as_me:2063: checking whether -R must be followed by a space" >&5 -+echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6 -+ ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" -+ cat >conftest.$ac_ext <<_ACEOF -+#line 2067 "configure" - #include "confdefs.h" - - int - main () - { --bool testing_bool; testing_bool=true; -+ - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:2153: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:2079: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:2156: \$? = $ac_status" >&5 -+ echo "$as_me:2082: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:2085: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:2088: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_R_nospace=yes -+else -+ echo "$as_me: failed program was:" >&5 -+cat conftest.$ac_ext >&5 -+ac_R_nospace=no -+fi -+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+ if test $ac_R_nospace = yes; then -+ echo "$as_me:2098: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+ X_LIBS="$X_LIBS -R$x_libraries" -+ else -+ LIBS="$ac_xsave_LIBS -R $x_libraries" -+ cat >conftest.$ac_ext <<_ACEOF -+#line 2104 "configure" -+#include "confdefs.h" -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:2116: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ echo "$as_me:2119: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:2122: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:2125: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_R_space=yes -+else -+ echo "$as_me: failed program was:" >&5 -+cat conftest.$ac_ext >&5 -+ac_R_space=no -+fi -+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+ if test $ac_R_space = yes; then -+ echo "$as_me:2135: result: yes" >&5 -+echo "${ECHO_T}yes" >&6 -+ X_LIBS="$X_LIBS -R $x_libraries" -+ else -+ echo "$as_me:2139: result: neither works" >&5 -+echo "${ECHO_T}neither works" >&6 -+ fi -+ fi -+ LIBS=$ac_xsave_LIBS -+ esac -+ fi -+ -+ # Check for system-dependent libraries X programs must link with. -+ # Do this before checking for the system-independent R6 libraries -+ # (-lICE), since we may need -lsocket or whatever for X linking. -+ -+ if test "$ISC" = yes; then -+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet" -+ else -+ # Martyn Johnson says this is needed for Ultrix, if the X -+ # libraries were built with DECnet support. And Karl Berry says -+ # the Alpha needs dnet_stub (dnet does not exist). -+ ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" -+ cat >conftest.$ac_ext <<_ACEOF -+#line 2159 "configure" -+#include "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 XOpenDisplay (); -+int -+main () -+{ -+XOpenDisplay (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:2178: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ echo "$as_me:2181: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:2184: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:2187: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ : -+else -+ echo "$as_me: failed program was:" >&5 -+cat conftest.$ac_ext >&5 -+echo "$as_me:2193: checking for dnet_ntoa in -ldnet" >&5 -+echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6 -+if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ldnet $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+#line 2201 "configure" -+#include "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 dnet_ntoa (); -+int -+main () -+{ -+dnet_ntoa (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:2220: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ echo "$as_me:2223: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:2226: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:2229: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_lib_dnet_dnet_ntoa=yes -+else -+ echo "$as_me: failed program was:" >&5 -+cat conftest.$ac_ext >&5 -+ac_cv_lib_dnet_dnet_ntoa=no -+fi -+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+echo "$as_me:2240: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 -+echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6 -+if test $ac_cv_lib_dnet_dnet_ntoa = yes; then -+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" -+fi -+ -+ if test $ac_cv_lib_dnet_dnet_ntoa = no; then -+ echo "$as_me:2247: checking for dnet_ntoa in -ldnet_stub" >&5 -+echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6 -+if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ldnet_stub $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+#line 2255 "configure" -+#include "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 dnet_ntoa (); -+int -+main () -+{ -+dnet_ntoa (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:2274: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ echo "$as_me:2277: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:2280: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:2283: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_lib_dnet_stub_dnet_ntoa=yes -+else -+ echo "$as_me: failed program was:" >&5 -+cat conftest.$ac_ext >&5 -+ac_cv_lib_dnet_stub_dnet_ntoa=no -+fi -+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+echo "$as_me:2294: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 -+echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6 -+if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then -+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" -+fi -+ -+ fi -+fi -+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+ LIBS="$ac_xsave_LIBS" -+ -+ # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, -+ # to get the SysV transport functions. -+ # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4) -+ # needs -lnsl. -+ # The nsl library prevents programs from opening the X display -+ # on Irix 5.2, according to T.E. Dickey. -+ # The functions gethostbyname, getservbyname, and inet_addr are -+ # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. -+ echo "$as_me:2313: checking for gethostbyname" >&5 -+echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6 -+if test "${ac_cv_func_gethostbyname+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+#line 2319 "configure" -+#include "confdefs.h" -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char gethostbyname (); below. */ -+#include <assert.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 gethostbyname (); -+char (*f) (); -+ -+int -+main () -+{ -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname) -+choke me -+#else -+f = gethostbyname; -+#endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:2350: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ echo "$as_me:2353: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:2356: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:2359: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_func_gethostbyname=yes -+else -+ echo "$as_me: failed program was:" >&5 -+cat conftest.$ac_ext >&5 -+ac_cv_func_gethostbyname=no -+fi -+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+fi -+echo "$as_me:2369: result: $ac_cv_func_gethostbyname" >&5 -+echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6 -+ -+ if test $ac_cv_func_gethostbyname = no; then -+ echo "$as_me:2373: checking for gethostbyname in -lnsl" >&5 -+echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 -+if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lnsl $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+#line 2381 "configure" -+#include "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 gethostbyname (); -+int -+main () -+{ -+gethostbyname (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:2400: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ echo "$as_me:2403: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:2406: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:2409: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_lib_nsl_gethostbyname=yes -+else -+ echo "$as_me: failed program was:" >&5 -+cat conftest.$ac_ext >&5 -+ac_cv_lib_nsl_gethostbyname=no -+fi -+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+echo "$as_me:2420: result: $ac_cv_lib_nsl_gethostbyname" >&5 -+echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 -+if test $ac_cv_lib_nsl_gethostbyname = yes; then -+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" -+fi -+ -+ if test $ac_cv_lib_nsl_gethostbyname = no; then -+ echo "$as_me:2427: checking for gethostbyname in -lbsd" >&5 -+echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6 -+if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lbsd $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+#line 2435 "configure" -+#include "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 gethostbyname (); -+int -+main () -+{ -+gethostbyname (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:2454: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ echo "$as_me:2457: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:2460: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:2463: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_lib_bsd_gethostbyname=yes -+else -+ echo "$as_me: failed program was:" >&5 -+cat conftest.$ac_ext >&5 -+ac_cv_lib_bsd_gethostbyname=no -+fi -+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+echo "$as_me:2474: result: $ac_cv_lib_bsd_gethostbyname" >&5 -+echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6 -+if test $ac_cv_lib_bsd_gethostbyname = yes; then -+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" -+fi -+ -+ fi -+ fi -+ -+ # lieder@skyler.mavd.honeywell.com says without -lsocket, -+ # socket/setsockopt and other routines are undefined under SCO ODT -+ # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary -+ # on later versions), says Simon Leinen: it contains gethostby* -+ # variants that don't use the nameserver (or something). -lsocket -+ # must be given before -lnsl if both are needed. We assume that -+ # if connect needs -lnsl, so does gethostbyname. -+ echo "$as_me:2490: checking for connect" >&5 -+echo $ECHO_N "checking for connect... $ECHO_C" >&6 -+if test "${ac_cv_func_connect+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+#line 2496 "configure" -+#include "confdefs.h" -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char connect (); below. */ -+#include <assert.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 connect (); -+char (*f) (); -+ -+int -+main () -+{ -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_connect) || defined (__stub___connect) -+choke me -+#else -+f = connect; -+#endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:2527: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ echo "$as_me:2530: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:2533: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:2536: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_func_connect=yes -+else -+ echo "$as_me: failed program was:" >&5 -+cat conftest.$ac_ext >&5 -+ac_cv_func_connect=no -+fi -+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+fi -+echo "$as_me:2546: result: $ac_cv_func_connect" >&5 -+echo "${ECHO_T}$ac_cv_func_connect" >&6 -+ -+ if test $ac_cv_func_connect = no; then -+ echo "$as_me:2550: checking for connect in -lsocket" >&5 -+echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6 -+if test "${ac_cv_lib_socket_connect+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lsocket $X_EXTRA_LIBS $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+#line 2558 "configure" -+#include "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 connect (); -+int -+main () -+{ -+connect (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:2577: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ echo "$as_me:2580: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:2583: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:2586: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_lib_socket_connect=yes -+else -+ echo "$as_me: failed program was:" >&5 -+cat conftest.$ac_ext >&5 -+ac_cv_lib_socket_connect=no -+fi -+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+echo "$as_me:2597: result: $ac_cv_lib_socket_connect" >&5 -+echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6 -+if test $ac_cv_lib_socket_connect = yes; then -+ X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" -+fi -+ -+ fi -+ -+ # Guillermo Gomez says -lposix is necessary on A/UX. -+ echo "$as_me:2606: checking for remove" >&5 -+echo $ECHO_N "checking for remove... $ECHO_C" >&6 -+if test "${ac_cv_func_remove+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+#line 2612 "configure" -+#include "confdefs.h" -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char remove (); below. */ -+#include <assert.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 remove (); -+char (*f) (); -+ -+int -+main () -+{ -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_remove) || defined (__stub___remove) -+choke me -+#else -+f = remove; -+#endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:2643: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ echo "$as_me:2646: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:2649: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:2652: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_func_remove=yes -+else -+ echo "$as_me: failed program was:" >&5 -+cat conftest.$ac_ext >&5 -+ac_cv_func_remove=no -+fi -+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+fi -+echo "$as_me:2662: result: $ac_cv_func_remove" >&5 -+echo "${ECHO_T}$ac_cv_func_remove" >&6 -+ -+ if test $ac_cv_func_remove = no; then -+ echo "$as_me:2666: checking for remove in -lposix" >&5 -+echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6 -+if test "${ac_cv_lib_posix_remove+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lposix $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+#line 2674 "configure" -+#include "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 remove (); -+int -+main () -+{ -+remove (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:2693: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ echo "$as_me:2696: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:2699: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:2702: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_lib_posix_remove=yes -+else -+ echo "$as_me: failed program was:" >&5 -+cat conftest.$ac_ext >&5 -+ac_cv_lib_posix_remove=no -+fi -+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+echo "$as_me:2713: result: $ac_cv_lib_posix_remove" >&5 -+echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6 -+if test $ac_cv_lib_posix_remove = yes; then -+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" -+fi -+ -+ fi -+ -+ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. -+ echo "$as_me:2722: checking for shmat" >&5 -+echo $ECHO_N "checking for shmat... $ECHO_C" >&6 -+if test "${ac_cv_func_shmat+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+#line 2728 "configure" -+#include "confdefs.h" -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char shmat (); below. */ -+#include <assert.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 shmat (); -+char (*f) (); -+ -+int -+main () -+{ -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_shmat) || defined (__stub___shmat) -+choke me -+#else -+f = shmat; -+#endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:2759: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ echo "$as_me:2762: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:2765: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:2768: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_func_shmat=yes -+else -+ echo "$as_me: failed program was:" >&5 -+cat conftest.$ac_ext >&5 -+ac_cv_func_shmat=no -+fi -+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+fi -+echo "$as_me:2778: result: $ac_cv_func_shmat" >&5 -+echo "${ECHO_T}$ac_cv_func_shmat" >&6 -+ -+ if test $ac_cv_func_shmat = no; then -+ echo "$as_me:2782: checking for shmat in -lipc" >&5 -+echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6 -+if test "${ac_cv_lib_ipc_shmat+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lipc $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+#line 2790 "configure" -+#include "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 shmat (); -+int -+main () -+{ -+shmat (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:2809: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ echo "$as_me:2812: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:2815: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:2818: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_lib_ipc_shmat=yes -+else -+ echo "$as_me: failed program was:" >&5 -+cat conftest.$ac_ext >&5 -+ac_cv_lib_ipc_shmat=no -+fi -+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+echo "$as_me:2829: result: $ac_cv_lib_ipc_shmat" >&5 -+echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6 -+if test $ac_cv_lib_ipc_shmat = yes; then -+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" -+fi -+ -+ fi -+ fi -+ -+ # Check for libraries that X11R6 Xt/Xaw programs need. -+ ac_save_LDFLAGS=$LDFLAGS -+ test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries" -+ # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to -+ # check for ICE first), but we must link in the order -lSM -lICE or -+ # we get undefined symbols. So assume we have SM if we have ICE. -+ # These have to be linked with before -lX11, unlike the other -+ # libraries we check for below, so use a different variable. -+ # John Interrante, Karl Berry -+ echo "$as_me:2847: checking for IceConnectionNumber in -lICE" >&5 -+echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6 -+if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lICE $X_EXTRA_LIBS $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+#line 2855 "configure" -+#include "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 IceConnectionNumber (); -+int -+main () -+{ -+IceConnectionNumber (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:2874: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ echo "$as_me:2877: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:2880: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:2883: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_lib_ICE_IceConnectionNumber=yes -+else -+ echo "$as_me: failed program was:" >&5 -+cat conftest.$ac_ext >&5 -+ac_cv_lib_ICE_IceConnectionNumber=no -+fi -+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+echo "$as_me:2894: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 -+echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6 -+if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then -+ X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" -+fi -+ -+ LDFLAGS=$ac_save_LDFLAGS -+ -+fi -+ -+DEPLIBS="`$LIBTOOL -n cc -o xx xx.o $LIBPLOTTERLA | tr ' ' '\012' | sed -e '/^-[LWl]/!d' -e '/^-lplotter$/d' | tr '\012' ' '`" -+ -+LDLIBS="$DEPLIBS $LDLIBS" -+LIBS="$DEPLIBS" -+CPPFLAGS="$X_CFLAGS $CPPFLAGS" -+ -+echo "$as_me:2910: checking for main in -ldl" >&5 -+echo $ECHO_N "checking for main in -ldl... $ECHO_C" >&6 -+if test "${ac_cv_lib_dl_main+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ldl $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+#line 2918 "configure" -+#include "confdefs.h" -+ -+int -+main () -+{ -+main (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:2930: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ echo "$as_me:2933: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:2936: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:2939: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_lib_dl_main=yes -+else -+ echo "$as_me: failed program was:" >&5 -+cat conftest.$ac_ext >&5 -+ac_cv_lib_dl_main=no -+fi -+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+echo "$as_me:2950: result: $ac_cv_lib_dl_main" >&5 -+echo "${ECHO_T}$ac_cv_lib_dl_main" >&6 -+if test $ac_cv_lib_dl_main = yes; then -+ LDL=-ldl -+else -+ LDL= -+fi -+ -+echo "$as_me:2958: checking for main in -lming" >&5 -+echo $ECHO_N "checking for main in -lming... $ECHO_C" >&6 -+if test "${ac_cv_lib_ming_main+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lming $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+#line 2966 "configure" -+#include "confdefs.h" -+ -+int -+main () -+{ -+main (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:2978: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ echo "$as_me:2981: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:2984: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:2987: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_lib_ming_main=yes -+else -+ echo "$as_me: failed program was:" >&5 -+cat conftest.$ac_ext >&5 -+ac_cv_lib_ming_main=no -+fi -+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+echo "$as_me:2998: result: $ac_cv_lib_ming_main" >&5 -+echo "${ECHO_T}$ac_cv_lib_ming_main" >&6 -+if test $ac_cv_lib_ming_main = yes; then -+ LMING=-lming -+else -+ LMING= -+fi -+ -+echo "$as_me:3006: checking for main in -lplotter" >&5 -+echo $ECHO_N "checking for main in -lplotter... $ECHO_C" >&6 -+if test "${ac_cv_lib_plotter_main+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lplotter $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+#line 3014 "configure" -+#include "confdefs.h" -+ -+int -+main () -+{ -+main (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:3026: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ echo "$as_me:3029: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:3032: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:3035: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_lib_plotter_main=yes -+else -+ echo "$as_me: failed program was:" >&5 -+cat conftest.$ac_ext >&5 -+ac_cv_lib_plotter_main=no -+fi -+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+echo "$as_me:3046: result: $ac_cv_lib_plotter_main" >&5 -+echo "${ECHO_T}$ac_cv_lib_plotter_main" >&6 -+if test $ac_cv_lib_plotter_main = yes; then -+ LPLOTTER=-lplotter -+else -+ LPLOTTER= -+fi -+ -+echo "$as_me:3054: checking for plotter.h" >&5 -+echo $ECHO_N "checking for plotter.h... $ECHO_C" >&6 -+if test "${ac_cv_header_plotter_h+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+#line 3060 "configure" -+#include "confdefs.h" -+#include <plotter.h> -+_ACEOF -+if { (eval echo "$as_me:3064: \"$ac_cpp conftest.$ac_ext\"") >&5 -+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+ ac_status=$? -+ egrep -v '^ *\+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:3070: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null; then -+ if test -s conftest.err; then -+ ac_cpp_err=$ac_cxx_preproc_warn_flag -+ else -+ ac_cpp_err= -+ fi -+else -+ ac_cpp_err=yes -+fi -+if test -z "$ac_cpp_err"; then -+ ac_cv_header_plotter_h=yes -+else -+ echo "$as_me: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ ac_cv_header_plotter_h=no -+fi -+rm -f conftest.err conftest.$ac_ext -+fi -+echo "$as_me:3089: result: $ac_cv_header_plotter_h" >&5 -+echo "${ECHO_T}$ac_cv_header_plotter_h" >&6 -+if test $ac_cv_header_plotter_h = yes; then -+ PLOTCOMPILEFLAGS="-DHAVE_LIBPLOTTER" -+else -+ PLOTCOMPILEFLAGS="" -+fi -+ -+echo "$as_me:3097: checking for version of \"lib plot\" " >&5 -+echo $ECHO_N "checking for version of \"lib plot\" ... $ECHO_C" >&6 -+cat >conftest.$ac_ext <<_ACEOF -+#line 3100 "configure" -+#include "confdefs.h" -+#include <plotter.h> -+ typedef int Point; -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (eval echo "$as_me:3113: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>&5 -+ ac_status=$? -+ echo "$as_me:3116: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (eval echo "$as_me:3119: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:3122: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ echo "$as_me:3124: result: you seem to have a newer version " >&5 -+echo "${ECHO_T}you seem to have a newer version " >&6 -+else -+ echo "$as_me: failed program was:" >&5 -+cat conftest.$ac_ext >&5 -+PLOTCOMPILEFLAGS="$PLOTCOMPILEFLAGS -DOLD_LIBPLOTTER"; -+echo "$as_me:3130: result: you seem to have a older version " >&5 -+echo "${ECHO_T}you seem to have a older version " >&6 -+fi -+rm -f conftest.$ac_objext conftest.$ac_ext -+ -+echo "$as_me:3135: checking for mingpp.h" >&5 -+echo $ECHO_N "checking for mingpp.h... $ECHO_C" >&6 -+if test "${ac_cv_header_mingpp_h+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+#line 3141 "configure" -+#include "confdefs.h" -+#include <mingpp.h> -+_ACEOF -+if { (eval echo "$as_me:3145: \"$ac_cpp conftest.$ac_ext\"") >&5 -+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+ ac_status=$? -+ egrep -v '^ *\+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:3151: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null; then -+ if test -s conftest.err; then -+ ac_cpp_err=$ac_cxx_preproc_warn_flag -+ else -+ ac_cpp_err= -+ fi -+else -+ ac_cpp_err=yes -+fi -+if test -z "$ac_cpp_err"; then -+ ac_cv_header_mingpp_h=yes -+else -+ echo "$as_me: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ ac_cv_header_mingpp_h=no -+fi -+rm -f conftest.err conftest.$ac_ext -+fi -+echo "$as_me:3170: result: $ac_cv_header_mingpp_h" >&5 -+echo "${ECHO_T}$ac_cv_header_mingpp_h" >&6 -+if test $ac_cv_header_mingpp_h = yes; then -+ MINGCOMPILEFLAGS="-DHAVE_LIBMING" -+else -+ MINGCOMPILEFLAGS="" -+fi -+ -+echo "$as_me:3178: checking for libemf.h" >&5 -+echo $ECHO_N "checking for libemf.h... $ECHO_C" >&6 -+if test "${ac_cv_header_libemf_h+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+#line 3184 "configure" -+#include "confdefs.h" -+#include <libemf.h> -+_ACEOF -+if { (eval echo "$as_me:3188: \"$ac_cpp conftest.$ac_ext\"") >&5 -+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+ ac_status=$? -+ egrep -v '^ *\+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:3194: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null; then -+ if test -s conftest.err; then -+ ac_cpp_err=$ac_cxx_preproc_warn_flag -+ else -+ ac_cpp_err= -+ fi -+else -+ ac_cpp_err=yes -+fi -+if test -z "$ac_cpp_err"; then -+ ac_cv_header_libemf_h=yes -+else -+ echo "$as_me: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ ac_cv_header_libemf_h=no -+fi -+rm -f conftest.err conftest.$ac_ext -+fi -+echo "$as_me:3213: result: $ac_cv_header_libemf_h" >&5 -+echo "${ECHO_T}$ac_cv_header_libemf_h" >&6 -+if test $ac_cv_header_libemf_h = yes; then -+ EMFCOMPILEFLAGS="drvwmf.o emflib.o" -+else -+ EMFCOMPILEFLAGS="" -+fi -+ -+echo "$as_me:3221: checking for built-in \"bool\" datatype" >&5 -+echo $ECHO_N "checking for built-in \"bool\" datatype... $ECHO_C" >&6 -+cat >conftest.$ac_ext <<_ACEOF -+#line 3224 "configure" -+#include "confdefs.h" -+ -+int -+main () -+{ -+bool testing_bool; testing_bool=true; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (eval echo "$as_me:3236: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>&5 -+ ac_status=$? -+ echo "$as_me:3239: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:2159: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:3242: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:2162: \$? = $ac_status" >&5 -+ echo "$as_me:3245: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- CXXFLAGS="$CXXFLAGS -DINTERNALBOOL"; echo "$as_me:2164: result: yes" >&5 -+ CXXFLAGS="$CXXFLAGS -DINTERNALBOOL"; echo "$as_me:3247: result: yes" >&5 - echo "${ECHO_T}yes" >&6 - else - echo "$as_me: failed program was:" >&5 -@@ -2691,10 +3774,14 @@ s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t - s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t - s,@INSTALL_DATA@,$INSTALL_DATA,;t t - s,@GS@,$GS,;t t -+s,@CXXCPP@,$CXXCPP,;t t -+s,@X_CFLAGS@,$X_CFLAGS,;t t -+s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t -+s,@X_LIBS@,$X_LIBS,;t t -+s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t - s,@LDL@,$LDL,;t t - s,@LMING@,$LMING,;t t - s,@LPLOTTER@,$LPLOTTER,;t t --s,@CXXCPP@,$CXXCPP,;t t - s,@PLOTCOMPILEFLAGS@,$PLOTCOMPILEFLAGS,;t t - s,@MINGCOMPILEFLAGS@,$MINGCOMPILEFLAGS,;t t - s,@EMFCOMPILEFLAGS@,$EMFCOMPILEFLAGS,;t t diff --git a/graphics/pstoedit/patches/patch-ac b/graphics/pstoedit/patches/patch-ac deleted file mode 100644 index c6175f454c9..00000000000 --- a/graphics/pstoedit/patches/patch-ac +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ac,v 1.3 2002/05/07 13:18:27 itohy Exp $ - ---- Makefile.in.orig Sat Dec 29 01:34:06 2001 -+++ Makefile.in Fri Mar 22 11:19:23 2002 -@@ -19,7 +19,7 @@ - GS=@GS@ - - # Choose a compiler + linker --CXXFLAGS=@CXXFLAGS@ -+CXXFLAGS=@CXXFLAGS@ @X_CFLAGS@ - CCC=@CXX@ @SPECIAL_CXXFLAGS@ - LDLIBS=$(LOCALLIBS) @LDLIBS@ -lm @LDL@ - LINK=@LINK@ -@@ -71,7 +71,7 @@ - #LOCALDEFINES=-DHAVE_LIBPLOTTER -I/path/to/plotter.h - # add -DOLD_LIBPLOTTER for libplot older than 2.3 - LOCALDEFINES=@PLOTCOMPILEFLAGS@ @MINGCOMPILEFLAGS@ @PNGCOMPILEFLAGS@ --LOCALLIBS=-L/path/to/libplot @LPLOTTER@ @LMING@ @PNGLINKFLAGS@ -+LOCALLIBS=-L${LOCALBASE}/lib -lplotter @LPLOTTER@ @LMING@ @PNGLINKFLAGS@ - ############################################################# - - ## IRIX 5.3 diff --git a/graphics/pstoedit/patches/patch-ad b/graphics/pstoedit/patches/patch-ad deleted file mode 100644 index 336cfe68713..00000000000 --- a/graphics/pstoedit/patches/patch-ad +++ /dev/null @@ -1,56 +0,0 @@ -$NetBSD: patch-ad,v 1.3 2005/02/25 18:31:43 drochner Exp $ - ---- miscutil.cpp.orig 2001-12-30 21:35:25.000000000 +0100 -+++ miscutil.cpp -@@ -26,8 +26,12 @@ - // #ifdef _MSC_VER - // for getcwd ( at least for Visual C++) - --#if defined(unix) || defined(__unix__) || defined(_unix) || defined(__unix) || defined(__EMX__) || defined (NetBSD) -+#if defined(unix) || defined(__unix__) || defined(_unix) || defined(__unix) || defined(__EMX__) || defined (__NetBSD__) - #include <unistd.h> -+#include <sys/param.h> -+#if defined(BSD) && BSD >= 199306 -+#define HAVE_MKSTEMP -+#endif - - #ifdef __hpux - // HP-UX does not define getcwd in unistd.h -@@ -134,6 +138,17 @@ char *tempnam(const char *, const char * - - char *full_qualified_tempnam(const char *pref) - { -+#ifdef HAVE_MKSTEMP -+ char buf[80]; -+ int fd; -+ -+ /* safer than tempnam(), probably, but, .... */ -+ sprintf(buf, "/tmp/%sXXXXXX", pref); -+ if ((fd = mkstemp(buf)) < 0) -+ return NULL; -+ close(fd); -+ return strdup(buf); -+#else - #if defined (__BCPLUSPLUS__) || defined (__TCPLUSPLUS__) - /* borland has a prototype that expects a char * as second arg */ - char *filename = tempnam(0, (char *) pref); -@@ -161,6 +176,7 @@ char *full_qualified_tempnam(const char - return filename; - } - #endif -+#endif - } - - unsigned short hextoint(const char hexchar) -@@ -374,7 +390,11 @@ ostream & operator << (ostream & out, co - - TempFile::TempFile() - { -+#if 1 -+ tempFileName = full_qualified_tempnam("pstmp"); -+#else - tempFileName = tempnam(0, "pstmp"); -+#endif - // cout << "constructed " << tempFileName << endl; - } - diff --git a/graphics/pstoedit/patches/patch-ae b/graphics/pstoedit/patches/patch-ae deleted file mode 100644 index 02804009ecb..00000000000 --- a/graphics/pstoedit/patches/patch-ae +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ae,v 1.4 2005/02/25 18:31:43 drochner Exp $ - ---- drvsk.cpp.orig 2001-11-03 21:18:20.000000000 +0100 -+++ drvsk.cpp -@@ -61,8 +61,8 @@ PERFORMANCE OF THIS SOFTWARE. - #include <stdlib.h> - #include <ctype.h> - #include <iomanip.h> --#if (defined(unix) || defined(__unix__) || defined(_unix) || defined(__unix) || defined(__EMX__) || defined (NetBSD) ) && !defined(DJGPP) --#include <strstream.h> -+#if (defined(unix) || defined(__unix__) || defined(_unix) || defined(__unix) || defined(__EMX__) || defined (__NetBSD__) ) && !defined(DJGPP) -+#include <strstream> - #else - #include <strstrea.h> - #endif -@@ -377,7 +377,7 @@ void drvSK::show_image(const Image & ima - return; - } - -- ostrstream ppm; -+ std::ostrstream ppm; - - switch (imageinfo.type) { - case colorimage: diff --git a/graphics/pstoedit/patches/patch-af b/graphics/pstoedit/patches/patch-af deleted file mode 100644 index dfff1ffba45..00000000000 --- a/graphics/pstoedit/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-af,v 1.3 2005/03/14 15:04:04 rillig Exp $ - ---- cppcomp.h.orig Sun Dec 30 21:35:19 2001 -+++ cppcomp.h Sat Mar 12 11:19:15 2005 -@@ -122,7 +122,7 @@ - #define I_streamb <iostream.h> - - --#if (defined(unix) || defined(__unix__) || defined(_unix) || defined(__unix) || defined(__EMX__) || defined (NetBSD) ) && !defined(DJGPP) -+#if (defined(unix) || defined(__unix__) || defined(_unix) || defined(__unix) || defined(__EMX__) || defined (__NetBSD__) ) && !defined(DJGPP) - #define I_strstream <strstream.h> - #else - #define I_strstream <strstrea.h> |