[w3m-dev 04259] long long (Re: Re: road to 0.5.2)

> libgc --with-gc 
> configure 
>  long long 
> # Web 
> 
> LD_LIBRARY_PATH ( make 
> )configure 
>  long long  gc 
> 
> 
>  1. AC_W3M_GC  AC_CHECK_SIZEOF(long long, 0) 
>  2. gc  $LIBS 
> 
> (-R  -Wl,-rpath )
> 
> 2. libintl  libiconv 
> $LIBS  w3mimgdisplay  inflate 
> 
> (w3mhelperpanel, w3mbookmark, mktable )

 configure 
LD_LIBRARY_PATH  make 
libintl -Wl,-rpath 
autoconf 

diff -u Makefile.in.orig Makefile.in
--- Makefile.in.orig	Tue May 29 09:31:21 2007
+++ Makefile.in	Tue May 29 13:34:14 2007
@@ -45,7 +45,8 @@
 	-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 @@
 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 @@
 	-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
 
diff -u aclocal.m4.orig aclocal.m4
--- aclocal.m4.orig	Thu May 24 13:36:02 2007
+++ aclocal.m4	Tue May 29 13:38:32 2007
@@ -426,6 +426,7 @@
 # ----------------------------------------------------------------
 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 @@
    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 @@
       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
diff -u configure.orig configure
--- configure.orig	Thu May 24 13:31:51 2007
+++ configure	Tue May 29 13:38:56 2007
@@ -756,6 +756,7 @@
 USE_W3M
 USE_SYSMOUSE
 AUXBIN_TARGETS
+LIBGC
 GREP
 EGREP
 USE_BINMODE_STREAM
@@ -7543,6 +7544,7 @@
 { 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 @@
 { 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 @@
 { 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_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 @@
 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



-----------------------------------
  <[email protected]>