storm/w3m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[w3m-dev 03838] W3M_LIBS splitted from LIBS

Browse Source 
* Makefile.in (W3M_LIBS): added
* acinclude.m4 (AC_W3M_TERMLIB): use W3M_LIB
	(AC_W3M_SSL): ditto
* configure.in (W3M_LIBS): added
From: ABE Yuji <cbo46560@pop12.odn.ne.jp>
This commit is contained in:
Fumitoshi UKAI
2003-04-04 16:00:09 +00:00
parent 4fadb14e79
commit f50e7e4849
6 changed files with 175 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@@ -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> 2003-04-04 Hiroyuki Ito <hito@crl.go.jp>
* [w3m-dev 03837] Re: gif animation with no delay_time * [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 * release-0-2-1
* import w3m-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 $

3
Makefile.in
View File

@@ -36,6 +36,7 @@ DEFS = @DEFS@ -I. -I$(top_srcdir) -DAUXBIN_DIR=\"$(AUXBIN_DIR)\" \
-DETC_DIR=\"$(sysconfdir)\" -DRC_DIR=\"$(RC_DIR)\" -DETC_DIR=\"$(sysconfdir)\" -DRC_DIR=\"$(RC_DIR)\"
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LIBS = -L. -lindep @LIBS@ LIBS = -L. -lindep @LIBS@
W3M_LIBS = @W3M_LIBS@
MAKE_ARGS = PERL='$(PERL)' MKDIR='$(MKDIR)' INSTALL='$(INSTALL)' \ MAKE_ARGS = PERL='$(PERL)' MKDIR='$(MKDIR)' INSTALL='$(INSTALL)' \
BIN_DIR='$(bindir)' AUXBIN_DIR='$(AUXBIN_DIR)' \ BIN_DIR='$(bindir)' AUXBIN_DIR='$(AUXBIN_DIR)' \
@@ -107,7 +108,7 @@ SUBDIRS = $(SCRIPTSUBDIRS)
all: $(TARGETS) all-scripts all: $(TARGETS) all-scripts
$(TARGET): $(ALLOBJS) $(ALIB) $(TARGET): $(ALLOBJS) $(ALIB)
$(CC) $(CFLAGS) -o $(TARGET) $(ALLOBJS) $(LDFLAGS) $(LIBS) $(CC) $(CFLAGS) -o $(TARGET) $(ALLOBJS) $(LDFLAGS) $(LIBS) $(W3M_LIBS)
$(ALIB): $(ALIBOBJS) $(ALIB): $(ALIBOBJS)
$(AR) rv $(ALIB) $(ALIBOBJS) $(AR) rv $(ALIB) $(ALIBOBJS)

10
acinclude.m4
View File

@@ -336,7 +336,7 @@ AC_ARG_WITH(termlib,
AC_MSG_RESULT($with_termlib) AC_MSG_RESULT($with_termlib)
test x"$with_termlib" = xyes && with_termlib="terminfo mytinfo termlib termcap ncurses curses" test x"$with_termlib" = xyes && with_termlib="terminfo mytinfo termlib termcap ncurses curses"
for lib in $with_termlib; do 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 done
]) ])
# #
@@ -420,11 +420,11 @@ if test x"$with_ssl" != xno; then
CFLAGS="$CFLAGS -I$dir/include" CFLAGS="$CFLAGS -I$dir/include"
fi fi
if test "$dir" != "/usr" -a -f "$dir/lib/libssl.a"; then if test "$dir" != "/usr" -a -f "$dir/lib/libssl.a"; then
LIBS="$LIBS -L$dir/lib" W3M_LIBS="$W3M_LIBS -L$dir/lib"
fi fi
done done
AC_CHECK_LIB(ssl, SSL_new, 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"], [w3m_ssl="not found"],
[-lcrypto]) [-lcrypto])
@@ -634,11 +634,11 @@ if test x"$enable_ipv6" = xyes; then
do do
if test -f $dir/libinet6.a; then if test -f $dir/libinet6.a; then
if test $dir != "/usr/lib"; then if test $dir != "/usr/lib"; then
LIBS="$LIBS -L$dir" W3M_LIBS="$W3M_LIBS -L$dir"
fi fi
AC_CHECK_LIB(inet6, getaddrinfo, AC_CHECK_LIB(inet6, getaddrinfo,
[enable_ipv6="yes"; AC_DEFINE(INET6) [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"]) [use_libinet6="not found"])
fi fi
done done

10
aclocal.m4 vendored
View File

@@ -348,7 +348,7 @@ AC_ARG_WITH(termlib,
AC_MSG_RESULT($with_termlib) AC_MSG_RESULT($with_termlib)
test x"$with_termlib" = xyes && with_termlib="terminfo mytinfo termlib termcap ncurses curses" test x"$with_termlib" = xyes && with_termlib="terminfo mytinfo termlib termcap ncurses curses"
for lib in $with_termlib; do 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 done
]) ])
# #
@@ -432,11 +432,11 @@ if test x"$with_ssl" != xno; then
CFLAGS="$CFLAGS -I$dir/include" CFLAGS="$CFLAGS -I$dir/include"
fi fi
if test "$dir" != "/usr" -a -f "$dir/lib/libssl.a"; then if test "$dir" != "/usr" -a -f "$dir/lib/libssl.a"; then
LIBS="$LIBS -L$dir/lib" W3M_LIBS="$W3M_LIBS -L$dir/lib"
fi fi
done done
AC_CHECK_LIB(ssl, SSL_new, 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"], [w3m_ssl="not found"],
[-lcrypto]) [-lcrypto])
@@ -646,11 +646,11 @@ if test x"$enable_ipv6" = xyes; then
do do
if test -f $dir/libinet6.a; then if test -f $dir/libinet6.a; then
if test $dir != "/usr/lib"; then if test $dir != "/usr/lib"; then
LIBS="$LIBS -L$dir" W3M_LIBS="$W3M_LIBS -L$dir"
fi fi
AC_CHECK_LIB(inet6, getaddrinfo, AC_CHECK_LIB(inet6, getaddrinfo,
[enable_ipv6="yes"; AC_DEFINE(INET6) [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"]) [use_libinet6="not found"])
fi fi
done done

302
configure vendored
View File

File diff suppressed because it is too large Load Diff

3
configure.in
View File

@@ -21,6 +21,7 @@ AC_EXEEXT
AC_SUBST(EXEEXT) AC_SUBST(EXEEXT)
AC_SUBST(W3M_TARGET) AC_SUBST(W3M_TARGET)
AC_SUBST(W3M_LIBS)
W3M_TARGET=$target W3M_TARGET=$target
AC_DEFINE_UNQUOTED(W3M_TARGET, $W3M_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 if test x"$enable_mouse" = xyes; then
AC_SUBST(USE_W3M) AC_SUBST(USE_W3M)
AC_CHECK_LIB(gpm, Gpm_Open, [AC_DEFINE(USE_GPM) AC_CHECK_LIB(gpm, Gpm_Open, [AC_DEFINE(USE_GPM)
LIBS="$LIBS -lgpm"]) W3M_LIBS="$W3M_LIBS -lgpm"])
AC_SUBST(USE_SYSMOUSE) AC_SUBST(USE_SYSMOUSE)
AC_TRY_CPP([#include <machine/console.h> AC_TRY_CPP([#include <machine/console.h>
MOUSE_GETINFO], [AC_DEFINE(USE_SYSMOUSE)]) MOUSE_GETINFO], [AC_DEFINE(USE_SYSMOUSE)])