PatchSet 4330 Date: 2004/01/12 08:08:15 Author: dalibor Branch: HEAD Tag: (none) Log: Fixed build with kjc + Added ESounD autoconf macros
2004-01-12 Dalibor Topic <[EMAIL PROTECTED]> * m4/esd.m4: New file. * THIRDPARTY: Added information on GNU Inetlib and ESound m4 macros. * Makefile.in, aclocal.m4, configure, configure.in, config/Makefile.in, 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.1917->1.1918 Makefile.in:1.127->1.128 THIRDPARTY:1.7->1.8 aclocal.m4:1.88->1.89 configure:1.274->1.275 configure.in:1.238->1.239 config/Makefile.in:1.108->1.109 include/Makefile.in:1.133->1.134 kaffe/Makefile.in:1.94->1.95 kaffe/jvmpi/Makefile.in:1.15->1.16 kaffe/kaffe/Makefile.in:1.108->1.109 kaffe/kaffeh/Makefile.in:1.91->1.92 kaffe/kaffevm/Makefile.in:1.125->1.126 kaffe/kaffevm/gcj/Makefile.in:1.74->1.75 kaffe/kaffevm/intrp/Makefile.in:1.80->1.81 kaffe/kaffevm/jit/Makefile.in:1.86->1.87 kaffe/kaffevm/jit3/Makefile.in:1.56->1.57 kaffe/kaffevm/systems/Makefile.in:1.82->1.83 kaffe/kaffevm/systems/beos-native/Makefile.in:1.73->1.74 kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.79->1.80 kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.82->1.83 kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.52->1.53 kaffe/man/Makefile.in:1.80->1.81 kaffe/scripts/Makefile.in:1.117->1.118 kaffe/scripts/bat/Makefile.in:1.73->1.74 kaffe/scripts/compat/Makefile.in:1.98->1.99 kaffe/xprof/Makefile.in:1.48->1.49 libraries/Makefile.in:1.77->1.78 libraries/clib/Makefile.in:1.85->1.86 libraries/clib/awt/Makefile.in:1.90->1.91 libraries/clib/awt/X/Makefile.in:1.80->1.81 libraries/clib/awt/qt/Makefile.in:1.35->1.36 libraries/clib/io/Makefile.in:1.83->1.84 libraries/clib/management/Makefile.in:1.92->1.93 libraries/clib/math/Makefile.in:1.88->1.89 libraries/clib/native/Makefile.in:1.115->1.116 libraries/clib/net/Makefile.in:1.96->1.97 libraries/clib/nio/Makefile.in:1.9->1.10 libraries/clib/security/Makefile.in:1.56->1.57 libraries/clib/zip/Makefile.in:1.90->1.91 libraries/extensions/Makefile.in:1.68->1.69 libraries/extensions/comm/Makefile.in:1.63->1.64 libraries/extensions/comm/javalib/Makefile.in:1.63->1.64 libraries/extensions/microsoft/Makefile.in:1.55->1.56 libraries/extensions/microsoft/clib/Makefile.in:1.58->1.59 libraries/extensions/microsoft/javalib/Makefile.in:1.56->1.57 libraries/extensions/pjava/Makefile.in:1.63->1.64 libraries/extensions/pjava/javalib/Makefile.in:1.63->1.64 libraries/extensions/servlet/Makefile.in:1.63->1.64 libraries/extensions/servlet/javalib/Makefile.in:1.63->1.64 libraries/extensions/sound/Makefile.in:1.31->1.32 libraries/extensions/sound/alsa/Makefile.in:1.33->1.34 libraries/extensions/sound/common/Makefile.in:1.33->1.34 libraries/extensions/sound/esd/Makefile.in:1.33->1.34 libraries/javalib/Makefile.in:1.211->1.212 libraries/javalib/profiles/default/awt.files:1.6->1.7 libraries/javalib/profiles/default/moreawt.files:1.3->1.4 m4/esd.m4:INITIAL->1.1 replace/Makefile.in:1.27->1.28 test/Makefile.in:1.83->1.84 test/internal/Makefile.in:1.41->1.42 test/regression/Makefile.in:1.150->1.151 test/regression/compile_time/Makefile.in:1.11->1.12 test/regression/run_time/Makefile.in:1.12->1.13 Index: kaffe/ChangeLog diff -u kaffe/ChangeLog:1.1917 kaffe/ChangeLog:1.1918 --- kaffe/ChangeLog:1.1917 Mon Jan 12 07:04:51 2004 +++ kaffe/ChangeLog Mon Jan 12 08:08:15 2004 @@ -1,5 +1,208 @@ 2004-01-12 Dalibor Topic <[EMAIL PROTECTED]> + * m4/esd.m4: + New file. + + * THIRDPARTY: + Added information on GNU Inetlib and ESound m4 macros. + + * Makefile.in, + aclocal.m4, + configure, + configure.in, + config/Makefile.in, + 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. + +2004-01-12 Dalibor Topic <[EMAIL PROTECTED]> + + * libraries/javalib/profiles/default/awt.files, + libraries/javalib/profiles/default/moreawt.files: + Shuffled java/awt/GridBagInfo.java around to fix build + with kjc. + +2004-01-12 Dalibor Topic <[EMAIL PROTECTED]> + + m4/esd.m4, + Makefile.in, + THIRDPARTY, + aclocal.m4, + configure, + configure.in, + config/Makefile.in, + 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, + + m4/esd.m4, + Makefile.in, + THIRDPARTY, + aclocal.m4, + configure, + configure.in, + config/Makefile.in, + 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, + libraries/javalib/profiles/default/awt.files, + libraries/javalib/profiles/default/moreawt.files, + 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, +2004-01-12 Dalibor Topic <[EMAIL PROTECTED]> + * FAQ/FAQ.automake, developers/autogen.sh: Updated to Automake 1.8.1. Index: kaffe/Makefile.in diff -u kaffe/Makefile.in:1.127 kaffe/Makefile.in:1.128 --- kaffe/Makefile.in:1.127 Mon Jan 12 07:04:52 2004 +++ kaffe/Makefile.in Mon Jan 12 08:08:16 2004 @@ -54,7 +54,7 @@ install-sh ltmain.sh missing mkinstalldirs subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/alsa.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 \ @@ -145,6 +145,9 @@ ENABLE_XPROF_FALSE = @ENABLE_XPROF_FALSE@ ENABLE_XPROF_TRUE = @ENABLE_XPROF_TRUE@ ENGINE_NAME = @ENGINE_NAME@ +ESD_CFLAGS = @ESD_CFLAGS@ +ESD_CONFIG = @ESD_CONFIG@ +ESD_LIBS = @ESD_LIBS@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ Index: kaffe/THIRDPARTY diff -u kaffe/THIRDPARTY:1.7 kaffe/THIRDPARTY:1.8 --- kaffe/THIRDPARTY:1.7 Sun Jan 11 22:06:46 2004 +++ kaffe/THIRDPARTY Mon Jan 12 08:08:16 2004 @@ -83,6 +83,21 @@ More information on Jessie is available from http://www.nongnu.org/jessie/. +* gnu.inet + +FTP URL Connection handler and utility classes are taken from GNU +Inetlib's CVS. + +They are licensed under the terms of the GNU General Public License \ +with the following clarification and special exception: + + "As a special exception, if you link this library with other files + to produce an executable, this library does not by itself cause + the resulting executable to be covered by the GNU General Public + License. This exception does not however invalidate any other + reasons why the executable file might be covered by the GNU General + Public License." + * Class library Parts of kaffe's class library were merged in from GNU @@ -220,6 +235,10 @@ * m4/alsa.m4 Autoconf/automake macros taken from ALSA CVS. Licensed under the GPL/LGPL. + +* m4/esd.m4 + +Autoconf macros taken from GNOME ESounD CVS. Licensed under the GPL/LGPL. * libraries/javalib/kjc.jar Index: kaffe/aclocal.m4 diff -u kaffe/aclocal.m4:1.88 kaffe/aclocal.m4:1.89 --- kaffe/aclocal.m4:1.88 Mon Jan 12 07:04:52 2004 +++ kaffe/aclocal.m4 Mon Jan 12 08:08:16 2004 @@ -971,6 +971,7 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])]) m4_include([m4/alsa.m4]) +m4_include([m4/esd.m4]) m4_include([m4/gnu-crypto.m4]) m4_include([m4/gwqt.m4]) m4_include([m4/herrno.m4]) Index: kaffe/configure diff -u kaffe/configure:1.274 kaffe/configure:1.275 --- kaffe/configure:1.274 Mon Jan 12 07:04:52 2004 +++ kaffe/configure Mon Jan 12 08:08:16 2004 @@ -467,7 +467,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 KVER 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 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 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 KVER 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_files='cpu_os_frag cpu_frag engine_frag threads_frag' # Initialize some variables set by options. @@ -1055,6 +1055,7 @@ --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 --enable-pure-java-math Enable pure java java.math.* package [default=native] @@ -1088,6 +1089,8 @@ --with-qtdir=DIR Qt installation directory default=$QTDIR --with-alsa-prefix=PFX Prefix where Alsa library is installed(optional) --with-alsa-inc-prefix=PFX Prefix where include libraries are (optional) + --with-esd-prefix=PFX Prefix where ESD is installed (optional) + --with-esd-exec-prefix=PFX Exec prefix where ESD is installed (optional) --without-alsa Don't use ALSA for sound default is to use it if present --without-esd Don't use esd for sound default is to use it if present --with-extensions the extensions (like the servlet API) to include [default=none] @@ -4350,7 +4353,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4353 "configure"' > conftest.$ac_ext + echo '#line 4356 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5700,7 +5703,7 @@ # Provide some information about the compiler. -echo "$as_me:5703:" \ +echo "$as_me:5706:" \ "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 @@ -6737,11 +6740,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6740: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6743: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6744: \$? = $ac_status" >&5 + echo "$as_me:6747: \$? = $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 @@ -6969,11 +6972,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6972: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6975: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6976: \$? = $ac_status" >&5 + echo "$as_me:6979: \$? = $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 @@ -7036,11 +7039,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7039: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7042: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7043: \$? = $ac_status" >&5 + echo "$as_me:7046: \$? = $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 @@ -9154,7 +9157,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9157 "configure" +#line 9160 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9252,7 +9255,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9255 "configure" +#line 9258 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11408,11 +11411,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11411: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11414: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11415: \$? = $ac_status" >&5 + echo "$as_me:11418: \$? = $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 @@ -11475,11 +11478,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11478: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11481: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11482: \$? = $ac_status" >&5 + echo "$as_me:11485: \$? = $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 @@ -12804,7 +12807,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 12807 "configure" +#line 12810 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12902,7 +12905,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 12905 "configure" +#line 12908 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13724,11 +13727,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13727: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13730: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13731: \$? = $ac_status" >&5 + echo "$as_me:13734: \$? = $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 @@ -13791,11 +13794,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13794: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13797: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13798: \$? = $ac_status" >&5 + echo "$as_me:13801: \$? = $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 @@ -15757,11 +15760,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15760: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15763: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15764: \$? = $ac_status" >&5 + echo "$as_me:15767: \$? = $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 @@ -15989,11 +15992,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15992: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15995: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15996: \$? = $ac_status" >&5 + echo "$as_me:15999: \$? = $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 @@ -16056,11 +16059,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16059: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16062: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16063: \$? = $ac_status" >&5 + echo "$as_me:16066: \$? = $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 @@ -18174,7 +18177,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 18177 "configure" +#line 18180 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -18272,7 +18275,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 18275 "configure" +#line 18278 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -45261,177 +45264,250 @@ -have_esd_h=no -if test "${ac_cv_header_esd_h+set}" = set; then - echo "$as_me:$LINENO: checking for esd.h" >&5 -echo $ECHO_N "checking for esd.h... $ECHO_C" >&6 -if test "${ac_cv_header_esd_h+set}" = set; then +# Check whether --with-esd-prefix or --without-esd-prefix was given. +if test "${with_esd_prefix+set}" = set; then + withval="$with_esd_prefix" + esd_prefix="$withval" +else + esd_prefix="" +fi; + +# Check whether --with-esd-exec-prefix or --without-esd-exec-prefix was given. +if test "${with_esd_exec_prefix+set}" = set; then + withval="$with_esd_exec_prefix" + esd_exec_prefix="$withval" +else + esd_exec_prefix="" +fi; +# Check whether --enable-esdtest or --disable-esdtest was given. +if test "${enable_esdtest+set}" = set; then + enableval="$enable_esdtest" + +else + enable_esdtest=yes +fi; + + if test x$esd_exec_prefix != x ; then + esd_args="$esd_args --exec-prefix=$esd_exec_prefix" + if test x${ESD_CONFIG+set} != xset ; then + ESD_CONFIG=$esd_exec_prefix/bin/esd-config + fi + fi + if test x$esd_prefix != x ; then + esd_args="$esd_args --prefix=$esd_prefix" + if test x${ESD_CONFIG+set} != xset ; then + ESD_CONFIG=$esd_prefix/bin/esd-config + fi + fi + + # Extract the first word of "esd-config", so it can be a program name with args. +set dummy esd-config; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_ESD_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $ESD_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ESD_CONFIG="$ESD_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ESD_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + test -z "$ac_cv_path_ESD_CONFIG" && ac_cv_path_ESD_CONFIG="no" + ;; +esac fi -echo "$as_me:$LINENO: result: $ac_cv_header_esd_h" >&5 -echo "${ECHO_T}$ac_cv_header_esd_h" >&6 +ESD_CONFIG=$ac_cv_path_ESD_CONFIG + +if test -n "$ESD_CONFIG"; then + echo "$as_me:$LINENO: result: $ESD_CONFIG" >&5 +echo "${ECHO_T}$ESD_CONFIG" >&6 else - # Is the header compilable? -echo "$as_me:$LINENO: checking esd.h usability" >&5 -echo $ECHO_N "checking esd.h usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + min_esd_version=0.2.1 + echo "$as_me:$LINENO: checking for ESD - version >= $min_esd_version" >&5 +echo $ECHO_N "checking for ESD - version >= $min_esd_version... $ECHO_C" >&6 + no_esd="" + if test "$ESD_CONFIG" = "no" ; then + no_esd=yes + else + + + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + ESD_CFLAGS=`$ESD_CONFIG $esdconf_args --cflags` + ESD_LIBS=`$ESD_CONFIG $esdconf_args --libs` + + esd_major_version=`$ESD_CONFIG $esd_args --version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` + esd_minor_version=`$ESD_CONFIG $esd_args --version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` + esd_micro_version=`$ESD_CONFIG $esd_config_args --version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` + if test "x$enable_esdtest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $ESD_CFLAGS" + LIBS="$LIBS $ESD_LIBS" + rm -f conf.esdtest + if test "$cross_compiling" = yes; then + echo $ac_n "cross compiling; assumed OK... $ac_c" +else + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> #include <esd.h> + +char* +my_strdup (char *str) +{ + char *new_str; + + if (str) + { + new_str = malloc ((strlen (str) + 1) * sizeof(char)); + strcpy (new_str, str); + } + else + new_str = NULL; + + return new_str; +} + +int main () +{ + int major, minor, micro; + char *tmp_version; + + system ("touch conf.esdtest"); + + /* HP/UX 9 ([EMAIL PROTECTED]) writes to sscanf strings */ + tmp_version = my_strdup("$min_esd_version"); + if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_esd_version"); + exit(1); + } + + if (($esd_major_version > major) || + (($esd_major_version == major) && ($esd_minor_version > minor)) || + (($esd_major_version == major) && ($esd_minor_version == minor) && ($esd_micro_version >= micro))) + { + return 0; + } + else + { + printf("\n*** 'esd-config --version' returned %d.%d.%d, but the minimum version\n", $esd_major_version, $esd_minor_version, $esd_micro_version); + printf("*** of ESD required is %d.%d.%d. If esd-config is correct, then it is\n", major, minor, micro); + printf("*** best to upgrade to the required version.\n"); + printf("*** If esd-config was wrong, set the environment variable ESD_CONFIG\n"); + printf("*** to point to the correct copy of esd-config, and remove the file\n"); + printf("*** config.cache before re-running configure\n"); + return 1; + } +} + + _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +rm -f conftest$ac_exeext +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); }; } && - { ac_try='test -s conftest.$ac_objext' + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_header_compiler=yes + : else - echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking esd.h presence" >&5 -echo $ECHO_N "checking esd.h presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <esd.h> -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes +( exit $ac_status ) +no_esd=yes fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: esd.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: esd.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: esd.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: esd.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: esd.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: esd.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: esd.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: esd.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: esd.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: esd.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: esd.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: esd.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: esd.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: esd.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: esd.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: esd.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------ ## -## Report this to [EMAIL PROTECTED] ## -## ------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for esd.h" >&5 -echo $ECHO_N "checking for esd.h... $ECHO_C" >&6 -if test "${ac_cv_header_esd_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_esd_h=$ac_header_preproc -fi -echo "$as_me:$LINENO: result: $ac_cv_header_esd_h" >&5 -echo "${ECHO_T}$ac_cv_header_esd_h" >&6 + fi + fi + if test "x$no_esd" = x ; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + esd_found=yes + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + if test "$ESD_CONFIG" = "no" ; then + echo "*** The esd-config script installed by ESD could not be found" + echo "*** If ESD was installed in PREFIX, make sure PREFIX/bin is in" *** Patch too long, truncated *** _______________________________________________ kaffe mailing list [EMAIL PROTECTED] http://kaffe.org/cgi-bin/mailman/listinfo/kaffe