[kaffe] CVS kaffe (dalibor): Moved m4 macros into their own directory

Kaffe CVS cvs-commits at kaffe.org
Wed Dec 24 11:24:03 PST 2003


PatchSet 4237 
Date: 2003/12/24 19:06:49
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Moved m4 macros into their own directory

2003-12-24  Dalibor Topic <robilad at kaffe.org>

        * configure.in:
        Set m4 macro directory to m4.

        * Makefile.am
        (EXTRA_DIST): Removed m4 macros.
        (ACLOCAL_FLAGS) New setting.

        * developers/autogen.sh:
        Use m4 directory for aclocal.

        * gnu-crypto.m4,
        gwqt.m4,
        herrno.m4,
        iconv.m4,
        in6addr.m4,
        lib-ld.m4,
        lib-link.m4,
        lib-prefix.m4,
        libtool.m4,
        sockaddrin6.m4,
        sockinttypes.m4,
        valist.m4:
        Moved to m4 directory.

        * m4/gnu-crypto.m4,
        m4/gwqt.m4,
        m4/herrno.m4,
        m4/iconv.m4,
        m4/in6addr.m4,
        m4/lib-ld.m4,
        m4/lib-link.m4,
        m4/lib-prefix.m4,
        m4/libtool.m4,
        m4/sockaddrin6.m4,
        m4/sockinttypes.m4,
        m4/valist.m4:
        New files.

        * Makefile.in,
        aclocal.m4,
        config/Makefile.in,
        configure,
        include/Makefile.in,
        kaffe/Makefile.in,
        kaffe/jvmpi/Makefile.in,
        kaffe/kaffe/Makefile.in,
        kaffe/kaffeh/Makefile.in,
        kaffe/kaffevm/Makefile.in,
        kaffe/kaffevm/gcj/Makefile.in,
        kaffe/kaffevm/intrp/Makefile.in,
        kaffe/kaffevm/jit/Makefile.in,
        kaffe/kaffevm/jit3/Makefile.in,
        kaffe/kaffevm/systems/Makefile.in,
        kaffe/kaffevm/systems/beos-native/Makefile.in,
        kaffe/kaffevm/systems/oskit-pthreads/Makefile.in,
        kaffe/kaffevm/systems/unix-jthreads/Makefile.in,
        kaffe/kaffevm/systems/unix-pthreads/Makefile.in,
        kaffe/man/Makefile.in,
        kaffe/scripts/Makefile.in,
        kaffe/scripts/bat/Makefile.in,
        kaffe/scripts/compat/Makefile.in,
        kaffe/xprof/Makefile.in,
        libraries/Makefile.in,
        libraries/clib/Makefile.in,
        libraries/clib/awt/Makefile.in,
        libraries/clib/awt/X/Makefile.in,
        libraries/clib/awt/qt/Makefile.in,
        libraries/clib/io/Makefile.in,
        libraries/clib/management/Makefile.in,
        libraries/clib/math/Makefile.in,
        libraries/clib/native/Makefile.in,
        libraries/clib/net/Makefile.in,
        libraries/clib/nio/Makefile.in,
        libraries/clib/security/Makefile.in,
        libraries/clib/zip/Makefile.in,
        libraries/extensions/Makefile.in,
        libraries/extensions/comm/Makefile.in,
        libraries/extensions/comm/javalib/Makefile.in,
        libraries/extensions/microsoft/Makefile.in,
        libraries/extensions/microsoft/clib/Makefile.in,
        libraries/extensions/microsoft/javalib/Makefile.in,
        libraries/extensions/pjava/Makefile.in,
        libraries/extensions/pjava/javalib/Makefile.in,
        libraries/extensions/servlet/Makefile.in,
        libraries/extensions/servlet/javalib/Makefile.in,
        libraries/extensions/sound/Makefile.in,
        libraries/extensions/sound/alsa/Makefile.in,
        libraries/extensions/sound/common/Makefile.in,
        libraries/extensions/sound/esd/Makefile.in,
        libraries/javalib/Makefile.in,
        replace/Makefile.in,
        test/Makefile.in,
        test/internal/Makefile.in,
        test/regression/Makefile.in,
        test/regression/compile_time/Makefile.in,
        test/regression/run_time/Makefile.in:
        Regenerated.

