=================================================================== RCS file: /home/cvs/OpenXM_contrib/gnuplot/Attic/configure,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.2 diff -u -p -r1.1.1.1 -r1.1.1.2 --- OpenXM_contrib/gnuplot/Attic/configure 2000/01/09 17:00:49 1.1.1.1 +++ OpenXM_contrib/gnuplot/Attic/configure 2000/01/22 14:15:49 1.1.1.2 @@ -1,80 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.90 - - - -# Do all the work for Automake. This macro actually does too much -- -# some checks are only needed if your package does certain things. -# But this isn't really a big deal. - -# serial 1 - - - - -# -# Check to make sure that the build environment is sane. -# - - - - - - -# serial 1 - - - - -# serial 1 - -# @defmac AC_PROG_CC_STDC -# @maindex PROG_CC_STDC -# @ovindex CC -# If the C compiler in not in ANSI C mode by default, try to add an option -# to output variable @code{CC} to make it so. This macro tries various -# options that select ANSI C on some system or another. It considers the -# compiler to be in ANSI C mode if it handles function prototypes correctly. -# -# If you use this macro, you should check after calling it whether the C -# compiler has been set to accept ANSI C; if not, the shell variable -# @code{am_cv_prog_cc_stdc} is set to @samp{no}. If you wrote your source -# code in ANSI C, you can make an un-ANSIfied copy of it by using the -# program @code{ansi2knr}, which comes with Ghostscript. -# @end defmac - - - - -# serial 1 - - - - - -# serial 1 - - - - - -# serial 1 - - - - -# serial 1 - - - - - -# serial 1 - - - - # Guess values for system-dependent variables and create Makefiles. # Generated automatically using autoconf version 2.13 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. @@ -87,12 +12,11 @@ ac_help= ac_default_prefix=/usr/local # Any additions from configure.in: ac_help="$ac_help - --with-readline use the included minimal readline function (default) - --without-readline do not use the included readline function" + --with-readline use the builtin minimal readline function (default) + --without-readline do not use the builtin readline function + --with-readline=gnu use the GNU readline library + --with-readline=PATH Specify the location of GNU readline" ac_help="$ac_help - --with-gnu-readline use the GNU readline library - --with-gnu-readline=PATH Specify the location of GNU readline" -ac_help="$ac_help --with-plot use the Unix plot library --with-plot=PATH Specify the location of GNU libplot" ac_help="$ac_help @@ -109,27 +33,15 @@ ac_help="$ac_help ac_help="$ac_help --with-lasergnu install lasergnu printer script" ac_help="$ac_help - --without-linux-vga do not use the Linux console driver - (requires Linux SVGAlib /usr/lib/libvga)" + --with-linux-vga use the Linux SVGA console driver + (requires /usr/lib/libvga)" ac_help="$ac_help - --enable-apollo Apollo Graphics Primitive Resource" -ac_help="$ac_help - --enable-gpr Apollo Graphics Primitive Resource (fixed-size window)" -ac_help="$ac_help - --enable-cgi enable CGI terminal (SCO only)" -ac_help="$ac_help --enable-iris enable IRIS terminal (IRIS4D only)" ac_help="$ac_help --enable-mgr enable MGR terminal" ac_help="$ac_help --enable-rgip enable Redwood Graphics Interface Protocol" ac_help="$ac_help - --enable-sun enable sunview terminal (Sun only)" -ac_help="$ac_help - --enable-unixpc enable unixpc terminal (ATT 3b1 or ATT 7300)" -ac_help="$ac_help - --enable-system-time use the system time routines in time.c" -ac_help="$ac_help --with-x use the X Window System" # Initialize some variables set by options. @@ -641,7 +553,10 @@ else fi + +# From configure.in Revision: 1.41.2.7 VERSION=`sed -n 's/.*version.*"\(.*\)".*/\1/p' $srcdir/version.c|tr -d ' '` +PL=`sed -n 's/.*patchlevel.*"\(.*\)".*/\1/p' $srcdir/version.c|tr -d ' '` ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do if test -f $ac_dir/install-sh; then @@ -673,7 +588,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cy # 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:677: checking for a BSD compatible install" >&5 +echo "configure:592: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -726,7 +641,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:730: checking whether build environment is sane" >&5 +echo "configure:645: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -783,7 +698,7 @@ test "$program_suffix" != NONE && test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:787: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:702: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -810,9 +725,10 @@ else fi + PACKAGE=gnuplot -VERSION=$VERSION +VERSION=$VERSION.$PL if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -829,7 +745,7 @@ EOF missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:833: checking for working aclocal" >&5 +echo "configure:749: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -842,7 +758,7 @@ else fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:846: checking for working autoconf" >&5 +echo "configure:762: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -855,7 +771,7 @@ else fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:859: checking for working automake" >&5 +echo "configure:775: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -868,7 +784,7 @@ else fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:872: checking for working autoheader" >&5 +echo "configure:788: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -881,7 +797,7 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:885: checking for working makeinfo" >&5 +echo "configure:801: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -893,10 +809,54 @@ else echo "$ac_t""missing" 1>&6 fi +install_sh="$missing_dir/install-sh" +test -f "$install_sh" || install_sh="$missing_dir/install.sh" +for ac_prog in gnutar gtar tar +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:821: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_AMTAR'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$AMTAR"; then + ac_cv_prog_AMTAR="$AMTAR" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_AMTAR="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +AMTAR="$ac_cv_prog_AMTAR" +if test -n "$AMTAR"; then + echo "$ac_t""$AMTAR" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi +test -n "$AMTAR" && break +done +AMTARFLAGS= +if test -n "$AMTAR"; then + if $SHELL -c "$AMTAR --version" > /dev/null 2>&1; then + AMTARFLAGS=o + fi +fi + + + + # Check whether --with-readline or --without-readline was given. if test "${with_readline+set}" = set; then withval="$with_readline" @@ -906,15 +866,6 @@ else fi -# Check whether --with-gnu-readline or --without-gnu-readline was given. -if test "${with_gnu_readline+set}" = set; then - withval="$with_gnu_readline" - : -else - test -z "$with_gnu_readline" && with_gnu_readline=no - -fi - # Check whether --with-plot or --without-plot was given. if test "${with_plot+set}" = set; then withval="$with_plot" @@ -945,16 +896,10 @@ fi # Check whether --with-cwdrc or --without-cwdrc was given. if test "${with_cwdrc+set}" = set; then withval="$with_cwdrc" - test "$withval" = no && cat >> confdefs.h <<\EOF -#define NOCWDRC 1 -EOF - + : else - cat >> confdefs.h <<\EOF -#define NOCWDRC 1 -EOF + test -z "$with_cwdrc" && with_cwdrc=no - fi # Check whether --with-lasergnu or --without-lasergnu was given. @@ -972,37 +917,10 @@ if test "${with_linux_vga+set}" = set; then withval="$with_linux_vga" : else - test -z "$with_linux_vga" && with_linux_vga=yes + test -z "$with_linux_vga" && with_linux_vga=no fi -# Check whether --enable-apollo or --disable-apollo was given. -if test "${enable_apollo+set}" = set; then - enableval="$enable_apollo" - : -else - test -z "$enable_apollo" && enable_apollo=no - -fi - -# Check whether --enable-gpr or --disable-gpr was given. -if test "${enable_gpr+set}" = set; then - enableval="$enable_gpr" - : -else - test -z "$enable_gpr" && enable_gpr=no - -fi - -# Check whether --enable-cgi or --disable-cgi was given. -if test "${enable_cgi+set}" = set; then - enableval="$enable_cgi" - : -else - test -z "$enable_cgi" && enable_cgi=no - -fi - # Check whether --enable-iris or --disable-iris was given. if test "${enable_iris+set}" = set; then enableval="$enable_iris" @@ -1030,38 +948,11 @@ else fi -# Check whether --enable-sun or --disable-sun was given. -if test "${enable_sun+set}" = set; then - enableval="$enable_sun" - : -else - test -z "$enable_sun" && enable_sun=no -fi - -# Check whether --enable-unixpc or --disable-unixpc was given. -if test "${enable_unixpc+set}" = set; then - enableval="$enable_unixpc" - : -else - test -z "$enable_unixpc" && enable_unixpc=no - -fi - -# Check whether --enable-system-time or --disable-system-time was given. -if test "${enable_system_time+set}" = set; then - enableval="$enable_system_time" - : -else - test -z "$enable_system_time" && enable_system_time=no - -fi - - # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1065: checking for $ac_word" >&5 +echo "configure:956: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1091,7 +982,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1095: checking for $ac_word" >&5 +echo "configure:986: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1142,7 +1033,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1146: checking for $ac_word" >&5 +echo "configure:1037: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1174,7 +1065,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1178: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1069: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1185,12 +1076,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1189 "configure" +#line 1080 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1216,12 +1107,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1220: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1111: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1225: checking whether we are using GNU C" >&5 +echo "configure:1116: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1230,7 +1121,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1234: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1125: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1249,7 +1140,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1253: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1144: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1284,7 +1175,7 @@ fi echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6 -echo "configure:1288: checking for ${CC-cc} option to accept ANSI C" >&5 +echo "configure:1179: checking for ${CC-cc} option to accept ANSI C" >&5 if eval "test \"`echo '$''{'am_cv_prog_cc_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1294,13 +1185,14 @@ ac_save_CC="$CC" # breaks some systems' header files. # AIX -qlanglvl=ansi # Ultrix and OSF/1 -std1 -# HP-UX -Aa -D_HPUX_SOURCE +# HP-UX 10.20 and later -Ae +# HP-UX older versions -Aa -D_HPUX_SOURCE # SVR4 -Xc -D__EXTENSIONS__ -for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" cat > conftest.$ac_ext < #include @@ -1337,7 +1229,7 @@ return f (e, argv, 0) != argv[0] || f (e, argv, 1) ! ; return 0; } EOF -if { (eval echo configure:1341: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1233: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_prog_cc_stdc="$ac_arg"; break else @@ -1361,7 +1253,7 @@ case "x$am_cv_prog_cc_stdc" in esac echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1365: checking how to run the C preprocessor" >&5 +echo "configure:1257: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1376,13 +1268,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1386: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1278: \"$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 : @@ -1393,13 +1285,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1403: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1295: \"$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 : @@ -1410,13 +1302,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1420: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1312: \"$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 : @@ -1443,7 +1335,7 @@ echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for function prototypes""... $ac_c" 1>&6 -echo "configure:1447: checking for function prototypes" >&5 +echo "configure:1339: checking for function prototypes" >&5 if test "$am_cv_prog_cc_stdc" != no; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF @@ -1456,12 +1348,12 @@ else U=_ ANSI2KNR=./ansi2knr # Ensure some checks needed by ansi2knr itself. echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1460: checking for ANSI C header files" >&5 +echo "configure:1352: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1469,7 +1361,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1473: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1365: \"$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* @@ -1486,7 +1378,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1504,7 +1396,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1525,7 +1417,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1536,7 +1428,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != T exit (0); } EOF -if { (eval echo configure:1540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1563,17 +1455,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1567: checking for $ac_hdr" >&5 +echo "configure:1459: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1577: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1469: \"$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* @@ -1602,7 +1494,7 @@ done fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1606: checking how to run the C preprocessor" >&5 +echo "configure:1498: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1617,13 +1509,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1627: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1519: \"$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 : @@ -1634,13 +1526,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1644: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1536: \"$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 : @@ -1651,13 +1543,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1661: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1553: \"$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 : @@ -1682,12 +1574,12 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1686: checking for working const" >&5 +echo "configure:1578: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1632: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1757,21 +1649,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:1761: checking for inline" >&5 +echo "configure:1653: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1667: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -1799,12 +1691,12 @@ esac echo $ac_n "checking for preprocessor stringizing operator""... $ac_c" 1>&6 -echo "configure:1803: checking for preprocessor stringizing operator" >&5 +echo "configure:1695: checking for preprocessor stringizing operator" >&5 if eval "test \"`echo '$''{'ac_cv_c_stringize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 echo $ac_n "checking if compiler handles warn and error directives correctly""... $ac_c" 1>&6 -echo "configure:1839: checking if compiler handles warn and error directives correctly" >&5 +echo "configure:1731: checking if compiler handles warn and error directives correctly" >&5 cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1741: \"$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* @@ -1869,7 +1761,7 @@ rm -f conftest* # 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:1873: checking for X" >&5 +echo "configure:1765: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -1931,12 +1823,12 @@ if test "$ac_x_includes" = NO; then # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1940: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1832: \"$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* @@ -2005,14 +1897,14 @@ if test "$ac_x_libraries" = NO; then ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -2118,17 +2010,17 @@ else 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:2122: checking whether -R must be followed by a space" >&5 +echo "configure:2014: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -2144,14 +2036,14 @@ rm -f conftest* else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -2183,7 +2075,7 @@ rm -f conftest* # libraries were built with DECnet support. And karl@cs.umb.edu 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:2187: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:2079: 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 @@ -2191,7 +2083,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2098: \"$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 @@ -2224,7 +2116,7 @@ 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:2228: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:2120: 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 @@ -2232,7 +2124,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2139: \"$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 @@ -2272,12 +2164,12 @@ fi # 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:2276: checking for gethostbyname" >&5 +echo "configure:2168: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -2321,7 +2213,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:2325: checking for gethostbyname in -lnsl" >&5 +echo "configure:2217: 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 @@ -2329,7 +2221,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2236: \"$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 @@ -2370,12 +2262,12 @@ fi # -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:2374: checking for connect" >&5 +echo "configure:2266: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -2419,7 +2311,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:2423: checking for connect in -lsocket" >&5 +echo "configure:2315: 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 @@ -2427,7 +2319,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2334: \"$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 @@ -2462,12 +2354,12 @@ 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:2466: checking for remove" >&5 +echo "configure:2358: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -2511,7 +2403,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:2515: checking for remove in -lposix" >&5 +echo "configure:2407: 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 @@ -2519,7 +2411,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2426: \"$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 @@ -2554,12 +2446,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:2558: checking for shmat" >&5 +echo "configure:2450: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -2603,7 +2495,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:2607: checking for shmat in -lipc" >&5 +echo "configure:2499: 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 @@ -2611,7 +2503,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2518: \"$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 @@ -2655,7 +2547,7 @@ fi # 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:2659: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:2551: 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 @@ -2663,7 +2555,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2570: \"$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 @@ -2698,6 +2590,50 @@ fi fi + +if test "$ac_cv_lib_nsl_gethostbyname" = no; then + echo $ac_n "checking for gethostbyname in -lbsd""... $ac_c" 1>&6 +echo "configure:2597: checking for gethostbyname in -lbsd" >&5 +ac_lib_var=`echo bsd'_'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="-lbsd $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" +else + echo "$ac_t""no" 1>&6 +fi + +fi + if test "$no_x" != yes; then CPPFLAGS="$CPPFLAGS $X_CFLAGS" X_LIBRARIES="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS" @@ -2710,9 +2646,9 @@ fi echo $ac_n "checking for MS-DOS/djgpp/libGRX""... $ac_c" 1>&6 -echo "configure:2714: checking for MS-DOS/djgpp/libGRX" >&5 +echo "configure:2650: checking for MS-DOS/djgpp/libGRX" >&5 cat > conftest.$ac_ext <&5 | egrep "yes" >/dev/null 2>&1; then rm -rf conftest* echo "$ac_t""yes" 1>&6 - LIBS="-lpc $LIBS" - cat >> confdefs.h <<\EOF + LIBS="-lpc $LIBS" + cat >> confdefs.h <<\EOF #define MSDOS 1 EOF - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define DOS32 1 EOF - with_linux_vga=no - echo $ac_n "checking for GrLine in -lgrx20""... $ac_c" 1>&6 -echo "configure:2738: checking for GrLine in -lgrx20" >&5 + with_linux_vga=no + echo $ac_n "checking for GrLine in -lgrx20""... $ac_c" 1>&6 +echo "configure:2674: checking for GrLine in -lgrx20" >&5 ac_lib_var=`echo grx20'_'GrLine | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2742,7 +2678,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgrx20 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2693: \"$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 @@ -2768,14 +2704,14 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - LIBS="-lgrx20 $LIBS" - CFLAGS="$CFLAGS -fno-inline-functions" - cat >> confdefs.h <<\EOF + LIBS="-lgrx20 $LIBS" + CFLAGS="$CFLAGS -fno-inline-functions" + cat >> confdefs.h <<\EOF #define DJSVGA 1 EOF - echo $ac_n "checking for GrCustomLine in -lgrx20""... $ac_c" 1>&6 -echo "configure:2779: checking for GrCustomLine in -lgrx20" >&5 + echo $ac_n "checking for GrCustomLine in -lgrx20""... $ac_c" 1>&6 +echo "configure:2715: checking for GrCustomLine in -lgrx20" >&5 ac_lib_var=`echo grx20'_'GrCustomLine | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2783,7 +2719,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgrx20 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2734: \"$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 @@ -2809,29 +2745,29 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define GRX21 1 EOF - + else echo "$ac_t""no" 1>&6 fi - + else echo "$ac_t""no" 1>&6 fi else rm -rf conftest* - echo "$ac_t""no" 1>&6 - + echo "$ac_t""no" 1>&6 + fi rm -f conftest* echo $ac_n "checking for NeXT""... $ac_c" 1>&6 -echo "configure:2833: checking for NeXT" >&5 +echo "configure:2769: checking for NeXT" >&5 cat > conftest.$ac_ext <&5 | rm -rf conftest* echo "$ac_t""yes" 1>&6 LIBS="$LIBS -lsys_s -lNeXT_s" - NEXTOBJS=epsviewe.o CFLAGS="$CFLAGS -ObjC" else rm -rf conftest* - NEXTOBJS= - echo "$ac_t""no" 1>&6 + echo "$ac_t""no" 1>&6 fi rm -f conftest* -LIBS="$LIBS -lm" +echo $ac_n "checking for sin""... $ac_c" 1>&6 +echo "configure:2793: checking for sin" >&5 +if eval "test \"`echo '$''{'ac_cv_func_sin'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char sin(); +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_sin) || defined (__stub___sin) +choke me +#else +sin(); +#endif + +; return 0; } +EOF +if { (eval echo configure:2821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_sin=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_sin=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'sin`\" = yes"; then + echo "$ac_t""yes" 1>&6 + : +else + echo "$ac_t""no" 1>&6 +fi + +if test "$ac_cv_func_sin" = no ; then + echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6 +echo "configure:2842: checking for sin in -lm" >&5 +ac_lib_var=`echo m'_'sin | 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="-lm $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo m | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <&6 +fi + +fi +dnlLIBS="$LIBS -lm" + + echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2862: checking for ANSI C header files" >&5 +echo "configure:2893: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2871,7 +2902,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2875: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2906: \"$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* @@ -2888,7 +2919,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -2906,7 +2937,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -2927,7 +2958,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -2938,7 +2969,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != T exit (0); } EOF -if { (eval echo configure:2942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -2967,17 +2998,17 @@ for ac_hdr in errno.h float.h limits.h locale.h math.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2971: checking for $ac_hdr" >&5 +echo "configure:3002: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2981: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3012: \"$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* @@ -3008,17 +3039,17 @@ for ac_hdr in sys/bsdtypes.h sys/select.h sys/socket.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3012: checking for $ac_hdr" >&5 +echo "configure:3043: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3022: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3053: \"$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* @@ -3045,12 +3076,12 @@ fi done test "$ac_cv_header_sys_stat_h" = yes && echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6 -echo "configure:3049: checking whether stat file-mode macros are broken" >&5 +echo "configure:3080: checking whether stat file-mode macros are broken" >&5 if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3102,9 +3133,9 @@ fi echo $ac_n "checking for unistd.h""... $ac_c" 1>&6 -echo "configure:3106: checking for unistd.h" >&5 +echo "configure:3137: checking for unistd.h" >&5 cat > conftest.$ac_ext < EOF @@ -3123,9 +3154,9 @@ rm -f conftest* echo $ac_n "checking if errno variable is declared""... $ac_c" 1>&6 -echo "configure:3127: checking if errno variable is declared" >&5 +echo "configure:3158: checking if errno variable is declared" >&5 cat > conftest.$ac_ext < #ifdef HAVE_ERRNO_H @@ -3135,28 +3166,29 @@ int main() { errno=0 ; return 0; } EOF -if { (eval echo configure:3139: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3170: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define EXTERN_ERRNO 1 EOF - echo "$ac_t""no" 1>&6 + + echo "$ac_t""no" 1>&6 + fi rm -f conftest* - echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:3155: checking for size_t" >&5 +echo "configure:3187: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3184,9 +3216,9 @@ EOF fi echo $ac_n "checking for time_t in time.h""... $ac_c" 1>&6 -echo "configure:3188: checking for time_t in time.h" >&5 +echo "configure:3220: checking for time_t in time.h" >&5 cat > conftest.$ac_ext < EOF @@ -3197,12 +3229,12 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | else rm -rf conftest* echo "$ac_t""no" 1>&6 echo $ac_n "checking for time_t""... $ac_c" 1>&6 -echo "configure:3201: checking for time_t" >&5 +echo "configure:3233: checking for time_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_time_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3233,12 +3265,12 @@ fi rm -f conftest* echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:3237: checking return type of signal handlers" >&5 +echo "configure:3269: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3255,7 +3287,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:3259: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3291: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -3280,12 +3312,12 @@ for ac_func in atexit on_exit memcpy memmove memset bc strerror strchr index strrchr rindex strstr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3284: checking for $ac_func" >&5 +echo "configure:3316: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3337,12 +3369,12 @@ for ac_func in erf erfc gamma lgamma getcwd pclose pop strncasecmp strnicmp sysinfo tcgetattr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3341: checking for $ac_func" >&5 +echo "configure:3373: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3396,21 +3428,77 @@ EOF fi -for ac_hdr in sys/types.h sys/time.h sys/select.h sys/socket.h +for ac_func in select do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:3435: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +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_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + +; return 0; } +EOF +if { (eval echo configure:3463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 +fi +done + +if test "$ac_cv_func_select" = yes; then + for ac_hdr in unistd.h sys/types.h sys/time.h sys/select.h sys/socket.h +do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3404: checking for $ac_hdr" >&5 +echo "configure:3492: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3414: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3502: \"$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* @@ -3436,28 +3524,28 @@ else fi done - echo $ac_n "checking types of arguments for select()""... $ac_c" 1>&6 -echo "configure:3441: checking types of arguments for select()" >&5 - if eval "test \"`echo '$''{'ac_cv_func_select_arg234'+set}'`\" = set"; then + echo $ac_n "checking argument types of select()""... $ac_c" 1>&6 +echo "configure:3529: checking argument types of select()" >&5 + if eval "test \"`echo '$''{'ac_cv_type_fd_set_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if eval "test \"`echo '$''{'ac_cv_func_select_arg1'+set}'`\" = set"; then + if eval "test \"`echo '$''{'ac_cv_type_fd_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if eval "test \"`echo '$''{'ac_cv_func_select_arg5'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - for ac_cv_func_select_arg234 in 'fd_set *' 'int *' 'void *'; do - for ac_cv_func_select_arg1 in 'int' 'size_t' 'unsigned long' 'unsigned'; do - for ac_cv_func_select_arg5 in 'struct timeval *' 'const struct timeval *'; do - cat > conftest.$ac_ext < conftest.$ac_ext < +#endif #ifdef HAVE_SYS_TYPES_H #include #endif -#ifdef HAVE_SYS_TIME_H -#include +#ifdef HAVE_UNISTD_H +#include #endif #ifdef HAVE_SYS_SELECT_H #include @@ -3465,56 +3553,98 @@ else #ifdef HAVE_SYS_SOCKET_H #include #endif -extern select ($ac_cv_func_select_arg1,$ac_cv_func_select_arg234,$ac_cv_func_select_arg234,$ac_cv_func_select_arg234,$ac_cv_func_select_arg5); int main() { - +#ifdef __STDC__ +extern int select ($ac_cv_type_fd_set_size_t, + $ac_cv_type_fd_set *, $ac_cv_type_fd_set *, $ac_cv_type_fd_set *, + $ac_type_timeval *); +#else +extern int select (); + $ac_cv_type_fd_set_size_t s; + $ac_cv_type_fd_set *p; + $ac_type_timeval *t; +#endif ; return 0; } EOF -if { (eval echo configure:3474: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3570: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - ac_not_found=no ; break 3 + ac_found=yes ; break 3 else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - ac_not_found=yes + ac_found=no fi rm -f conftest* + done + done done - done - done - + fi fi - -fi - if test "$ac_not_found" = yes; then - ac_cv_func_select_arg1=int - ac_cv_func_select_arg234='int *' - ac_cv_func_select_arg5='struct timeval *' - fi - echo "$ac_t""$ac_cv_func_select_arg1,$ac_cv_func_select_arg234,$ac_cv_func_select_arg5" 1>&6 - cat >> confdefs.h <&2; exit 1; } + fi + + echo "$ac_t""select($ac_cv_type_fd_set_size_t,$ac_cv_type_fd_set *,...)" 1>&6 + cat >> confdefs.h <> confdefs.h < conftest.$ac_ext < +#endif +#ifdef HAVE_SYS_TYPES_H +#include +#endif +#ifdef HAVE_UNISTD_H +#include +#endif +#ifdef HAVE_SYS_SELECT_H +#include +#endif +#ifdef HAVE_SYS_SOCKET_H +#include +#endif EOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "(^|[^a-zA-Z_0-9])fd_set[^a-zA-Z_0-9]" >/dev/null 2>&1; then + rm -rf conftest* + # We found fd_set type in a header, need special cast + ac_cast="($ac_cv_type_fd_set *)" +else + rm -rf conftest* + # No fd_set type; it is safe to define it + cat >> confdefs.h <> confdefs.h <> confdefs.h <&6 -echo "configure:3516: checking for linux vga library" >&5 +echo "configure:3646: checking for linux vga library" >&5 echo $ac_n "checking for vga_init in -lvga""... $ac_c" 1>&6 -echo "configure:3518: checking for vga_init in -lvga" >&5 +echo "configure:3648: checking for vga_init in -lvga" >&5 ac_lib_var=`echo vga'_'vga_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3522,7 +3652,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lvga $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3667: \"$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 @@ -3561,11 +3691,12 @@ fi fi -if test "$with_gnu_readline" != no; then - gp_tcap="" - for termlib in ncurses curses termcap terminfo termlib; do - echo $ac_n "checking for tputs in -l${termlib}""... $ac_c" 1>&6 -echo "configure:3569: checking for tputs in -l${termlib}" >&5 +if test "$with_readline" != no; then + if test "$with_readline" != yes; then + gp_tcap="" + for termlib in ncurses curses termcap terminfo termlib; do + echo $ac_n "checking for tputs in -l${termlib}""... $ac_c" 1>&6 +echo "configure:3700: checking for tputs in -l${termlib}" >&5 ac_lib_var=`echo ${termlib}'_'tputs | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3573,7 +3704,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l${termlib} $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3719: \"$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 @@ -3599,30 +3730,29 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - gp_tcap="${gp_tcap} -l${termlib}" + gp_tcap="$gp_tcap -l$termlib" else echo "$ac_t""no" 1>&6 fi - case "${gp_tcap}" in - *-l${termlib}*) - echo "$ac_t""using ${gp_tcap} with readline" 1>&6 - break - ;; - esac - done + case "$gp_tcap" in + *-l${termlib}*) + break + ;; + esac + done - if test "$with_gnu_readline" = yes; then - echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6 -echo "configure:3618: checking for readline in -lreadline" >&5 + if test "$with_readline" = gnu; then + echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6 +echo "configure:3748: checking for readline in -lreadline" >&5 ac_lib_var=`echo readline'_'readline | 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="-lreadline ${gp_tcap} $LIBS" +LIBS="-lreadline ${gp_tcap} $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3767: \"$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 @@ -3648,51 +3778,108 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - LIBS="$LIBS -lreadline $gp_tcap" - cat >> confdefs.h <<\EOF -#define GNU_READLINE 1 + TERMLIBS="$TERMLIBS -lreadline $gp_tcap" +else + echo "$ac_t""no" 1>&6 +fi + + else + ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'` + gp_tr_lib=HAVE_LIB`echo readline | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` +echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6 +echo "configure:3792: checking for readline in -lreadline" >&5 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + gp_save_TERMLIBS="$TERMLIBS" +if test "$with_readline" != yes && test "$with_readline" != no; then + gp_l_path=`echo "$with_readline" | sed -e 's%/libreadline\.a$%%'` + gp_l_prfx=`echo $gp_l_path | sed -e 's%/lib$%%' -e 's%/include$%%'` + gp_l_list="$gp_l_prfx $gp_l_prfx/lib $gp_l_path" +fi +for ac_dir in $gp_l_list '' /usr/local/lib ; do + test x${ac_dir} != x && TERMLIBS="-L${ac_dir} $gp_save_TERMLIBS" + ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'` +ac_save_LIBS="$LIBS" +LIBS="$TERMLIBS $TERMXLIBS -lreadline ${gp_tcap} $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + ac_tr_lib=HAVE_LIB`echo readline | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` +fi - with_readline=no + TERMLIBS="$gp_save_TERMLIBS" + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + eval "ac_cv_lib_$ac_lib_var=${ac_dir}" + break + fi +done + +fi + +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" != no"; then + if eval "test \"`echo x'$ac_cv_lib_'$ac_lib_var`\" != x" && eval "test \"`echo x'$ac_cv_lib_'$ac_lib_var`\" != xyes"; then + eval "TERMLIBS=\"$gp_save_TERMLIBS -L`echo '$ac_cv_lib_'$ac_lib_var`\"" + fi + TERMLIBS="$TERMLIBS -lreadline" + echo "$ac_t""yes" 1>&6 else echo "$ac_t""no" 1>&6 - { echo "configure: error: Can't find -lreadline in a standard path -- specify its location using --with-gnu-readline=/path/to/libreadline.a" 1>&2; exit 1; } fi - else - if test ! -f $with_gnu_readline ; then - if test ! -f ${with_gnu_readline}/lib/libreadline.a ; then - if test ! -f ${with_gnu_readline}/libreadline.a ; then - { echo "configure: error: GNU readline library not found" 1>&2; exit 1; } - else - echo "$ac_t""using ${with_gnu_readline}/libreadline.a" 1>&6 - LIBS="$LIBS ${with_gnu_readline}/libreadline.a $gp_tcap" - fi - else - echo "$ac_t""using ${with_gnu_readline}/lib/libreadline.a" 1>&6 - LIBS="$LIBS ${with_gnu_readline}/lib/libreadline.a $gp_tcap" + + if test "$ac_cv_lib_readline_readline" != no; then + TERMLIBS="$TERMLIBS $gp_tcap" fi - else - echo "$ac_t""using ${with_gnu_readline}" 1>&6 - LIBS="$LIBS $with_gnu_readline $gp_tcap" fi - cat >> confdefs.h <<\EOF -#define GNU_READLINE 1 + if test "$ac_cv_lib_readline_readline" = no; then + echo "configure: warning: GNU readline not found - falling back to builtin readline" 1>&2 + with_readline=yes + else + cat >> confdefs.h <<\EOF +#define HAVE_LIBREADLINE 1 EOF - with_readline=no - fi -fi + fi # ! ac_cv_lib_readline_readline = no -test "$with_readline" = yes && cat >> confdefs.h <<\EOF + fi # ! with_readline != yes + + if test "$with_readline" = yes; then + cat >> confdefs.h <<\EOF #define READLINE 1 EOF + fi +fi + if test "$with_plot" != no; then if test "$with_plot" = yes; then echo $ac_n "checking for openpl in -lplot""... $ac_c" 1>&6 -echo "configure:3696: checking for openpl in -lplot" >&5 +echo "configure:3883: checking for openpl in -lplot" >&5 ac_lib_var=`echo plot'_'openpl | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3700,7 +3887,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lplot $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3902: \"$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 @@ -3738,26 +3925,94 @@ fi else TERMXLIBS="$X_LIBS -lXaw -lXmu -lXt -lXext -lX11" - echo $ac_n "checking for textangle in -lplot""... $ac_c" 1>&6 -echo "configure:3743: checking for textangle in -lplot" >&5 -gp_save_TERMLIBS="$TERMLIBS" + ac_lib_var=`echo plot'_'pl_textangle | sed 'y%./+-%__p_%'` gp_tr_lib=HAVE_LIB`echo plot | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` -case "$with_plot" in - yes|no) - gp_lib_list="";; - *) - gp_lib_path=`echo $with_plot | sed -e 's%/libplot\.a$%%'` - gp_lib_prefix=`echo $gp_lib_path | sed 's%/lib$%%'` - gp_lib_list="$gp_lib_prefix $gp_lib_prefix/lib $gp_lib_path" -esac -for ac_dir in '' /usr/local/lib $gp_lib_list ; do - TERMLIBS="`test x${ac_dir} != x && echo -L${ac_dir}` $gp_save_TERMLIBS" +echo $ac_n "checking for pl_textangle in -lplot""... $ac_c" 1>&6 +echo "configure:3933: checking for pl_textangle in -lplot" >&5 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + gp_save_TERMLIBS="$TERMLIBS" +if test "$with_plot" != yes && test "$with_plot" != no; then + gp_l_path=`echo "$with_plot" | sed -e 's%/libplot\.a$%%'` + gp_l_prfx=`echo $gp_l_path | sed -e 's%/lib$%%' -e 's%/include$%%'` + gp_l_list="$gp_l_prfx $gp_l_prfx/lib $gp_l_path" +fi +for ac_dir in $gp_l_list '' /usr/local/lib ; do + test x${ac_dir} != x && TERMLIBS="-L${ac_dir} $gp_save_TERMLIBS" + ac_lib_var=`echo plot'_'pl_textangle | sed 'y%./+-%__p_%'` +ac_save_LIBS="$LIBS" +LIBS="$TERMLIBS $TERMXLIBS -lplot $TERMXLIBS $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + ac_tr_lib=HAVE_LIB`echo plot | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` +fi + + TERMLIBS="$gp_save_TERMLIBS" + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + eval "ac_cv_lib_$ac_lib_var=${ac_dir}" + break + fi +done + +fi + +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" != no"; then + if eval "test \"`echo x'$ac_cv_lib_'$ac_lib_var`\" != x" && eval "test \"`echo x'$ac_cv_lib_'$ac_lib_var`\" != xyes"; then + eval "TERMLIBS=\"$gp_save_TERMLIBS -L`echo '$ac_cv_lib_'$ac_lib_var`\"" + fi + TERMLIBS="$TERMLIBS -lplot" + echo "$ac_t""yes" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + if test "$ac_cv_lib_plot_pl_textangle" = no; then + ac_lib_var=`echo plot'_'textangle | sed 'y%./+-%__p_%'` + gp_tr_lib=HAVE_LIB`echo plot | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` +echo $ac_n "checking for textangle in -lplot""... $ac_c" 1>&6 +echo "configure:4000: checking for textangle in -lplot" >&5 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + gp_save_TERMLIBS="$TERMLIBS" +if test "$with_plot" != yes && test "$with_plot" != no; then + gp_l_path=`echo "$with_plot" | sed -e 's%/libplot\.a$%%'` + gp_l_prfx=`echo $gp_l_path | sed -e 's%/lib$%%' -e 's%/include$%%'` + gp_l_list="$gp_l_prfx $gp_l_prfx/lib $gp_l_path" +fi +for ac_dir in $gp_l_list '' /usr/local/lib ; do + test x${ac_dir} != x && TERMLIBS="-L${ac_dir} $gp_save_TERMLIBS" ac_lib_var=`echo plot'_'textangle | sed 'y%./+-%__p_%'` ac_save_LIBS="$LIBS" -LIBS="$TERMLIBS $TERMXLIBS -lplot $TERMXLIBS $LIBS" +LIBS="$TERMLIBS $TERMXLIBS -lplot $TERMXLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4027: \"$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 @@ -3780,39 +4035,52 @@ fi rm -f conftest* LIBS="$ac_save_LIBS" if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - TERMLIBS="$TERMLIBS -lplot"; break -else - TERMLIBS="$gp_save_TERMLIBS" + ac_tr_lib=HAVE_LIB`echo plot | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` fi - done -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + + TERMLIBS="$gp_save_TERMLIBS" + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + eval "ac_cv_lib_$ac_lib_var=${ac_dir}" + break + fi +done + +fi + +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" != no"; then + if eval "test \"`echo x'$ac_cv_lib_'$ac_lib_var`\" != x" && eval "test \"`echo x'$ac_cv_lib_'$ac_lib_var`\" != xyes"; then + eval "TERMLIBS=\"$gp_save_TERMLIBS -L`echo '$ac_cv_lib_'$ac_lib_var`\"" + fi + TERMLIBS="$TERMLIBS -lplot" echo "$ac_t""yes" 1>&6 else echo "$ac_t""no" 1>&6 fi - if test "$ac_cv_lib_plot_textangle" = no; then - TERMXLIBS= - echo $ac_n "checking for rotate in -lplot""... $ac_c" 1>&6 -echo "configure:3798: checking for rotate in -lplot" >&5 -gp_save_TERMLIBS="$TERMLIBS" + if test "$ac_cv_lib_plot_textangle" = no; then + TERMXLIBS= + ac_lib_var=`echo plot'_'rotate | sed 'y%./+-%__p_%'` gp_tr_lib=HAVE_LIB`echo plot | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` -case "$with_plot" in - yes|no) - gp_lib_list="";; - *) - gp_lib_path=`echo $with_plot | sed -e 's%/libplot\.a$%%'` - gp_lib_prefix=`echo $gp_lib_path | sed 's%/lib$%%'` - gp_lib_list="$gp_lib_prefix $gp_lib_prefix/lib $gp_lib_path" -esac -for ac_dir in '' /usr/local/lib $gp_lib_list ; do - TERMLIBS="`test x${ac_dir} != x && echo -L${ac_dir}` $gp_save_TERMLIBS" +echo $ac_n "checking for rotate in -lplot""... $ac_c" 1>&6 +echo "configure:4068: checking for rotate in -lplot" >&5 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + gp_save_TERMLIBS="$TERMLIBS" +if test "$with_plot" != yes && test "$with_plot" != no; then + gp_l_path=`echo "$with_plot" | sed -e 's%/libplot\.a$%%'` + gp_l_prfx=`echo $gp_l_path | sed -e 's%/lib$%%' -e 's%/include$%%'` + gp_l_list="$gp_l_prfx $gp_l_prfx/lib $gp_l_path" +fi +for ac_dir in $gp_l_list '' /usr/local/lib ; do + test x${ac_dir} != x && TERMLIBS="-L${ac_dir} $gp_save_TERMLIBS" ac_lib_var=`echo plot'_'rotate | sed 'y%./+-%__p_%'` ac_save_LIBS="$LIBS" -LIBS="$TERMLIBS $TERMXLIBS -lplot $LIBS" +LIBS="$TERMLIBS $TERMXLIBS -lplot $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4095: \"$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 @@ -3835,29 +4103,106 @@ fi rm -f conftest* LIBS="$ac_save_LIBS" if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - TERMLIBS="$TERMLIBS -lplot"; break -else - TERMLIBS="$gp_save_TERMLIBS" + ac_tr_lib=HAVE_LIB`echo plot | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` fi - done -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + + TERMLIBS="$gp_save_TERMLIBS" + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + eval "ac_cv_lib_$ac_lib_var=${ac_dir}" + break + fi +done + +fi + +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" != no"; then + if eval "test \"`echo x'$ac_cv_lib_'$ac_lib_var`\" != x" && eval "test \"`echo x'$ac_cv_lib_'$ac_lib_var`\" != xyes"; then + eval "TERMLIBS=\"$gp_save_TERMLIBS -L`echo '$ac_cv_lib_'$ac_lib_var`\"" + fi + TERMLIBS="$TERMLIBS -lplot" echo "$ac_t""yes" 1>&6 else echo "$ac_t""no" 1>&6 fi - if test "$ac_cv_lib_plot_rotate" = no; then - echo "configure: warning: can't find GNU libplot -- disabling gnugraph terminal" 1>&2 - with_plot=no + if test "$ac_cv_lib_plot_rotate" = no; then + echo "configure: warning: can't find GNU libplot -- disabling gnugraph terminal" 1>&2 + with_plot=no + else + echo "$ac_t"" - using obsolete GNU graphics library" 1>&6 + fi # old GNU plotlib else - echo "$ac_t"" - using obsolete GNU graphics library" 1>&6 - cat >> confdefs.h <<\EOF -#define GNUGRAPH 1 + echo "$ac_t"" - using GNU plotutils library" 1>&6 + fi # GNU plotlib pre-2.2 + else + ac_safe=`echo "plotcompat.h" | sed 'y%./+-%__p_%'` + ac_tr_hdr=HAVE_`echo plotcompat.h | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` +echo $ac_n "checking for plotcompat.h""... $ac_c" 1>&6 +echo "configure:4143: checking for plotcompat.h" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + gp_save_CPPFLAGS="$CPPFLAGS" +if test "$with_plot" != yes && test "$with_plot" != no; then + gp_h_path=`echo "$with_plot" | sed -e 's%/libplotcompat.h\.a$%%'` + gp_h_prfx=`echo "$gp_h_path" | sed -e 's%/lib$%%' -e 's%/include$%%'` + gp_h_list="$gp_h_prfx $gp_h_prfx/include $gp_h_path" +else + gp_h_list='' +fi +for ac_dir in $gp_h_list '' /usr/local/include ; do + test x${ac_dir} != x && CPPFLAGS="$gp_save_CPPFLAGS -I${ac_dir}" + cat > conftest.$ac_ext < EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:4163: \"$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* + eval "ac_cv_header_$ac_safe=${ac_dir}" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* + CPPFLAGS="$gp_save_CPPFLAGS" + if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" != no"; then + break + fi +done - fi # old GNU plotlib - else - echo "$ac_t"" - using GNU plotutils library" 1>&6 +fi + +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" != no"; then + if eval "test \"`echo x'$ac_cv_header_'$ac_safe`\" != x" && eval "test \"`echo x'$ac_cv_header_'$ac_safe`\" != xyes"; then + eval "CPPFLAGS=\"$gp_save_CPPFLAGS -I`echo '$ac_cv_header_'$ac_safe`\"" + fi + cat >> confdefs.h <&6 + cat >> confdefs.h <<\EOF +#define HAVE_PLOTCOMPAT_H 1 +EOF + +else + echo "$ac_t""no" 1>&6 +echo "configure: warning: found GNU plotutils 2.2+ library but not plotcompat.h" 1>&2 + echo "configure: warning: please add path to plotcompat.h to CPPFLAGS in Makefile" 1>&2 + +fi + # plotcompat.h + fi # new GNU plotlib + + if test "$with_plot" != no; then cat >> confdefs.h <<\EOF #define GNUGRAPH 1 EOF @@ -3866,31 +4211,33 @@ EOF #define GNU_PLOTUTILS 1 EOF - fi # new GNU plotlib - fi # Unix plotlib + fi + + fi # ! Unix plotlib fi if test "$with_gd" != no; then - echo $ac_n "checking for gdImageCreate in -lgd""... $ac_c" 1>&6 -echo "configure:3876: checking for gdImageCreate in -lgd" >&5 -gp_save_TERMLIBS="$TERMLIBS" + ac_lib_var=`echo gd'_'gdImageCreate | sed 'y%./+-%__p_%'` gp_tr_lib=HAVE_LIB`echo gd | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` -case "$with_gd" in - yes|no) - gp_lib_list="";; - *) - gp_lib_path=`echo $with_gd | sed -e 's%/libgd\.a$%%'` - gp_lib_prefix=`echo $gp_lib_path | sed 's%/lib$%%'` - gp_lib_list="$gp_lib_prefix $gp_lib_prefix/lib $gp_lib_path" -esac -for ac_dir in '' /usr/local/lib $gp_lib_list ; do - TERMLIBS="`test x${ac_dir} != x && echo -L${ac_dir}` $gp_save_TERMLIBS" +echo $ac_n "checking for gdImageCreate in -lgd""... $ac_c" 1>&6 +echo "configure:4225: checking for gdImageCreate in -lgd" >&5 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + gp_save_TERMLIBS="$TERMLIBS" +if test "$with_gd" != yes && test "$with_gd" != no; then + gp_l_path=`echo "$with_gd" | sed -e 's%/libgd\.a$%%'` + gp_l_prfx=`echo $gp_l_path | sed -e 's%/lib$%%' -e 's%/include$%%'` + gp_l_list="$gp_l_prfx $gp_l_prfx/lib $gp_l_path" +fi +for ac_dir in $gp_l_list '' /usr/local/lib ; do + test x${ac_dir} != x && TERMLIBS="-L${ac_dir} $gp_save_TERMLIBS" ac_lib_var=`echo gd'_'gdImageCreate | sed 'y%./+-%__p_%'` ac_save_LIBS="$LIBS" -LIBS="$TERMLIBS $TERMXLIBS -lgd $LIBS" +LIBS="$TERMLIBS $TERMXLIBS -lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4252: \"$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 @@ -3913,36 +4260,58 @@ fi rm -f conftest* LIBS="$ac_save_LIBS" if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - TERMLIBS="$TERMLIBS -lgd"; break -else - TERMLIBS="$gp_save_TERMLIBS" + ac_tr_lib=HAVE_LIB`echo gd | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` fi - done -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + + TERMLIBS="$gp_save_TERMLIBS" + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + eval "ac_cv_lib_$ac_lib_var=${ac_dir}" + break + fi +done + +fi + +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" != no"; then + if eval "test \"`echo x'$ac_cv_lib_'$ac_lib_var`\" != x" && eval "test \"`echo x'$ac_cv_lib_'$ac_lib_var`\" != xyes"; then + eval "TERMLIBS=\"$gp_save_TERMLIBS -L`echo '$ac_cv_lib_'$ac_lib_var`\"" + fi + TERMLIBS="$TERMLIBS -lgd" echo "$ac_t""yes" 1>&6 else echo "$ac_t""no" 1>&6 fi - if test "$ac_cv_lib_gd_gdImageCreate" = yes; then - + if test "$ac_cv_lib_gd_gdImageCreate" != no; then + ac_safe=`echo "gd.h" | sed 'y%./+-%__p_%'` + ac_tr_hdr=HAVE_`echo gd.h | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` echo $ac_n "checking for gd.h""... $ac_c" 1>&6 -echo "configure:3931: checking for gd.h" >&5 -ac_safe=`echo "gd.h" | sed 'y%./+-%__p_%'` -gp_save_CPPFLAGS="$CPPFLAGS" -for ac_dir in '' /usr/local/include $gp_lib_prefix $gp_lib_prefix/include ; do - CPPFLAGS="$gp_save_CPPFLAGS `test x${ac_dir} != x && echo -I${ac_dir}`" +echo "configure:4291: checking for gd.h" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + gp_save_CPPFLAGS="$CPPFLAGS" +if test "$with_gd" != yes && test "$with_gd" != no; then + gp_h_path=`echo "$with_gd" | sed -e 's%/libgd.h\.a$%%'` + gp_h_prfx=`echo "$gp_h_path" | sed -e 's%/lib$%%' -e 's%/include$%%'` + gp_h_list="$gp_h_prfx $gp_h_prfx/include $gp_h_path" +else + gp_h_list='' +fi +for ac_dir in $gp_h_list '' /usr/local/include ; do + test x${ac_dir} != x && CPPFLAGS="$gp_save_CPPFLAGS -I${ac_dir}" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3942: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4311: \"$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* - eval "ac_cv_header_$ac_safe=yes" + eval "ac_cv_header_$ac_safe=${ac_dir}" else echo "$ac_err" >&5 echo "configure: failed program was:" >&5 @@ -3951,24 +4320,32 @@ else eval "ac_cv_header_$ac_safe=no" fi rm -f conftest* - if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + CPPFLAGS="$gp_save_CPPFLAGS" + if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" != no"; then break - else - CPPFLAGS="${ac_save_CPPFLAGS}" fi done -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + +fi + +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" != no"; then + if eval "test \"`echo x'$ac_cv_header_'$ac_safe`\" != x" && eval "test \"`echo x'$ac_cv_header_'$ac_safe`\" != xyes"; then + eval "CPPFLAGS=\"$gp_save_CPPFLAGS -I`echo '$ac_cv_header_'$ac_safe`\"" + fi + cat >> confdefs.h <&6 - : + cat >> confdefs.h <<\EOF +#define HAVE_LIBGD 1 +EOF + else echo "$ac_t""no" 1>&6 -echo "configure: warning: found gd library but not gd.h" 1>&2 - echo "configure: warning: please add path to gd.h to CPPFLAGS in Makefile" 1>&2 - + echo "configure: warning: found gd library but not gd.h" 1>&2 + echo "configure: warning: please add path to gd.h to CPPFLAGS in Makefile" 1>&2 fi - cat >> confdefs.h <<\EOF -#define HAVE_LIBGD 1 -EOF else echo "$ac_t""- see term/gif.trm for download details" 1>&6 @@ -3976,26 +4353,27 @@ EOF fi if test "$with_png" != no; then - echo $ac_n "checking for png_info_init in -lpng""... $ac_c" 1>&6 -echo "configure:3981: checking for png_info_init in -lpng" >&5 -gp_save_TERMLIBS="$TERMLIBS" + ac_lib_var=`echo png'_'png_info_init | sed 'y%./+-%__p_%'` gp_tr_lib=HAVE_LIB`echo png | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` -case "$with_png" in - yes|no) - gp_lib_list="";; - *) - gp_lib_path=`echo $with_png | sed -e 's%/libpng\.a$%%'` - gp_lib_prefix=`echo $gp_lib_path | sed 's%/lib$%%'` - gp_lib_list="$gp_lib_prefix $gp_lib_prefix/lib $gp_lib_path" -esac -for ac_dir in '' /usr/local/lib $gp_lib_list ; do - TERMLIBS="`test x${ac_dir} != x && echo -L${ac_dir}` $gp_save_TERMLIBS" +echo $ac_n "checking for png_info_init in -lpng""... $ac_c" 1>&6 +echo "configure:4361: checking for png_info_init in -lpng" >&5 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + gp_save_TERMLIBS="$TERMLIBS" +if test "$with_png" != yes && test "$with_png" != no; then + gp_l_path=`echo "$with_png" | sed -e 's%/libpng\.a$%%'` + gp_l_prfx=`echo $gp_l_path | sed -e 's%/lib$%%' -e 's%/include$%%'` + gp_l_list="$gp_l_prfx $gp_l_prfx/lib $gp_l_path" +fi +for ac_dir in $gp_l_list '' /usr/local/lib ; do + test x${ac_dir} != x && TERMLIBS="-L${ac_dir} $gp_save_TERMLIBS" ac_lib_var=`echo png'_'png_info_init | sed 'y%./+-%__p_%'` ac_save_LIBS="$LIBS" -LIBS="$TERMLIBS $TERMXLIBS -lpng -lz $LIBS" +LIBS="$TERMLIBS $TERMXLIBS -lpng -lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4388: \"$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 @@ -4018,37 +4396,59 @@ fi rm -f conftest* LIBS="$ac_save_LIBS" if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - TERMLIBS="$TERMLIBS -lpng"; break -else - TERMLIBS="$gp_save_TERMLIBS" + ac_tr_lib=HAVE_LIB`echo png | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` fi - done -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + + TERMLIBS="$gp_save_TERMLIBS" + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + eval "ac_cv_lib_$ac_lib_var=${ac_dir}" + break + fi +done + +fi + +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" != no"; then + if eval "test \"`echo x'$ac_cv_lib_'$ac_lib_var`\" != x" && eval "test \"`echo x'$ac_cv_lib_'$ac_lib_var`\" != xyes"; then + eval "TERMLIBS=\"$gp_save_TERMLIBS -L`echo '$ac_cv_lib_'$ac_lib_var`\"" + fi + TERMLIBS="$TERMLIBS -lpng" echo "$ac_t""yes" 1>&6 else echo "$ac_t""no" 1>&6 fi - if test "$ac_cv_lib_png_png_info_init" = yes; then + if test "$ac_cv_lib_png_png_info_init" != no; then TERMLIBS="$TERMLIBS -lz" - + ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'` + ac_tr_hdr=HAVE_`echo png.h | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` echo $ac_n "checking for png.h""... $ac_c" 1>&6 -echo "configure:4037: checking for png.h" >&5 -ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'` -gp_save_CPPFLAGS="$CPPFLAGS" -for ac_dir in '' /usr/local/include $gp_lib_prefix $gp_lib_prefix/include ; do - CPPFLAGS="$gp_save_CPPFLAGS `test x${ac_dir} != x && echo -I${ac_dir}`" +echo "configure:4428: checking for png.h" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + gp_save_CPPFLAGS="$CPPFLAGS" +if test "$with_png" != yes && test "$with_png" != no; then + gp_h_path=`echo "$with_png" | sed -e 's%/libpng.h\.a$%%'` + gp_h_prfx=`echo "$gp_h_path" | sed -e 's%/lib$%%' -e 's%/include$%%'` + gp_h_list="$gp_h_prfx $gp_h_prfx/include $gp_h_path" +else + gp_h_list='' +fi +for ac_dir in $gp_h_list '' /usr/local/include ; do + test x${ac_dir} != x && CPPFLAGS="$gp_save_CPPFLAGS -I${ac_dir}" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4048: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4448: \"$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* - eval "ac_cv_header_$ac_safe=yes" + eval "ac_cv_header_$ac_safe=${ac_dir}" else echo "$ac_err" >&5 echo "configure: failed program was:" >&5 @@ -4057,39 +4457,59 @@ else eval "ac_cv_header_$ac_safe=no" fi rm -f conftest* - if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + CPPFLAGS="$gp_save_CPPFLAGS" + if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" != no"; then break - else - CPPFLAGS="${ac_save_CPPFLAGS}" fi done -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + +fi + +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" != no"; then + if eval "test \"`echo x'$ac_cv_header_'$ac_safe`\" != x" && eval "test \"`echo x'$ac_cv_header_'$ac_safe`\" != xyes"; then + eval "CPPFLAGS=\"$gp_save_CPPFLAGS -I`echo '$ac_cv_header_'$ac_safe`\"" + fi + cat >> confdefs.h <&6 : else echo "$ac_t""no" 1>&6 -echo "configure: warning: found png library but not png.h" 1>&2 + echo "configure: warning: found png library but not png.h" 1>&2 echo "configure: warning: please add path to png.h to CPPFLAGS in Makefile" 1>&2 fi - + + ac_safe=`echo "zlib.h" | sed 'y%./+-%__p_%'` + ac_tr_hdr=HAVE_`echo zlib.h | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` echo $ac_n "checking for zlib.h""... $ac_c" 1>&6 -echo "configure:4078: checking for zlib.h" >&5 -ac_safe=`echo "zlib.h" | sed 'y%./+-%__p_%'` -gp_save_CPPFLAGS="$CPPFLAGS" -for ac_dir in '' /usr/local/include $gp_lib_prefix $gp_lib_prefix/include ; do - CPPFLAGS="$gp_save_CPPFLAGS `test x${ac_dir} != x && echo -I${ac_dir}`" +echo "configure:4489: checking for zlib.h" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + gp_save_CPPFLAGS="$CPPFLAGS" +if test "$with_png" != yes && test "$with_png" != no; then + gp_h_path=`echo "$with_png" | sed -e 's%/libzlib.h\.a$%%'` + gp_h_prfx=`echo "$gp_h_path" | sed -e 's%/lib$%%' -e 's%/include$%%'` + gp_h_list="$gp_h_prfx $gp_h_prfx/include $gp_h_path" +else + gp_h_list='' +fi +for ac_dir in $gp_h_list '' /usr/local/include ; do + test x${ac_dir} != x && CPPFLAGS="$gp_save_CPPFLAGS -I${ac_dir}" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4089: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4509: \"$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* - eval "ac_cv_header_$ac_safe=yes" + eval "ac_cv_header_$ac_safe=${ac_dir}" else echo "$ac_err" >&5 echo "configure: failed program was:" >&5 @@ -4098,24 +4518,34 @@ else eval "ac_cv_header_$ac_safe=no" fi rm -f conftest* - if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + CPPFLAGS="$gp_save_CPPFLAGS" + if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" != no"; then break - else - CPPFLAGS="${ac_save_CPPFLAGS}" fi done -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + +fi + +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" != no"; then + if eval "test \"`echo x'$ac_cv_header_'$ac_safe`\" != x" && eval "test \"`echo x'$ac_cv_header_'$ac_safe`\" != xyes"; then + eval "CPPFLAGS=\"$gp_save_CPPFLAGS -I`echo '$ac_cv_header_'$ac_safe`\"" + fi + cat >> confdefs.h <&6 : else echo "$ac_t""no" 1>&6 -echo "configure: warning: found z library but not zlib.h" 1>&2 + echo "configure: warning: found z library but not zlib.h" 1>&2 echo "configure: warning: please add path to zlib.h to CPPFLAGS in Makefile" 1>&2 fi - if test "$ac_cv_header_png_h" = yes; then + + if test "$ac_cv_header_png_h" != no; then cat > conftest.$ac_ext <&5 | egrep "You lose" >/dev/null 2>&1; then rm -rf conftest* echo "configure: warning: - libpng too old - not including png driver" 1>&2 -else - rm -rf conftest* - cat >> confdefs.h <<\EOF -#define HAVE_LIBPNG 1 -EOF - + with_png=no fi rm -f conftest* else echo "configure: warning: - cannot check png version - compilation may fail" 1>&2 - cat >> confdefs.h <<\EOF + fi + + if test "$with_png" != no; then + cat >> confdefs.h <<\EOF #define HAVE_LIBPNG 1 EOF - fi + fi + else echo "$ac_t""- see term/png.trm for download details" 1>&6 fi fi -echo $ac_n "checking terminal driver sources""... $ac_c" 1>&6 -echo "configure:4153: checking terminal driver sources" >&5 -( cd $srcdir/term && for i in *.trm ; do echo '${srcdir}'/../term/$i ; done )\ - |(tr '\012' @; echo) |sed 's/@$/%/;s/@/ \\@/g' |tr @% '\012\012' >termlist -TERM_LIST=termlist -echo "$ac_t""list created" 1>&6 - - -if test "$enable_apollo" = yes; then - cat > conftest.$ac_ext < conftest.$ac_ext <&5 | - egrep "yes" >/dev/null 2>&1; then - rm -rf conftest* - cat >> confdefs.h <<\EOF -#define APOLLO 1 -EOF +#ifdef SCO +yes +#endif -else - rm -rf conftest* - enable_apollo=no -fi -rm -f conftest* - -fi - -if test "$enable_gpr" = yes; then - cat > conftest.$ac_ext <&5 | egrep "yes" >/dev/null 2>&1; then rm -rf conftest* - cat >> confdefs.h <<\EOF -#define APOLLO 1 -EOF - cat >> confdefs.h <<\EOF -#define GPR 1 -EOF - -else - rm -rf conftest* - enable_gpr=no -fi -rm -f conftest* - -fi - -if test "$enable_cgi" = yes; then - cat > conftest.$ac_ext <&5 | - egrep "yes" >/dev/null 2>&1; then - rm -rf conftest* echo $ac_n "checking for v_opnwk in -lccgi""... $ac_c" 1>&6 -echo "configure:4226: checking for v_opnwk in -lccgi" >&5 +echo "configure:4595: checking for v_opnwk in -lccgi" >&5 ac_lib_var=`echo ccgi'_'v_opnwk | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4230,7 +4599,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lccgi $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4614: \"$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 @@ -4256,45 +4625,50 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define CGI 1 EOF - - TERMLIBS="$TERMLIBS -lccgi" + TERMLIBS="$TERMLIBS -lccgi" else echo "$ac_t""no" 1>&6 fi -else - rm -rf conftest* - enable_cgi=no fi rm -f conftest* -fi -if test "$enable_iris" = yes; then - echo $ac_n "checking for winopen in -lgl_s""... $ac_c" 1>&6 -echo "configure:4279: checking for winopen in -lgl_s" >&5 -ac_lib_var=`echo gl_s'_'winopen | sed 'y%./+-%__p_%'` +cat > conftest.$ac_ext <&5 | + egrep "yes" >/dev/null 2>&1; then + rm -rf conftest* + echo $ac_n "checking for window_create in -lsuntool""... $ac_c" 1>&6 +echo "configure:4653: checking for window_create in -lsuntool" >&5 +ac_lib_var=`echo suntool'_'window_create | 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="-lgl_s $LIBS" +LIBS="-lsuntool -lsunwindow -lpixrect $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4672: \"$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 @@ -4309,40 +4683,80 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define IRIS 1 + ac_safe=`echo "suntool/sunview.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for suntool/sunview.h""... $ac_c" 1>&6 +echo "configure:4689: checking for suntool/sunview.h" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:4699: \"$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* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF +#define SUN 1 +EOF + TERMLIBS="$TERMLIBS -lsuntool -lsunwindow -lpixrect" +else + echo "$ac_t""no" 1>&6 +fi - TERMLIBS="$TERMLIBS -lgl_s" else echo "$ac_t""no" 1>&6 - enable_iris=no fi fi +rm -f conftest* -if test "$enable_mgr" = yes; then - echo $ac_n "checking for m_getinfo in -lmgr""... $ac_c" 1>&6 -echo "configure:4327: checking for m_getinfo in -lmgr" >&5 -ac_lib_var=`echo mgr'_'m_getinfo | sed 'y%./+-%__p_%'` + + +if test "$with_cdwrc" = no; then + cat >> confdefs.h <<\EOF +#define NOCWDRC 1 +EOF + +fi + +if test "$enable_iris" = yes; then + echo $ac_n "checking for winopen in -lgl_s""... $ac_c" 1>&6 +echo "configure:4741: checking for winopen in -lgl_s" >&5 +ac_lib_var=`echo gl_s'_'winopen | 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="-lmgr -lpixrect $LIBS" +LIBS="-lgl_s $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4760: \"$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 @@ -4358,45 +4772,39 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF -#define MGR 1 +#define IRIS 1 EOF - TERMLIBS="$TERMLIBS -lmgr -lpixrect" + + TERMLIBS="$TERMLIBS -lgl_s" else echo "$ac_t""no" 1>&6 - enable_mgr=no + enable_iris=no fi fi -if test "$enable_rgip" = yes; then - cat >> confdefs.h <<\EOF -#define RGIP 1 -EOF - -fi - -if test "$enable_sun" = yes; then - echo $ac_n "checking for window_create in -lsuntool""... $ac_c" 1>&6 -echo "configure:4381: checking for window_create in -lsuntool" >&5 -ac_lib_var=`echo suntool'_'window_create | sed 'y%./+-%__p_%'` +if test "$enable_mgr" = yes; then + echo $ac_n "checking for m_getinfo in -lmgr""... $ac_c" 1>&6 +echo "configure:4789: checking for m_getinfo in -lmgr" >&5 +ac_lib_var=`echo mgr'_'m_getinfo | 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="-lsuntool -lsunwindow -lpixrect $LIBS" +LIBS="-lmgr -lpixrect $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4808: \"$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 @@ -4412,58 +4820,32 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF -#define SUN 1 +#define MGR 1 EOF - TERMLIBS="$TERMLIBS -lsuntool -lsunwindow -lpixrect" + + TERMLIBS="$TERMLIBS -lmgr -lpixrect" else echo "$ac_t""no" 1>&6 - enable_sun=no + enable_mgr=no fi fi -if test "$enable_unixpc" = yes; then - cat > conftest.$ac_ext <&5 | - egrep "yes" >/dev/null 2>&1; then - rm -rf conftest* +if test "$enable_rgip" = yes; then cat >> confdefs.h <<\EOF -#define UNIXPC 1 +#define RGIP 1 EOF -else - rm -rf conftest* - enable_unixpc=no fi -rm -f conftest* -fi -if test "$enable_system_time" = yes; then - cat >> confdefs.h <<\EOF -#define USE_SYSTEM_TIME 1 -EOF -fi - - - - eval gp_datadir=$datadir test $gp_datadir = NONE/share && gp_datadir=/usr/local/share echo "$ac_t"" @@ -4472,62 +4854,55 @@ echo "$ac_t"" Where is the help file? $gp_datadir/gnuplot.gih " 1>&6 test "$ac_cv_header_gd_h" = yes && \ - echo "$ac_t"" Enable generation of GIF files." 1>&6 + echo "$ac_t"" Enable generation of GIF files" 1>&6 test "$ac_cv_header_zlib_h" = yes && \ - echo "$ac_t"" Enable generation of PNG files." 1>&6 + echo "$ac_t"" Enable generation of PNG files" 1>&6 test "$with_cwdrc" = yes && \ - echo "$ac_t"" Check current directory for .gnuplot file." 1>&6 + echo "$ac_t"" Check current directory for .gnuplot file" 1>&6 -if test "$with_gnu_readline" != no; then - echo "$ac_t"" Use GNU readline library." 1>&6 -else - test "$with_readline" != no && \ - echo "$ac_t"" Use included readline." 1>&6 +if test "$with_readline" != no; then + if test "$with_readline" != yes; then + echo "$ac_t"" Use GNU readline library" 1>&6 + test -n "$gp_tcap" && echo "$ac_t"" with ${gp_tcap}" 1>&6 + else + echo "$ac_t"" Use builtin minimal readline" 1>&6 + fi fi if test "$with_plot" = yes; then - echo "$ac_t"" Use the Unix plot library." 1>&6 + echo "$ac_t"" Use the Unix plot library" 1>&6 elif test "$with_plot" != no; then - echo "$ac_t"" Use the GNU plot library." 1>&6 + echo "$ac_t"" Use the GNU plot library," 1>&6 + if test x"$ac_cv_header_plotcompat_h" != x && \ + test "$ac_cv_header_plotcompat_h" != no ; then + echo "$ac_t"" version 2.2 or newer" 1>&6 + else + echo "$ac_t"" version 2.1 or older" 1>&6 + fi fi test "$with_lasergnu" = yes && \ - echo "$ac_t"" Install lasergnu printer script." 1>&6 + echo "$ac_t"" Install lasergnu printer script" 1>&6 -test "$with_linux_vga" = yes && \ - echo "$ac_t"" Use the Linux console driver." 1>&6 +if test "$with_linux_vga" = yes; then + echo "$ac_t"" Use the Linux SVGA console driver" 1>&6 + echo "$ac_t"" SECURITY NOTICE: SVGAlib requires that" 1>&6 + echo "$ac_t"" gnuplot is installed suid root!" 1>&6 +fi -test "$enable_apollo" = yes && \ - echo "$ac_t"" Enable Apollo terminal (resizeable window)." 1>&6 - -test "$enable_cgi" = yes && \ - echo "$ac_t"" Enable cgi terminal (SCO)." 1>&6 - -test "$enable_gpr" = yes && \ - echo "$ac_t"" Enable Apollo terminal (fixed-size window)." 1>&6 - test "$enable_iris" = yes && \ - echo "$ac_t"" Enable IRIS terminal." 1>&6 + echo "$ac_t"" Enable IRIS terminal" 1>&6 test "$enable_mgr" = yes && \ - echo "$ac_t"" Enable MGR terminal." 1>&6 + echo "$ac_t"" Enable MGR terminal" 1>&6 test "$enable_rgip" = yes && \ - echo "$ac_t"" Enable RGIP terminal." 1>&6 + echo "$ac_t"" Enable RGIP terminal" 1>&6 -test "$enable_sun" = yes && \ - echo "$ac_t"" Enable sunview terminal." 1>&6 - -test "$enable_unixpc" = yes && \ - echo "$ac_t"" Enable unixpc terminal (ATT 3b1 or ATT 7300)." 1>&6 - -test "$enable_system_time" = yes && \ - echo "$ac_t"" Use system time routines in time.c." 1>&6 - test "$no_x" != yes && \ - echo "$ac_t"" Use the X Window System. + echo "$ac_t"" Use the X Window System " 1>&6 trap '' 1 2 15 @@ -4673,6 +5048,9 @@ s%@AUTOCONF@%$AUTOCONF%g s%@AUTOMAKE@%$AUTOMAKE%g s%@AUTOHEADER@%$AUTOHEADER%g s%@MAKEINFO@%$MAKEINFO%g +s%@install_sh@%$install_sh%g +s%@AMTAR@%$AMTAR%g +s%@AMTARFLAGS@%$AMTARFLAGS%g s%@SET_MAKE@%$SET_MAKE%g s%@CC@%$CC%g s%@CPP@%$CPP%g @@ -4685,11 +5063,8 @@ 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 -/@TERM_LIST@/r $TERM_LIST -s%@TERM_LIST@%%g s%@LASERGNU@%$LASERGNU%g s%@LINUXSUID@%$LINUXSUID%g -s%@NEXTOBJS@%$NEXTOBJS%g s%@TERMLIBS@%$TERMLIBS%g s%@TERMXLIBS@%$TERMXLIBS%g @@ -4905,7 +5280,7 @@ cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF \ -test -z "$CONFIG_HEADERS" || echo timestamp >stamp-h ; rm -f termlist +test -z "$CONFIG_HEADERS" || echo timestamp >stamp-h exit 0 EOF chmod +x $CONFIG_STATUS