diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | Makefile.in | 3 | ||||
| -rw-r--r-- | acinclude.m4 | 10 | ||||
| -rw-r--r-- | aclocal.m4 | 10 | ||||
| -rwxr-xr-x | configure | 302 | ||||
| -rw-r--r-- | configure.in | 3 |
6 files changed, 175 insertions, 163 deletions
@@ -1,3 +1,11 @@ +2003-04-05 ABE Yuji <cbo46560@pop12.odn.ne.jp> + + * [w3m-dev 03838] W3M_LIBS splitted from LIBS + * Makefile.in (W3M_LIBS): added + * acinclude.m4 (AC_W3M_TERMLIB): use W3M_LIB + (AC_W3M_SSL): ditto + * configure.in (W3M_LIBS): added + 2003-04-04 Hiroyuki Ito <hito@crl.go.jp> * [w3m-dev 03837] Re: gif animation with no delay_time @@ -7637,4 +7645,4 @@ a * [w3m-dev 03276] compile error on EWS4800 * release-0-2-1 * import w3m-0.2.1 -$Id: ChangeLog,v 1.809 2003/04/03 16:35:42 ukai Exp $ +$Id: ChangeLog,v 1.810 2003/04/04 16:00:09 ukai Exp $ diff --git a/Makefile.in b/Makefile.in index 111a92c..dc35b2f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -36,6 +36,7 @@ DEFS = @DEFS@ -I. -I$(top_srcdir) -DAUXBIN_DIR=\"$(AUXBIN_DIR)\" \ -DETC_DIR=\"$(sysconfdir)\" -DRC_DIR=\"$(RC_DIR)\" LDFLAGS = @LDFLAGS@ LIBS = -L. -lindep @LIBS@ +W3M_LIBS = @W3M_LIBS@ MAKE_ARGS = PERL='$(PERL)' MKDIR='$(MKDIR)' INSTALL='$(INSTALL)' \ BIN_DIR='$(bindir)' AUXBIN_DIR='$(AUXBIN_DIR)' \ @@ -107,7 +108,7 @@ SUBDIRS = $(SCRIPTSUBDIRS) all: $(TARGETS) all-scripts $(TARGET): $(ALLOBJS) $(ALIB) - $(CC) $(CFLAGS) -o $(TARGET) $(ALLOBJS) $(LDFLAGS) $(LIBS) + $(CC) $(CFLAGS) -o $(TARGET) $(ALLOBJS) $(LDFLAGS) $(LIBS) $(W3M_LIBS) $(ALIB): $(ALIBOBJS) $(AR) rv $(ALIB) $(ALIBOBJS) diff --git a/acinclude.m4 b/acinclude.m4 index 56d9700..661eaf3 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -336,7 +336,7 @@ AC_ARG_WITH(termlib, AC_MSG_RESULT($with_termlib) test x"$with_termlib" = xyes && with_termlib="terminfo mytinfo termlib termcap ncurses curses" for lib in $with_termlib; do - AC_CHECK_LIB($lib, tgetent, [LIBS="$LIBS -l$lib"; break]) + AC_CHECK_LIB($lib, tgetent, [W3M_LIBS="$W3M_LIBS -l$lib"; break]) done ]) # @@ -420,11 +420,11 @@ if test x"$with_ssl" != xno; then CFLAGS="$CFLAGS -I$dir/include" fi if test "$dir" != "/usr" -a -f "$dir/lib/libssl.a"; then - LIBS="$LIBS -L$dir/lib" + W3M_LIBS="$W3M_LIBS -L$dir/lib" fi done AC_CHECK_LIB(ssl, SSL_new, - [w3m_ssl="found"; LIBS="$LIBS -lssl -lcrypto"], + [w3m_ssl="found"; W3M_LIBS="$W3M_LIBS -lssl -lcrypto"], [w3m_ssl="not found"], [-lcrypto]) @@ -634,11 +634,11 @@ if test x"$enable_ipv6" = xyes; then do if test -f $dir/libinet6.a; then if test $dir != "/usr/lib"; then - LIBS="$LIBS -L$dir" + W3M_LIBS="$W3M_LIBS -L$dir" fi AC_CHECK_LIB(inet6, getaddrinfo, [enable_ipv6="yes"; AC_DEFINE(INET6) - use_libinet6="found"; LIBS="$LIBS -linet6"; break], + use_libinet6="found"; W3M_LIBS="$W3M_LIBS -linet6"; break], [use_libinet6="not found"]) fi done @@ -348,7 +348,7 @@ AC_ARG_WITH(termlib, AC_MSG_RESULT($with_termlib) test x"$with_termlib" = xyes && with_termlib="terminfo mytinfo termlib termcap ncurses curses" for lib in $with_termlib; do - AC_CHECK_LIB($lib, tgetent, [LIBS="$LIBS -l$lib"; break]) + AC_CHECK_LIB($lib, tgetent, [W3M_LIBS="$W3M_LIBS -l$lib"; break]) done ]) # @@ -432,11 +432,11 @@ if test x"$with_ssl" != xno; then CFLAGS="$CFLAGS -I$dir/include" fi if test "$dir" != "/usr" -a -f "$dir/lib/libssl.a"; then - LIBS="$LIBS -L$dir/lib" + W3M_LIBS="$W3M_LIBS -L$dir/lib" fi done AC_CHECK_LIB(ssl, SSL_new, - [w3m_ssl="found"; LIBS="$LIBS -lssl -lcrypto"], + [w3m_ssl="found"; W3M_LIBS="$W3M_LIBS -lssl -lcrypto"], [w3m_ssl="not found"], [-lcrypto]) @@ -646,11 +646,11 @@ if test x"$enable_ipv6" = xyes; then do if test -f $dir/libinet6.a; then if test $dir != "/usr/lib"; then - LIBS="$LIBS -L$dir" + W3M_LIBS="$W3M_LIBS -L$dir" fi AC_CHECK_LIB(inet6, getaddrinfo, [enable_ipv6="yes"; AC_DEFINE(INET6) - use_libinet6="found"; LIBS="$LIBS -linet6"; break], + use_libinet6="found"; W3M_LIBS="$W3M_LIBS -linet6"; break], [use_libinet6="not found"]) fi done @@ -1310,6 +1310,7 @@ ac_exeext=$EXEEXT + W3M_TARGET=$target cat >> confdefs.h <<EOF #define W3M_TARGET $W3M_TARGET @@ -1320,7 +1321,7 @@ EOF echo $ac_n "checking if japanese support is enabled""... $ac_c" 1>&6 -echo "configure:1324: checking if japanese support is enabled" >&5 +echo "configure:1325: checking if japanese support is enabled" >&5 # Check whether --enable-japanese or --disable-japanese was given. if test "${enable_japanese+set}" = set; then enableval="$enable_japanese" @@ -1379,7 +1380,7 @@ EOF if test x"$enable_japanese" != xno; then echo $ac_n "checking if kanji symbols is used""... $ac_c" 1>&6 -echo "configure:1383: checking if kanji symbols is used" >&5 +echo "configure:1384: checking if kanji symbols is used" >&5 # Check whether --enable-kanjisymbols or --disable-kanjisymbols was given. if test "${enable_kanjisymbols+set}" = set; then enableval="$enable_kanjisymbols" @@ -1397,7 +1398,7 @@ fi echo $ac_n "checking if color escape sequence for kterm/pxvt is enabled""... $ac_c" 1>&6 -echo "configure:1401: checking if color escape sequence for kterm/pxvt is enabled" >&5 +echo "configure:1402: checking if color escape sequence for kterm/pxvt is enabled" >&5 # Check whether --enable-color or --disable-color was given. if test "${enable_color+set}" = set; then enableval="$enable_color" @@ -1413,7 +1414,7 @@ EOF echo "$ac_t""$enable_color" 1>&6 echo $ac_n "checking if ansi color escape sequence support is enabled""... $ac_c" 1>&6 -echo "configure:1417: checking if ansi color escape sequence support is enabled" >&5 +echo "configure:1418: checking if ansi color escape sequence support is enabled" >&5 # Check whether --enable-ansi_color or --disable-ansi_color was given. if test "${enable_ansi_color+set}" = set; then enableval="$enable_ansi_color" @@ -1429,7 +1430,7 @@ EOF echo "$ac_t""$enable_ansi_color" 1>&6 echo $ac_n "checking if background color support is enabled""... $ac_c" 1>&6 -echo "configure:1433: checking if background color support is enabled" >&5 +echo "configure:1434: checking if background color support is enabled" >&5 # Check whether --enable-bgcolor or --disable-bgcolor was given. if test "${enable_bgcolor+set}" = set; then enableval="$enable_bgcolor" @@ -1448,7 +1449,7 @@ echo "$ac_t""$enable_bgcolor" 1>&6 migemo_command="migemo -t egrep /usr/local/share/migemo/migemo-dict" echo $ac_n "checking if migemo is supported with""... $ac_c" 1>&6 -echo "configure:1452: checking if migemo is supported with" >&5 +echo "configure:1453: checking if migemo is supported with" >&5 # Check whether --with-migemo or --without-migemo was given. if test "${with_migemo+set}" = set; then withval="$with_migemo" @@ -1469,7 +1470,7 @@ EOF echo $ac_n "checking if mouse operation enabled""... $ac_c" 1>&6 -echo "configure:1473: checking if mouse operation enabled" >&5 +echo "configure:1474: checking if mouse operation enabled" >&5 # Check whether --enable-mouse or --disable-mouse was given. if test "${enable_mouse+set}" = set; then enableval="$enable_mouse" @@ -1486,7 +1487,7 @@ echo "$ac_t""$enable_mouse" 1>&6 echo $ac_n "checking if popup menu is enabled""... $ac_c" 1>&6 -echo "configure:1490: checking if popup menu is enabled" >&5 +echo "configure:1491: checking if popup menu is enabled" >&5 # Check whether --enable-menu or --disable-menu was given. if test "${enable_menu+set}" = set; then enableval="$enable_menu" @@ -1502,7 +1503,7 @@ EOF echo "$ac_t""$enable_menu" 1>&6 echo $ac_n "checking if cookie is enabled""... $ac_c" 1>&6 -echo "configure:1506: checking if cookie is enabled" >&5 +echo "configure:1507: checking if cookie is enabled" >&5 # Check whether --enable-cookie or --disable-cookie was given. if test "${enable_cookie+set}" = set; then enableval="$enable_cookie" @@ -1518,7 +1519,7 @@ EOF echo "$ac_t""$enable_cookie" 1>&6 echo $ac_n "checking if dictionary lookup is enabled""... $ac_c" 1>&6 -echo "configure:1522: checking if dictionary lookup is enabled" >&5 +echo "configure:1523: checking if dictionary lookup is enabled" >&5 # Check whether --enable-dict or --disable-dict was given. if test "${enable_dict+set}" = set; then enableval="$enable_dict" @@ -1534,7 +1535,7 @@ EOF echo "$ac_t""$enable_dict" 1>&6 echo $ac_n "checking if URL history is enabled""... $ac_c" 1>&6 -echo "configure:1538: checking if URL history is enabled" >&5 +echo "configure:1539: checking if URL history is enabled" >&5 # Check whether --enable-history or --disable-history was given. if test "${enable_history+set}" = set; then enableval="$enable_history" @@ -1550,7 +1551,7 @@ EOF echo "$ac_t""$enable_history" 1>&6 echo $ac_n "checking if digest auth is enabled""... $ac_c" 1>&6 -echo "configure:1554: checking if digest auth is enabled" >&5 +echo "configure:1555: checking if digest auth is enabled" >&5 # Check whether --enable-digest_auth or --disable-digest_auth was given. if test "${enable_digest_auth+set}" = set; then enableval="$enable_digest_auth" @@ -1566,7 +1567,7 @@ EOF echo "$ac_t""$enable_digest_auth" 1>&6 echo $ac_n "checking if nntp is enabled""... $ac_c" 1>&6 -echo "configure:1570: checking if nntp is enabled" >&5 +echo "configure:1571: checking if nntp is enabled" >&5 # Check whether --enable-nntp or --disable-nntp was given. if test "${enable_nntp+set}" = set; then enableval="$enable_nntp" @@ -1582,7 +1583,7 @@ EOF echo "$ac_t""$enable_nntp" 1>&6 echo $ac_n "checking if gopher is enabled""... $ac_c" 1>&6 -echo "configure:1586: checking if gopher is enabled" >&5 +echo "configure:1587: checking if gopher is enabled" >&5 # Check whether --enable-gopher or --disable-gopher was given. if test "${enable_gopher+set}" = set; then enableval="$enable_gopher" @@ -1599,7 +1600,7 @@ EOF echo $ac_n "checking default keymap""... $ac_c" 1>&6 -echo "configure:1603: checking default keymap" >&5 +echo "configure:1604: checking default keymap" >&5 # Check whether --enable-keymap or --disable-keymap was given. if test "${enable_keymap+set}" = set; then enableval="$enable_keymap" @@ -1632,7 +1633,7 @@ EOF w3m_editor="/usr/bin/vi" echo $ac_n "checking which editor is used by default""... $ac_c" 1>&6 -echo "configure:1636: checking which editor is used by default" >&5 +echo "configure:1637: checking which editor is used by default" >&5 # Check whether --with-editor or --without-editor was given. if test "${with_editor+set}" = set; then withval="$with_editor" @@ -1647,7 +1648,7 @@ EOF w3m_mailer="/usr/bin/mail" echo $ac_n "checking which mailer is used by default""... $ac_c" 1>&6 -echo "configure:1651: checking which mailer is used by default" >&5 +echo "configure:1652: checking which mailer is used by default" >&5 # Check whether --with-mailer or --without-mailer was given. if test "${with_mailer+set}" = set; then withval="$with_mailer" @@ -1662,7 +1663,7 @@ EOF w3m_browser="/usr/bin/mozilla" echo $ac_n "checking which external browser is used by default""... $ac_c" 1>&6 -echo "configure:1666: checking which external browser is used by default" >&5 +echo "configure:1667: checking which external browser is used by default" >&5 # Check whether --with-browser or --without-browser was given. if test "${with_browser+set}" = set; then withval="$with_browser" @@ -1676,7 +1677,7 @@ EOF echo $ac_n "checking if help cgi is enabled""... $ac_c" 1>&6 -echo "configure:1680: checking if help cgi is enabled" >&5 +echo "configure:1681: checking if help cgi is enabled" >&5 # Check whether --enable-help_cgi or --disable-help_cgi was given. if test "${enable_help_cgi+set}" = set; then enableval="$enable_help_cgi" @@ -1692,7 +1693,7 @@ EOF echo "$ac_t""$enable_help_cgi" 1>&6 echo $ac_n "checking if external URI loader is enabled""... $ac_c" 1>&6 -echo "configure:1696: checking if external URI loader is enabled" >&5 +echo "configure:1697: checking if external URI loader is enabled" >&5 # Check whether --enable-external_uri_loader or --disable-external_uri_loader was given. if test "${enable_external_uri_loader+set}" = set; then enableval="$enable_external_uri_loader" @@ -1708,7 +1709,7 @@ EOF echo "$ac_t""$enable_external_uri_loader" 1>&6 echo $ac_n "checking if w3mmail is used""... $ac_c" 1>&6 -echo "configure:1712: checking if w3mmail is used" >&5 +echo "configure:1713: checking if w3mmail is used" >&5 # Check whether --enable-w3mmailer or --disable-w3mmailer was given. if test "${enable_w3mmailer+set}" = set; then enableval="$enable_w3mmailer" @@ -1728,7 +1729,7 @@ for lib in bsd BSD 44bsd socket nsl dld dl do lib=$lib echo $ac_n "checking for -l$lib""... $ac_c" 1>&6 -echo "configure:1732: checking for -l$lib" >&5 +echo "configure:1733: checking for -l$lib" >&5 extlib="not found" for dir in /lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib do @@ -1742,12 +1743,12 @@ echo "configure:1732: checking for -l$lib" >&5 done echo $ac_n "checking for sqrt""... $ac_c" 1>&6 -echo "configure:1746: checking for sqrt" >&5 +echo "configure:1747: checking for sqrt" >&5 if eval "test \"`echo '$''{'ac_cv_func_sqrt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1751 "configure" +#line 1752 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char sqrt(); below. */ @@ -1770,7 +1771,7 @@ sqrt(); ; return 0; } EOF -if { (eval echo configure:1774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_sqrt=yes" else @@ -1788,7 +1789,7 @@ if eval "test \"`echo '$ac_cv_func_'sqrt`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for sqrt in -lm""... $ac_c" 1>&6 -echo "configure:1792: checking for sqrt in -lm" >&5 +echo "configure:1793: checking for sqrt in -lm" >&5 ac_lib_var=`echo m'_'sqrt | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1796,7 +1797,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <<EOF -#line 1800 "configure" +#line 1801 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1807,7 +1808,7 @@ int main() { sqrt() ; return 0; } EOF -if { (eval echo configure:1811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1812: \"$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 @@ -1839,7 +1840,7 @@ fi if test x"$enable_mouse" = xyes; then echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 -echo "configure:1843: checking for Gpm_Open in -lgpm" >&5 +echo "configure:1844: checking for Gpm_Open in -lgpm" >&5 ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1847,7 +1848,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgpm $LIBS" cat > conftest.$ac_ext <<EOF -#line 1851 "configure" +#line 1852 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1858,7 +1859,7 @@ int main() { Gpm_Open() ; return 0; } EOF -if { (eval echo configure:1862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1863: \"$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 @@ -1877,20 +1878,20 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then #define USE_GPM 1 EOF - LIBS="$LIBS -lgpm" + W3M_LIBS="$W3M_LIBS -lgpm" else echo "$ac_t""no" 1>&6 fi cat > conftest.$ac_ext <<EOF -#line 1888 "configure" +#line 1889 "configure" #include "confdefs.h" #include <machine/console.h> MOUSE_GETINFO EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1894: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1895: \"$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* @@ -1907,7 +1908,7 @@ rm -f conftest* fi echo $ac_n "checking if alarm is enabled""... $ac_c" 1>&6 -echo "configure:1911: checking if alarm is enabled" >&5 +echo "configure:1912: checking if alarm is enabled" >&5 # Check whether --enable-alarm or --disable-alarm was given. if test "${enable_alarm+set}" = set; then enableval="$enable_alarm" @@ -1919,7 +1920,7 @@ fi echo "$ac_t""$enable_alarm" 1>&6 if test x"$enable_alarm" = xyes; then cat > conftest.$ac_ext <<EOF -#line 1923 "configure" +#line 1924 "configure" #include "confdefs.h" #include <unistd.h> #include <signal.h> @@ -1928,7 +1929,7 @@ int sa = SIGALRM; void (*a) = alarm; ; return 0; } EOF -if { (eval echo configure:1932: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1933: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define USE_ALARM 1 @@ -1961,7 +1962,7 @@ EOF echo $ac_n "checking if image is enabled""... $ac_c" 1>&6 -echo "configure:1965: checking if image is enabled" >&5 +echo "configure:1966: checking if image is enabled" >&5 # Check whether --enable-image or --disable-image was given. if test "${enable_image+set}" = set; then enableval="$enable_image" @@ -2017,7 +2018,7 @@ EOF version="`$GDKPIXBUF_CONFIG --version 2>/dev/null`" if test x"$version" != x; then echo $ac_n "checking GdkPixbuf version""... $ac_c" 1>&6 -echo "configure:2021: checking GdkPixbuf version" >&5 +echo "configure:2022: checking GdkPixbuf version" >&5 echo "$ac_t""$version" 1>&6 set -- `echo "$version" | sed 's/[^0-9]/ /g'` if test "$1" -ne "0" -o "$2" -lt "16" -o "$3" -lt "0"; then @@ -2026,7 +2027,7 @@ echo "configure:2021: checking GdkPixbuf version" >&5 version="`$IMLIB_CONFIG --version 2>/dev/null`" if test x"$version" != x; then echo $ac_n "checking Imlib version""... $ac_c" 1>&6 -echo "configure:2030: checking Imlib version" >&5 +echo "configure:2031: checking Imlib version" >&5 echo "$ac_t""$version" 1>&6 set -- `echo "$version" | sed 's/[^0-9]/ /g'` if test "$1" -ne "1" -o "$2" -lt "9" -o "$3" -lt "8"; then @@ -2042,7 +2043,7 @@ echo "configure:2030: checking Imlib version" >&5 version="`$IMLIB2_CONFIG --version 2>/dev/null`" if test x"$version" != x; then echo $ac_n "checking Imlib2 version""... $ac_c" 1>&6 -echo "configure:2046: checking Imlib2 version" >&5 +echo "configure:2047: checking Imlib2 version" >&5 echo "$ac_t""$version" 1>&6 set -- `echo "$version" | sed 's/[^0-9]/ /g'` if test "$1" -ne "1" -o "$2" -lt "0" -o "$3" -lt "5"; then @@ -2064,7 +2065,7 @@ echo "configure:2046: checking Imlib2 version" >&5 version="`$IMLIB_CONFIG --version 2>/dev/null`" if test x"$version" != x; then echo $ac_n "checking Imlib version""... $ac_c" 1>&6 -echo "configure:2068: checking Imlib version" >&5 +echo "configure:2069: checking Imlib version" >&5 echo "$ac_t""$version" 1>&6 set -- `echo "$version" | sed 's/[^0-9]/ /g'` if test "$1" -ne "1" -o "$2" -lt "9" -o "$3" -lt "8"; then @@ -2080,7 +2081,7 @@ echo "configure:2068: checking Imlib version" >&5 version="`$IMLIB2_CONFIG --version 2>/dev/null`" if test x"$version" != x; then echo $ac_n "checking Imlib2 version""... $ac_c" 1>&6 -echo "configure:2084: checking Imlib2 version" >&5 +echo "configure:2085: checking Imlib2 version" >&5 echo "$ac_t""$version" 1>&6 set -- `echo "$version" | sed 's/[^0-9]/ /g'` if test "$1" -ne "1" -o "$2" -lt "0" -o "$3" -lt "5"; then @@ -2189,7 +2190,7 @@ if test x"$enable_image" != xno; then AUXBIN_TARGETS="$AUXBIN_TARGETS w3mimgdisplay\$(EXT)" echo $ac_n "checking if xface is enabled""... $ac_c" 1>&6 -echo "configure:2193: checking if xface is enabled" >&5 +echo "configure:2194: checking if xface is enabled" >&5 # Check whether --enable-xface or --disable-xface was given. if test "${enable_xface+set}" = set; then enableval="$enable_xface" @@ -2206,7 +2207,7 @@ EOF # Extract the first word of "uncompface", so it can be a program name with args. set dummy uncompface; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2210: checking for $ac_word" >&5 +echo "configure:2211: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_uncompface'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2237,7 +2238,7 @@ fi fi echo $ac_n "checking terminal library""... $ac_c" 1>&6 -echo "configure:2241: checking terminal library" >&5 +echo "configure:2242: checking terminal library" >&5 # Check whether --with-termlib or --without-termlib was given. if test "${with_termlib+set}" = set; then withval="$with_termlib" @@ -2250,7 +2251,7 @@ fi test x"$with_termlib" = xyes && with_termlib="terminfo mytinfo termlib termcap ncurses curses" for lib in $with_termlib; do echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6 -echo "configure:2254: checking for tgetent in -l$lib" >&5 +echo "configure:2255: checking for tgetent in -l$lib" >&5 ac_lib_var=`echo $lib'_'tgetent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2258,7 +2259,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$lib $LIBS" cat > conftest.$ac_ext <<EOF -#line 2262 "configure" +#line 2263 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2269,7 +2270,7 @@ int main() { tgetent() ; return 0; } EOF -if { (eval echo configure:2273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2274: \"$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 @@ -2284,7 +2285,7 @@ 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 -l$lib"; break + W3M_LIBS="$W3M_LIBS -l$lib"; break else echo "$ac_t""no" 1>&6 fi @@ -2292,7 +2293,7 @@ fi done echo $ac_n "checking GC library exists""... $ac_c" 1>&6 -echo "configure:2296: checking GC library exists" >&5 +echo "configure:2297: checking GC library exists" >&5 # Check whether --with-gc or --without-gc was given. if test "${with_gc+set}" = set; then withval="$with_gc" @@ -2306,17 +2307,17 @@ fi unset ac_cv_header_gc_h ac_safe=`echo "gc.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for gc.h""... $ac_c" 1>&6 -echo "configure:2310: checking for gc.h" >&5 +echo "configure:2311: checking for gc.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 -#line 2315 "configure" +#line 2316 "configure" #include "confdefs.h" #include <gc.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2320: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2321: \"$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* @@ -2339,7 +2340,7 @@ fi if test x"$ac_cv_header_gc_h" = xno; then echo $ac_n "checking GC header location""... $ac_c" 1>&6 -echo "configure:2343: checking GC header location" >&5 +echo "configure:2344: checking GC header location" >&5 echo "$ac_t""$with_gc" 1>&6 gcincludedir=no for dir in $with_gc; do @@ -2347,21 +2348,21 @@ echo "configure:2343: checking GC header location" >&5 cppflags="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -I$dir/$inc" echo $ac_n "checking $dir/$inc""... $ac_c" 1>&6 -echo "configure:2351: checking $dir/$inc" >&5 +echo "configure:2352: checking $dir/$inc" >&5 unset ac_cv_header_gc_h ac_safe=`echo "gc.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for gc.h""... $ac_c" 1>&6 -echo "configure:2355: checking for gc.h" >&5 +echo "configure:2356: checking for gc.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 -#line 2360 "configure" +#line 2361 "configure" #include "confdefs.h" #include <gc.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2365: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2366: \"$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* @@ -2394,7 +2395,7 @@ fi fi unset ac_cv_lib_gc_GC_version echo $ac_n "checking for GC_version in -lgc""... $ac_c" 1>&6 -echo "configure:2398: checking for GC_version in -lgc" >&5 +echo "configure:2399: checking for GC_version in -lgc" >&5 ac_lib_var=`echo gc'_'GC_version | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2402,7 +2403,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgc $LIBS" cat > conftest.$ac_ext <<EOF -#line 2406 "configure" +#line 2407 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2413,7 +2414,7 @@ int main() { GC_version() ; return 0; } EOF -if { (eval echo configure:2417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2418: \"$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 @@ -2435,17 +2436,17 @@ fi if test x"$ac_cv_lib_gc_GC_version" = xno; then echo $ac_n "checking GC library location""... $ac_c" 1>&6 -echo "configure:2439: checking GC library location" >&5 +echo "configure:2440: checking GC library location" >&5 echo "$ac_t""$with_gc" 1>&6 gclibdir=no for dir in $with_gc; do ldflags="$LDFLAGS" LDFLAGS="$LDFLAGS -L$dir/lib" echo $ac_n "checking $dir""... $ac_c" 1>&6 -echo "configure:2446: checking $dir" >&5 +echo "configure:2447: checking $dir" >&5 unset ac_cv_lib_gc_GC_version echo $ac_n "checking for GC_version in -lgc""... $ac_c" 1>&6 -echo "configure:2449: checking for GC_version in -lgc" >&5 +echo "configure:2450: checking for GC_version in -lgc" >&5 ac_lib_var=`echo gc'_'GC_version | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2453,7 +2454,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgc $LIBS" cat > conftest.$ac_ext <<EOF -#line 2457 "configure" +#line 2458 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2464,7 +2465,7 @@ int main() { GC_version() ; return 0; } EOF -if { (eval echo configure:2468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2469: \"$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 @@ -2493,7 +2494,7 @@ fi echo $ac_n "checking if SSL is suported""... $ac_c" 1>&6 -echo "configure:2497: checking if SSL is suported" >&5 +echo "configure:2498: checking if SSL is suported" >&5 # Check whether --with-ssl or --without-ssl was given. if test "${with_ssl+set}" = set; then withval="$with_ssl" @@ -2509,7 +2510,7 @@ if test x"$with_ssl" != xno; then EOF echo $ac_n "checking for SSL library/header""... $ac_c" 1>&6 -echo "configure:2513: checking for SSL library/header" >&5 +echo "configure:2514: checking for SSL library/header" >&5 test x"$with_ssl" = xyes && with_ssl="/usr/openssl /usr/ssl /usr /usr/local/openssl /usr/local/ssl /usr/local" echo "$ac_t""$with_ssl" 1>&6 for dir in $with_ssl @@ -2523,11 +2524,11 @@ echo "configure:2513: checking for SSL library/header" >&5 CFLAGS="$CFLAGS -I$dir/include" fi if test "$dir" != "/usr" -a -f "$dir/lib/libssl.a"; then - LIBS="$LIBS -L$dir/lib" + W3M_LIBS="$W3M_LIBS -L$dir/lib" fi done echo $ac_n "checking for SSL_new in -lssl""... $ac_c" 1>&6 -echo "configure:2531: checking for SSL_new in -lssl" >&5 +echo "configure:2532: checking for SSL_new in -lssl" >&5 ac_lib_var=`echo ssl'_'SSL_new | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2535,7 +2536,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lssl -lcrypto $LIBS" cat > conftest.$ac_ext <<EOF -#line 2539 "configure" +#line 2540 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2546,7 +2547,7 @@ int main() { SSL_new() ; return 0; } EOF -if { (eval echo configure:2550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2551: \"$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 @@ -2561,7 +2562,7 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - w3m_ssl="found"; LIBS="$LIBS -lssl -lcrypto" + w3m_ssl="found"; W3M_LIBS="$W3M_LIBS -lssl -lcrypto" else echo "$ac_t""no" 1>&6 w3m_ssl="not found" @@ -2570,7 +2571,7 @@ fi if test x"$w3m_ssl" = xfound; then echo $ac_n "checking if SSL certificate verify is enabled""... $ac_c" 1>&6 -echo "configure:2574: checking if SSL certificate verify is enabled" >&5 +echo "configure:2575: checking if SSL certificate verify is enabled" >&5 # Check whether --enable-sslverify or --disable-sslverify was given. if test "${enable_sslverify+set}" = set; then enableval="$enable_sslverify" @@ -2587,7 +2588,7 @@ EOF fi fi echo $ac_n "checking if IPv6 support is enabled""... $ac_c" 1>&6 -echo "configure:2591: checking if IPv6 support is enabled" >&5 +echo "configure:2592: checking if IPv6 support is enabled" >&5 # Check whether --enable-ipv6 or --disable-ipv6 was given. if test "${enable_ipv6+set}" = set; then enableval="$enable_ipv6" @@ -2600,15 +2601,15 @@ echo "$ac_t""$enable_ipv6" 1>&6 if test x"$enable_ipv6" = xyes; then echo $ac_n "checking if IPv6 API available""... $ac_c" 1>&6 -echo "configure:2604: checking if IPv6 API available" >&5 +echo "configure:2605: checking if IPv6 API available" >&5 echo $ac_n "checking for getaddrinfo""... $ac_c" 1>&6 -echo "configure:2607: checking for getaddrinfo" >&5 +echo "configure:2608: checking for getaddrinfo" >&5 if eval "test \"`echo '$''{'ac_cv_func_getaddrinfo'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2612 "configure" +#line 2613 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char getaddrinfo(); below. */ @@ -2631,7 +2632,7 @@ getaddrinfo(); ; return 0; } EOF -if { (eval echo configure:2635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_getaddrinfo=yes" else @@ -2656,15 +2657,15 @@ fi if test x"$enable_ipv6" = xno; then echo $ac_n "checking for libinet6""... $ac_c" 1>&6 -echo "configure:2660: checking for libinet6" >&5 +echo "configure:2661: checking for libinet6" >&5 for dir in /usr/local/v6/lib /usr/local/lib /usr/lib do if test -f $dir/libinet6.a; then if test $dir != "/usr/lib"; then - LIBS="$LIBS -L$dir" + W3M_LIBS="$W3M_LIBS -L$dir" fi echo $ac_n "checking for getaddrinfo in -linet6""... $ac_c" 1>&6 -echo "configure:2668: checking for getaddrinfo in -linet6" >&5 +echo "configure:2669: checking for getaddrinfo in -linet6" >&5 ac_lib_var=`echo inet6'_'getaddrinfo | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2672,7 +2673,7 @@ else ac_save_LIBS="$LIBS" LIBS="-linet6 $LIBS" cat > conftest.$ac_ext <<EOF -#line 2676 "configure" +#line 2677 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2683,7 +2684,7 @@ int main() { getaddrinfo() ; return 0; } EOF -if { (eval echo configure:2687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2688: \"$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 @@ -2702,7 +2703,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then #define INET6 1 EOF - use_libinet6="found"; LIBS="$LIBS -linet6"; break + use_libinet6="found"; W3M_LIBS="$W3M_LIBS -linet6"; break else echo "$ac_t""no" 1>&6 use_libinet6="not found" @@ -2714,7 +2715,7 @@ fi fi fi echo $ac_n "checking for zError in -lz""... $ac_c" 1>&6 -echo "configure:2718: checking for zError in -lz" >&5 +echo "configure:2719: checking for zError in -lz" >&5 ac_lib_var=`echo z'_'zError | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2722,7 +2723,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <<EOF -#line 2726 "configure" +#line 2727 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2733,7 +2734,7 @@ int main() { zError() ; return 0; } EOF -if { (eval echo configure:2737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2738: \"$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 @@ -2772,12 +2773,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:2776: checking for $ac_hdr that defines DIR" >&5 +echo "configure:2777: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2781 "configure" +#line 2782 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_hdr> @@ -2785,7 +2786,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:2789: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2790: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -2810,7 +2811,7 @@ done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:2814: checking for opendir in -ldir" >&5 +echo "configure:2815: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2818,7 +2819,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <<EOF -#line 2822 "configure" +#line 2823 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2829,7 +2830,7 @@ int main() { opendir() ; return 0; } EOF -if { (eval echo configure:2833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2834: \"$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 @@ -2851,7 +2852,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:2855: checking for opendir in -lx" >&5 +echo "configure:2856: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2859,7 +2860,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <<EOF -#line 2863 "configure" +#line 2864 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2870,7 +2871,7 @@ int main() { opendir() ; return 0; } EOF -if { (eval echo configure:2874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2875: \"$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 @@ -2893,12 +2894,12 @@ fi fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2897: checking for ANSI C header files" >&5 +echo "configure:2898: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2902 "configure" +#line 2903 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -2906,7 +2907,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2910: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2911: \"$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* @@ -2923,7 +2924,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 -#line 2927 "configure" +#line 2928 "configure" #include "confdefs.h" #include <string.h> EOF @@ -2941,7 +2942,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 -#line 2945 "configure" +#line 2946 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -2962,7 +2963,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 2966 "configure" +#line 2967 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -2973,7 +2974,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:2977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -2997,12 +2998,12 @@ EOF fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:3001: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:3002: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3006 "configure" +#line 3007 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/wait.h> @@ -3018,7 +3019,7 @@ wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:3022: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3023: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -3040,17 +3041,17 @@ fi ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for termios.h""... $ac_c" 1>&6 -echo "configure:3044: checking for termios.h" >&5 +echo "configure:3045: checking for termios.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 -#line 3049 "configure" +#line 3050 "configure" #include "confdefs.h" #include <termios.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3054: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3055: \"$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* @@ -3074,17 +3075,17 @@ else echo "$ac_t""no" 1>&6 ac_safe=`echo "termio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for termio.h""... $ac_c" 1>&6 -echo "configure:3078: checking for termio.h" >&5 +echo "configure:3079: checking for termio.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 -#line 3083 "configure" +#line 3084 "configure" #include "confdefs.h" #include <termio.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3088: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3089: \"$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* @@ -3108,17 +3109,17 @@ else echo "$ac_t""no" 1>&6 ac_safe=`echo "sgtty.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sgtty.h""... $ac_c" 1>&6 -echo "configure:3112: checking for sgtty.h" >&5 +echo "configure:3113: checking for sgtty.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 -#line 3117 "configure" +#line 3118 "configure" #include "confdefs.h" #include <sgtty.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3122: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3123: \"$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* @@ -3148,17 +3149,17 @@ fi ac_safe=`echo "float.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for float.h""... $ac_c" 1>&6 -echo "configure:3152: checking for float.h" >&5 +echo "configure:3153: checking for float.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 -#line 3157 "configure" +#line 3158 "configure" #include "confdefs.h" #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3162: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3163: \"$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* @@ -3181,17 +3182,17 @@ fi ac_safe=`echo "sys/select.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/select.h""... $ac_c" 1>&6 -echo "configure:3185: checking for sys/select.h" >&5 +echo "configure:3186: checking for sys/select.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 -#line 3190 "configure" +#line 3191 "configure" #include "confdefs.h" #include <sys/select.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3195: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3196: \"$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* @@ -3214,7 +3215,7 @@ fi echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:3218: checking size of long long" >&5 +echo "configure:3219: checking size of long long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3222,7 +3223,7 @@ else ac_cv_sizeof_long_long=0 else cat > conftest.$ac_ext <<EOF -#line 3226 "configure" +#line 3227 "configure" #include "confdefs.h" #include <stdio.h> #include <sys/types.h> @@ -3234,7 +3235,7 @@ main() exit(0); } EOF -if { (eval echo configure:3238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_long=`cat conftestval` else @@ -3257,12 +3258,12 @@ EOF for ac_func in strcasecmp strcasestr strchr memcpy strerror bcopy setpgrp chdir getcwd getwd readlink setenv putenv strtoll stroq atoll atoq symlink readlink lstat srand48 srandom getpassphrase waitpid do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3261: checking for $ac_func" >&5 +echo "configure:3262: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3266 "configure" +#line 3267 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3285,7 +3286,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3290: \"$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 @@ -3310,12 +3311,12 @@ fi done echo $ac_n "checking for strftime""... $ac_c" 1>&6 -echo "configure:3314: checking for strftime" >&5 +echo "configure:3315: checking for strftime" >&5 if eval "test \"`echo '$''{'ac_cv_func_strftime'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3319 "configure" +#line 3320 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char strftime(); below. */ @@ -3338,7 +3339,7 @@ strftime(); ; return 0; } EOF -if { (eval echo configure:3342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_strftime=yes" else @@ -3360,7 +3361,7 @@ else echo "$ac_t""no" 1>&6 # strftime is in -lintl on SCO UNIX. echo $ac_n "checking for strftime in -lintl""... $ac_c" 1>&6 -echo "configure:3364: checking for strftime in -lintl" >&5 +echo "configure:3365: checking for strftime in -lintl" >&5 ac_lib_var=`echo intl'_'strftime | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3368,7 +3369,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <<EOF -#line 3372 "configure" +#line 3373 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3379,7 +3380,7 @@ int main() { strftime() ; return 0; } EOF -if { (eval echo configure:3383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3384: \"$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 @@ -3406,7 +3407,7 @@ fi fi echo $ac_n "checking for wait3 that fills in rusage""... $ac_c" 1>&6 -echo "configure:3410: checking for wait3 that fills in rusage" >&5 +echo "configure:3411: checking for wait3 that fills in rusage" >&5 if eval "test \"`echo '$''{'ac_cv_func_wait3_rusage'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3414,7 +3415,7 @@ else ac_cv_func_wait3_rusage=no else cat > conftest.$ac_ext <<EOF -#line 3418 "configure" +#line 3419 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -3445,7 +3446,7 @@ main() { } } EOF -if { (eval echo configure:3449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_wait3_rusage=yes else @@ -3468,7 +3469,7 @@ EOF fi echo $ac_n "checking whether setpgrp takes no argument""... $ac_c" 1>&6 -echo "configure:3472: checking whether setpgrp takes no argument" >&5 +echo "configure:3473: checking whether setpgrp takes no argument" >&5 if eval "test \"`echo '$''{'ac_cv_func_setpgrp_void'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3476,7 +3477,7 @@ else { echo "configure: error: cannot check setpgrp if cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 3480 "configure" +#line 3481 "configure" #include "confdefs.h" #ifdef HAVE_UNISTD_H @@ -3496,7 +3497,7 @@ main() } EOF -if { (eval echo configure:3500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_setpgrp_void=no else @@ -3521,16 +3522,16 @@ fi echo $ac_n "checking for sys_errlist""... $ac_c" 1>&6 -echo "configure:3525: checking for sys_errlist" >&5 +echo "configure:3526: checking for sys_errlist" >&5 cat > conftest.$ac_ext <<EOF -#line 3527 "configure" +#line 3528 "configure" #include "confdefs.h" extern char *sys_errlist[]; int main() { printf(sys_errlist[0]); ; return 0; } EOF -if { (eval echo configure:3534: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3535: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_sys_errlist="yes"; cat >> confdefs.h <<\EOF #define HAVE_SYS_ERRLIST 1 @@ -3546,9 +3547,9 @@ rm -f conftest* echo "$ac_t""$have_sys_errlist" 1>&6 echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6 -echo "configure:3550: checking for sigsetjmp" >&5 +echo "configure:3551: checking for sigsetjmp" >&5 cat > conftest.$ac_ext <<EOF -#line 3552 "configure" +#line 3553 "configure" #include "confdefs.h" #include <setjmp.h> int main() { @@ -3556,7 +3557,7 @@ int main() { if (sigsetjmp(env, 1) != 0) { exit(0); } siglongjmp(env, 1); ; return 0; } EOF -if { (eval echo configure:3560: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3561: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_sigsetjmp="yes"; cat >> confdefs.h <<\EOF #define HAVE_SIGSETJMP 1 @@ -3571,12 +3572,12 @@ fi rm -f conftest* echo "$ac_t""$have_sigsetjmp" 1>&6 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:3575: checking return type of signal handlers" >&5 +echo "configure:3576: 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 <<EOF -#line 3580 "configure" +#line 3581 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> @@ -3593,7 +3594,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:3597: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3598: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -3789,6 +3790,7 @@ s%@build_vendor@%$build_vendor%g s%@build_os@%$build_os%g s%@EXEEXT@%$EXEEXT%g s%@W3M_TARGET@%$W3M_TARGET%g +s%@W3M_LIBS@%$W3M_LIBS%g s%@W3M_LANG@%$W3M_LANG%g s%@DISPLAY_CODE@%$DISPLAY_CODE%g s%@SYSTEM_CODE@%$SYSTEM_CODE%g diff --git a/configure.in b/configure.in index 816b399..74a80c1 100644 --- a/configure.in +++ b/configure.in @@ -21,6 +21,7 @@ AC_EXEEXT AC_SUBST(EXEEXT) AC_SUBST(W3M_TARGET) +AC_SUBST(W3M_LIBS) W3M_TARGET=$target AC_DEFINE_UNQUOTED(W3M_TARGET, $W3M_TARGET) @@ -63,7 +64,7 @@ AC_CHECK_FUNC(sqrt,,[AC_CHECK_LIB(m, sqrt)]) if test x"$enable_mouse" = xyes; then AC_SUBST(USE_W3M) AC_CHECK_LIB(gpm, Gpm_Open, [AC_DEFINE(USE_GPM) - LIBS="$LIBS -lgpm"]) + W3M_LIBS="$W3M_LIBS -lgpm"]) AC_SUBST(USE_SYSMOUSE) AC_TRY_CPP([#include <machine/console.h> MOUSE_GETINFO], [AC_DEFINE(USE_SYSMOUSE)]) |