Members: 
	ChangeLog:1.1826->1.1827 
	Makefile.am:1.53->1.54 
	Makefile.in:1.123->1.124 
	aclocal.m4:1.85->1.86 
	configure:1.269->1.270 
	configure.in:1.234->1.235 
	gnu-crypto.m4:1.2->1.3(DEAD) 
	gwqt.m4:1.5->1.6(DEAD) 
	herrno.m4:1.3->1.4(DEAD) 
	iconv.m4:1.2->1.3(DEAD) 
	in6addr.m4:1.3->1.4(DEAD) 
	lib-ld.m4:1.1->1.2(DEAD) 
	lib-link.m4:1.1->1.2(DEAD) 
	lib-prefix.m4:1.1->1.2(DEAD) 
	libtool.m4:1.6->1.7(DEAD) 
	sockaddrin6.m4:1.4->1.5(DEAD) 
	sockinttypes.m4:1.4->1.5(DEAD) 
	valist.m4:1.2->1.3(DEAD) 
	config/Makefile.in:1.104->1.105 
	developers/autogen.sh:1.19->1.20 
	include/Makefile.in:1.129->1.130 
	kaffe/Makefile.in:1.90->1.91 
	kaffe/jvmpi/Makefile.in:1.11->1.12 
	kaffe/kaffe/Makefile.in:1.104->1.105 
	kaffe/kaffeh/Makefile.in:1.87->1.88 
	kaffe/kaffevm/Makefile.in:1.121->1.122 
	kaffe/kaffevm/gcj/Makefile.in:1.70->1.71 
	kaffe/kaffevm/intrp/Makefile.in:1.76->1.77 
	kaffe/kaffevm/jit/Makefile.in:1.82->1.83 
	kaffe/kaffevm/jit3/Makefile.in:1.52->1.53 
	kaffe/kaffevm/systems/Makefile.in:1.78->1.79 
	kaffe/kaffevm/systems/beos-native/Makefile.in:1.69->1.70 
	kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.75->1.76 
	kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.78->1.79 
	kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.48->1.49 
	kaffe/man/Makefile.in:1.76->1.77 
	kaffe/scripts/Makefile.in:1.113->1.114 
	kaffe/scripts/bat/Makefile.in:1.69->1.70 
	kaffe/scripts/compat/Makefile.in:1.94->1.95 
	kaffe/xprof/Makefile.in:1.44->1.45 
	libraries/Makefile.in:1.73->1.74 
	libraries/clib/Makefile.in:1.81->1.82 
	libraries/clib/awt/Makefile.in:1.86->1.87 
	libraries/clib/awt/X/Makefile.in:1.76->1.77 
	libraries/clib/awt/qt/Makefile.in:1.31->1.32 
	libraries/clib/io/Makefile.in:1.79->1.80 
	libraries/clib/management/Makefile.in:1.88->1.89 
	libraries/clib/math/Makefile.in:1.84->1.85 
	libraries/clib/native/Makefile.in:1.111->1.112 
	libraries/clib/net/Makefile.in:1.92->1.93 
	libraries/clib/nio/Makefile.in:1.5->1.6 
	libraries/clib/security/Makefile.in:1.52->1.53 
	libraries/clib/zip/Makefile.in:1.86->1.87 
	libraries/extensions/Makefile.in:1.64->1.65 
	libraries/extensions/comm/Makefile.in:1.59->1.60 
	libraries/extensions/comm/javalib/Makefile.in:1.59->1.60 
	libraries/extensions/microsoft/Makefile.in:1.51->1.52 
	libraries/extensions/microsoft/clib/Makefile.in:1.54->1.55 
	libraries/extensions/microsoft/javalib/Makefile.in:1.52->1.53 
	libraries/extensions/pjava/Makefile.in:1.59->1.60 
	libraries/extensions/pjava/javalib/Makefile.in:1.59->1.60 
	libraries/extensions/servlet/Makefile.in:1.59->1.60 
	libraries/extensions/servlet/javalib/Makefile.in:1.59->1.60 
	libraries/extensions/sound/Makefile.in:1.27->1.28 
	libraries/extensions/sound/alsa/Makefile.in:1.29->1.30 
	libraries/extensions/sound/common/Makefile.in:1.29->1.30 
	libraries/extensions/sound/esd/Makefile.in:1.29->1.30 
	libraries/javalib/Makefile.in:1.201->1.202 
	m4/gnu-crypto.m4:INITIAL->1.1 
	m4/gwqt.m4:INITIAL->1.1 
	m4/herrno.m4:INITIAL->1.1 
	m4/iconv.m4:INITIAL->1.1 
	m4/in6addr.m4:INITIAL->1.1 
	m4/lib-ld.m4:INITIAL->1.1 
	m4/lib-link.m4:INITIAL->1.1 
	m4/lib-prefix.m4:INITIAL->1.1 
	m4/libtool.m4:INITIAL->1.1 
	m4/sockaddrin6.m4:INITIAL->1.1 
	m4/sockinttypes.m4:INITIAL->1.1 
	m4/valist.m4:INITIAL->1.1 
	replace/Makefile.in:1.23->1.24 
	test/Makefile.in:1.79->1.80 
	test/internal/Makefile.in:1.37->1.38 
	test/regression/Makefile.in:1.146->1.147 
	test/regression/compile_time/Makefile.in:1.7->1.8 
	test/regression/run_time/Makefile.in:1.8->1.9 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1826 kaffe/ChangeLog:1.1827
