diff options
| author | itohy <itohy@pkgsrc.org> | 2002-05-07 13:18:26 +0000 |
|---|---|---|
| committer | itohy <itohy@pkgsrc.org> | 2002-05-07 13:18:26 +0000 |
| commit | 3a9ea86baac1f5f45567182011ef177ce8a739f0 (patch) | |
| tree | 04114e05ec748791ef630adcc17c9d5b8fbdc869 /graphics/pstoedit | |
| parent | e7026585e584f83ce9c6eb1f46e3d4ee59705209 (diff) | |
| download | pkgsrc-3a9ea86baac1f5f45567182011ef177ce8a739f0.tar.gz | |
Update pstoedit to 3.31. Approved by wiz.
Tested compilation on i386 (a.out) and alpha (ELF).
Note the usage of libtool is not normal.
Diffstat (limited to 'graphics/pstoedit')
| -rw-r--r-- | graphics/pstoedit/Makefile | 19 | ||||
| -rw-r--r-- | graphics/pstoedit/PLIST | 6 | ||||
| -rw-r--r-- | graphics/pstoedit/distinfo | 17 | ||||
| -rw-r--r-- | graphics/pstoedit/patches/patch-aa | 22 | ||||
| -rw-r--r-- | graphics/pstoedit/patches/patch-ab | 3123 | ||||
| -rw-r--r-- | graphics/pstoedit/patches/patch-ac | 55 | ||||
| -rw-r--r-- | graphics/pstoedit/patches/patch-ad | 32 | ||||
| -rw-r--r-- | graphics/pstoedit/patches/patch-ae | 233 | ||||
| -rw-r--r-- | graphics/pstoedit/patches/patch-af | 12 | ||||
| -rw-r--r-- | graphics/pstoedit/patches/patch-ag | 58 |
10 files changed, 2316 insertions, 1261 deletions
diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile index 342f048f664..6642462a17c 100644 --- a/graphics/pstoedit/Makefile +++ b/graphics/pstoedit/Makefile @@ -1,18 +1,17 @@ -# $NetBSD: Makefile,v 1.8 2002/03/13 17:37:16 fredb Exp $ +# $NetBSD: Makefile,v 1.9 2002/05/07 13:18:26 itohy Exp $ -DISTNAME= pstoedit_3_20 -PKGNAME= pstoedit-3.20 -PKGREVISION= 1 +DISTNAME= pstoedit_3_31 +PKGNAME= pstoedit-3_31 CATEGORIES= converters graphics print -MASTER_SITES= http://www.geocities.com/SiliconValley/Network/1958/pstoedit/ +MASTER_SITES= http://home.t-online.de/home/helga.glunz/wglunz/pstoedit/ EXTRACT_SUFX= .zip MAINTAINER= packages@netbsd.org -HOMEPAGE= http://www.geocities.com/SiliconValley/Network/1958/pstoedit/ +HOMEPAGE= http://www.pstoedit.net/ COMMENT= Convert PostScript / PDF into various vector graphic formats # Requires C++ support of plotutils. -DEPENDS+= plotutils>=2.4.1nb1:../../graphics/plotutils +DEPENDS+= plotutils>=2.4.1:../../graphics/plotutils # Any ghostscript pkg will probably do, if not a font pkg. DEPENDS+= ghostscript-[^f]*:../../print/ghostscript @@ -20,13 +19,15 @@ RESTRICTED?= "The author writes: If you include this program on a CDROM, please NO_SRC_ON_CDROM= ${RESTRICTED} NO_BIN_ON_CDROM= ${RESTRICTED} -WRKSRC= ${WRKDIR}/pstoedit_3.20/src +WRKSRC= ${WRKDIR}/pstoedit_3.31/src +USE_LIBTOOL= yes GNU_CONFIGURE= yes +CONFIGURE_ENV+= LIBTOOL="${LIBTOOL}" LIBPLOTTERLA="${X11BASE}/lib/libplotter.la" CONFIGURE_ENV+= CXXFLAGS="${CFLAGS} -Dunix" CONFIGURE_ENV+= LDLIBS="-Wl,-R${X11BASE}/lib -L${X11BASE}/lib" CONFIGURE_ENV+= AWK=${AWK} GS=${PREFIX}/bin/gs -CONFIGURE_ARGS+=--datadir=${PREFIX}/share/pstoedit +CONFIGURE_ARGS+=--datadir=${PREFIX}/share CONFIGURE_ARGS+=--libdir=${PREFIX}/lib/pstoedit # plugin dir -- unused for now ALL_TARGET= diff --git a/graphics/pstoedit/PLIST b/graphics/pstoedit/PLIST index c1b8e933f71..2481acf019d 100644 --- a/graphics/pstoedit/PLIST +++ b/graphics/pstoedit/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:53:31 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/05/07 13:18:26 itohy Exp $ bin/pstoedit man/man1/pstoedit.1 share/pstoedit/doc/changelog.htm @@ -8,4 +8,8 @@ share/pstoedit/doc/readme.txt @dirrm share/pstoedit/doc share/pstoedit/latex2e.fmp share/pstoedit/mpost.fmp +share/pstoedit/pstoedit.htm +share/pstoedit/svg.fmp +share/pstoedit/swffonts/default.fdb +@dirrm share/pstoedit/swffonts @dirrm share/pstoedit diff --git a/graphics/pstoedit/distinfo b/graphics/pstoedit/distinfo index c8bc90cf05d..a3465cf617c 100644 --- a/graphics/pstoedit/distinfo +++ b/graphics/pstoedit/distinfo @@ -1,11 +1,8 @@ -$NetBSD: distinfo,v 1.2 2001/04/21 09:54:25 wiz Exp $ -SHA1 (pstoedit_3_20.zip) = c8d5ffcdb1e970d05124c73da7ad6243f6db90b8 -Size (pstoedit_3_20.zip) = 444849 bytes -SHA1 (patch-aa) = 1986e25c2b7fdbac91b4b9a91505e3f459ec3971 -SHA1 (patch-ab) = 3ec29a5fc62d476df1b3156728fbb597a353b0fb -SHA1 (patch-ac) = 1c69b7942d6bbc5e87a06326c96e8cd9b89db15b -SHA1 (patch-ad) = 771de9e3b67590ea077218d3c104fe074f833927 -SHA1 (patch-ae) = 47b9b17b1f1af2bcec5975b56238fce3a664f075 -SHA1 (patch-af) = 73534b7983ee0076f517b76bf512fcce2f3ba094 -SHA1 (patch-ag) = f313d6219b0b91eea504084f866e492a260d75f3 + +SHA1 (pstoedit_3_31.zip) = 95e7a09385c3d9ce3dbe8ba5afcc9154021c83ce +Size (pstoedit_3_31.zip) = 558546 bytes +SHA1 (patch-aa) = 25513e3452eed6eb464df1c0dbeeafa4d0f446bf +SHA1 (patch-ab) = 12ecc8f993e3702018267238c7ea5234a38f1482 +SHA1 (patch-ac) = 614ba9036e1484755955b765e829227e64f10879 +SHA1 (patch-ad) = 3b01b11422db35a95b1a55a20c7a28dc3a251fa9 diff --git a/graphics/pstoedit/patches/patch-aa b/graphics/pstoedit/patches/patch-aa index e5abd94a03c..f602e6c589a 100644 --- a/graphics/pstoedit/patches/patch-aa +++ b/graphics/pstoedit/patches/patch-aa @@ -1,24 +1,18 @@ -$NetBSD: patch-aa,v 1.1.1.1 2000/07/18 07:46:40 itohy Exp $ +$NetBSD: patch-aa,v 1.2 2002/05/07 13:18:27 itohy Exp $ ---- configure.in.orig Tue May 2 05:02:00 2000 -+++ configure.in Sat Jun 24 19:30:17 2000 -@@ -18,6 +18,21 @@ +--- 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 X11 support. Stolen from plotutils. ++dnl Look for extra libraries used by libplotter +AC_PATH_XTRA +AC_SUBST(X_CFLAGS) -+AC_SUBST(X_LIBS) -+AC_SUBST(X_TOOLKIT_LIBS) -+AC_SUBST(X_PRE_LIBS) -+AC_SUBST(X_BASIC_LIBS) -+AC_SUBST(X_EXTRA_LIBS) ++DEPLIBS="`$LIBTOOL -n cc -o xx xx.o $LIBPLOTTERLA | tr ' ' '\012' | sed -e '/^-[[LWl]]/!d' -e '/^-lplotter$/d' | tr '\012' ' '`" + -+X_TOOLKIT_LIBS="-lXaw -lXmu -lXt" -+X_BASIC_LIBS="-lXext -lX11" -+ -+LDFLAGS="$X_LIBS $LDFLAGS" ++LDLIBS="$DEPLIBS $LDLIBS" ++LIBS="$DEPLIBS" +CPPFLAGS="$X_CFLAGS $CPPFLAGS" + dnl Look for various optional libraries. diff --git a/graphics/pstoedit/patches/patch-ab b/graphics/pstoedit/patches/patch-ab index 090bb099302..eabecfaaeb0 100644 --- a/graphics/pstoedit/patches/patch-ab +++ b/graphics/pstoedit/patches/patch-ab @@ -1,190 +1,933 @@ -$NetBSD: patch-ab,v 1.1.1.1 2000/07/18 07:46:40 itohy Exp $ +$NetBSD: patch-ab,v 1.2 2002/05/07 13:18:27 itohy Exp $ ---- configure.orig Tue May 2 05:02:04 2000 -+++ configure Sat Jun 24 19:30:59 2000 -@@ -12,6 +12,8 @@ - ac_default_prefix=/usr/local - # Any additions from configure.in: - ac_help="$ac_help -+ --with-x use the X Window System" -+ac_help="$ac_help - --enable-wrapper=PROGRAM +--- configure.orig Fri Mar 22 10:14:43 2002 ++++ configure Fri Mar 22 10:18:52 2002 +@@ -618,6 +618,10 @@ + + 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 @@ Wrap (i.e. prefix) compiler invocations with PROGRAM - (e.g. \"insure\" or \"purify\")" -@@ -530,7 +532,7 @@ - # Extract the first word of "gs", so it can be a program name with args. - set dummy gs; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:534: checking for $ac_word" >&5 -+echo "configure:536: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_GS'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + (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 +@@ -827,7 +836,7 @@ + fi + for ac_site_file in $CONFIG_SITE; do + if test -r "$ac_site_file"; then +- { echo "$as_me:830: loading site script $ac_site_file" >&5 ++ { echo "$as_me:839: loading site script $ac_site_file" >&5 + echo "$as_me: loading site script $ac_site_file" >&6;} + cat "$ac_site_file" >&5 + . "$ac_site_file" +@@ -838,7 +847,7 @@ + # Some versions of bash will fail to source /dev/null (special + # files actually), so we avoid doing that. + if test -f "$cache_file"; then +- { echo "$as_me:841: loading cache $cache_file" >&5 ++ { echo "$as_me:850: loading cache $cache_file" >&5 + echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . $cache_file;; +@@ -846,7 +855,7 @@ + esac + fi else -@@ -593,7 +595,7 @@ +- { echo "$as_me:849: creating cache $cache_file" >&5 ++ { echo "$as_me:858: creating cache $cache_file" >&5 + echo "$as_me: creating cache $cache_file" >&6;} + >$cache_file + fi +@@ -862,21 +871,21 @@ + eval ac_new_val="\$ac_env_${ac_var}_value" + case $ac_old_set,$ac_new_set in + set,) +- { echo "$as_me:865: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 ++ { echo "$as_me:874: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,set) +- { echo "$as_me:869: error: \`$ac_var' was not set in the previous run" >&5 ++ { echo "$as_me:878: error: \`$ac_var' was not set in the previous run" >&5 + echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,);; + *) + if test "x$ac_old_val" != "x$ac_new_val"; then +- { echo "$as_me:875: error: \`$ac_var' has changed since the previous run:" >&5 ++ { echo "$as_me:884: error: \`$ac_var' has changed since the previous run:" >&5 + echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} +- { echo "$as_me:877: former value: $ac_old_val" >&5 ++ { echo "$as_me:886: former value: $ac_old_val" >&5 + echo "$as_me: former value: $ac_old_val" >&2;} +- { echo "$as_me:879: current value: $ac_new_val" >&5 ++ { echo "$as_me:888: current value: $ac_new_val" >&5 + echo "$as_me: current value: $ac_new_val" >&2;} + ac_cache_corrupted=: + fi;; +@@ -895,9 +904,9 @@ + fi + done + if $ac_cache_corrupted; then +- { echo "$as_me:898: error: changes in the environment can compromise the build" >&5 ++ { echo "$as_me:907: error: changes in the environment can compromise the build" >&5 + echo "$as_me: error: changes in the environment can compromise the build" >&2;} +- { { echo "$as_me:900: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 ++ { { echo "$as_me:909: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 + echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -917,10 +926,10 @@ + echo "#! $SHELL" >conftest.sh + echo "exit 0" >>conftest.sh + chmod +x conftest.sh +-if { (echo "$as_me:920: PATH=\".;.\"; conftest.sh") >&5 ++if { (echo "$as_me:929: PATH=\".;.\"; conftest.sh") >&5 + (PATH=".;."; conftest.sh) 2>&5 + ac_status=$? +- echo "$as_me:923: \$? = $ac_status" >&5 ++ echo "$as_me:932: \$? = $ac_status" >&5 + (exit $ac_status); }; then + ac_path_separator=';' + else +@@ -946,7 +955,7 @@ + fi + done + if test -z "$ac_aux_dir"; then +- { { echo "$as_me:949: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 ++ { { echo "$as_me:958: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 + echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} + { (exit 1); exit 1; }; } + fi +@@ -956,11 +965,11 @@ + + # Make sure we can run config.sub. + $ac_config_sub sun4 >/dev/null 2>&1 || +- { { echo "$as_me:959: error: cannot run $ac_config_sub" >&5 ++ { { echo "$as_me:968: error: cannot run $ac_config_sub" >&5 + echo "$as_me: error: cannot run $ac_config_sub" >&2;} + { (exit 1); exit 1; }; } + +-echo "$as_me:963: checking build system type" >&5 ++echo "$as_me:972: checking build system type" >&5 + echo $ECHO_N "checking build system type... $ECHO_C" >&6 + if test "${ac_cv_build+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -969,26 +978,23 @@ + test -z "$ac_cv_build_alias" && + ac_cv_build_alias=`$ac_config_guess` + test -z "$ac_cv_build_alias" && +- { { echo "$as_me:972: error: cannot guess build type; you must specify one" >&5 ++ { { echo "$as_me:981: error: cannot guess build type; you must specify one" >&5 + echo "$as_me: error: cannot guess build type; you must specify one" >&2;} + { (exit 1); exit 1; }; } + ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || +- { { echo "$as_me:976: error: $ac_config_sub $ac_cv_build_alias failed." >&5 ++ { { echo "$as_me:985: error: $ac_config_sub $ac_cv_build_alias failed." >&5 + echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} + { (exit 1); exit 1; }; } + fi +-echo "$as_me:981: result: $ac_cv_build" >&5 ++echo "$as_me:990: result: $ac_cv_build" >&5 + echo "${ECHO_T}$ac_cv_build" >&6 + build=$ac_cv_build + build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` + 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 +@@ -997,21 +1003,18 @@ + test -z "$ac_cv_host_alias" && + ac_cv_host_alias=$ac_cv_build_alias + ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || +- { { echo "$as_me:1000: error: $ac_config_sub $ac_cv_host_alias failed" >&5 ++ { { echo "$as_me:1006: error: $ac_config_sub $ac_cv_host_alias failed" >&5 + echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} + { (exit 1); exit 1; }; } - echo $ac_n "checking host system type""... $ac_c" 1>&6 --echo "configure:597: checking host system type" >&5 -+echo "configure:599: checking host system type" >&5 + fi +-echo "$as_me:1005: result: $ac_cv_host" >&5 ++echo "$as_me:1011: result: $ac_cv_host" >&5 + echo "${ECHO_T}$ac_cv_host" >&6 + host=$ac_cv_host + host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` + host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` + host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - host_alias=$host - case "$host_alias" in -@@ -626,7 +628,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. +-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' +@@ -1022,7 +1025,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:630: checking for $ac_word" >&5 -+echo "configure:632: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +-echo "$as_me:1025: checking for $ac_word" >&5 ++echo "$as_me:1028: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_AWK+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -1037,7 +1040,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_AWK="$ac_prog" +-echo "$as_me:1040: found $ac_dir/$ac_word" >&5 ++echo "$as_me:1043: found $ac_dir/$ac_word" >&5 + break + done + +@@ -1045,10 +1048,10 @@ + fi + AWK=$ac_cv_prog_AWK + if test -n "$AWK"; then +- echo "$as_me:1048: result: $AWK" >&5 ++ echo "$as_me:1051: result: $AWK" >&5 + echo "${ECHO_T}$AWK" >&6 + else +- echo "$as_me:1051: result: no" >&5 ++ echo "$as_me:1054: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -1065,7 +1068,7 @@ + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-echo "$as_me:1068: checking for $ac_word" >&5 ++echo "$as_me:1071: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_CXX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -1080,7 +1083,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" +-echo "$as_me:1083: found $ac_dir/$ac_word" >&5 ++echo "$as_me:1086: found $ac_dir/$ac_word" >&5 + break + done + +@@ -1088,10 +1091,10 @@ + fi + CXX=$ac_cv_prog_CXX + if test -n "$CXX"; then +- echo "$as_me:1091: result: $CXX" >&5 ++ echo "$as_me:1094: result: $CXX" >&5 + echo "${ECHO_T}$CXX" >&6 else -@@ -660,7 +662,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. +- echo "$as_me:1094: result: no" >&5 ++ echo "$as_me:1097: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -1104,7 +1107,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:664: checking for $ac_word" >&5 -+echo "configure:666: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +-echo "$as_me:1107: checking for $ac_word" >&5 ++echo "$as_me:1110: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -1119,7 +1122,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_CXX="$ac_prog" +-echo "$as_me:1122: found $ac_dir/$ac_word" >&5 ++echo "$as_me:1125: found $ac_dir/$ac_word" >&5 + break + done + +@@ -1127,10 +1130,10 @@ + fi + ac_ct_CXX=$ac_cv_prog_ac_ct_CXX + if test -n "$ac_ct_CXX"; then +- echo "$as_me:1130: result: $ac_ct_CXX" >&5 ++ echo "$as_me:1133: result: $ac_ct_CXX" >&5 + echo "${ECHO_T}$ac_ct_CXX" >&6 + else +- echo "$as_me:1133: result: no" >&5 ++ echo "$as_me:1136: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -1142,27 +1145,27 @@ + fi + + # Provide some information about the compiler. +-echo "$as_me:1145:" \ ++echo "$as_me:1148:" \ + "checking for C++ compiler version" >&5 + ac_compiler=`set X $ac_compile; echo $2` +-{ (eval echo "$as_me:1148: \"$ac_compiler --version </dev/null >&5\"") >&5 ++{ (eval echo "$as_me:1151: \"$ac_compiler --version </dev/null >&5\"") >&5 + (eval $ac_compiler --version </dev/null >&5) 2>&5 + ac_status=$? +- echo "$as_me:1151: \$? = $ac_status" >&5 ++ echo "$as_me:1154: \$? = $ac_status" >&5 + (exit $ac_status); } +-{ (eval echo "$as_me:1153: \"$ac_compiler -v </dev/null >&5\"") >&5 ++{ (eval echo "$as_me:1156: \"$ac_compiler -v </dev/null >&5\"") >&5 + (eval $ac_compiler -v </dev/null >&5) 2>&5 + ac_status=$? +- echo "$as_me:1156: \$? = $ac_status" >&5 ++ echo "$as_me:1159: \$? = $ac_status" >&5 + (exit $ac_status); } +-{ (eval echo "$as_me:1158: \"$ac_compiler -V </dev/null >&5\"") >&5 ++{ (eval echo "$as_me:1161: \"$ac_compiler -V </dev/null >&5\"") >&5 + (eval $ac_compiler -V </dev/null >&5) 2>&5 + ac_status=$? +- echo "$as_me:1161: \$? = $ac_status" >&5 ++ echo "$as_me:1164: \$? = $ac_status" >&5 + (exit $ac_status); } + + cat >conftest.$ac_ext <<_ACEOF +-#line 1165 "configure" ++#line 1168 "configure" + #include "confdefs.h" + + int +@@ -1178,13 +1181,13 @@ + # Try to create an executable without -o first, disregard a.out. + # It will help us diagnose broken compilers, and finding out an intuition + # of exeext. +-echo "$as_me:1181: checking for C++ compiler default output" >&5 ++echo "$as_me:1184: checking for C++ compiler default output" >&5 + echo $ECHO_N "checking for C++ compiler default output... $ECHO_C" >&6 + ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +-if { (eval echo "$as_me:1184: \"$ac_link_default\"") >&5 ++if { (eval echo "$as_me:1187: \"$ac_link_default\"") >&5 + (eval $ac_link_default) 2>&5 + ac_status=$? +- echo "$as_me:1187: \$? = $ac_status" >&5 ++ echo "$as_me:1190: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # Find the output, starting from the most likely. This scheme is + # not robust to junk in `.', hence go to wildcards (a.*) only as a last +@@ -1207,34 +1210,34 @@ else -@@ -692,7 +694,7 @@ + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-{ { echo "$as_me:1210: error: C++ compiler cannot create executables" >&5 ++{ { echo "$as_me:1213: error: C++ compiler cannot create executables" >&5 + echo "$as_me: error: C++ compiler cannot create executables" >&2;} + { (exit 77); exit 77; }; } + fi + + ac_exeext=$ac_cv_exeext +-echo "$as_me:1216: result: $ac_file" >&5 ++echo "$as_me:1219: result: $ac_file" >&5 + echo "${ECHO_T}$ac_file" >&6 + # Check the compiler produces executables we can run. If not, either + # the compiler is broken, or we cross compile. +-echo "$as_me:1221: checking whether the C++ compiler works" >&5 ++echo "$as_me:1224: checking whether the C++ compiler works" >&5 + echo $ECHO_N "checking whether the C++ compiler works... $ECHO_C" >&6 + # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 + # If not cross compiling, check that we can run a simple program. + if test "$cross_compiling" != yes; then + if { ac_try='./$ac_file' +- { (eval echo "$as_me:1227: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:1230: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:1230: \$? = $ac_status" >&5 ++ echo "$as_me:1233: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else +- { { echo "$as_me:1237: error: cannot run C++ compiled programs. ++ { { echo "$as_me:1240: error: cannot run C++ compiled programs. + If you meant to cross compile, use \`--host'." >&5 + echo "$as_me: error: cannot run C++ compiled programs. + If you meant to cross compile, use \`--host'." >&2;} +@@ -1242,24 +1245,24 @@ + fi + fi + fi +-echo "$as_me:1245: result: yes" >&5 ++echo "$as_me:1248: result: yes" >&5 + echo "${ECHO_T}yes" >&6 - echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 --echo "configure:696: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 -+echo "configure:698: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 + rm -f a.out a.exe conftest$ac_cv_exeext + ac_clean_files=$ac_clean_files_save + # Check the compiler produces executables we can run. If not, either + # the compiler is broken, or we cross compile. +-echo "$as_me:1252: checking whether we are cross compiling" >&5 ++echo "$as_me:1255: checking whether we are cross compiling" >&5 + echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 +-echo "$as_me:1254: result: $cross_compiling" >&5 ++echo "$as_me:1257: result: $cross_compiling" >&5 + echo "${ECHO_T}$cross_compiling" >&6 - ac_ext=C - # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -@@ -703,12 +705,12 @@ +-echo "$as_me:1257: checking for executable suffix" >&5 ++echo "$as_me:1260: checking for executable suffix" >&5 + echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 +-if { (eval echo "$as_me:1259: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:1262: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:1262: \$? = $ac_status" >&5 ++ echo "$as_me:1265: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # If both `conftest.exe' and `conftest' are `present' (well, observable) + # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +@@ -1275,25 +1278,25 @@ + esac + done + else +- { { echo "$as_me:1278: error: cannot compute EXEEXT: cannot compile and link" >&5 ++ { { echo "$as_me:1281: error: cannot compute EXEEXT: cannot compile and link" >&5 + echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} + { (exit 1); exit 1; }; } + fi - cat > conftest.$ac_ext << EOF + rm -f conftest$ac_cv_exeext +-echo "$as_me:1284: result: $ac_cv_exeext" >&5 ++echo "$as_me:1287: result: $ac_cv_exeext" >&5 + echo "${ECHO_T}$ac_cv_exeext" >&6 + + rm -f conftest.$ac_ext + EXEEXT=$ac_cv_exeext + ac_exeext=$EXEEXT +-echo "$as_me:1290: checking for object suffix" >&5 ++echo "$as_me:1293: checking for object suffix" >&5 + echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 + if test "${ac_cv_objext+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 1296 "configure" ++#line 1299 "configure" + #include "confdefs.h" + + int +@@ -1305,10 +1308,10 @@ + } + _ACEOF + rm -f conftest.o conftest.obj +-if { (eval echo "$as_me:1308: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:1311: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:1311: \$? = $ac_status" >&5 ++ echo "$as_me:1314: \$? = $ac_status" >&5 + (exit $ac_status); }; then + for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do + case $ac_file in +@@ -1320,24 +1323,24 @@ + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-{ { echo "$as_me:1323: error: cannot compute OBJEXT: cannot compile" >&5 ++{ { echo "$as_me:1326: error: cannot compute OBJEXT: cannot compile" >&5 + echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} + { (exit 1); exit 1; }; } + fi --#line 707 "configure" -+#line 709 "configure" + rm -f conftest.$ac_cv_objext conftest.$ac_ext + fi +-echo "$as_me:1330: result: $ac_cv_objext" >&5 ++echo "$as_me:1333: result: $ac_cv_objext" >&5 + echo "${ECHO_T}$ac_cv_objext" >&6 + OBJEXT=$ac_cv_objext + ac_objext=$OBJEXT +-echo "$as_me:1334: checking whether we are using the GNU C++ compiler" >&5 ++echo "$as_me:1337: checking whether we are using the GNU C++ compiler" >&5 + echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 + if test "${ac_cv_cxx_compiler_gnu+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 1340 "configure" ++#line 1343 "configure" #include "confdefs.h" - int main(){return(0);} - EOF --if { (eval echo configure:712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - ac_cv_prog_cxx_works=yes - # If we can't run a trivial program, we are probably using a cross compiler. - if (./conftest; exit) 2>/dev/null; then -@@ -734,12 +736,12 @@ - { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } + int +@@ -1352,16 +1355,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:1355: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:1358: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:1358: \$? = $ac_status" >&5 ++ echo "$as_me:1361: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:1361: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:1364: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:1364: \$? = $ac_status" >&5 ++ echo "$as_me:1367: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_compiler_gnu=yes + else +@@ -1373,19 +1376,19 @@ + ac_cv_cxx_compiler_gnu=$ac_compiler_gnu + fi - echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 --echo "configure:738: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "configure:740: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 - echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 - cross_compiling=$ac_cv_prog_cxx_cross +-echo "$as_me:1376: result: $ac_cv_cxx_compiler_gnu" >&5 ++echo "$as_me:1379: result: $ac_cv_cxx_compiler_gnu" >&5 + echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 + GXX=`test $ac_compiler_gnu = yes && echo yes` + ac_test_CXXFLAGS=${CXXFLAGS+set} + ac_save_CXXFLAGS=$CXXFLAGS + CXXFLAGS="-g" +-echo "$as_me:1382: checking whether $CXX accepts -g" >&5 ++echo "$as_me:1385: checking whether $CXX accepts -g" >&5 + echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 + if test "${ac_cv_prog_cxx_g+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 1388 "configure" ++#line 1391 "configure" + #include "confdefs.h" - echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 --echo "configure:743: checking whether we are using GNU C++" >&5 -+echo "configure:745: checking whether we are using GNU C++" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + int +@@ -1397,16 +1400,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:1400: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:1403: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:1403: \$? = $ac_status" >&5 ++ echo "$as_me:1406: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:1406: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:1409: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:1409: \$? = $ac_status" >&5 ++ echo "$as_me:1412: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cxx_g=yes else -@@ -748,7 +750,7 @@ - yes; - #endif - EOF --if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:752: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then -+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:754: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then - ac_cv_prog_gxx=yes +@@ -1416,7 +1419,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:1419: result: $ac_cv_prog_cxx_g" >&5 ++echo "$as_me:1422: result: $ac_cv_prog_cxx_g" >&5 + echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 + if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS=$ac_save_CXXFLAGS +@@ -1443,7 +1446,7 @@ + 'void exit (int);' + do + cat >conftest.$ac_ext <<_ACEOF +-#line 1446 "configure" ++#line 1449 "configure" + #include "confdefs.h" + #include <stdlib.h> + $ac_declaration +@@ -1456,16 +1459,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:1459: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:1462: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:1462: \$? = $ac_status" >&5 ++ echo "$as_me:1465: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:1465: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:1468: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:1468: \$? = $ac_status" >&5 ++ echo "$as_me:1471: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : else - ac_cv_prog_gxx=no -@@ -767,7 +769,7 @@ - ac_save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS= - echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 --echo "configure:771: checking whether ${CXX-g++} accepts -g" >&5 -+echo "configure:773: checking whether ${CXX-g++} accepts -g" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1475,7 +1478,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +-#line 1478 "configure" ++#line 1481 "configure" + #include "confdefs.h" + $ac_declaration + int +@@ -1487,16 +1490,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:1490: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:1493: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:1493: \$? = $ac_status" >&5 ++ echo "$as_me:1496: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:1496: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:1499: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:1499: \$? = $ac_status" >&5 ++ echo "$as_me:1502: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break else -@@ -810,7 +812,7 @@ +@@ -1530,7 +1533,7 @@ + # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. - echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 --echo "configure:814: checking for a BSD compatible install" >&5 -+echo "configure:816: checking for a BSD compatible install" >&5 +-echo "$as_me:1533: checking for a BSD compatible install" >&5 ++echo "$as_me:1536: checking for a BSD compatible install" >&5 + echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then - if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -865,7 +867,7 @@ + if test "${ac_cv_path_install+set}" = set; then +@@ -1579,7 +1582,7 @@ + INSTALL=$ac_install_sh + fi + fi +-echo "$as_me:1582: result: $INSTALL" >&5 ++echo "$as_me:1585: result: $INSTALL" >&5 + echo "${ECHO_T}$INSTALL" >&6 + + # Use test -z because SunOS4 sh mishandles braces in ${var-val}. +@@ -1592,7 +1595,7 @@ + # Extract the first word of "gs", so it can be a program name with args. set dummy gs; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:869: checking for $ac_word" >&5 -+echo "configure:871: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_GS'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +-echo "$as_me:1595: checking for $ac_word" >&5 ++echo "$as_me:1598: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_path_GS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -1609,7 +1612,7 @@ + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_GS="$ac_dir/$ac_word" +- echo "$as_me:1612: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:1615: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -1621,163 +1624,19 @@ + GS=$ac_cv_path_GS + + if test -n "$GS"; then +- echo "$as_me:1624: result: $GS" >&5 ++ echo "$as_me:1627: result: $GS" >&5 + echo "${ECHO_T}$GS" >&6 else -@@ -899,23 +901,391 @@ +- echo "$as_me:1627: result: no" >&5 ++ echo "$as_me:1630: result: no" >&5 + 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' + 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:1780: checking how to run the C++ preprocessor" >&5 ++echo "$as_me:1639: checking how to run the C++ preprocessor" >&5 + echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 + if test -z "$CXXCPP"; then + if test "${ac_cv_prog_CXXCPP+set}" = set; then +@@ -1794,18 +1653,18 @@ + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +-#line 1797 "configure" ++#line 1656 "configure" + #include "confdefs.h" + #include <assert.h> + Syntax error + _ACEOF +-if { (eval echo "$as_me:1802: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:1661: \"$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:1808: \$? = $ac_status" >&5 ++ echo "$as_me:1667: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -1828,17 +1687,17 @@ + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +-#line 1831 "configure" ++#line 1690 "configure" + #include "confdefs.h" + #include <ac_nonexistent.h> + _ACEOF +-if { (eval echo "$as_me:1835: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:1694: \"$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:1841: \$? = $ac_status" >&5 ++ echo "$as_me:1700: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -1875,7 +1734,7 @@ + else + ac_cv_prog_CXXCPP=$CXXCPP + fi +-echo "$as_me:1878: result: $CXXCPP" >&5 ++echo "$as_me:1737: result: $CXXCPP" >&5 + echo "${ECHO_T}$CXXCPP" >&6 + ac_preproc_ok=false + for ac_cxx_preproc_warn_flag in '' yes +@@ -1885,18 +1744,18 @@ + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +-#line 1888 "configure" ++#line 1747 "configure" + #include "confdefs.h" + #include <assert.h> + Syntax error + _ACEOF +-if { (eval echo "$as_me:1893: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:1752: \"$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:1899: \$? = $ac_status" >&5 ++ echo "$as_me:1758: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -1919,17 +1778,17 @@ + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +-#line 1922 "configure" ++#line 1781 "configure" + #include "confdefs.h" + #include <ac_nonexistent.h> + _ACEOF +-if { (eval echo "$as_me:1926: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:1785: \"$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:1932: \$? = $ac_status" >&5 ++ echo "$as_me:1791: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -1957,7 +1816,7 @@ + if $ac_preproc_ok; then + : + else +- { { echo "$as_me:1960: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 ++ { { echo "$as_me:1819: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 + echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -1968,23 +1827,114 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu --echo $ac_n "checking for main in -ldl""... $ac_c" 1>&6 --echo "configure:904: checking for main in -ldl" >&5 --ac_lib_var=`echo dl'_'main | sed 'y%./+-%__p_%'` -+echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -+echo "configure:906: checking how to run the C++ preprocessor" >&5 -+if test -z "$CXXCPP"; then -+if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_ext=C -+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cxx_cross -+ CXXCPP="${CXX-g++} -E" -+ cat > conftest.$ac_ext <<EOF -+#line 919 "configure" -+#include "confdefs.h" -+#include <stdlib.h> -+EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:924: \"$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 -+ : -+else -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ CXXCPP=/lib/cpp -+fi -+rm -f conftest* -+ ac_cv_prog_CXXCPP="$CXXCPP" -+ac_ext=C -+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cxx_cross -+fi -+fi -+CXXCPP="$ac_cv_prog_CXXCPP" -+echo "$ac_t""$CXXCPP" 1>&6 -+ -+# If we find X, set shell vars x_includes and x_libraries to the -+# paths, otherwise set no_x=yes. -+# Uses ac_ vars as temps to allow command line to override cache and checks. -+# --without-x overrides everything else, but does not touch the cache. -+echo $ac_n "checking for X""... $ac_c" 1>&6 -+echo "configure:953: checking for X" >&5 +-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 + ++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. @@ -194,16 +937,16 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/07/18 07:46:40 itohy Exp $ + # Both variables are already set. + have_x=yes + else -+if eval "test \"`echo '$''{'ac_cv_have_x'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+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 conftestdir -+if mkdir conftestdir; then -+ cd conftestdir ++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' ++ cat >Imakefile <<'EOF' +acfindx: + @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"' +EOF @@ -213,270 +956,401 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/07/18 07:46:40 itohy Exp $ + # 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 ++ 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 ++ case $ac_im_incroot in + /usr/include) ;; -+ *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes="$ac_im_incroot" ;; ++ *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; + esac -+ case "$ac_im_usrlibdir" in ++ case $ac_im_usrlibdir in + /usr/lib | /lib) ;; -+ *) test -d "$ac_im_usrlibdir" && ac_x_libraries="$ac_im_usrlibdir" ;; ++ *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; + esac + fi + cd .. -+ rm -fr conftestdir ++ rm -fr conftest.dir +fi + -+if test "$ac_x_includes" = NO; then -+ # Guess where to find include files, by looking for this one X11 .h file. -+ test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h -+ ++# 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 <<EOF -+#line 1015 "configure" -+#include "confdefs.h" -+#include <$x_direct_test_include> -+EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:1020: \"$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* + 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 + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:1987: \$? = $ac_status" >&5 ++ echo "$as_me:1937: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -1995,186 +1945,1319 @@ + 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 "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ # Look for the header file in a standard set of common directories. -+# Check X11 before X11Rn because it is often a symlink to the current release. -+ for ac_dir in \ -+ /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 \ -+ ; \ -+ do -+ if test -r "$ac_dir/$x_direct_test_include"; then -+ ac_x_includes=$ac_dir -+ break -+ fi -+ done -+fi -+rm -f conftest* -+fi # $ac_x_includes = NO -+ -+if test "$ac_x_libraries" = NO; then + 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. -+ -+ test -z "$x_direct_test_library" && x_direct_test_library=Xt -+ test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc -+ + # See if we find them without any special options. + # Don't add to $LIBS permanently. -+ ac_save_LIBS="$LIBS" -+ LIBS="-l$x_direct_test_library $LIBS" -+cat > conftest.$ac_ext <<EOF -+#line 1089 "configure" -+#include "confdefs.h" -+ -+int main() { -+${x_direct_test_function}() -+; return 0; } -+EOF -+if { (eval echo configure:1096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ LIBS="$ac_save_LIBS" ++ 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 "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ LIBS="$ac_save_LIBS" -+# First see if replacing the include by lib works. -+# Check X11 before X11Rn because it is often a symlink to the current release. -+for ac_dir in `echo "$ac_x_includes" | sed s/include/lib/` \ -+ /usr/X11/lib \ -+ /usr/X11R6/lib \ -+ /usr/X11R5/lib \ -+ /usr/X11R4/lib \ -+ \ -+ /usr/lib/X11 \ -+ /usr/lib/X11R6 \ -+ /usr/lib/X11R5 \ -+ /usr/lib/X11R4 \ -+ \ -+ /usr/local/X11/lib \ -+ /usr/local/X11R6/lib \ -+ /usr/local/X11R5/lib \ -+ /usr/local/X11R4/lib \ -+ \ -+ /usr/local/lib/X11 \ -+ /usr/local/lib/X11R6 \ -+ /usr/local/lib/X11R5 \ -+ /usr/local/lib/X11R4 \ -+ \ -+ /usr/X386/lib \ -+ /usr/x386/lib \ -+ /usr/XFree86/lib/X11 \ -+ \ -+ /usr/lib \ -+ /usr/local/lib \ -+ /usr/unsupported/lib \ -+ /usr/athena/lib \ -+ /usr/local/x11r5/lib \ -+ /usr/lpp/Xamples/lib \ -+ /lib/usr/lib/X11 \ -+ \ -+ /usr/openwin/lib \ -+ /usr/openwin/share/lib \ -+ ; \ + 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/lib${x_direct_test_library}.$ac_extension; then ++ if test -r $ac_dir/libXt.$ac_extension; then + ac_x_libraries=$ac_dir + break 2 + fi + done +done -+fi -+rm -f conftest* -+fi # $ac_x_libraries = NO -+ -+if test "$ac_x_includes" = NO || test "$ac_x_libraries" = NO; then + 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 + 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 -+fi -+ fi + 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 "$ac_t""$have_x" 1>&6 ++ echo "$as_me:2029: result: $have_x" >&5 ++echo "${ECHO_T}$have_x" >&6 + no_x=yes -+else + 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 "$ac_t""libraries $x_libraries, headers $x_includes" 1>&6 -+fi ++ 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 ++ ++cat >>confdefs.h <<\EOF +#define X_DISPLAY_MISSING 1 +EOF + + X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= -+else + 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 ++ case `(uname -sr) 2>/dev/null` in + "SunOS 5"*) -+ echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -+echo "configure:1202: checking whether -R must be followed by a space" >&5 -+ ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" -+ cat > conftest.$ac_ext <<EOF -+#line 1205 "configure" -+#include "confdefs.h" -+ -+int main() { -+ -+; return 0; } -+EOF -+if { (eval echo configure:1212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* ++ 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 "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ ac_R_nospace=no ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++ac_R_nospace=no +fi -+rm -f conftest* ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + if test $ac_R_nospace = yes; then -+ echo "$ac_t""no" 1>&6 ++ 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 <<EOF -+#line 1228 "configure" ++ cat >conftest.$ac_ext <<_ACEOF ++#line 2104 "configure" +#include "confdefs.h" + -+int main() { -+ -+; return 0; } -+EOF -+if { (eval echo configure:1235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* ++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 "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ ac_R_space=no ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++ac_R_space=no +fi -+rm -f conftest* ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + if test $ac_R_space = yes; then -+ echo "$ac_t""yes" 1>&6 ++ echo "$as_me:2135: result: yes" >&5 ++echo "${ECHO_T}yes" >&6 + X_LIBS="$X_LIBS -R $x_libraries" + else -+ echo "$ac_t""neither works" 1>&6 ++ echo "$as_me:2139: result: neither works" >&5 ++echo "${ECHO_T}neither works" >&6 + fi + fi -+ LIBS="$ac_xsave_LIBS" ++ LIBS=$ac_xsave_LIBS + esac + fi + @@ -487,760 +1361,1283 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/07/18 07:46:40 itohy Exp $ + if test "$ISC" = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet" + else -+ # Martyn.Johnson@cl.cam.ac.uk says this is needed for Ultrix, if the X -+ # libraries were built with DECnet support. And karl@cs.umb.edu says ++ # 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). -+ echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -+echo "configure:1267: checking for dnet_ntoa in -ldnet" >&5 -+ac_lib_var=`echo dnet'_'dnet_ntoa | 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="-ldl $LIBS" ++ 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 <<EOF --#line 912 "configure" -+#line 1275 "configure" - #include "confdefs.h" ++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() { --main() -+dnet_ntoa() - ; return 0; } - EOF --if { (eval echo configure:919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1289: \"$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 -@@ -930,30 +1300,139 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- LDL=-ldl ++ 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" - else - echo "$ac_t""no" 1>&6 --LDL= - fi - ++fi ++ + if test $ac_cv_lib_dnet_dnet_ntoa = no; then -+ echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -+echo "configure:1311: checking for dnet_ntoa in -ldnet_stub" >&5 -+ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 ++ 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_save_LIBS="$LIBS" ++ ac_check_lib_save_LIBS=$LIBS +LIBS="-ldnet_stub $LIBS" -+cat > conftest.$ac_ext <<EOF -+#line 1319 "configure" ++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(); - --echo $ac_n "checking for main in -lplotter""... $ac_c" 1>&6 --echo "configure:942: checking for main in -lplotter" >&5 --ac_lib_var=`echo plotter'_'main | sed 'y%./+-%__p_%'` -+int main() { -+dnet_ntoa() -+; return 0; } -+EOF -+if { (eval echo configure:1333: \"$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" ++ 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 "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++ac_cv_lib_dnet_stub_dnet_ntoa=no +fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS +fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 ++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" -+else -+ echo "$ac_t""no" 1>&6 +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@anasazi.com says the Pyramis MIS-ES running DC/OSx (SVR4) ++ # 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 dickey@clark.net. -+ echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -+echo "configure:1362: checking for gethostbyname" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 ++ # 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 <<EOF -+#line 1367 "configure" ++ 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. */ ++ 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(); -+ -+int main() { ++ 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 -+gethostbyname(); ++f = gethostbyname; +#endif + -+; return 0; } -+EOF -+if { (eval echo configure:1393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_func_gethostbyname=yes" ++ ; ++ 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 "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_gethostbyname=no" -+fi -+rm -f conftest* ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++ac_cv_func_gethostbyname=no +fi -+ -+if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ : -+else -+ echo "$ac_t""no" 1>&6 ++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 $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -+echo "configure:1414: checking for gethostbyname in -lnsl" >&5 -+ac_lib_var=`echo nsl'_'gethostbyname | 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="-lplotter $LIBS" ++ 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 <<EOF --#line 950 "configure" -+#line 1422 "configure" - #include "confdefs.h" ++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() { --main() -+gethostbyname() - ; return 0; } - EOF --if { (eval echo configure:957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1436: \"$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 -@@ -968,70 +1447,473 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- LPLOTTER=-lplotter ++ 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" - else - echo "$ac_t""no" 1>&6 --LPLOTTER= - fi - ++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@lia.di.epfl.ch: 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 $ac_n "checking for connect""... $ac_c" 1>&6 -+echo "configure:1466: checking for connect" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 ++ # 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 <<EOF -+#line 1471 "configure" ++ 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. */ ++ 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(); - -+int main() { - --echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 --echo "configure:981: checking how to run the C++ preprocessor" >&5 --if test -z "$CXXCPP"; then --if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then ++ 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 -+connect(); ++f = connect; +#endif + -+; return 0; } -+EOF -+if { (eval echo configure:1497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_func_connect=yes" ++ ; ++ 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 "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_connect=no" -+fi -+rm -f conftest* ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++ac_cv_func_connect=no +fi -+ -+if eval "test \"`echo '$ac_cv_func_'connect`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ : -+else -+ echo "$ac_t""no" 1>&6 ++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 $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -+echo "configure:1518: checking for connect in -lsocket" >&5 -+ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 ++ 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_save_LIBS="$LIBS" ++ ac_check_lib_save_LIBS=$LIBS +LIBS="-lsocket $X_EXTRA_LIBS $LIBS" -+cat > conftest.$ac_ext <<EOF -+#line 1526 "configure" ++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; } -+EOF -+if { (eval echo configure:1540: \"$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" ++ 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 "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++ac_cv_lib_socket_connect=no +fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS +fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 ++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" -+else -+ echo "$ac_t""no" 1>&6 +fi + + fi + -+ # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. -+ echo $ac_n "checking for remove""... $ac_c" 1>&6 -+echo "configure:1564: checking for remove" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -- ac_ext=C --# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. --ac_cpp='$CXXCPP $CPPFLAGS' --ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' --ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' --cross_compiling=$ac_cv_prog_cxx_cross -- CXXCPP="${CXX-g++} -E" - cat > conftest.$ac_ext <<EOF --#line 994 "configure" -+#line 1569 "configure" - #include "confdefs.h" --#include <stdlib.h> ++ # 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. */ ++ 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(); -+ -+int main() { ++ 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 -+remove(); ++f = remove; +#endif + -+; return 0; } - EOF --ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:999: \"$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 -+if { (eval echo configure:1595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_func_remove=yes" ++ ; ++ 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 "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_remove=no" -+fi -+rm -f conftest* ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++ac_cv_func_remove=no +fi -+ -+if eval "test \"`echo '$ac_cv_func_'remove`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 - : - else -- echo "$ac_err" >&5 -+ echo "$ac_t""no" 1>&6 ++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 $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -+echo "configure:1616: checking for remove in -lposix" >&5 -+ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 ++ 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_save_LIBS="$LIBS" ++ ac_check_lib_save_LIBS=$LIBS +LIBS="-lposix $LIBS" -+cat > conftest.$ac_ext <<EOF -+#line 1624 "configure" ++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; } -+EOF -+if { (eval echo configure:1638: \"$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" ++ 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 "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* -- CXXCPP=/lib/cpp -+ eval "ac_cv_lib_$ac_lib_var=no" - fi - rm -f conftest* -- ac_cv_prog_CXXCPP="$CXXCPP" --ac_ext=C --# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. --ac_cpp='$CXXCPP $CPPFLAGS' --ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' --ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' --cross_compiling=$ac_cv_prog_cxx_cross -+LIBS="$ac_save_LIBS" -+ - fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 ++ 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" -+else -+ echo "$ac_t""no" 1>&6 - fi --CXXCPP="$ac_cv_prog_CXXCPP" --echo "$ac_t""$CXXCPP" 1>&6 ++fi + + fi + + # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. -+ echo $ac_n "checking for shmat""... $ac_c" 1>&6 -+echo "configure:1662: checking for shmat" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 ++ 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 <<EOF -+#line 1667 "configure" ++ 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. */ ++ 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(); -+ -+int main() { ++ 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 -+shmat(); ++f = shmat; +#endif + -+; return 0; } -+EOF -+if { (eval echo configure:1693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_func_shmat=yes" ++ ; ++ 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 "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_shmat=no" ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++ac_cv_func_shmat=no +fi -+rm -f conftest* -+fi -+ -+if eval "test \"`echo '$ac_cv_func_'shmat`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ : -+else -+ echo "$ac_t""no" 1>&6 ++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 $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -+echo "configure:1714: checking for shmat in -lipc" >&5 -+ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 ++ 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_save_LIBS="$LIBS" ++ ac_check_lib_save_LIBS=$LIBS +LIBS="-lipc $LIBS" -+cat > conftest.$ac_ext <<EOF -+#line 1722 "configure" ++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; } -+EOF -+if { (eval echo configure:1736: \"$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" ++ 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 "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++ac_cv_lib_ipc_shmat=no +fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS +fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 ++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" -+else -+ echo "$ac_t""no" 1>&6 +fi + + fi + fi + + # Check for libraries that X11R6 Xt/Xaw programs need. -+ ac_save_LDFLAGS="$LDFLAGS" ++ 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. -+ # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. -+ echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -+echo "configure:1769: checking for IceConnectionNumber in -lICE" >&5 -+ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 ++ # 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_save_LIBS="$LIBS" ++ ac_check_lib_save_LIBS=$LIBS +LIBS="-lICE $X_EXTRA_LIBS $LIBS" -+cat > conftest.$ac_ext <<EOF -+#line 1777 "configure" ++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; } -+EOF -+if { (eval echo configure:1791: \"$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" ++ 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 "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++ac_cv_lib_ICE_IceConnectionNumber=no +fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS +fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 ++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" -+else -+ echo "$ac_t""no" 1>&6 +fi + -+ LDFLAGS="$ac_save_LDFLAGS" ++ 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" + -+X_TOOLKIT_LIBS="-lXaw -lXmu -lXt" -+X_BASIC_LIBS="-lXext -lX11" -+ -+LDFLAGS="$X_LIBS $LDFLAGS" -+CPPFLAGS="$X_CFLAGS $CPPFLAGS" ++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 $ac_n "checking for main in -ldl""... $ac_c" 1>&6 -+echo "configure:1829: checking for main in -ldl" >&5 -+ac_lib_var=`echo dl'_'main | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 ++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 -+ ac_save_LIBS="$LIBS" -+LIBS="-ldl $LIBS" -+cat > conftest.$ac_ext <<EOF -+#line 1837 "configure" ++ cat >conftest.$ac_ext <<_ACEOF ++#line 3060 "configure" +#include "confdefs.h" -+ -+int main() { -+main() -+; return 0; } -+EOF -+if { (eval echo configure:1844: \"$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" ++#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 -+ echo "configure: failed program was:" >&5 ++ 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 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" ++ ac_cv_header_plotter_h=no +fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ ++rm -f conftest.err conftest.$ac_ext +fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ LDL=-ldl ++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 -+ echo "$ac_t""no" 1>&6 -+LDL= ++ 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 $ac_n "checking for main in -lplotter""... $ac_c" 1>&6 -+echo "configure:1867: checking for main in -lplotter" >&5 -+ac_lib_var=`echo plotter'_'main | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 ++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 -+ ac_save_LIBS="$LIBS" -+LIBS="-lplotter $LIBS" -+cat > conftest.$ac_ext <<EOF -+#line 1875 "configure" ++ cat >conftest.$ac_ext <<_ACEOF ++#line 3141 "configure" +#include "confdefs.h" -+ -+int main() { -+main() -+; return 0; } -+EOF -+if { (eval echo configure:1882: \"$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" ++#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 "configure: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" ++ 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 -+rm -f conftest* -+LIBS="$ac_save_LIBS" + ++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 eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ LPLOTTER=-lplotter ++if test -z "$ac_cpp_err"; then ++ ac_cv_header_libemf_h=yes +else -+ echo "$ac_t""no" 1>&6 -+LPLOTTER= ++ 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" + - - ac_safe=`echo "plotter.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for plotter.h""... $ac_c" 1>&6 --echo "configure:1025: checking for plotter.h" >&5 -+echo "configure:1907: checking for plotter.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 ++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 - cat > conftest.$ac_ext <<EOF --#line 1030 "configure" -+#line 1912 "configure" - #include "confdefs.h" - #include <plotter.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1035: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1917: \"$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* -@@ -1055,9 +1937,9 @@ - + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-echo "$as_me:2169: result: no" >&5 ++echo "$as_me:3252: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + rm -f conftest.$ac_objext conftest.$ac_ext - echo $ac_n "checking for version of "lib plot" ""... $ac_c" 1>&6 --echo "configure:1059: checking for version of "lib plot" " >&5 -+echo "configure:1941: checking for version of "lib plot" " >&5 - cat > conftest.$ac_ext <<EOF --#line 1061 "configure" -+#line 1943 "configure" +-echo "$as_me:2174: checking See if we have libpng and zlib" >&5 ++echo "$as_me:3257: checking See if we have libpng and zlib" >&5 + echo $ECHO_N "checking See if we have libpng and zlib... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +-#line 2177 "configure" ++#line 3260 "configure" #include "confdefs.h" - #include <plotter.h> - typedef int Point; -@@ -1065,7 +1947,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:1069: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:1951: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - echo "$ac_t""you seem to have a newer version " 1>&6 + #include <png.h> + int i = PNG_TRANSFORM_IDENTITY; +@@ -2187,69 +3270,69 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:2190: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:3273: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:2193: \$? = $ac_status" >&5 ++ echo "$as_me:3276: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:2196: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:3279: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:2199: \$? = $ac_status" >&5 ++ echo "$as_me:3282: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + PNGCOMPILEFLAGS="-DHAVE_LIBPNG"; PNGLINKFLAGS="-lpng -lz "; +- echo "$as_me:2202: result: you seem to have compatible version of libpng" >&5 ++ echo "$as_me:3285: result: you seem to have compatible version of libpng" >&5 + echo "${ECHO_T}you seem to have compatible version of libpng" >&6 else -@@ -1079,16 +1961,16 @@ - + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 - echo $ac_n "checking for built-in "bool" datatype""... $ac_c" 1>&6 --echo "configure:1083: checking for built-in "bool" datatype" >&5 -+echo "configure:1965: checking for built-in "bool" datatype" >&5 - cat > conftest.$ac_ext <<EOF --#line 1085 "configure" -+#line 1967 "configure" - #include "confdefs.h" - - int main() { - bool testing_bool; testing_bool=true; - ; return 0; } - EOF --if { (eval echo configure:1092: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:1974: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - CXXFLAGS="$CXXFLAGS -DINTERNALBOOL"; echo "$ac_t""yes" 1>&6 - else -@@ -1100,7 +1982,7 @@ - rm -f conftest* +-echo "$as_me:2208: result: you either have no libpng or an old version - 1.0.8 should be ok." >&5 ++echo "$as_me:3291: result: you either have no libpng or an old version - 1.0.8 should be ok." >&5 + echo "${ECHO_T}you either have no libpng or an old version - 1.0.8 should be ok." >&6 + fi + rm -f conftest.$ac_objext conftest.$ac_ext - echo $ac_n "checking C++ compiler model""... $ac_c" 1>&6 --echo "configure:1104: checking C++ compiler model" >&5 -+echo "configure:1986: checking C++ compiler model" >&5 +-echo "$as_me:2213: checking C++ compiler model" >&5 ++echo "$as_me:3296: checking C++ compiler model" >&5 + echo $ECHO_N "checking C++ compiler model... $ECHO_C" >&6 LINK="$CXX $LDFLAGS" if test "$GXX" = yes; then if test "$host_os" = riscos; then -@@ -1299,9 +2181,15 @@ - s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g - s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g - s%@INSTALL_DATA@%$INSTALL_DATA%g -+s%@CXXCPP@%$CXXCPP%g -+s%@X_CFLAGS@%$X_CFLAGS%g -+s%@X_PRE_LIBS@%$X_PRE_LIBS%g -+s%@X_LIBS@%$X_LIBS%g -+s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g -+s%@X_TOOLKIT_LIBS@%$X_TOOLKIT_LIBS%g -+s%@X_BASIC_LIBS@%$X_BASIC_LIBS%g - s%@LDL@%$LDL%g - s%@LPLOTTER@%$LPLOTTER%g --s%@CXXCPP@%$CXXCPP%g - s%@PLOTCOMPILEFLAGS@%$PLOTCOMPILEFLAGS%g - s%@SPECIAL_CXXFLAGS@%$SPECIAL_CXXFLAGS%g - s%@LDLIBS@%$LDLIBS%g +- echo "$as_me:2218: result: GNU on RiscOS" >&5 ++ echo "$as_me:3301: result: GNU on RiscOS" >&5 + echo "${ECHO_T}GNU on RiscOS" >&6 + SPECIAL_CXXFLAGS="-Wall -Dunix -Ilibgpp: -Ilibstdc: -Ilibio:" + LDLIBS="-rescan libgpp:o.libg++ libstdc:o.libstdc++ libio:o.libiostrea gcc:o.libgcc Unix:o.UnixLib" + LINK=link + else +- echo "$as_me:2224: result: GNU" >&5 ++ echo "$as_me:3307: result: GNU" >&5 + echo "${ECHO_T}GNU" >&6 + SPECIAL_CXXFLAGS="-DBUGGYGPP -ansi -pedantic -Wall -Wwrite-strings -Wcast-qual -Wpointer-arith -Wstrict-prototypes" + fi + elif test `echo "$CXX" | egrep -c 'xlC$'` -eq 1; then +- echo "$as_me:2229: result: AIX xlC" >&5 ++ echo "$as_me:3312: result: AIX xlC" >&5 + echo "${ECHO_T}AIX xlC" >&6 + CXXFLAGS="-D__unix__ -g -+ -I/usr/lpp/xlC/src/nihC/aixinclude" + elif test `echo "$CXX" | egrep -c 'cxx$'` -eq 1; then +- echo "$as_me:2233: result: OSF/1 cxx" >&5 ++ echo "$as_me:3316: result: OSF/1 cxx" >&5 + echo "${ECHO_T}OSF/1 cxx" >&6 + SPECIAL_CXXFLAGS=-w + CXXFLAGS=-define_templates + elif test `echo "$CXX" | egrep -c 'CC$'` -eq 1; then + if test "$host_os" = irix5.3; then +- echo "$as_me:2239: result: Irix 5.3" >&5 ++ echo "$as_me:3322: result: Irix 5.3" >&5 + echo "${ECHO_T}Irix 5.3" >&6 + SPECIAL_CXXFLAGS="-O2 -mips2 -Olimit 2400" + elif test "$host_os" = irix6.2; then +- echo "$as_me:2243: result: Irix 6.2" >&5 ++ echo "$as_me:3326: result: Irix 6.2" >&5 + echo "${ECHO_T}Irix 6.2" >&6 + SPECIAL_CXXFLAGS="-mips3 -n32 -O2 -OPT:fold_arith_limit=2500" + elif test "$host_vendor" = sun; then +- echo "$as_me:2247: result: Sun" >&5 ++ echo "$as_me:3330: result: Sun" >&5 + echo "${ECHO_T}Sun" >&6 + SPECIAL_CXXFLAGS="-w" + fi + else +- echo "$as_me:2252: result: unknown" >&5 ++ echo "$as_me:3335: result: unknown" >&5 + echo "${ECHO_T}unknown" >&6 + fi + # Check whether --enable-wrapper or --disable-wrapper was given. +@@ -2368,7 +3451,7 @@ + : ${CONFIG_STATUS=./config.status} + ac_clean_files_save=$ac_clean_files + ac_clean_files="$ac_clean_files $CONFIG_STATUS" +-{ echo "$as_me:2371: creating $CONFIG_STATUS" >&5 ++{ echo "$as_me:3454: creating $CONFIG_STATUS" >&5 + echo "$as_me: creating $CONFIG_STATUS" >&6;} + cat >$CONFIG_STATUS <<_ACEOF + #! $SHELL +@@ -2536,7 +3619,7 @@ + echo "$ac_cs_version"; exit 0 ;; + --he | --h) + # Conflict between --help and --header +- { { echo "$as_me:2539: error: ambiguous option: $1 ++ { { echo "$as_me:3622: error: ambiguous option: $1 + Try \`$0 --help' for more information." >&5 + echo "$as_me: error: ambiguous option: $1 + Try \`$0 --help' for more information." >&2;} +@@ -2555,7 +3638,7 @@ + ac_need_defaults=false;; + + # This is an error. +- -*) { { echo "$as_me:2558: error: unrecognized option: $1 ++ -*) { { echo "$as_me:3641: error: unrecognized option: $1 + Try \`$0 --help' for more information." >&5 + echo "$as_me: error: unrecognized option: $1 + Try \`$0 --help' for more information." >&2;} +@@ -2591,7 +3674,7 @@ + case "$ac_config_target" in + # Handling of arguments. + "../src/Makefile" ) CONFIG_FILES="$CONFIG_FILES ../src/Makefile" ;; +- *) { { echo "$as_me:2594: error: invalid argument: $ac_config_target" >&5 ++ *) { { echo "$as_me:3677: error: invalid argument: $ac_config_target" >&5 + echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; + esac +@@ -2691,10 +3774,14 @@ + 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 +@@ -2817,7 +3904,7 @@ + esac + + if test x"$ac_file" != x-; then +- { echo "$as_me:2820: creating $ac_file" >&5 ++ { echo "$as_me:3907: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi +@@ -2835,7 +3922,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:2838: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:3925: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -2848,7 +3935,7 @@ + echo $srcdir/$f + else + # /dev/null tree +- { { echo "$as_me:2851: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:3938: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; diff --git a/graphics/pstoedit/patches/patch-ac b/graphics/pstoedit/patches/patch-ac index 4cfb734d9a8..c6175f454c9 100644 --- a/graphics/pstoedit/patches/patch-ac +++ b/graphics/pstoedit/patches/patch-ac @@ -1,57 +1,22 @@ -$NetBSD: patch-ac,v 1.2 2000/08/25 00:17:06 wiz Exp $ +$NetBSD: patch-ac,v 1.3 2002/05/07 13:18:27 itohy Exp $ ---- Makefile.in.orig Sun Jul 2 19:18:37 2000 -+++ Makefile.in -@@ -6,6 +6,7 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ - bindir=@bindir@ -+datadir=@datadir@ - libdir=@libdir@ - mandir=@mandir@ - MANEXT=1 -@@ -15,12 +16,16 @@ - INSTALL=@INSTALL@ +--- 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@ -+X_LIBS=@X_LIBS@ @X_TOOLKIT_LIBS@ @X_PRE_LIBS@ @X_BASIC_LIBS@ @X_EXTRA_LIBS@ -+X_CFLAGS=@X_CFLAGS@ -+ # Choose a compiler + linker -CXXFLAGS=@CXXFLAGS@ -+CXXFLAGS=@CXXFLAGS@ $(X_CFLAGS) ++CXXFLAGS=@CXXFLAGS@ @X_CFLAGS@ CCC=@CXX@ @SPECIAL_CXXFLAGS@ --LDLIBS=$(LOCALLIBS) @LDLIBS@ -lm @LDL@ -+LDLIBS=$(LOCALLIBS) @LDLIBS@ $(X_LIBS) -lm @LDL@ + LDLIBS=$(LOCALLIBS) @LDLIBS@ -lm @LDL@ LINK=@LINK@ --CCFLAGS=-DDEFAULTGS=$(GS) $(CXXFLAGS) -+CCFLAGS=-DDEFAULTGS=$(GS) $(CXXFLAGS) \ -+ -DPATH_DATADIR=\"$(datadir)\" -DPATH_PLUGINDIR=\"$(libdir)\" - - # uncommment one of the following CCC lines for Un*x like systems - # For users of GNU g++ -@@ -68,7 +73,7 @@ +@@ -71,7 +71,7 @@ #LOCALDEFINES=-DHAVE_LIBPLOTTER -I/path/to/plotter.h # add -DOLD_LIBPLOTTER for libplot older than 2.3 - LOCALDEFINES=@PLOTCOMPILEFLAGS@ --LOCALLIBS=-L/path/to/libplot @LPLOTTER@ -+LOCALLIBS=-L${LOCALBASE}/lib -lplotter @LPLOTTER@ + LOCALDEFINES=@PLOTCOMPILEFLAGS@ @MINGCOMPILEFLAGS@ @PNGCOMPILEFLAGS@ +-LOCALLIBS=-L/path/to/libplot @LPLOTTER@ @LMING@ @PNGLINKFLAGS@ ++LOCALLIBS=-L${LOCALBASE}/lib -lplotter @LPLOTTER@ @LMING@ @PNGLINKFLAGS@ ############################################################# ## IRIX 5.3 -@@ -338,11 +343,11 @@ - $(INSTALL_DIR) $(bindir); \ - fi - $(INSTALL_PROGRAM) pstoedit $(bindir) -- if [ ! -d $(libdir) ] ; then \ -- $(INSTALL_DIR) $(libdir); \ -+ if [ ! -d $(datadir) ] ; then \ -+ $(INSTALL_DIR) $(datadir); \ - fi -- $(INSTALL_DATA) ../misc/mpost.fmp $(libdir) -- $(INSTALL_DATA) ../misc/latex2e.fmp $(libdir) -+ $(INSTALL_DATA) ../misc/mpost.fmp $(datadir) -+ $(INSTALL_DATA) ../misc/latex2e.fmp $(datadir) - if [ ! -d $(MANDIR) ] ; then \ - $(INSTALL_DIR) $(MANDIR); \ - fi diff --git a/graphics/pstoedit/patches/patch-ad b/graphics/pstoedit/patches/patch-ad index c8e66429d36..fd2b134e829 100644 --- a/graphics/pstoedit/patches/patch-ad +++ b/graphics/pstoedit/patches/patch-ad @@ -1,21 +1,21 @@ -$NetBSD: patch-ad,v 1.1.1.1 2000/07/18 07:46:40 itohy Exp $ +$NetBSD: patch-ad,v 1.2 2002/05/07 13:18:27 itohy Exp $ ---- miscutil.cpp.orig Mon Jul 3 02:18:37 2000 -+++ miscutil.cpp Thu Jul 13 21:23:57 2000 +--- miscutil.cpp.orig Mon Dec 31 05:35:25 2001 ++++ miscutil.cpp Fri Mar 22 12:37:42 2002 @@ -28,6 +28,10 @@ - #if defined(unix) || defined(__unix__) || defined(_unix) || defined(__unix) || defined(__EMX__) + #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 - #else - #include <direct.h> - #endif -@@ -113,6 +117,17 @@ - char * full_qualified_tempnam(const char * pref) + #ifdef __hpux + // HP-UX does not define getcwd in unistd.h +@@ -134,6 +138,17 @@ + + char *full_qualified_tempnam(const char *pref) { +#ifdef HAVE_MKSTEMP + char buf[80]; @@ -30,23 +30,23 @@ $NetBSD: patch-ad,v 1.1.1.1 2000/07/18 07:46:40 itohy Exp $ +#else #if defined (__BCPLUSPLUS__) || defined (__TCPLUSPLUS__) /* borland has a prototype that expects a char * as second arg */ - char * filename = tempnam(0,(char *) pref); -@@ -141,6 +156,7 @@ + char *filename = tempnam(0, (char *) pref); +@@ -161,6 +176,7 @@ return filename; } #endif +#endif } - // a strdup which uses new instead of malloc -@@ -280,7 +296,11 @@ + unsigned short hextoint(const char hexchar) +@@ -374,7 +390,11 @@ - TempFile::TempFile() - { + TempFile::TempFile() + { +#if 1 + tempFileName = full_qualified_tempnam("pstmp"); +#else - tempFileName = tempnam(0,"pstmp"); + 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 0935052de0e..00000000000 --- a/graphics/pstoedit/patches/patch-ae +++ /dev/null @@ -1,233 +0,0 @@ -$NetBSD: patch-ae,v 1.1.1.1 2000/07/18 07:46:40 itohy Exp $ - -Don't add spaces at the end of lines -since fig2dev (in transfig) doesn't like them. - ---- drvfig.cpp.orig Mon Jun 5 03:49:29 2000 -+++ drvfig.cpp Fri Jul 14 08:28:42 2000 -@@ -217,19 +217,19 @@ - // const Point & p; - for (unsigned int n = 0; n < numberOfElementsInPath(); n++) { - const basedrawingelement & elem = pathElement(n); -- if (j == 0) { buffer << "\t"; } -+ if (j == 0) { buffer << "\t"; } else buffer << " "; - switch(elem.getType()) { - case lineto: - case moveto: { - const Point & p = pathElement(n).getPoint(0); - buffer << (int)(PntFig * p.x_) << " " -- << (int)(y_offset - (PntFig * p.y_)) << " "; -+ << (int)(y_offset - (PntFig * p.y_)); - } - break; - case closepath: { - const Point & p = pathElement(0).getPoint(0); - buffer << (int)(PntFig * p.x_) << " " -- << (int)(y_offset - (PntFig * p.y_)) << " "; -+ << (int)(y_offset - (PntFig * p.y_)); - } - break; - default: -@@ -248,6 +248,10 @@ - void drvFIG::prpoint(ostream & os, const Point& p) const { - os << (int)(PntFig * p.x_) << " " << (int)(y_offset - (PntFig * p.y_)) << " "; - } -+ -+void drvFIG::prpointnl(ostream & os, const Point& p) const { -+ os << (int)(PntFig * p.x_) << " " << (int)(y_offset - (PntFig * p.y_)) << endl; -+} - // print segments without x-splines - void drvFIG::print_spline_coords_noxsplines(int linestyle,float localLineWidth) - { -@@ -275,9 +279,8 @@ - // 4.0 is the gap spec. we could also derive this from the input - buffer << 2 << "\n\t"; - prpoint(buffer,currentPoint); -- prpoint(buffer,p); -+ prpointnl(buffer,p); - currentPoint=p; -- buffer << endl; - } - break; - } -@@ -295,9 +298,8 @@ - prpoint(buffer,currentPoint); - prpoint(buffer,elem.getPoint(0)); - prpoint(buffer,elem.getPoint(1)); -- prpoint(buffer,elem.getPoint(2)); -+ prpointnl(buffer,elem.getPoint(2)); - currentPoint=elem.getPoint(2); -- buffer << endl; - // 32 buffer << "\n\t0.000 1.000 1.000 0.000" << endl; - break; - } -@@ -312,9 +314,8 @@ - // 4.0 is the gap spec. we could also derive this from the input - buffer << 2 << "\n\t"; - prpoint(buffer,currentPoint); -- prpoint(buffer,firstPoint); -+ prpointnl(buffer,firstPoint); - currentPoint=firstPoint; -- buffer << endl; - break; - } - break; -@@ -332,14 +333,14 @@ - int j = 0; - - for (unsigned int n = 0; n < numberOfElementsInPath(); n++) { -- if (j == 0) { buffer << "\t"; } -+ if (j == 0) { buffer << "\t"; } else { buffer << " "; } - const basedrawingelement & elem = pathElement(n); - switch (elem.getType()) { - case moveto: - case lineto: { - const Point & p = elem.getPoint(0); - buffer << (int)(PntFig * p.x_) << " " -- << (int)(y_offset - (PntFig * p.y_)) << " "; -+ << (int)(y_offset - (PntFig * p.y_)); - } - j++; if (j == 5) { j=0; buffer << "\n"; } - break; -@@ -347,16 +348,17 @@ - if ((format == 31)) { - const Point & p = elem.getPoint(2); - buffer << (int)(PntFig * p.x_) << " " -- << (int)(y_offset - (PntFig * p.y_)) << " "; -+ << (int)(y_offset - (PntFig * p.y_)); - j++; if (j == 5) { j=0; buffer << "\n"; } - } else { - // put all points, middle points will have control value 1 - for (unsigned int cp = 0 ; cp < 3; cp++ ) { - const Point & p = elem.getPoint(cp); - buffer << (int)(PntFig * p.x_) << " " -- << (int)(y_offset - (PntFig * p.y_)) << " "; -+ << (int)(y_offset - (PntFig * p.y_)); - j++; if (j == 5) { j=0; buffer << "\n"; } - if ((j == 0) && (cp != 2) && ( n+1 != (numberOfElementsInPath()))) { buffer << "\t"; } -+ if ((j != 0) && (cp != 2) && ( n+1 != (numberOfElementsInPath()))) { buffer << " "; } - } - } - } -@@ -364,7 +366,7 @@ - case closepath: { - const Point & p = pathElement(0).getPoint(0); - buffer << (int)(PntFig * p.x_) << " " -- << (int)(y_offset - (PntFig * p.y_)) << " "; -+ << (int)(y_offset - (PntFig * p.y_)); - } - j++; if (j == 5) { j=0; buffer << "\n"; } - break; -@@ -397,14 +399,14 @@ - switch (elem.getType()) { - case moveto: { - if (format == 31) { -- buffer << "\t0.0 0.0 "; -+ buffer << "\t0.0 0.0"; - } else { -- buffer << " 0 "; -+ buffer << " 0"; - } - j++; if (j == maxj) { - j=0; buffer << "\n"; - if ( (n+1) != numberOfElementsInPath()) { buffer << "\t"; } -- } -+ } else if (n+1 != numberOfElementsInPath()) { buffer << " "; } - lastp = elem.getPoint(0); - } - break; -@@ -412,23 +414,23 @@ - if (format == 31) { - const Point & p = elem.getPoint(0); - buffer << (float)(PntFig * lastp.x_) << " " -- << (float)(y_offset - (PntFig * lastp.y_)) << " "; -+ << (float)(y_offset - (PntFig * lastp.y_)); - j++; if (j == maxj) { - j=0; buffer << "\n\t"; -- } -+ } else if (n+1 != numberOfElementsInPath()) { buffer << " "; } - buffer << (float)(PntFig * p.x_) << " " -- << (float)(y_offset - (PntFig * p.y_)) << " "; -+ << (float)(y_offset - (PntFig * p.y_)); - j++; if (j == maxj) { - j=0; buffer << "\n"; - if ( (n+1) != numberOfElementsInPath()) { buffer << "\t"; } -- } -+ } else if (n+1 != numberOfElementsInPath()) { buffer << " "; } - lastp = elem.getPoint(0); - } else { -- buffer << " 0 "; -+ buffer << " 0"; - j++; if (j == maxj) { - j=0; buffer << "\n"; - if ((n+1) != numberOfElementsInPath()) { buffer << "\t"; } -- } -+ } else if (n+1 != numberOfElementsInPath()) { buffer << " "; } - } - } - break; -@@ -436,23 +438,23 @@ - if (format == 31) { - const Point & p = pathElement(0).getPoint(0); - buffer << (float)(PntFig * lastp.x_) << " " -- << (float)(y_offset - (PntFig * lastp.y_)) << " "; -+ << (float)(y_offset - (PntFig * lastp.y_)); - j++; if (j == maxj) { - j=0; buffer << "\n\t"; -- } -+ } else buffer << " "; - buffer << (float)(PntFig * p.x_) << " " -- << (float)(y_offset - (PntFig * p.y_)) << " "; -+ << (float)(y_offset - (PntFig * p.y_)); - j++; if (j == maxj) { - j=0; buffer << "\n"; - if ( (n+1) != numberOfElementsInPath()) { buffer << "\t"; } -- } -+ } else if (n+1 != numberOfElementsInPath()) { buffer << " "; } - lastp = pathElement(0).getPoint(0); - } else { -- buffer << " 0 "; -+ buffer << " 0"; - j++; if (j == maxj) { - j=0; buffer << "\n"; - if ( (n+1) != numberOfElementsInPath()) { buffer << "\t"; } -- } -+ } else if (n+1 != numberOfElementsInPath()) { buffer << " "; } - } - } - break; -@@ -461,21 +463,21 @@ - for (unsigned int cp = 0 ; cp < 2; cp++ ) { - const Point & p = elem.getPoint(cp); - buffer << (float)(PntFig * p.x_) << " " -- << (float)(y_offset - (PntFig * p.y_)) << " "; -+ << (float)(y_offset - (PntFig * p.y_)); - j++; if (j == maxj) { - j=0; buffer << "\n"; - if (!((cp == 2) && ( (n+1) == numberOfElementsInPath()))) { buffer << "\t"; } -- } -+ } else if (n+1 != numberOfElementsInPath()) { buffer << " "; } - } - } else { - // put all points, middle points will have control value 1 - const char * sk = "110"; - for (unsigned int i = 0 ; i < 3; i++ ){ -- buffer << " " << sk[i] << " "; -+ buffer << " " << sk[i]; - j++; if (j == maxj) { - j=0; buffer << "\n"; - if (!((i == 2) && ((n+1) == numberOfElementsInPath()))) { buffer << "\t"; } -- } -+ } else if (!(i == 2 && n+1 == numberOfElementsInPath())) { buffer << " "; } - } - } - lastp = elem.getPoint(2); -@@ -488,7 +490,7 @@ - } - } - if (format == 31) { -- if (j == maxj) { j=0; buffer << "\n\t"; } -+ if (j == maxj) { j=0; buffer << "\n\t"; } else buffer << " "; - buffer << "0.0 0.0\n"; - } else { - if (j != 0) { buffer << endl; } diff --git a/graphics/pstoedit/patches/patch-af b/graphics/pstoedit/patches/patch-af deleted file mode 100644 index 3c4dda26759..00000000000 --- a/graphics/pstoedit/patches/patch-af +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-af,v 1.1.1.1 2000/07/18 07:46:40 itohy Exp $ - ---- drvfig.h.orig Sun Aug 8 02:33:38 1999 -+++ drvfig.h Fri Jul 14 07:52:05 2000 -@@ -47,6 +47,7 @@ - void print_polyline_coords(); - void print_spline_coords_noxsplines(int linestyle, float localLineWidth); - void prpoint(ostream & os, const Point& p) const; -+ void prpointnl(ostream & os, const Point& p) const; - void print_spline_coords1(); - void print_spline_coords2(); - diff --git a/graphics/pstoedit/patches/patch-ag b/graphics/pstoedit/patches/patch-ag deleted file mode 100644 index fe6e2c071d9..00000000000 --- a/graphics/pstoedit/patches/patch-ag +++ /dev/null @@ -1,58 +0,0 @@ -$NetBSD: patch-ag,v 1.1.1.1 2000/07/18 07:46:41 itohy Exp $ - ---- pstoedit.cpp.orig Mon Jul 3 02:18:38 2000 -+++ pstoedit.cpp Sat Jul 15 00:47:54 2000 -@@ -218,6 +218,12 @@ - } - - // also look in the directory where the pstoedit .exe/dll was found -+#ifdef PATH_PLUGINDIR -+ if (strcmp(PATH_PLUGINDIR,plugindir?plugindir:"") != 0) { -+ loadPlugInDrivers(PATH_PLUGINDIR,errstream); -+ pluginsloaded = true; -+ } -+#else - char szExePath[1000]; - szExePath[0]= '\0'; - const int r = P_GetPathToMyself(progname,szExePath, sizeof(szExePath)); -@@ -230,6 +236,7 @@ - pluginsloaded = true; - } - } -+#endif - - delete [] plugindir; - } -@@ -587,6 +594,14 @@ - // also look in the directory where the pstoedit .exe/dll was found - char szExePath[1000]; - szExePath[0]= '\0'; -+#ifdef PATH_DATADIR -+ RSString test(szExePath); -+ test += PATH_DATADIR; -+ char delim[] = {directoryDelimiter,'\0'}; -+ test += delim; -+ test+=drivername; -+ test+=".fmp"; -+#else - const int r = P_GetPathToMyself(argv[0],szExePath, sizeof(szExePath)); - if( r && verbose) { - errstream << " path to myself: " << szExePath << endl; -@@ -605,6 +620,7 @@ - test+=drivername; - test+=".fmp"; - #endif -+#endif - // errstream << test.value() << endl; - if (fileExists(test.value())) { - if(verbose) { -@@ -612,7 +628,9 @@ - } - outputdriver->theFontMapper.readMappingTable(errstream,test.value()); - } -+#ifndef PATH_DATADIR - } -+#endif - } - - char * gsoutName = 0; |