From 2472bd3c8998dfd0ad751dbcf5b546b288112699 Mon Sep 17 00:00:00 2001 From: dan Date: Tue, 14 Dec 1999 03:24:38 +0000 Subject: [PATCH] Another try with autoconf --- WPrefs.app/Makefile.in | 2 +- WPrefs.app/po/Makefile.in | 2 +- WPrefs.app/tiff/Makefile.in | 2 +- WPrefs.app/xpm/Makefile.in | 2 +- WindowMaker/Backgrounds/Makefile.in | 2 +- WindowMaker/Defaults/Makefile.in | 2 +- WindowMaker/IconSets/Makefile.in | 2 +- WindowMaker/Icons/Makefile.in | 2 +- WindowMaker/Makefile.in | 2 +- WindowMaker/Pixmaps/Makefile.in | 2 +- WindowMaker/Styles/Makefile.in | 2 +- WindowMaker/Themes/Makefile.in | 2 +- acconfig.h | 3 + configure | 292 +++++++++++++++++----------- configure.in | 18 +- contrib/Makefile.in | 2 +- doc/Makefile.in | 2 +- po/Makefile.in | 2 +- src/Makefile.in | 2 +- test/Makefile.in | 2 +- util/Makefile.in | 2 +- wmlib/Makefile.in | 2 +- wrlib/Makefile.in | 2 +- 23 files changed, 215 insertions(+), 138 deletions(-) diff --git a/WPrefs.app/Makefile.in b/WPrefs.app/Makefile.in index 7cf076f3..7b3603b1 100644 --- a/WPrefs.app/Makefile.in +++ b/WPrefs.app/Makefile.in @@ -77,6 +77,7 @@ LITE = @LITE@ LN_S = @LN_S@ MAKEINFO = @MAKEINFO@ MOFILES = @MOFILES@ +NETLIBS = @NETLIBS@ NLSDIR = @NLSDIR@ NM = @NM@ OBJDUMP = @OBJDUMP@ @@ -88,7 +89,6 @@ XCFLAGS = @XCFLAGS@ XGETTEXT = @XGETTEXT@ XLFLAGS = @XLFLAGS@ XLIBS = @XLIBS@ -XTRALIBS = @XTRALIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBRARY_PATH = @X_LIBRARY_PATH@ wprefsdir = @wprefsdir@ diff --git a/WPrefs.app/po/Makefile.in b/WPrefs.app/po/Makefile.in index 09fd078e..742112e6 100644 --- a/WPrefs.app/po/Makefile.in +++ b/WPrefs.app/po/Makefile.in @@ -77,6 +77,7 @@ LITE = @LITE@ LN_S = @LN_S@ MAKEINFO = @MAKEINFO@ MOFILES = @MOFILES@ +NETLIBS = @NETLIBS@ NLSDIR = @NLSDIR@ NM = @NM@ OBJDUMP = @OBJDUMP@ @@ -88,7 +89,6 @@ XCFLAGS = @XCFLAGS@ XGETTEXT = @XGETTEXT@ XLFLAGS = @XLFLAGS@ XLIBS = @XLIBS@ -XTRALIBS = @XTRALIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBRARY_PATH = @X_LIBRARY_PATH@ wprefsdir = @wprefsdir@ diff --git a/WPrefs.app/tiff/Makefile.in b/WPrefs.app/tiff/Makefile.in index e53d7690..dc456409 100644 --- a/WPrefs.app/tiff/Makefile.in +++ b/WPrefs.app/tiff/Makefile.in @@ -77,6 +77,7 @@ LITE = @LITE@ LN_S = @LN_S@ MAKEINFO = @MAKEINFO@ MOFILES = @MOFILES@ +NETLIBS = @NETLIBS@ NLSDIR = @NLSDIR@ NM = @NM@ OBJDUMP = @OBJDUMP@ @@ -88,7 +89,6 @@ XCFLAGS = @XCFLAGS@ XGETTEXT = @XGETTEXT@ XLFLAGS = @XLFLAGS@ XLIBS = @XLIBS@ -XTRALIBS = @XTRALIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBRARY_PATH = @X_LIBRARY_PATH@ wprefsdir = @wprefsdir@ diff --git a/WPrefs.app/xpm/Makefile.in b/WPrefs.app/xpm/Makefile.in index 552c8f2e..b71ed514 100644 --- a/WPrefs.app/xpm/Makefile.in +++ b/WPrefs.app/xpm/Makefile.in @@ -77,6 +77,7 @@ LITE = @LITE@ LN_S = @LN_S@ MAKEINFO = @MAKEINFO@ MOFILES = @MOFILES@ +NETLIBS = @NETLIBS@ NLSDIR = @NLSDIR@ NM = @NM@ OBJDUMP = @OBJDUMP@ @@ -88,7 +89,6 @@ XCFLAGS = @XCFLAGS@ XGETTEXT = @XGETTEXT@ XLFLAGS = @XLFLAGS@ XLIBS = @XLIBS@ -XTRALIBS = @XTRALIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBRARY_PATH = @X_LIBRARY_PATH@ wprefsdir = @wprefsdir@ diff --git a/WindowMaker/Backgrounds/Makefile.in b/WindowMaker/Backgrounds/Makefile.in index 6dcf7957..e4cadf8f 100755 --- a/WindowMaker/Backgrounds/Makefile.in +++ b/WindowMaker/Backgrounds/Makefile.in @@ -77,6 +77,7 @@ LITE = @LITE@ LN_S = @LN_S@ MAKEINFO = @MAKEINFO@ MOFILES = @MOFILES@ +NETLIBS = @NETLIBS@ NLSDIR = @NLSDIR@ NM = @NM@ OBJDUMP = @OBJDUMP@ @@ -88,7 +89,6 @@ XCFLAGS = @XCFLAGS@ XGETTEXT = @XGETTEXT@ XLFLAGS = @XLFLAGS@ XLIBS = @XLIBS@ -XTRALIBS = @XTRALIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBRARY_PATH = @X_LIBRARY_PATH@ wprefsdir = @wprefsdir@ diff --git a/WindowMaker/Defaults/Makefile.in b/WindowMaker/Defaults/Makefile.in index 283440fa..d963884b 100755 --- a/WindowMaker/Defaults/Makefile.in +++ b/WindowMaker/Defaults/Makefile.in @@ -77,6 +77,7 @@ LITE = @LITE@ LN_S = @LN_S@ MAKEINFO = @MAKEINFO@ MOFILES = @MOFILES@ +NETLIBS = @NETLIBS@ NLSDIR = @NLSDIR@ NM = @NM@ OBJDUMP = @OBJDUMP@ @@ -88,7 +89,6 @@ XCFLAGS = @XCFLAGS@ XGETTEXT = @XGETTEXT@ XLFLAGS = @XLFLAGS@ XLIBS = @XLIBS@ -XTRALIBS = @XTRALIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBRARY_PATH = @X_LIBRARY_PATH@ wprefsdir = @wprefsdir@ diff --git a/WindowMaker/IconSets/Makefile.in b/WindowMaker/IconSets/Makefile.in index 7f65366b..dfaa6cd1 100755 --- a/WindowMaker/IconSets/Makefile.in +++ b/WindowMaker/IconSets/Makefile.in @@ -77,6 +77,7 @@ LITE = @LITE@ LN_S = @LN_S@ MAKEINFO = @MAKEINFO@ MOFILES = @MOFILES@ +NETLIBS = @NETLIBS@ NLSDIR = @NLSDIR@ NM = @NM@ OBJDUMP = @OBJDUMP@ @@ -88,7 +89,6 @@ XCFLAGS = @XCFLAGS@ XGETTEXT = @XGETTEXT@ XLFLAGS = @XLFLAGS@ XLIBS = @XLIBS@ -XTRALIBS = @XTRALIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBRARY_PATH = @X_LIBRARY_PATH@ wprefsdir = @wprefsdir@ diff --git a/WindowMaker/Icons/Makefile.in b/WindowMaker/Icons/Makefile.in index b97127dc..70753477 100755 --- a/WindowMaker/Icons/Makefile.in +++ b/WindowMaker/Icons/Makefile.in @@ -77,6 +77,7 @@ LITE = @LITE@ LN_S = @LN_S@ MAKEINFO = @MAKEINFO@ MOFILES = @MOFILES@ +NETLIBS = @NETLIBS@ NLSDIR = @NLSDIR@ NM = @NM@ OBJDUMP = @OBJDUMP@ @@ -88,7 +89,6 @@ XCFLAGS = @XCFLAGS@ XGETTEXT = @XGETTEXT@ XLFLAGS = @XLFLAGS@ XLIBS = @XLIBS@ -XTRALIBS = @XTRALIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBRARY_PATH = @X_LIBRARY_PATH@ wprefsdir = @wprefsdir@ diff --git a/WindowMaker/Makefile.in b/WindowMaker/Makefile.in index a335f937..04911d3e 100755 --- a/WindowMaker/Makefile.in +++ b/WindowMaker/Makefile.in @@ -77,6 +77,7 @@ LITE = @LITE@ LN_S = @LN_S@ MAKEINFO = @MAKEINFO@ MOFILES = @MOFILES@ +NETLIBS = @NETLIBS@ NLSDIR = @NLSDIR@ NM = @NM@ OBJDUMP = @OBJDUMP@ @@ -88,7 +89,6 @@ XCFLAGS = @XCFLAGS@ XGETTEXT = @XGETTEXT@ XLFLAGS = @XLFLAGS@ XLIBS = @XLIBS@ -XTRALIBS = @XTRALIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBRARY_PATH = @X_LIBRARY_PATH@ wprefsdir = @wprefsdir@ diff --git a/WindowMaker/Pixmaps/Makefile.in b/WindowMaker/Pixmaps/Makefile.in index 118cce0f..fd7b5b2e 100755 --- a/WindowMaker/Pixmaps/Makefile.in +++ b/WindowMaker/Pixmaps/Makefile.in @@ -77,6 +77,7 @@ LITE = @LITE@ LN_S = @LN_S@ MAKEINFO = @MAKEINFO@ MOFILES = @MOFILES@ +NETLIBS = @NETLIBS@ NLSDIR = @NLSDIR@ NM = @NM@ OBJDUMP = @OBJDUMP@ @@ -88,7 +89,6 @@ XCFLAGS = @XCFLAGS@ XGETTEXT = @XGETTEXT@ XLFLAGS = @XLFLAGS@ XLIBS = @XLIBS@ -XTRALIBS = @XTRALIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBRARY_PATH = @X_LIBRARY_PATH@ wprefsdir = @wprefsdir@ diff --git a/WindowMaker/Styles/Makefile.in b/WindowMaker/Styles/Makefile.in index f2835f79..98884c0b 100755 --- a/WindowMaker/Styles/Makefile.in +++ b/WindowMaker/Styles/Makefile.in @@ -77,6 +77,7 @@ LITE = @LITE@ LN_S = @LN_S@ MAKEINFO = @MAKEINFO@ MOFILES = @MOFILES@ +NETLIBS = @NETLIBS@ NLSDIR = @NLSDIR@ NM = @NM@ OBJDUMP = @OBJDUMP@ @@ -88,7 +89,6 @@ XCFLAGS = @XCFLAGS@ XGETTEXT = @XGETTEXT@ XLFLAGS = @XLFLAGS@ XLIBS = @XLIBS@ -XTRALIBS = @XTRALIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBRARY_PATH = @X_LIBRARY_PATH@ wprefsdir = @wprefsdir@ diff --git a/WindowMaker/Themes/Makefile.in b/WindowMaker/Themes/Makefile.in index 4a803872..ba05febe 100755 --- a/WindowMaker/Themes/Makefile.in +++ b/WindowMaker/Themes/Makefile.in @@ -77,6 +77,7 @@ LITE = @LITE@ LN_S = @LN_S@ MAKEINFO = @MAKEINFO@ MOFILES = @MOFILES@ +NETLIBS = @NETLIBS@ NLSDIR = @NLSDIR@ NM = @NM@ OBJDUMP = @OBJDUMP@ @@ -88,7 +89,6 @@ XCFLAGS = @XCFLAGS@ XGETTEXT = @XGETTEXT@ XLFLAGS = @XLFLAGS@ XLIBS = @XLIBS@ -XTRALIBS = @XTRALIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBRARY_PATH = @X_LIBRARY_PATH@ wprefsdir = @wprefsdir@ diff --git a/acconfig.h b/acconfig.h index edc59ef9..e252a323 100644 --- a/acconfig.h +++ b/acconfig.h @@ -81,3 +81,6 @@ /* define if you want user defined menus for applications */ #undef USER_MENU + +/* define if you have inet_aton */ +#undef HAVE_INET_ATON diff --git a/configure b/configure index efc92002..c5193f50 100755 --- a/configure +++ b/configure @@ -2328,7 +2328,7 @@ EOF fi -for ac_func in gethostname select poll strerror strncasecmp setpgid atexit inet_aton +for ac_func in gethostname select poll strerror strncasecmp setpgid atexit do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo "configure:2335: checking for $ac_func" >&5 @@ -3189,7 +3189,7 @@ fi -XTRALIBS="" +NETLIBS="" echo $ac_n "checking for connect""... $ac_c" 1>&6 echo "configure:3196: checking for connect" >&5 @@ -3237,24 +3237,24 @@ if eval "test \"`echo '$ac_cv_func_'connect`\" = yes"; then : else echo "$ac_t""no" 1>&6 -echo $ac_n "checking for socket in -lconnect""... $ac_c" 1>&6 -echo "configure:3242: checking for socket in -lconnect" >&5 -ac_lib_var=`echo connect'_'socket | sed 'y%./+-%__p_%'` +echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 +echo "configure:3242: 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 else ac_save_LIBS="$LIBS" -LIBS="-lconnect $LIBS" +LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then @@ -3326,24 +3326,24 @@ if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then : else echo "$ac_t""no" 1>&6 -echo $ac_n "checking for nsl in -lgethostbyname""... $ac_c" 1>&6 -echo "configure:3331: checking for nsl in -lgethostbyname" >&5 -ac_lib_var=`echo gethostbyname'_'nsl | sed 'y%./+-%__p_%'` +echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 +echo "configure:3331: checking for gethostbyname in -lnsl" >&5 +ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lgethostbyname $LIBS" +LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then @@ -3369,6 +3369,70 @@ fi fi +save_LIBS=$LIBS +LIBS="$LIBS $NETLIBS -lresolv" +for ac_func in inet_aton +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:3378: 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:3406: \"$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_inet_aton = yes; then + NETLIBS="$NETLIBS -lresolv" +fi + +LIBS=$save_LIBS + + @@ -3378,7 +3442,7 @@ fi # 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:3382: checking for X" >&5 +echo "configure:3446: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -3440,12 +3504,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:3449: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3513: \"$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* @@ -3514,14 +3578,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:3589: \"$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. @@ -3627,17 +3691,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:3631: checking whether -R must be followed by a space" >&5 +echo "configure:3695: 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:3705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -3653,14 +3717,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:3728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -3692,7 +3756,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:3696: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:3760: 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 @@ -3700,7 +3764,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:3779: \"$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 @@ -3733,7 +3797,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:3737: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:3801: 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 @@ -3741,7 +3805,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:3820: \"$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 @@ -3781,12 +3845,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:3785: checking for gethostbyname" >&5 +echo "configure:3849: 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:3877: \"$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 @@ -3830,7 +3894,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:3834: checking for gethostbyname in -lnsl" >&5 +echo "configure:3898: 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 @@ -3838,7 +3902,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:3917: \"$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 @@ -3879,12 +3943,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:3883: checking for connect" >&5 +echo "configure:3947: 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:3975: \"$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 @@ -3928,7 +3992,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:3932: checking for connect in -lsocket" >&5 +echo "configure:3996: 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 @@ -3936,7 +4000,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:4015: \"$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 @@ -3971,12 +4035,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:3975: checking for remove" >&5 +echo "configure:4039: 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:4067: \"$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 @@ -4020,7 +4084,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:4024: checking for remove in -lposix" >&5 +echo "configure:4088: 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 @@ -4028,7 +4092,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:4107: \"$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 @@ -4063,12 +4127,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:4067: checking for shmat" >&5 +echo "configure:4131: 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:4159: \"$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 @@ -4112,7 +4176,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:4116: checking for shmat in -lipc" >&5 +echo "configure:4180: 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 @@ -4120,7 +4184,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:4199: \"$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 @@ -4164,7 +4228,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:4168: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:4232: 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 @@ -4172,7 +4236,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:4251: \"$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 @@ -4241,7 +4305,7 @@ fi if test "$use_locale" = yes; then echo $ac_n "checking for _Xsetlocale in -lX11""... $ac_c" 1>&6 -echo "configure:4245: checking for _Xsetlocale in -lX11" >&5 +echo "configure:4309: checking for _Xsetlocale in -lX11" >&5 ac_lib_var=`echo X11'_'_Xsetlocale | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4249,7 +4313,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lX11 $XLFLAGS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4328: \"$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 @@ -4312,7 +4376,7 @@ added_xext=no if test "$shape" = yes; then echo $ac_n "checking for XShapeSelectInput in -lXext""... $ac_c" 1>&6 -echo "configure:4316: checking for XShapeSelectInput in -lXext" >&5 +echo "configure:4380: checking for XShapeSelectInput in -lXext" >&5 ac_lib_var=`echo Xext'_'XShapeSelectInput | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4320,7 +4384,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXext $XLFLAGS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4399: \"$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 @@ -4372,7 +4436,7 @@ fi if test "$shm" = yes; then echo $ac_n "checking for XShmAttach in -lXext""... $ac_c" 1>&6 -echo "configure:4376: checking for XShmAttach in -lXext" >&5 +echo "configure:4440: checking for XShmAttach in -lXext" >&5 ac_lib_var=`echo Xext'_'XShmAttach | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4380,7 +4444,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXext $XLFLAGS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4459: \"$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 @@ -4415,12 +4479,12 @@ fi if test "$ok" = yes; then echo $ac_n "checking for shmget""... $ac_c" 1>&6 -echo "configure:4419: checking for shmget" >&5 +echo "configure:4483: checking for shmget" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmget'+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:4511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmget=yes" else @@ -4492,7 +4556,7 @@ LIBPL="" LDFLAGS_old="$LDFLAGS" LDFLAGS="$LDFLAGS $lib_search_path" echo $ac_n "checking for PLGetString in -lPropList""... $ac_c" 1>&6 -echo "configure:4496: checking for PLGetString in -lPropList" >&5 +echo "configure:4560: checking for PLGetString in -lPropList" >&5 ac_lib_var=`echo PropList'_'PLGetString | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4500,7 +4564,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lPropList $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4579: \"$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 @@ -4540,17 +4604,17 @@ CPPFLAGS_old="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $inc_search_path" ac_safe=`echo "proplist.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for proplist.h""... $ac_c" 1>&6 -echo "configure:4544: checking for proplist.h" >&5 +echo "configure:4608: checking for proplist.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:4554: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4618: \"$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* @@ -4622,7 +4686,7 @@ if test "$xpm" = yes; then LDFLAGS_old="$LDFLAGS" LDFLAGS="$LDFLAGS $lib_search_path" echo $ac_n "checking for XpmCreatePixmapFromData in -lXpm""... $ac_c" 1>&6 -echo "configure:4626: checking for XpmCreatePixmapFromData in -lXpm" >&5 +echo "configure:4690: checking for XpmCreatePixmapFromData in -lXpm" >&5 ac_lib_var=`echo Xpm'_'XpmCreatePixmapFromData | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4630,7 +4694,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXpm $XLFLAGS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4709: \"$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 @@ -4671,17 +4735,17 @@ CPPFLAGS_old="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $inc_search_path" ac_safe=`echo "X11/xpm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/xpm.h""... $ac_c" 1>&6 -echo "configure:4675: checking for X11/xpm.h" >&5 +echo "configure:4739: checking for X11/xpm.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:4685: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4749: \"$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* @@ -4743,7 +4807,7 @@ if test "$png" = yes ; then LDFLAGS_old="$LDFLAGS" LDFLAGS="$LDFLAGS $lib_search_path" echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6 -echo "configure:4747: checking for png_get_valid in -lpng" >&5 +echo "configure:4811: checking for png_get_valid in -lpng" >&5 ac_lib_var=`echo png'_'png_get_valid | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4751,7 +4815,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpng -lz -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4830: \"$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 @@ -4792,17 +4856,17 @@ CPPFLAGS_old="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $inc_search_path" ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for png.h""... $ac_c" 1>&6 -echo "configure:4796: checking for png.h" >&5 +echo "configure:4860: 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 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4806: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4870: \"$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* @@ -4853,7 +4917,7 @@ if test "$jpeg" = yes; then LDFLAGS_old="$LDFLAGS" LDFLAGS="$LDFLAGS $lib_search_path" echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6 -echo "configure:4857: checking for jpeg_destroy_compress in -ljpeg" >&5 +echo "configure:4921: checking for jpeg_destroy_compress in -ljpeg" >&5 ac_lib_var=`echo jpeg'_'jpeg_destroy_compress | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4861,7 +4925,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ljpeg $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4940: \"$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 @@ -4905,17 +4969,17 @@ CPPFLAGS_old="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $inc_search_path" ac_safe=`echo "jpeglib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6 -echo "configure:4909: checking for jpeglib.h" >&5 +echo "configure:4973: checking for jpeglib.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:4919: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4983: \"$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* @@ -4966,7 +5030,7 @@ if test "$gif" = yes; then LDFLAGS_old="$LDFLAGS" LDFLAGS="$LDFLAGS $lib_search_path" echo $ac_n "checking for DGifOpenFileName in -lungif""... $ac_c" 1>&6 -echo "configure:4970: checking for DGifOpenFileName in -lungif" >&5 +echo "configure:5034: checking for DGifOpenFileName in -lungif" >&5 ac_lib_var=`echo ungif'_'DGifOpenFileName | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4974,7 +5038,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lungif $XLFLAGS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5053: \"$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 @@ -5016,7 +5080,7 @@ LDFLAGS="$LDFLAGS_old" LDFLAGS_old="$LDFLAGS" LDFLAGS="$LDFLAGS $lib_search_path" echo $ac_n "checking for DGifOpenFileName in -lgif""... $ac_c" 1>&6 -echo "configure:5020: checking for DGifOpenFileName in -lgif" >&5 +echo "configure:5084: checking for DGifOpenFileName in -lgif" >&5 ac_lib_var=`echo gif'_'DGifOpenFileName | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5024,7 +5088,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgif $XLFLAGS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5103: \"$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 @@ -5069,17 +5133,17 @@ CPPFLAGS_old="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $inc_search_path" ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6 -echo "configure:5073: checking for gif_lib.h" >&5 +echo "configure:5137: checking for gif_lib.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:5083: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5147: \"$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* @@ -5140,7 +5204,7 @@ if test "$tif" = yes; then LDFLAGS_old="$LDFLAGS" LDFLAGS="$LDFLAGS $lib_search_path" echo $ac_n "checking for TIFFGetVersion in -ltiff""... $ac_c" 1>&6 -echo "configure:5144: checking for TIFFGetVersion in -ltiff" >&5 +echo "configure:5208: checking for TIFFGetVersion in -ltiff" >&5 ac_lib_var=`echo tiff'_'TIFFGetVersion | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5148,7 +5212,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltiff -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5227: \"$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 @@ -5191,7 +5255,7 @@ LDFLAGS="$LDFLAGS_old" LDFLAGS_old="$LDFLAGS" LDFLAGS="$LDFLAGS $lib_search_path" echo $ac_n "checking for TIFFGetVersion in -ltiff""... $ac_c" 1>&6 -echo "configure:5195: checking for TIFFGetVersion in -ltiff" >&5 +echo "configure:5259: checking for TIFFGetVersion in -ltiff" >&5 ac_lib_var=`echo tiff'_'TIFFGetVersion | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5199,7 +5263,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltiff $ljpeg -lz -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5278: \"$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 @@ -5243,7 +5307,7 @@ LDFLAGS="$LDFLAGS_old" LDFLAGS_old="$LDFLAGS" LDFLAGS="$LDFLAGS $lib_search_path" echo $ac_n "checking for TIFFGetVersion in -ltiff34""... $ac_c" 1>&6 -echo "configure:5247: checking for TIFFGetVersion in -ltiff34" >&5 +echo "configure:5311: checking for TIFFGetVersion in -ltiff34" >&5 ac_lib_var=`echo tiff34'_'TIFFGetVersion | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5251,7 +5315,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltiff34 $ljpeg -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5330: \"$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 @@ -5297,17 +5361,17 @@ CPPFLAGS_old="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $inc_search_path" ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6 -echo "configure:5301: checking for tiffio.h" >&5 +echo "configure:5365: checking for tiffio.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:5311: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5375: \"$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* diff --git a/configure.in b/configure.in index ba051399..cf14526a 100644 --- a/configure.in +++ b/configure.in @@ -98,7 +98,7 @@ dnl not used anywhere dnl AC_FUNC_MEMCMP AC_FUNC_VPRINTF AC_FUNC_ALLOCA -AC_CHECK_FUNCS(gethostname select poll strerror strncasecmp setpgid atexit inet_aton) +AC_CHECK_FUNCS(gethostname select poll strerror strncasecmp setpgid atexit) @@ -327,13 +327,23 @@ dnl dnl Networking stuff for Sysv dnl -XTRALIBS="" +NETLIBS="" AC_CHECK_FUNC(connect,, - AC_CHECK_LIB(connect, socket, NETLIBS="$NETLIBS -lsocket",)) + AC_CHECK_LIB(socket, connect, NETLIBS="$NETLIBS -lsocket",)) AC_CHECK_FUNC(gethostbyname,, - AC_CHECK_LIB(gethostbyname, nsl, NETLIBS="$NETLIBS -lnsl",)) + AC_CHECK_LIB(nsl, gethostbyname, NETLIBS="$NETLIBS -lnsl",)) + +save_LIBS=$LIBS +LIBS="$LIBS $NETLIBS -lresolv" +AC_CHECK_FUNCS(inet_aton) +if test $ac_cv_func_inet_aton = yes; then + NETLIBS="$NETLIBS -lresolv" +fi + +LIBS=$save_LIBS + AC_SUBST(NETLIBS) diff --git a/contrib/Makefile.in b/contrib/Makefile.in index 66d402b4..d017063d 100644 --- a/contrib/Makefile.in +++ b/contrib/Makefile.in @@ -77,6 +77,7 @@ LITE = @LITE@ LN_S = @LN_S@ MAKEINFO = @MAKEINFO@ MOFILES = @MOFILES@ +NETLIBS = @NETLIBS@ NLSDIR = @NLSDIR@ NM = @NM@ OBJDUMP = @OBJDUMP@ @@ -88,7 +89,6 @@ XCFLAGS = @XCFLAGS@ XGETTEXT = @XGETTEXT@ XLFLAGS = @XLFLAGS@ XLIBS = @XLIBS@ -XTRALIBS = @XTRALIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBRARY_PATH = @X_LIBRARY_PATH@ wprefsdir = @wprefsdir@ diff --git a/doc/Makefile.in b/doc/Makefile.in index f911d834..bb89f27c 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -77,6 +77,7 @@ LITE = @LITE@ LN_S = @LN_S@ MAKEINFO = @MAKEINFO@ MOFILES = @MOFILES@ +NETLIBS = @NETLIBS@ NLSDIR = @NLSDIR@ NM = @NM@ OBJDUMP = @OBJDUMP@ @@ -88,7 +89,6 @@ XCFLAGS = @XCFLAGS@ XGETTEXT = @XGETTEXT@ XLFLAGS = @XLFLAGS@ XLIBS = @XLIBS@ -XTRALIBS = @XTRALIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBRARY_PATH = @X_LIBRARY_PATH@ wprefsdir = @wprefsdir@ diff --git a/po/Makefile.in b/po/Makefile.in index 941ea8b3..e8026dd4 100644 --- a/po/Makefile.in +++ b/po/Makefile.in @@ -77,6 +77,7 @@ LITE = @LITE@ LN_S = @LN_S@ MAKEINFO = @MAKEINFO@ MOFILES = @MOFILES@ +NETLIBS = @NETLIBS@ NLSDIR = @NLSDIR@ NM = @NM@ OBJDUMP = @OBJDUMP@ @@ -88,7 +89,6 @@ XCFLAGS = @XCFLAGS@ XGETTEXT = @XGETTEXT@ XLFLAGS = @XLFLAGS@ XLIBS = @XLIBS@ -XTRALIBS = @XTRALIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBRARY_PATH = @X_LIBRARY_PATH@ wprefsdir = @wprefsdir@ diff --git a/src/Makefile.in b/src/Makefile.in index d9b65931..27bb382a 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -77,6 +77,7 @@ LITE = @LITE@ LN_S = @LN_S@ MAKEINFO = @MAKEINFO@ MOFILES = @MOFILES@ +NETLIBS = @NETLIBS@ NLSDIR = @NLSDIR@ NM = @NM@ OBJDUMP = @OBJDUMP@ @@ -88,7 +89,6 @@ XCFLAGS = @XCFLAGS@ XGETTEXT = @XGETTEXT@ XLFLAGS = @XLFLAGS@ XLIBS = @XLIBS@ -XTRALIBS = @XTRALIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBRARY_PATH = @X_LIBRARY_PATH@ wprefsdir = @wprefsdir@ diff --git a/test/Makefile.in b/test/Makefile.in index f98ed34f..11499b83 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -77,6 +77,7 @@ LITE = @LITE@ LN_S = @LN_S@ MAKEINFO = @MAKEINFO@ MOFILES = @MOFILES@ +NETLIBS = @NETLIBS@ NLSDIR = @NLSDIR@ NM = @NM@ OBJDUMP = @OBJDUMP@ @@ -88,7 +89,6 @@ XCFLAGS = @XCFLAGS@ XGETTEXT = @XGETTEXT@ XLFLAGS = @XLFLAGS@ XLIBS = @XLIBS@ -XTRALIBS = @XTRALIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBRARY_PATH = @X_LIBRARY_PATH@ wprefsdir = @wprefsdir@ diff --git a/util/Makefile.in b/util/Makefile.in index d0c384c1..72ee96bc 100644 --- a/util/Makefile.in +++ b/util/Makefile.in @@ -75,6 +75,7 @@ LITE = @LITE@ LN_S = @LN_S@ MAKEINFO = @MAKEINFO@ MOFILES = @MOFILES@ +NETLIBS = @NETLIBS@ NLSDIR = @NLSDIR@ NM = @NM@ OBJDUMP = @OBJDUMP@ @@ -86,7 +87,6 @@ XCFLAGS = @XCFLAGS@ XGETTEXT = @XGETTEXT@ XLFLAGS = @XLFLAGS@ XLIBS = @XLIBS@ -XTRALIBS = @XTRALIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBRARY_PATH = @X_LIBRARY_PATH@ wprefsdir = @wprefsdir@ diff --git a/wmlib/Makefile.in b/wmlib/Makefile.in index 606b923b..9b6c0c21 100644 --- a/wmlib/Makefile.in +++ b/wmlib/Makefile.in @@ -77,6 +77,7 @@ LITE = @LITE@ LN_S = @LN_S@ MAKEINFO = @MAKEINFO@ MOFILES = @MOFILES@ +NETLIBS = @NETLIBS@ NLSDIR = @NLSDIR@ NM = @NM@ OBJDUMP = @OBJDUMP@ @@ -88,7 +89,6 @@ XCFLAGS = @XCFLAGS@ XGETTEXT = @XGETTEXT@ XLFLAGS = @XLFLAGS@ XLIBS = @XLIBS@ -XTRALIBS = @XTRALIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBRARY_PATH = @X_LIBRARY_PATH@ wprefsdir = @wprefsdir@ diff --git a/wrlib/Makefile.in b/wrlib/Makefile.in index a7b0fa1b..d6cec636 100644 --- a/wrlib/Makefile.in +++ b/wrlib/Makefile.in @@ -77,6 +77,7 @@ LITE = @LITE@ LN_S = @LN_S@ MAKEINFO = @MAKEINFO@ MOFILES = @MOFILES@ +NETLIBS = @NETLIBS@ NLSDIR = @NLSDIR@ NM = @NM@ OBJDUMP = @OBJDUMP@ @@ -88,7 +89,6 @@ XCFLAGS = @XCFLAGS@ XGETTEXT = @XGETTEXT@ XLFLAGS = @XLFLAGS@ XLIBS = @XLIBS@ -XTRALIBS = @XTRALIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBRARY_PATH = @X_LIBRARY_PATH@ wprefsdir = @wprefsdir@