--- kaffe/ChangeLog:1.1826	Wed Dec 24 17:59:07 2003
+++ kaffe/ChangeLog	Wed Dec 24 19:06:49 2003
@@ -1,3 +1,103 @@
+2003-12-24  Dalibor Topic <robilad at kaffe.org>
+
+        * configure.in:
+	Set m4 macro directory to m4.
+
+        * Makefile.am
+	(EXTRA_DIST): Removed m4 macros.
+	(ACLOCAL_FLAGS) New setting.
+
+        * developers/autogen.sh:
+	Use m4 directory for aclocal.
+
+        * gnu-crypto.m4,
+        gwqt.m4,
+        herrno.m4,
+        iconv.m4,
+        in6addr.m4,
+        lib-ld.m4,
+        lib-link.m4,
+        lib-prefix.m4,
+	libtool.m4,
+        sockaddrin6.m4,
+        sockinttypes.m4,
+        valist.m4:
+	Moved to m4 directory.
+
+        * m4/gnu-crypto.m4,
+        m4/gwqt.m4,
+        m4/herrno.m4,
+        m4/iconv.m4,
+        m4/in6addr.m4,
+        m4/lib-ld.m4,
+        m4/lib-link.m4,
+        m4/lib-prefix.m4,
+        m4/libtool.m4,
+        m4/sockaddrin6.m4,
+        m4/sockinttypes.m4,
+        m4/valist.m4:
+	New files.
+
+        * Makefile.in,
+        aclocal.m4,
+        config/Makefile.in,
+        configure,
+        include/Makefile.in,
+        kaffe/Makefile.in,
+        kaffe/jvmpi/Makefile.in,
+        kaffe/kaffe/Makefile.in,
+        kaffe/kaffeh/Makefile.in,
+        kaffe/kaffevm/Makefile.in,
+        kaffe/kaffevm/gcj/Makefile.in,
+        kaffe/kaffevm/intrp/Makefile.in,
+        kaffe/kaffevm/jit/Makefile.in,
+        kaffe/kaffevm/jit3/Makefile.in,
+        kaffe/kaffevm/systems/Makefile.in,
+        kaffe/kaffevm/systems/beos-native/Makefile.in,
+        kaffe/kaffevm/systems/oskit-pthreads/Makefile.in,
+        kaffe/kaffevm/systems/unix-jthreads/Makefile.in,
+        kaffe/kaffevm/systems/unix-pthreads/Makefile.in,
+        kaffe/man/Makefile.in,
+        kaffe/scripts/Makefile.in,
+        kaffe/scripts/bat/Makefile.in,
+        kaffe/scripts/compat/Makefile.in,
+        kaffe/xprof/Makefile.in,
+        libraries/Makefile.in,
+        libraries/clib/Makefile.in,
+        libraries/clib/awt/Makefile.in,
+        libraries/clib/awt/X/Makefile.in,
+        libraries/clib/awt/qt/Makefile.in,
+        libraries/clib/io/Makefile.in,
+        libraries/clib/management/Makefile.in,
+        libraries/clib/math/Makefile.in,
+        libraries/clib/native/Makefile.in,
+        libraries/clib/net/Makefile.in,
+        libraries/clib/nio/Makefile.in,
+        libraries/clib/security/Makefile.in,
+        libraries/clib/zip/Makefile.in,
+        libraries/extensions/Makefile.in,
+        libraries/extensions/comm/Makefile.in,
+        libraries/extensions/comm/javalib/Makefile.in,
+        libraries/extensions/microsoft/Makefile.in,
+        libraries/extensions/microsoft/clib/Makefile.in,
+        libraries/extensions/microsoft/javalib/Makefile.in,
+        libraries/extensions/pjava/Makefile.in,
+        libraries/extensions/pjava/javalib/Makefile.in,
+        libraries/extensions/servlet/Makefile.in,
+        libraries/extensions/servlet/javalib/Makefile.in,
+        libraries/extensions/sound/Makefile.in,
+        libraries/extensions/sound/alsa/Makefile.in,
+        libraries/extensions/sound/common/Makefile.in,
+        libraries/extensions/sound/esd/Makefile.in,
+        libraries/javalib/Makefile.in,
+        replace/Makefile.in,
+        test/Makefile.in,
+        test/internal/Makefile.in,
+        test/regression/Makefile.in,
+        test/regression/compile_time/Makefile.in,
+        test/regression/run_time/Makefile.in:
+	Regenerated.
+
 2003-12-24  Guilhem Lavaux <guilhem at kaffe.org>
 
 	* libraries/javalib/java/net/InetSocketAddress.java
