[kaffe] CVS kaffe (dalibor): Added support for gettext in order to update m4 files needed for libiconv in syn
Kaffe CVS
Kaffe Mailing List <kaffe@kaffe.org>
Sat Jan 17 10:03:02 2004
PatchSet 4345
Date: 2004/01/17 18:00:08
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Added support for gettext in order to update m4 files needed for libiconv in sync with gettext releases
2004-01-17 Dalibor Topic <robilad@kaffe.org>
Switched over to using gettext's autopoint to
update m4 files required for iconv support.
* developers/autogen.sh:
Added calls to autopoint.
* configure.in:
Added check for GNU gettext.
* ABOUT-NLS,
Makefile.am,
Makefile.in,
aclocal.m4,
config/Makefile.in,
config/config.h.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.am,
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.
* m4/codeset.m4,
m4/gettext.m4,
m4/glibc21.m4,
m4/intdiv0.m4,
m4/intmax.m4,
m4/inttypes-pri.m4,
m4/inttypes.m4,
m4/inttypes_h.m4,
m4/isc-posix.m4,
m4/lcmessage.m4,
m4/longdouble.m4,
m4/longlong.m4,
m4/nls.m4,
m4/po.m4,
m4/printf-posix.m4,
m4/progtest.m4,
m4/signed.m4,
m4/size_max.m4,
m4/stdint_h.m4,
m4/uintmax_t.m4,
m4/ulonglong.m4,
m4/wchar_t.m4,
m4/wint_t.m4,
m4/xsize.m4,
po/Makefile.in.in,
po/Makevars.template,
po/Rules-quot,
po/boldquot.sed,
po/en@boldquot.header,
po/en@quot.header,
po/insert-header.sin,
po/quot.sed,
po/remove-potcdate.sin,
scripts/config.rpath,
scripts/mkinstalldirs:
New files.
* m4/lib-ld.m4,
m4/lib-prefix.m4:
Updated to gettext 0.13.1.
Members:
ChangeLog:1.1932->1.1933
Makefile.am:1.55->1.56
Makefile.in:1.134->1.135
aclocal.m4:1.90->1.91
configure:1.283->1.284
configure.in:1.248->1.249
config/Makefile.in:1.113->1.114
config/config.h.in:1.86->1.87
developers/autogen.sh:1.24->1.25
include/Makefile.in:1.137->1.138
kaffe/Makefile.in:1.98->1.99
kaffe/jvmpi/Makefile.in:1.19->1.20
kaffe/kaffe/Makefile.in:1.112->1.113
kaffe/kaffeh/Makefile.in:1.95->1.96
kaffe/kaffevm/Makefile.in:1.129->1.130
kaffe/kaffevm/gcj/Makefile.in:1.78->1.79
kaffe/kaffevm/intrp/Makefile.in:1.84->1.85
kaffe/kaffevm/jit/Makefile.in:1.90->1.91
kaffe/kaffevm/jit3/Makefile.in:1.60->1.61
kaffe/kaffevm/systems/Makefile.in:1.86->1.87
kaffe/kaffevm/systems/beos-native/Makefile.in:1.77->1.78
kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.83->1.84
kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.86->1.87
kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.56->1.57
kaffe/man/Makefile.in:1.84->1.85
kaffe/scripts/Makefile.in:1.121->1.122
kaffe/scripts/bat/Makefile.in:1.77->1.78
kaffe/scripts/compat/Makefile.in:1.102->1.103
kaffe/xprof/Makefile.in:1.52->1.53
libraries/Makefile.in:1.81->1.82
libraries/clib/Makefile.in:1.89->1.90
libraries/clib/awt/Makefile.in:1.94->1.95
libraries/clib/awt/X/Makefile.in:1.84->1.85
libraries/clib/awt/qt/Makefile.in:1.39->1.40
libraries/clib/io/Makefile.in:1.87->1.88
libraries/clib/management/Makefile.in:1.96->1.97
libraries/clib/math/Makefile.in:1.92->1.93
libraries/clib/native/Makefile.in:1.119->1.120
libraries/clib/net/Makefile.in:1.100->1.101
libraries/clib/nio/Makefile.in:1.13->1.14
libraries/clib/security/Makefile.in:1.60->1.61
libraries/clib/zip/Makefile.in:1.94->1.95
libraries/extensions/Makefile.in:1.72->1.73
libraries/extensions/comm/Makefile.in:1.67->1.68
libraries/extensions/comm/javalib/Makefile.in:1.67->1.68
libraries/extensions/microsoft/Makefile.in:1.59->1.60
libraries/extensions/microsoft/clib/Makefile.in:1.62->1.63
libraries/extensions/microsoft/javalib/Makefile.in:1.60->1.61
libraries/extensions/pjava/Makefile.in:1.67->1.68
libraries/extensions/pjava/javalib/Makefile.in:1.67->1.68
libraries/extensions/servlet/Makefile.in:1.67->1.68
libraries/extensions/servlet/javalib/Makefile.in:1.67->1.68
libraries/extensions/sound/Makefile.in:1.35->1.36
libraries/extensions/sound/alsa/Makefile.in:1.37->1.38
libraries/extensions/sound/common/Makefile.in:1.37->1.38
libraries/extensions/sound/esd/Makefile.in:1.37->1.38
libraries/javalib/Makefile.am:1.161->1.162
libraries/javalib/Makefile.in:1.217->1.218
m4/codeset.m4:INITIAL->1.1
m4/gettext.m4:INITIAL->1.1
m4/glibc21.m4:INITIAL->1.1
m4/intdiv0.m4:INITIAL->1.1
m4/intmax.m4:INITIAL->1.1
m4/inttypes-pri.m4:INITIAL->1.1
m4/inttypes.m4:INITIAL->1.1
m4/inttypes_h.m4:INITIAL->1.1
m4/isc-posix.m4:INITIAL->1.1
m4/lcmessage.m4:INITIAL->1.1
m4/lib-ld.m4:1.1->1.2
m4/lib-prefix.m4:1.1->1.2
m4/longdouble.m4:INITIAL->1.1
m4/longlong.m4:INITIAL->1.1
m4/nls.m4:INITIAL->1.1
m4/po.m4:INITIAL->1.1
m4/printf-posix.m4:INITIAL->1.1
m4/progtest.m4:INITIAL->1.1
m4/signed.m4:INITIAL->1.1
m4/size_max.m4:INITIAL->1.1
m4/stdint_h.m4:INITIAL->1.1
m4/uintmax_t.m4:INITIAL->1.1
m4/ulonglong.m4:INITIAL->1.1
m4/wchar_t.m4:INITIAL->1.1
m4/wint_t.m4:INITIAL->1.1
m4/xsize.m4:INITIAL->1.1
po/Makefile.in.in:INITIAL->1.1
po/Makevars.template:INITIAL->1.1
po/boldquot.sed:INITIAL->1.1
po/en@boldquot.header:INITIAL->1.1
po/en@quot.header:INITIAL->1.1
po/insert-header.sin:INITIAL->1.1
po/quot.sed:INITIAL->1.1
po/remove-potcdate.sin:INITIAL->1.1
replace/Makefile.in:1.31->1.32
scripts/config.rpath:1.1->1.2
scripts/mkinstalldirs:INITIAL->1.1
test/Makefile.in:1.87->1.88
test/internal/Makefile.in:1.45->1.46
test/regression/Makefile.in:1.154->1.155
test/regression/compile_time/Makefile.in:1.15->1.16
test/regression/run_time/Makefile.in:1.16->1.17
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1932 kaffe/ChangeLog:1.1933
--- kaffe/ChangeLog:1.1932 Thu Jan 15 18:20:28 2004
+++ kaffe/ChangeLog Sat Jan 17 18:00:08 2004
@@ -1,3 +1,123 @@
+2004-01-17 Dalibor Topic <robilad@kaffe.org>
+
+ Switched over to using gettext's autopoint to
+ update m4 files required for iconv support.
+
+ * developers/autogen.sh:
+ Added calls to autopoint.
+
+ * configure.in:
+ Added check for GNU gettext.
+
+ * ABOUT-NLS,
+ Makefile.am,
+ Makefile.in,
+ aclocal.m4,
+ config/Makefile.in,
+ config/config.h.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.am,
+ 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.
+
+ * m4/codeset.m4,
+ m4/gettext.m4,
+ m4/glibc21.m4,
+ m4/intdiv0.m4,
+ m4/intmax.m4,
+ m4/inttypes-pri.m4,
+ m4/inttypes.m4,
+ m4/inttypes_h.m4,
+ m4/isc-posix.m4,
+ m4/lcmessage.m4,
+ m4/longdouble.m4,
+ m4/longlong.m4,
+ m4/nls.m4,
+ m4/po.m4,
+ m4/printf-posix.m4,
+ m4/progtest.m4,
+ m4/signed.m4,
+ m4/size_max.m4,
+ m4/stdint_h.m4,
+ m4/uintmax_t.m4,
+ m4/ulonglong.m4,
+ m4/wchar_t.m4,
+ m4/wint_t.m4,
+ m4/xsize.m4,
+ po/Makefile.in.in,
+ po/Makevars.template,
+ po/Rules-quot,
+ po/boldquot.sed,
+ po/en@boldquot.header,
+ po/en@quot.header,
+ po/insert-header.sin,
+ po/quot.sed,
+ po/remove-potcdate.sin,
+ scripts/config.rpath,
+ scripts/mkinstalldirs:
+ New files.
+
+ * m4/lib-ld.m4,
+ m4/lib-prefix.m4:
+ Updated to gettext 0.13.1.
+
+2004-01-17 gettextize <bug-gnu-gettext@gnu.org>
+
+ * Makefile.am (ACLOCAL_AMFLAGS): New variable.
+
2004-01-15 Dalibor Topic <robilad@kaffe.org>
* config.rpath: Moved to scripts directory.
Index: kaffe/Makefile.am
diff -u kaffe/Makefile.am:1.55 kaffe/Makefile.am:1.56
--- kaffe/Makefile.am:1.55 Wed Jan 14 22:13:47 2004
+++ kaffe/Makefile.am Sat Jan 17 18:00:09 2004
@@ -10,11 +10,11 @@
# of this file.
## Tell ac local to pick up the m4 macros from m4 directory
-ACLOCAL_FLAGS=-I m4
+ACLOCAL_AMFLAGS=-I m4
AUTOMAKE_OPTIONS = foreign 1.3e
-SUBDIRS = . config include replace libltdl libraries/clib libraries/extensions kaffe libraries/javalib test
+SUBDIRS = . config include replace libltdl libraries/clib libraries/extensions kaffe libraries/javalib test po
DIST_SUBDIRS = . config include replace libltdl kaffe libraries test
@@ -167,4 +167,3 @@
# Regenerate HTML docs and copy them to source tree
docs-regen: docs-docbook-html
cp -f target/docs/docbook/*.html $(srcdir)/docs/html
-
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.134 kaffe/Makefile.in:1.135
--- kaffe/Makefile.in:1.134 Thu Jan 15 18:20:29 2004
+++ kaffe/Makefile.in Sat Jan 17 18:00:09 2004
@@ -49,25 +49,27 @@
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/project.properties.in \
$(srcdir)/project.xml.in $(top_srcdir)/configure \
- $(top_srcdir)/include/kaffe/jtypes.h.in AUTHORS ChangeLog \
- INSTALL scripts/config.guess scripts/config.rpath \
+ $(top_srcdir)/include/kaffe/jtypes.h.in ABOUT-NLS AUTHORS \
+ ChangeLog INSTALL scripts/config.guess scripts/config.rpath \
scripts/config.sub scripts/depcomp scripts/install-sh \
- scripts/ltmain.sh scripts/missing
+ scripts/ltmain.sh scripts/missing scripts/mkinstalldirs
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/esd.m4 \
- $(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/gettext.m4 $(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/nls.m4 $(top_srcdir)/m4/po.m4 \
+ $(top_srcdir)/m4/progtest.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 \
configure.lineno configure.status.lineno
-mkinstalldirs = $(mkdir_p)
+mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config/config.h \
$(top_builddir)/include/kaffe/jtypes.h
CONFIG_CLEAN_FILES = project.xml project.properties
@@ -152,6 +154,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
+GMSGFMT = @GMSGFMT@
GNU_CRYPTO_HOME = @GNU_CRYPTO_HOME@
GNU_CRYPTO_JAR = @GNU_CRYPTO_JAR@
HAVE_BCEL_FALSE = @HAVE_BCEL_FALSE@
@@ -174,6 +177,7 @@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
JASMIN = @JASMIN@
JAVAX_CRYPTO_JAR = @JAVAX_CRYPTO_JAR@
JAVAX_SECURITY_JAR = @JAVAX_SECURITY_JAR@
@@ -193,6 +197,7 @@
KVMLIBFLAGS = @KVMLIBFLAGS@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -200,6 +205,7 @@
LIBTOOL_DEPS = @LIBTOOL_DEPS@
LN_S = @LN_S@
LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
@@ -208,8 +214,11 @@
MAKE_KAFFEH = @MAKE_KAFFEH@
MATH_LIB = @MATH_LIB@
MATH_LIBS = @MATH_LIBS@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MKTEMP = @MKTEMP@
MOC = @MOC@
+MSGFMT = @MSGFMT@
+MSGMERGE = @MSGMERGE@
M_LIBS = @M_LIBS@
NEED_LIBXPROF_FALSE = @NEED_LIBXPROF_FALSE@
NEED_LIBXPROF_TRUE = @NEED_LIBXPROF_TRUE@
@@ -225,6 +234,7 @@
PATHSEP = @PATHSEP@
PATH_SEPARATOR = @PATH_SEPARATOR@
PATH_TO_RT_JAR = @PATH_TO_RT_JAR@
+POSUB = @POSUB@
PROFILE = @PROFILE@
QEMBED = @QEMBED@
QT_CXXFLAGS = @QT_CXXFLAGS@
@@ -247,10 +257,12 @@
USE_COMPAT_IFADDRS_TRUE = @USE_COMPAT_IFADDRS_TRUE@
USE_JIT_FALSE = @USE_JIT_FALSE@
USE_JIT_TRUE = @USE_JIT_TRUE@
+USE_NLS = @USE_NLS@
USE_PRECOMPILED_RT_JAR_FALSE = @USE_PRECOMPILED_RT_JAR_FALSE@
USE_PRECOMPILED_RT_JAR_TRUE = @USE_PRECOMPILED_RT_JAR_TRUE@
VERSION = @VERSION@
VM_LIBS = @VM_LIBS@
+XGETTEXT = @XGETTEXT@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
@@ -313,9 +325,9 @@
target_alias = @target_alias@
toolslibdir = @toolslibdir@
with_engine = @with_engine@
-ACLOCAL_FLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4
AUTOMAKE_OPTIONS = foreign 1.3e
-SUBDIRS = . config include replace libltdl libraries/clib libraries/extensions kaffe libraries/javalib test
+SUBDIRS = . config include replace libltdl libraries/clib libraries/extensions kaffe libraries/javalib test po
DIST_SUBDIRS = . config include replace libltdl kaffe libraries test
EXTRA_DIST = \
ChangeLog.1 \
Index: kaffe/aclocal.m4
diff -u kaffe/aclocal.m4:1.90 kaffe/aclocal.m4:1.91
--- kaffe/aclocal.m4:1.90 Wed Jan 14 19:41:03 2004
+++ kaffe/aclocal.m4 Sat Jan 17 18:00:09 2004
@@ -972,6 +972,7 @@
m4_include([m4/alsa.m4])
m4_include([m4/esd.m4])
+m4_include([m4/gettext.m4])
m4_include([m4/gnu-crypto.m4])
m4_include([m4/gwqt.m4])
m4_include([m4/herrno.m4])
@@ -981,6 +982,9 @@
m4_include([m4/lib-link.m4])
m4_include([m4/lib-prefix.m4])
m4_include([m4/libtool.m4])
+m4_include([m4/nls.m4])
+m4_include([m4/po.m4])
+m4_include([m4/progtest.m4])
m4_include([m4/sockaddrin6.m4])
m4_include([m4/sockinttypes.m4])
m4_include([m4/valist.m4])
Index: kaffe/configure
diff -u kaffe/configure:1.283 kaffe/configure:1.284
--- kaffe/configure:1.283 Thu Jan 15 05:51:08 2004
+++ kaffe/configure Sat Jan 17 18:00:09 2004
@@ -490,7 +490,7 @@
#endif"
ac_subdirs_all="$ac_subdirs_all libltdl"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT abssrcdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBTOOL_DEPS LIBLTDL CCLD REGEN_FORWARD CONFIG_MD_H CONFIG_CALLKAFFEEXCEPTION_H KAFFEVM_MD_C CONFIG_JIT_MD_H KAFFEVM_JIT_DEF KAFFEVM_ICODE_H HAVE_CONFIG_JIT_MD_H USE_JIT_TRUE USE_JIT_FALSE ENGINE_NAME BCEL_JAR HAVE_BCEL_TRUE HAVE_BCEL_FALSE ENABLE_JVMPI_TRUE ENABLE_JVMPI_FALSE DNSJAVA_JAR HAVE_DNSJAVA_TRUE HAVE_DNSJAVA_FALSE ENABLE_XPROF_TRUE ENABLE_XPROF_FALSE CONFIG_XPROFILE_MD_H NEED_LIBXPROF_TRUE NEED_LIBXPROF_FALSE SUN_COMPAT_TRUE SUN_COMPAT_FALSE THREAD_DIR JIKESPROG JIKES KAFFEVM_TRAMPOLINES_C JAVA_LIBS with_engine THREAD_SYSTEM KPREFIX KAFFE_ARCHOS ZIP MKTEMP JASMIN HAVE_ZIP_TRUE HAVE_ZIP_FALSE HAVE_JIKES_TRUE HAVE_JIKES_FALSE HAVE_MKTEMP_TRUE HAVE_MKTEMP_FALSE HAVE_JASMIN_TRUE HAVE_JASMIN_FALSE KAFFE_LIBS M_LIBS VM_LIBS NET_LIBS ZIP_LIBS MATH_LIBS SECURITY_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS AWT_LIBS HAVE_GCJ_SUPPORT_TRUE HAVE_GCJ_SUPPORT_FALSE LIBOBJS LIBICONV LTLIBICONV USE_COMPAT_IFADDRS_TRUE USE_COMPAT_IFADDRS_FALSE MOC UIC QEMBED QT_CXXFLAGS QT_LDADD QT_GUILINK AWT_DIR ALSA_CFLAGS ALSA_LIBS ESD_CONFIG ESD_CFLAGS ESD_LIBS COND_SOUND_ALSA_TRUE COND_SOUND_ALSA_FALSE COND_SOUND_ESD_TRUE COND_SOUND_ESD_FALSE COND_PURE_JAVA_MATH_TRUE COND_PURE_JAVA_MATH_FALSE MATH_LIB INCLUDED_EXTENSIONS GNU_CRYPTO_HOME GNU_CRYPTO_JAR JAVAX_CRYPTO_JAR JAVAX_SECURITY_JAR USER_WANT_GNU_CRYPTO_TRUE USER_WANT_GNU_CRYPTO_FALSE PROFILE USE_PRECOMPILED_RT_JAR_TRUE USE_PRECOMPILED_RT_JAR_FALSE PATH_TO_RT_JAR DLOPEN_JAVA_LIBS KLIBFLAGS KVMBINFLAGS KVMLIBFLAGS KAFFEH MAKE_KAFFEH toolslibdir jredir jrebindir jrelibdir nativedir securitydir PATHSEP DIRSEP kaffe_TRANSF kaffeh_TRANSF kaffebin_TRANSF CFLAGS_WITHOUT_PG subdirs LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT abssrcdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBTOOL_DEPS LIBLTDL CCLD MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB REGEN_FORWARD CONFIG_MD_H CONFIG_CALLKAFFEEXCEPTION_H KAFFEVM_MD_C CONFIG_JIT_MD_H KAFFEVM_JIT_DEF KAFFEVM_ICODE_H HAVE_CONFIG_JIT_MD_H USE_JIT_TRUE USE_JIT_FALSE ENGINE_NAME BCEL_JAR HAVE_BCEL_TRUE HAVE_BCEL_FALSE ENABLE_JVMPI_TRUE ENABLE_JVMPI_FALSE DNSJAVA_JAR HAVE_DNSJAVA_TRUE HAVE_DNSJAVA_FALSE ENABLE_XPROF_TRUE ENABLE_XPROF_FALSE CONFIG_XPROFILE_MD_H NEED_LIBXPROF_TRUE NEED_LIBXPROF_FALSE SUN_COMPAT_TRUE SUN_COMPAT_FALSE THREAD_DIR JIKESPROG JIKES KAFFEVM_TRAMPOLINES_C JAVA_LIBS with_engine THREAD_SYSTEM KPREFIX KAFFE_ARCHOS ZIP MKTEMP JASMIN HAVE_ZIP_TRUE HAVE_ZIP_FALSE HAVE_JIKES_TRUE HAVE_JIKES_FALSE HAVE_MKTEMP_TRUE HAVE_MKTEMP_FALSE HAVE_JASMIN_TRUE HAVE_JASMIN_FALSE KAFFE_LIBS M_LIBS VM_LIBS NET_LIBS ZIP_LIBS MATH_LIBS SECURITY_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS AWT_LIBS HAVE_GCJ_SUPPORT_TRUE HAVE_GCJ_SUPPORT_FALSE LIBOBJS USE_COMPAT_IFADDRS_TRUE USE_COMPAT_IFADDRS_FALSE MOC UIC QEMBED QT_CXXFLAGS QT_LDADD QT_GUILINK AWT_DIR ALSA_CFLAGS ALSA_LIBS ESD_CONFIG ESD_CFLAGS ESD_LIBS COND_SOUND_ALSA_TRUE COND_SOUND_ALSA_FALSE COND_SOUND_ESD_TRUE COND_SOUND_ESD_FALSE COND_PURE_JAVA_MATH_TRUE COND_PURE_JAVA_MATH_FALSE MATH_LIB INCLUDED_EXTENSIONS GNU_CRYPTO_HOME GNU_CRYPTO_JAR JAVAX_CRYPTO_JAR JAVAX_SECURITY_JAR USER_WANT_GNU_CRYPTO_TRUE USER_WANT_GNU_CRYPTO_FALSE PROFILE USE_PRECOMPILED_RT_JAR_TRUE USE_PRECOMPILED_RT_JAR_FALSE PATH_TO_RT_JAR DLOPEN_JAVA_LIBS KLIBFLAGS KVMBINFLAGS KVMLIBFLAGS KAFFEH MAKE_KAFFEH toolslibdir jredir jrebindir jrelibdir nativedir securitydir PATHSEP DIRSEP kaffe_TRANSF kaffeh_TRANSF kaffebin_TRANSF CFLAGS_WITHOUT_PG subdirs LTLIBOBJS'
ac_subst_files='cpu_os_frag cpu_frag engine_frag threads_frag'
# Initialize some variables set by options.
@@ -1067,6 +1067,8 @@
--enable-fast-install[=PKGS]
optimize for fast installation [default=yes]
--disable-libtool-lock avoid locking (might break parallel builds)
+ --disable-nls do not use Native Language Support
+ --disable-rpath do not hardcode runtime library paths
--enable-debug Enable run-time debugging machinery [default=yes]
--disable-debug Disable assertion checking (but not -g)]
--enable-jvmpi Enable JVMPI [default=no]
@@ -1076,7 +1078,6 @@
--enable-feedback Enable generation of feedback data
--enable-gcj Enable GCJ support
--disable-mips2 Disable MIPS II instructions
- --disable-rpath do not hardcode runtime library paths
--disable-alsatest Do not try to compile and run a test Alsa program
--disable-esdtest Do not try to compile and run a test ESD program
--disable-sound Disable javax.sound support
@@ -1095,6 +1096,11 @@
both]
--with-tags[=TAGS]
include additional configurations [automatic]
+ --with-gnu-ld assume the C compiler uses GNU ld default=no
+ --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
+ --without-libiconv-prefix don't search for libiconv in includedir and libdir
+ --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib
+ --without-libintl-prefix don't search for libintl in includedir and libdir
--with-engine=ENGINE Force use given execution engine (intrp, jit, or jit3)
--with-bcel=<jar> Use the specified Bytecode Engineering Jar file.
--with-dnsjava=<jar> Use the specified DNS java Jar file.
@@ -1105,9 +1111,6 @@
--with-libffi Use libffi for sysdepCallMethod
--with-x use the X Window System
--with-stats Gather statistics on vm execution
- --with-gnu-ld assume the C compiler uses GNU ld default=no
- --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
- --without-libiconv-prefix don't search for libiconv in includedir and libdir
--with-awt=GRAPHICSYS specify AWT engine (no, X, qt)
--with-qtdir=DIR Qt installation directory default=$QTDIR
--with-alsa-prefix=PFX Prefix where Alsa library is installed(optional)
@@ -4407,7 +4410,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4410 "configure"' > conftest.$ac_ext
+ echo '#line 4413 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5757,7 +5760,7 @@
# Provide some information about the compiler.
-echo "$as_me:5760:" \
+echo "$as_me:5763:" \
"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
@@ -6794,11 +6797,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6797: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6800: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6801: \$? = $ac_status" >&5
+ echo "$as_me:6804: \$? = $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
@@ -7026,11 +7029,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7029: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7032: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7033: \$? = $ac_status" >&5
+ echo "$as_me:7036: \$? = $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
@@ -7093,11 +7096,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7096: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7099: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7100: \$? = $ac_status" >&5
+ echo "$as_me:7103: \$? = $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
@@ -9211,7 +9214,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9214 "configure"
+#line 9217 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9309,7 +9312,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9312 "configure"
+#line 9315 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11465,11 +11468,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11468: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11471: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11472: \$? = $ac_status" >&5
+ echo "$as_me:11475: \$? = $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
@@ -11532,11 +11535,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11535: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11538: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11539: \$? = $ac_status" >&5
+ echo "$as_me:11542: \$? = $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
@@ -12861,7 +12864,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12864 "configure"
+#line 12867 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12959,7 +12962,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12962 "configure"
+#line 12965 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13781,11 +13784,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13784: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13787: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13788: \$? = $ac_status" >&5
+ echo "$as_me:13791: \$? = $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
@@ -13848,11 +13851,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13851: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13854: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13855: \$? = $ac_status" >&5
+ echo "$as_me:13858: \$? = $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
@@ -15814,11 +15817,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15817: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15820: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15821: \$? = $ac_status" >&5
+ echo "$as_me:15824: \$? = $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
@@ -16046,11 +16049,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16049: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16052: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16053: \$? = $ac_status" >&5
+ echo "$as_me:16056: \$? = $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
@@ -16113,11 +16116,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16116: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16119: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16120: \$? = $ac_status" >&5
+ echo "$as_me:16123: \$? = $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
@@ -18231,7 +18234,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 18234 "configure"
+#line 18237 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -18329,7 +18332,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 18332 "configure"
+#line 18335 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -19341,440 +19344,2172 @@
CCLD=${CCLD:-'$(CC)'}
+# ===========================================================================
+# Configure gettext (needed for libiconv scripts)
+# ===========================================================================
-
-
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
-echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6
-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix. What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[BCDEGRST]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
-
-# Transform the above into a raw symbol and a C symbol.
-symxfrm='\1 \2\3 \3'
-
-# Transform an extracted symbol line into a proper C declaration
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
-
-# Define system-specific variables.
-case $host_os in
-aix*)
- symcode='[BCDT]'
- ;;
-cygwin* | mingw* | pw32*)
- symcode='[ABCDGISTW]'
- ;;
-hpux*) # Its linker distinguishes data from code symbols
- if test "$host_cpu" = ia64; then
- symcode='[ABCDEGRST]'
+ MKINSTALLDIRS=
+ if test -n "$ac_aux_dir"; then
+ case "$ac_aux_dir" in
+ /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;;
+ *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;;
+ esac
+ fi
+ if test -z "$MKINSTALLDIRS"; then
+ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
fi
- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
- lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
- ;;
-irix* | nonstopux*)
- symcode='[BCDEGRST]'
- ;;
-osf*)
- symcode='[BCDEGQRST]'
- ;;
-solaris* | sysv5*)
- symcode='[BDT]'
- ;;
-sysv4)
- symcode='[DFNSTU]'
- ;;
-esac
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
- opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
- ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
- symcode='[ABCDGISTW]' ;;
-esac
-
-# Try without a prefix undercore, then with it.
-for ac_symprfx in "" "_"; do
-
- # Write the raw and C identifiers.
- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
- # Check to see that the pipe works correctly.
- pipe_works=no
- rm -f conftest*
- cat > conftest.$ac_ext <<EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-EOF
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- # Now try to grab the symbols.
- nlist=conftest.nm
- if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
- (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s "$nlist"; then
- # Try sorting and uniquifying the output.
- if sort "$nlist" | uniq > "$nlist"T; then
- mv -f "$nlist"T "$nlist"
- else
- rm -f "$nlist"T
- fi
+ echo "$as_me:$LINENO: checking whether NLS is requested" >&5
+echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6
+ # Check whether --enable-nls or --disable-nls was given.
+if test "${enable_nls+set}" = set; then
+ enableval="$enable_nls"
+ USE_NLS=$enableval
+else
+ USE_NLS=yes
+fi;
+ echo "$as_me:$LINENO: result: $USE_NLS" >&5
+echo "${ECHO_T}$USE_NLS" >&6
- # Make sure that we snagged all the symbols we need.
- if grep ' nm_test_var$' "$nlist" >/dev/null; then
- if grep ' nm_test_func$' "$nlist" >/dev/null; then
- cat <<EOF > conftest.$ac_ext
-#ifdef __cplusplus
-extern "C" {
-#endif
-EOF
- # Now generate the symbol file.
- eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
- cat <<EOF >> conftest.$ac_ext
-#if defined (__STDC__) && __STDC__
-# define lt_ptr_t void *
-#else
-# define lt_ptr_t char *
-# define const
-#endif
-/* The mapping between symbol names and symbols. */
-const struct {
- const char *name;
- lt_ptr_t address;
-}
-lt_preloaded_symbols[] =
-{
-EOF
- $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
- cat <<\EOF >> conftest.$ac_ext
- {0, (lt_ptr_t) 0}
-};
-#ifdef __cplusplus
-}
-#endif
-EOF
- # Now try linking the two files.
- mv conftest.$ac_objext conftstm.$ac_objext
- lt_save_LIBS="$LIBS"
- lt_save_CFLAGS="$CFLAGS"
- LIBS="conftstm.$ac_objext"
- CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest${ac_exeext}; then
- pipe_works=yes
- fi
- LIBS="$lt_save_LIBS"
- CFLAGS="$lt_save_CFLAGS"
- else
- echo "cannot find nm_test_func in $nlist" >&5
- fi
- else
- echo "cannot find nm_test_var in $nlist" >&5
- fi
- else
- echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
- fi
- else
- echo "$progname: failed program was:" >&5
- cat conftest.$ac_ext >&5
- fi
- rm -f conftest* conftst*
- # Do not use the global_symbol_pipe unless it works.
- if test "$pipe_works" = yes; then
- break
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ echo "#! /bin/sh" >conf$$.sh
+ echo "exit 0" >>conf$$.sh
+ chmod +x conf$$.sh
+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+ PATH_SEPARATOR=';'
else
*** Patch too long, truncated ***