w3m

commit 92149493e457e864a610bea73c2225b789fb4b1c
parent 815434e7971a949c0d94afc150b1f4bf82e84122
Author: ukai <ukai>
Date:   Thu, 20 Dec 2001 03:39:32 +0000

w3m 0.2.3 rc2
[w3m-dev 02678]
From: Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>

Diffstat:
M
ChangeLog
 | 
7
+++++++
M
Makefile
 | 
4
++--
M
configure
 | 
27
++++++++++++++++++++-------

3 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2001-12-20  Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
+
+	* w3m 0.2.3 release candidate 2
+	* [w3m-dev 02678]
+	* configure: get mygcversion from gc/version.h
+	* Makefile: update GCLIBTGZ
+
 2001-12-20  Fumitoshi UKAI  <ukai@debian.or.jp>
 
 	* w3m 0.2.3 release candidate 1
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-GCLIBTGZ=gc5.0alpha3.tar.gz
+GCLIBTGZ=gc6.1alpha2.tar.gz
 
 all: XXMakefile
 	$(MAKE) -f XXMakefile 
@@ -36,7 +36,7 @@ veryclean: clean sweep
 prepare:
 	rm -rf gc
 	gzip -dc ../$(GCLIBTGZ) | tar xvf -
-	cp XMakefile.dist XMakefile
+#	cp XMakefile.dist XMakefile
 
 dist: XXMakefile
 	$(MAKE) -f XXMakefile dist
diff --git a/configure b/configure
@@ -138,12 +138,6 @@ do
   shift
 done
 
-# Version number of Boehm-GC library comes with w3m.
-# version number: JMMAAA  J: major MM: minor AAA: alpha
-#   Alpha number of non-alpha version is 255.
-# version 4.14alpha1 => 414002
-mygcversion=600255
-
 if [ -z "`echo -n aho | grep n`" ] ; then
 Echo()
 {
@@ -992,6 +986,19 @@ esac
 if [ -n "$gclib" -a -n "$gcinclude" ]; then
   Echo GC library found on your system...
   cat > _zmachdep.c << EOF
+#include "gc/version.h"
+main()
+{
+  printf("%d%02d%03d\n",(GC_version>>16)&0xff,(GC_version>>8)&0xff,GC_version&0xff);
+}
+EOF
+  if $cc $cflags -o _zmachdep _zmachdep.c > /dev/null 2>&1
+  then
+    mygcversion=`./_zmachdep`
+  else
+    mygcversion=0
+  fi
+  cat > _zmachdep.c << EOF
 #include <gc.h>
 main()
 {
@@ -1014,15 +1021,21 @@ EOF
         cflags="$cflags -I./gc/include"
         gclib="gc/gc.a"
         gctarget=$gclib
+        echo "GC_version is $mygcversion."
       fi
     else
       cflags="$cflags -I$gcinclude"
     fi
-  else
+  elif [ $mygcversion -gt 0 ]; then
     echo "but it doesn't seem to work."
     cflags="$cflags -I./gc/include"
     gclib="gc/gc.a"
     gctarget=$gclib
+    echo "GC_version is $mygcversion."    
+  else
+    echo "It seems you don't have GC library."
+    echo "Stop."
+    exit 1
   fi
 fi