Index: kaffe/Makefile.am
diff -u kaffe/Makefile.am:1.53 kaffe/Makefile.am:1.54
--- kaffe/Makefile.am:1.53	Wed Dec 10 23:11:46 2003
+++ kaffe/Makefile.am	Wed Dec 24 19:06:50 2003
@@ -9,6 +9,9 @@
 # See the file "license.terms" for information on usage and redistribution 
 # of this file. 
 
+## Tell ac local to pick up the m4 macros from m4 directory
+ACLOCAL_FLAGS=-I m4
+
 AUTOMAKE_OPTIONS = foreign 1.3e
 
 SUBDIRS = . config include replace libltdl libraries/clib libraries/extensions kaffe libraries/javalib test
@@ -30,18 +33,6 @@
 	license.terms \
 	license-lesser.terms \
 	license-w3c.terms \
-	gnu-crypto.m4 \
-	gwqt.m4 \
-	herrno.m4 \
-	in6addr.m4 \
-	iconv.m4 \
-	lib-ld.m4 \
-	lib-link.m4 \
-	lib-prefix.m4 \
-	libtool.m4 \
-	sockaddrin6.m4 \
-	sockinttypes.m4 \
-	valist.m4 \
 	FAQ/FAQ.BeOS \
 	FAQ/FAQ.Known-Bugs \
 	FAQ/FAQ.amigaos \
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.123 kaffe/Makefile.in:1.124
--- kaffe/Makefile.in:1.123	Tue Dec 23 17:26:21 2003
+++ kaffe/Makefile.in	Wed Dec 24 19:06:50 2003
@@ -54,13 +54,14 @@
 	depcomp install-sh ltmain.sh missing mkinstalldirs
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/./gnu-crypto.m4 \
-	$(top_srcdir)/./gwqt.m4 $(top_srcdir)/./herrno.m4 \
-	$(top_srcdir)/./iconv.m4 $(top_srcdir)/./in6addr.m4 \
-	$(top_srcdir)/./lib-ld.m4 $(top_srcdir)/./lib-link.m4 \
-	$(top_srcdir)/./lib-prefix.m4 $(top_srcdir)/./libtool.m4 \
-	$(top_srcdir)/./sockaddrin6.m4 $(top_srcdir)/./sockinttypes.m4 \
-	$(top_srcdir)/./valist.m4 $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/m4/gnu-crypto.m4 \
+	$(top_srcdir)/m4/gwqt.m4 $(top_srcdir)/m4/herrno.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/in6addr.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/sockaddrin6.m4 \
+	$(top_srcdir)/m4/sockinttypes.m4 $(top_srcdir)/m4/valist.m4 \
+	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -301,6 +302,7 @@
 target_alias = @target_alias@
 toolslibdir = @toolslibdir@
 with_engine = @with_engine@
+ACLOCAL_FLAGS = -I m4
 AUTOMAKE_OPTIONS = foreign 1.3e
 SUBDIRS = . config include replace libltdl libraries/clib libraries/extensions kaffe libraries/javalib test
 DIST_SUBDIRS = . config include replace libltdl kaffe libraries test
@@ -319,18 +321,6 @@
 	license.terms \
 	license-lesser.terms \
 	license-w3c.terms \
-	gnu-crypto.m4 \
-	gwqt.m4 \
-	herrno.m4 \
-	in6addr.m4 \
-	iconv.m4 \
-	lib-ld.m4 \
-	lib-link.m4 \
-	lib-prefix.m4 \
-	libtool.m4 \
-	sockaddrin6.m4 \
-	sockinttypes.m4 \
-	valist.m4 \
 	FAQ/FAQ.BeOS \
 	FAQ/FAQ.Known-Bugs \
 	FAQ/FAQ.amigaos \
@@ -598,7 +588,7 @@
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/. $(distdir)/FAQ $(distdir)/compat-include $(distdir)/developers $(distdir)/include/kaffe $(distdir)/kaffe/man $(distdir)/kaffe/scripts $(distdir)/kaffe/scripts/compat $(distdir)/libraries/javalib $(distdir)/test/regression $(distdir)/test/regression/compile_time $(distdir)/test/regression/run_time
+	$(mkdir_p) $(distdir)/. $(distdir)/FAQ $(distdir)/compat-include $(distdir)/developers $(distdir)/include/kaffe $(distdir)/kaffe/man $(distdir)/kaffe/scripts $(distdir)/kaffe/scripts/compat $(distdir)/libraries/javalib $(distdir)/m4 $(distdir)/test/regression $(distdir)/test/regression/compile_time $(distdir)/test/regression/run_time
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
Index: kaffe/aclocal.m4
diff -u kaffe/aclocal.m4:1.85 kaffe/aclocal.m4:1.86
--- kaffe/aclocal.m4:1.85	Fri Dec 19 20:03:26 2003
+++ kaffe/aclocal.m4	Wed Dec 24 19:06:50 2003
@@ -953,15 +953,15 @@
 INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-m4_include([./gnu-crypto.m4])
