diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | Makefile.in | 12 | ||||
| -rw-r--r-- | aclocal.m4 | 5 | ||||
| -rwxr-xr-x | configure | 9 |
4 files changed, 24 insertions, 12 deletions
@@ -1,4 +1,10 @@ -2007-05-23 Hironori Sakamoto <hsaka@mth.biglobe.ne.jp> +2007-05-29 Hironori Sakamoto <hsaka@mth.biglobe.ne.jp> + + * [w3m-dev 04259] long long (Re: road to 0.5.2) + * Makefile.in, aclocal.m4: move 'gc' from $LIBS to $LIBGC. + * configure: regenerated. + +2007-05-29 Hironori Sakamoto <hsaka@mth.biglobe.ne.jp> * [w3m-dev 04256] Re: road to 0.5.2 * scripts/Makefile.in, scripts/w3mhelp.cgi.in: add datarootdir. @@ -8867,4 +8873,4 @@ a * [w3m-dev 03276] compile error on EWS4800 * release-0-2-1 * import w3m-0.2.1 -$Id: ChangeLog,v 1.990 2007/05/29 11:50:24 inu Exp $ +$Id: ChangeLog,v 1.991 2007/05/29 12:01:04 inu Exp $ diff --git a/Makefile.in b/Makefile.in index 182e081..ab81d30 100644 --- a/Makefile.in +++ b/Makefile.in @@ -45,7 +45,8 @@ DEFS = @DEFS@ -DAUXBIN_DIR=\"$(AUXBIN_DIR)\" \ -DRC_DIR=\"$(RC_DIR)\" \ -DLOCALEDIR=\"$(localedir)\" LDFLAGS = @LDFLAGS@ -LIBS = -L. -lindep @LIBINTL@ @LIBS@ +LIBS = @LIBS@ +EXT_LIBS = -L. -lindep @LIBINTL@ @LIBGC@ W3M_LIBS = @W3M_LIBS@ WCTARGET = @WCTARGET@ NLSTARGET = @NLSTARGET@ @@ -124,7 +125,7 @@ SUBDIRS = $(SCRIPTSUBDIRS) w3mimg libwc po all: $(TARGETS) all-scripts $(NLSTARGET) $(TARGET): $(ALLOBJS) $(ALIB) $(WCTARGET) - $(CC) $(CFLAGS) -o $(TARGET) $(ALLOBJS) $(LDFLAGS) $(LIBS) $(W3M_LIBS) + $(CC) $(CFLAGS) -o $(TARGET) $(ALLOBJS) $(LDFLAGS) $(LIBS) $(EXT_LIBS) $(W3M_LIBS) $(ALIB): $(ALIBOBJS) $(AR) rv $(ALIB) $(ALIBOBJS) @@ -170,13 +171,14 @@ functable.c: funcname.tab mktable$(EXT) -rm -f functable.tab mktable$(EXT): mktable.o dummy.o $(ALIB) - $(CC) $(CFLAGS) -o mktable mktable.o dummy.o $(LDFLAGS) $(LIBS) + $(CC) $(CFLAGS) -o mktable mktable.o dummy.o $(LDFLAGS) $(LIBS) $(EXT_LIBS) $(BOOKMARKER): w3mbookmark.o dummy.o $(ALIB) - $(CC) $(CFLAGS) -o $(BOOKMARKER) w3mbookmark.o dummy.o $(LDFLAGS) $(LIBS) + $(CC) $(CFLAGS) -o $(BOOKMARKER) w3mbookmark.o dummy.o $(LDFLAGS) $(LIBS) $(EXT_LIBS) $(HELPER): w3mhelperpanel.o dummy.o $(ALIB) - $(CC) $(CFLAGS) -o $(HELPER) w3mhelperpanel.o dummy.o $(LDFLAGS) $(LIBS) + $(CC) $(CFLAGS) -o $(HELPER) w3mhelperpanel.o dummy.o $(LDFLAGS) $(LIBS) $(EXT_LIBS) + $(INFLATE): inflate.o $(ALIB) $(CC) $(CFLAGS) -o $(INFLATE) inflate.o $(LDFLAGS) $(LIBS) -lz @@ -426,6 +426,7 @@ AC_ARG_WITH(termlib, # ---------------------------------------------------------------- AC_DEFUN([AC_W3M_GC], [AC_MSG_CHECKING(GC library exists) +AC_SUBST(LIBGC) AC_ARG_WITH(gc, [ --with-gc[=PREFIX] libgc PREFIX], [test x"$with_gc" = xno && AC_MSG_ERROR([You can not build w3m without gc])], @@ -456,7 +457,7 @@ AC_ARG_WITH(gc, fi fi unset ac_cv_lib_gc_GC_init - AC_CHECK_LIB(gc, GC_init, [LIBS="$LIBS -lgc"]) + AC_CHECK_LIB(gc, GC_init, [LIBGC="-lgc"]) if test x"$ac_cv_lib_gc_GC_init" = xno; then AC_MSG_CHECKING(GC library location) AC_MSG_RESULT($with_gc) @@ -466,7 +467,7 @@ AC_ARG_WITH(gc, LDFLAGS="$LDFLAGS -L$dir/lib" AC_MSG_CHECKING($dir) unset ac_cv_lib_gc_GC_init - AC_CHECK_LIB(gc, GC_init, [gclibdir="$dir/lib"; LIBS="$LIBS -L$dir/lib -lgc"; break]) + AC_CHECK_LIB(gc, GC_init, [gclibdir="$dir/lib"; LIBGC="-L$dir/lib -lgc"; break]) LDFLAGS="$ldflags" done if test x"$gclibdir" = xno; then @@ -756,6 +756,7 @@ USE_DIGEST_AUTH USE_W3M USE_SYSMOUSE AUXBIN_TARGETS +LIBGC GREP EGREP USE_BINMODE_STREAM @@ -7543,6 +7544,7 @@ done { echo "$as_me:$LINENO: checking GC library exists" >&5 echo $ECHO_N "checking GC library exists... $ECHO_C" >&6; } + # Check whether --with-gc was given. if test "${with_gc+set}" = set; then withval=$with_gc; test x"$with_gc" = xno && { { echo "$as_me:$LINENO: error: You can not build w3m without gc" >&5 @@ -7911,7 +7913,7 @@ fi { echo "$as_me:$LINENO: result: $ac_cv_lib_gc_GC_init" >&5 echo "${ECHO_T}$ac_cv_lib_gc_GC_init" >&6; } if test $ac_cv_lib_gc_GC_init = yes; then - LIBS="$LIBS -lgc" + LIBGC="-lgc" fi if test x"$ac_cv_lib_gc_GC_init" = xno; then @@ -7988,7 +7990,7 @@ fi { echo "$as_me:$LINENO: result: $ac_cv_lib_gc_GC_init" >&5 echo "${ECHO_T}$ac_cv_lib_gc_GC_init" >&6; } if test $ac_cv_lib_gc_GC_init = yes; then - gclibdir="$dir/lib"; LIBS="$LIBS -L$dir/lib -lgc"; break + gclibdir="$dir/lib"; LIBGC="-L$dir/lib -lgc"; break fi LDFLAGS="$ldflags" @@ -11623,6 +11625,7 @@ USE_DIGEST_AUTH!$USE_DIGEST_AUTH$ac_delim USE_W3M!$USE_W3M$ac_delim USE_SYSMOUSE!$USE_SYSMOUSE$ac_delim AUXBIN_TARGETS!$AUXBIN_TARGETS$ac_delim +LIBGC!$LIBGC$ac_delim GREP!$GREP$ac_delim EGREP!$EGREP$ac_delim USE_BINMODE_STREAM!$USE_BINMODE_STREAM$ac_delim @@ -11638,7 +11641,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 58; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 59; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 |