-m4_include([./gwqt.m4])
-m4_include([./herrno.m4])
-m4_include([./iconv.m4])
-m4_include([./in6addr.m4])
-m4_include([./lib-ld.m4])
-m4_include([./lib-link.m4])
-m4_include([./lib-prefix.m4])
-m4_include([./libtool.m4])
-m4_include([./sockaddrin6.m4])
-m4_include([./sockinttypes.m4])
-m4_include([./valist.m4])
+m4_include([m4/gnu-crypto.m4])
+m4_include([m4/gwqt.m4])
+m4_include([m4/herrno.m4])
+m4_include([m4/iconv.m4])
+m4_include([m4/in6addr.m4])
+m4_include([m4/lib-ld.m4])
+m4_include([m4/lib-link.m4])
+m4_include([m4/lib-prefix.m4])
+m4_include([m4/libtool.m4])
+m4_include([m4/sockaddrin6.m4])
+m4_include([m4/sockinttypes.m4])
+m4_include([m4/valist.m4])
Index: kaffe/configure
diff -u kaffe/configure:1.269 kaffe/configure:1.270
--- kaffe/configure:1.269	Tue Dec 23 17:26:21 2003
+++ kaffe/configure	Wed Dec 24 19:06:50 2003
@@ -1980,6 +1980,17 @@
 
 
 
+case m4 in
+  [\\/]* | ?:[\\/]* ) ac_macro_dir=m4         ;;
+  *)                      ac_macro_dir=$srcdir/m4 ;;
+esac
+if test -d "$ac_macro_dir"; then :
+else
+  { { echo "$as_me:$LINENO: error: cannot find macro directory \`m4'" >&5
+echo "$as_me: error: cannot find macro directory \`m4'" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
 
 
 
@@ -4328,7 +4339,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4331 "configure"' > conftest.$ac_ext
+  echo '#line 4342 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -5436,7 +5447,7 @@
 
 
 # Provide some information about the compiler.
-echo "$as_me:5439:" \
+echo "$as_me:5450:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6473,11 +6484,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6476: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6487: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6480: \$? = $ac_status" >&5
+   echo "$as_me:6491: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -6705,11 +6716,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6708: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6719: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6712: \$? = $ac_status" >&5
+   echo "$as_me:6723: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -6772,11 +6783,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6775: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6786: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:6779: \$? = $ac_status" >&5
+   echo "$as_me:6790: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8890,7 +8901,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 8893 "configure"
+#line 8904 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -8988,7 +8999,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 8991 "configure"
+#line 9002 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11144,11 +11155,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11147: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11158: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:11151: \$? = $ac_status" >&5
+   echo "$as_me:11162: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -11211,11 +11222,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11214: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11225: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:11218: \$? = $ac_status" >&5
+   echo "$as_me:11229: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12540,7 +12551,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12543 "configure"
+#line 12554 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12638,7 +12649,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12641 "configure"
+#line 12652 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13460,11 +13471,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13463: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13474: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13467: \$? = $ac_status" >&5
+   echo "$as_me:13478: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -13527,11 +13538,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13530: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13541: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13534: \$? = $ac_status" >&5
+   echo "$as_me:13545: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15493,11 +15504,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15496: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15507: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15500: \$? = $ac_status" >&5
+   echo "$as_me:15511: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -15725,11 +15736,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15728: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15739: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15732: \$? = $ac_status" >&5
+   echo "$as_me:15743: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -15792,11 +15803,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15795: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15806: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15799: \$? = $ac_status" >&5
+   echo "$as_me:15810: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -17910,7 +17921,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 17913 "configure"
+#line 17924 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -18008,7 +18019,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 18011 "configure"
+#line 18022 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
Index: kaffe/configure.in
diff -u kaffe/configure.in:1.234 kaffe/configure.in:1.235
--- kaffe/configure.in:1.234	Tue Dec 23 17:26:27 2003
+++ kaffe/configure.in	Wed Dec 24 19:06:54 2003
@@ -1,6 +1,7 @@
 AC_INIT([kaffe],[1.1.x-cvs],[kaffe at kaffe.org])
 AC_CONFIG_SRCDIR([kaffe])
 AM_INIT_AUTOMAKE(kaffe, 1.1.x-cvs)
+AC_CONFIG_MACRO_DIR([m4])
 
 AC_PREFIX_DEFAULT(/usr/local/kaffe)
 
===================================================================
Checking out kaffe/gnu-crypto.m4
RCS:  /home/cvs/kaffe/kaffe/Attic/gnu-crypto.m4,v
VERS: 1.2
***************
--- kaffe/gnu-crypto.m4	Wed Dec 24 19:10:39 2003
+++ /dev/null	Sun Aug  4 19:57:58 2002
@@ -1,134 +0,0 @@
-# ----------------------------------------------------------------------------
-# $Id: gnu-crypto.m4,v 1.2 2003/12/19 20:03:31 dalibor Exp $
-#
-# Copyright (C) 2003 Free Software Foundation, Inc.
-#
-# This file is part of GNU Crypto.
-#
-# GNU Crypto is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# GNU Crypto is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; see the file COPYING.  If not, write to the
-#
-#    Free Software Foundation Inc.,
-#    59 Temple Place - Suite 330,
-#    Boston, MA 02111-1307
-#    USA
-#
-# Linking this library statically or dynamically with other modules is
-# making a combined work based on this library.  Thus, the terms and
-# conditions of the GNU General Public License cover the whole
-# combination.
-#
-# As a special exception, the copyright holders of this library give
-# you permission to link this library with independent modules to
-# produce an executable, regardless of the license terms of these
-# independent modules, and to copy and distribute the resulting
-# executable under terms of your choice, provided that you also meet,
-# for each linked independent module, the terms and conditions of the
-# license of that module.  An independent module is a module which is
-# not derived from or based on this library.  If you modify this
-# library, you may extend this exception to your version of the
-# library, but you are not obligated to do so.  If you do not wish to
-# do so, delete this exception statement from your version.
-# ----------------------------------------------------------------------------
-#
-# GNU Crypto m4 macro for use by VM Providers
-#
-# $Revision: 1.2 $
-#
-
-# process --with-gnu-crypto configure option.
-# test if the GNU Crypto package is installed.  if no argument was specified
-# with the option, this macro looks for a 'share/gnu-crypto.jar' file and
-# a 'lib/lib-gnu-crypto.so' in the following places, in this order:
-# /usr/local/gnu-crypto, /usr/local, /usr, /opt/gnu-crypto, and /opt.
-# otherwise those two files are looked up under the designated location.
-# in total, the following variables are set:
-#
-# USER_WANT_GNU_CRYPTO: an automake conditional; true if with-gnu-crypto is set,
-# GNU_CRYPTO_HOME: the installation directory of GNU Crypto,
-# GNU_CRYPTO_JAR: the fully qualified path to gnu-crypto.jar,
-# JAVAX_CRYPTO_JAR: the fully qualified path to javax-crypto.jar,
-# JAVAX_SECURITY_JAR: the fully qualified path to javax-security.jar.
-# -----------------------------------------------------------------------------
-AC_DEFUN([CHECK_GNU_CRYPTO],[
-AC_ARG_WITH([gnu-crypto],
-            AC_HELP_STRING([--with-gnu-crypto],
-                           [path to GNU Crypto install directory.  if unspecified, /usr/local/gnu-crypto, /usr/local, /usr, /opt/gnu-crypto, and /opt are considered, in that order]),
-
-            [if test "x${withval}" != x && test "x${withval}" != xyes && test "x${withval}" != xno; then
-              AC_MSG_CHECKING([${withval}])
-              _CHECK_GNU_CRYPTO_HOME(${withval})
-              if test x$GNU_CRYPTO_HOME = x ; then
-                AC_MSG_RESULT(no)
-                AC_MSG_ERROR([cannot find designated GNU Crypto install directory])
-              else
-                AC_MSG_RESULT(yes)
-                with_gnu_crypto=true
-              fi
-            elif test "x${withval}" != xno; then
-              AC_MSG_NOTICE([no value supplied --with-gnu-crypto.  will look in default locations])
-              _FIND_GNU_CRYPTO_HOME([/usr/local/gnu-crypto /usr/local /usr /opt/gnu-crypto /opt])
-              if test x$GNU_CRYPTO_HOME = x ; then
-                AC_MSG_ERROR([cannot find GNU Crypto install directory.  install it and/or specify its location using --with-gnu-crypto])
-              fi
-              with_gnu_crypto=true
-            else
-              with_gnu_crypto=false
-            fi],
-            [with_gnu_crypto=false])
-GNU_CRYPTO_HOME=`(cd ${GNU_CRYPTO_HOME}; pwd)`
-AC_SUBST(GNU_CRYPTO_HOME)
-if test -r ${GNU_CRYPTO_HOME}/share/gnu-crypto.jar ; then
-  GNU_CRYPTO_JAR=${GNU_CRYPTO_HOME}/share/gnu-crypto.jar
-  AC_SUBST(GNU_CRYPTO_JAR)
-fi
-if test -r ${GNU_CRYPTO_HOME}/share/javax-crypto.jar ; then
-  JAVAX_CRYPTO_JAR=${GNU_CRYPTO_HOME}/share/javax-crypto.jar
-  AC_SUBST(JAVAX_CRYPTO_JAR)
-fi
-if test -r ${GNU_CRYPTO_HOME}/share/javax-security.jar ; then
-  JAVAX_SECURITY_JAR=${GNU_CRYPTO_HOME}/share/javax-security.jar
-  AC_SUBST(JAVAX_SECURITY_JAR)
-fi
-AM_CONDITIONAL(USER_WANT_GNU_CRYPTO, test "x${with_gnu_crypto}" = xtrue)
-])# CHECK_GNU_CRYPTO
-
-
-# given a list of arguments, this macro tries repeatedly and for each element
-# of the input list, to (a) assert that the argument is indeed a directory,
-# and (b) it contains under it both 'lib/lib-gnu-crypto.so' and
-# 'share/gnu-crypto.jar' files.
-# -----------------------------------------------------------------------------
-AC_DEFUN([_FIND_GNU_CRYPTO_HOME],[
-AC_MSG_CHECKING([for GNU Crypto installation directory])
-for _F in $1 ; do
-  _CHECK_GNU_CRYPTO_HOME(${_F})
-  if test x$GNU_CRYPTO_HOME != x ; then
-    break
-  fi
-done
-if test x${GNU_CRYPTO_HOME} = x ; then
-  AC_MSG_RESULT([not found])
-else
-  AC_MSG_RESULT([${GNU_CRYPTO_HOME}])
-fi])# _FIND_GNU_CRYPTO_HOME
-
-
-# given a directory as an input, this macro checks if the two files
-# 'lib/lib-gnu-crypto.so' and 'share/gnu-crypto.jar' exist under it.  if they
-# do, then GNU_CRYPTO_DIR is set to that argument.
-# -----------------------------------------------------------------------------
-AC_DEFUN([_CHECK_GNU_CRYPTO_HOME],
-[if test -r $1/lib/lib-gnu-crypto.so || test -r $1/share/gnu-crypto.jar ; then
-  GNU_CRYPTO_HOME=$1
-fi])# _CHECK_GNU_CRYPTO_HOME
===================================================================
Checking out kaffe/gwqt.m4
RCS:  /home/cvs/kaffe/kaffe/Attic/gwqt.m4,v
VERS: 1.5
***************
--- kaffe/gwqt.m4	Wed Dec 24 19:10:39 2003
+++ /dev/null	Sun Aug  4 19:57:58 2002
@@ -1,214 +0,0 @@
-# Check for Qt compiler flags, linker flags, and binary packages
-AC_DEFUN([gw_CHECK_QT],
-[
-AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([AC_PATH_X])
-
-AC_MSG_CHECKING([QTDIR])
-AC_ARG_WITH([qtdir], [  --with-qtdir=DIR        Qt installation directory [default=$QTDIR]], QTDIR=$withval)
-# Check that QTDIR is defined or that --with-qtdir given
-if test x"$QTDIR" = x"" ; then
-    AC_MSG_ERROR([*** QTDIR must be defined, or --with-qtdir option given])
-fi
-AC_MSG_RESULT([$QTDIR])
-
-# Change backslashes in QTDIR to forward slashes to prevent escaping
-# problems later on in the build process, mainly for Cygwin build
-# environment using MSVC as the compiler
-# TODO: Use sed instead of perl
-QTDIR=`echo $QTDIR | perl -p -e 's/\\\\/\\//g'`
-
-# Figure out which version of Qt we are using
-AC_MSG_CHECKING([Qt version])
-QT_VER=`grep 'define.*QT_VERSION_STR\W' $QTDIR/include/qglobal.h | perl -p -e 's/\D//g'`
-case "${QT_VER}" in
-    2*)
-        QT_MAJOR="2"
-    ;;
-    3*)
-        QT_MAJOR="3"
-    ;;
-    *)
-        AC_MSG_ERROR([*** Don't know how to handle this Qt major version])
-    ;;
-esac
-AC_MSG_RESULT([$QT_VER ($QT_MAJOR)])
-
-# Check that moc is in path
-AC_CHECK_PROG(MOC, moc, moc)
-if test x$MOC = x ; then
-        AC_MSG_ERROR([*** moc must be in path])
-fi
-
-# uic is the Qt user interface compiler
-AC_CHECK_PROG(UIC, uic, uic)
-#if test x$UIC = x ; then
-#        AC_MSG_ERROR([*** uic must be in path])
-#fi
-
-# qembed is the Qt data embedding utility.
-# It is located in $QTDIR/tools/qembed, and must be compiled and installed
-# manually, we'll let it slide if it isn't present
-AC_CHECK_PROG(QEMBED, qembed, qembed)
-
-
-# Calculate Qt include path
-QT_CXXFLAGS="-I$QTDIR/include"
-
-QT_IS_EMBEDDED="no"
-# On unix, figure out if we're doing a static or dynamic link
-case "${host}" in
-    *-cygwin)
-	AC_DEFINE_UNQUOTED(WIN32, "", Defined if on Win32 platform)
-        if test -f "$QTDIR/lib/qt.lib" ; then
-            QT_LIB="qt.lib"
-            QT_IS_STATIC="yes"
-            QT_IS_MT="no"
-        elif test -f "$QTDIR/lib/qt-mt.lib" ; then
-            QT_LIB="qt-mt.lib" 
-            QT_IS_STATIC="yes"
-            QT_IS_MT="yes"
-        elif test -f "$QTDIR/lib/qt$QT_VER.lib" ; then
-            QT_LIB="qt$QT_VER.lib"
-            QT_IS_STATIC="no"
-            QT_IS_MT="no"
-        elif test -f "$QTDIR/lib/qt-mt$QT_VER.lib" ; then
-            QT_LIB="qt-mt$QT_VER.lib"
-            QT_IS_STATIC="no"
-            QT_IS_MT="yes"
-        fi
-        ;;
-
-    *)
-        QT_IS_STATIC=`ls $QTDIR/lib/*.a 2> /dev/null`
-        if test "x$QT_IS_STATIC" = x; then
-            QT_IS_STATIC="no"
-        else
-            QT_IS_STATIC="yes"
-        fi
-        if test x$QT_IS_STATIC = xno ; then
-            QT_IS_DYNAMIC=`ls $QTDIR/lib/*.so 2> /dev/null` 
-            if test "x$QT_IS_DYNAMIC" = x;  then
-                AC_MSG_ERROR([*** Couldn't find any Qt libraries])
-            fi
-        fi
-
-        if test "x`ls $QTDIR/lib/libqt-mt.* 2> /dev/null`" != x ; then
-            QT_LIB="-lqt-mt"
-            QT_IS_MT="yes"
-        elif test "x`ls $QTDIR/lib/libqt.* 2> /dev/null`" != x ; then
-            QT_LIB="-lqt"
-            QT_IS_MT="no"
-        elif test "x`ls $QTDIR/lib/libqte-mt.* 2> /dev/null`" != x ; then
-            QT_LIB="-lqte-mt"
-            QT_IS_MT="yes"
-            QT_IS_EMBEDDED="yes"
-        elif test "x`ls $QTDIR/lib/libqte.* 2> /dev/null`" != x ; then
-            QT_LIB="-lqte"
-            QT_IS_MT="no"
-            QT_IS_EMBEDDED="yes"
-        fi
-        ;;
-	
-esac
-AC_MSG_CHECKING([if Qt is static])
-AC_MSG_RESULT([$QT_IS_STATIC])
-AC_MSG_CHECKING([if Qt is multithreaded])
-AC_MSG_RESULT([$QT_IS_MT])
-AC_MSG_CHECKING([if Qt is embedded])
-AC_MSG_RESULT([$QT_IS_EMBEDDED])
-
-if test x$QT_IS_EMBEDDED = xyes ; then
-	QT_CXXFLAGS="$QT_CXXFLAGS -DQWS"
-
-	# test for Qtopia
-	AC_MSG_CHECKING([Qtopia])
-	if test "x`ls $QTDIR/lib/libqpe.* 2> /dev/null`" != x ; then
-		QT_CXXFLAGS="$QT_CXXFLAGS -DQPE"
-		QT_LIB="-lqpe -lqtopia -lm $QT_LIB"
-		AC_MSG_RESULT([found])
-	else
-		AC_MSG_RESULT([not found])
-	fi
-fi
-
-QT_GUILINK=""
-case "${host}" in
-    *irix*)
-        QT_LIBS="$QT_LIB"
-        if test $QT_IS_STATIC = yes ; then
-            QT_LIBS="$QT_LIBS -L$x_libraries -lXext -lX11 -lm -lSM -lICE"
-        fi
-        ;;
-
-    *linux*)
-        QT_LIBS="$QT_LIB"
-        if test $QT_IS_STATIC = yes && test $QT_IS_EMBEDDED = no; then
-            QT_LIBS="$QT_LIBS -L$x_libraries -lXext -lX11 -lm -lSM -lICE -ldl -ljpeg"
-        fi
-        ;;
-
-
-    *osf*) 
-        # Digital Unix (aka DGUX aka Tru64)
-        QT_LIBS="$QT_LIB"
-        if test $QT_IS_STATIC = yes ; then
-            QT_LIBS="$QT_LIBS -L$x_libraries -lXext -lX11 -lm -lSM -lICE"
-        fi
-        ;;
-
-    *solaris*)
-        QT_LIBS="$QT_LIB"
-        if test $QT_IS_STATIC = yes ; then
-            QT_LIBS="$QT_LIBS -L$x_libraries -lXext -lX11 -lm -lSM -lICE -lresolv -lsocket -lnsl"
-        fi
-        ;;
-
-
-    *win*)
-        # linker flag to suppress console when linking a GUI app on Win32
-        QT_GUILINK="/subsystem:windows"
-
-	if test $QT_MAJOR = "3" ; then
-	    if test $QT_IS_MT = yes ; then

*** Patch too long, truncated ***




More information about the kaffe mailing list