From 04e0cb885cfba02870a9c00debc68ef2a86ce8a7 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Mon, 5 Nov 2007 16:53:42 +0000 Subject: configure.ac: Don't run config-ml.in directly. 2007-11-05 H.J. Lu * configure.ac: Don't run config-ml.in directly. (multilib_arg): New. * configure: Regenerated. From-SVN: r129902 --- libjava/ChangeLog | 6 ++++++ libjava/configure | 48 ++++++++++++------------------------------------ libjava/configure.ac | 34 ++++++---------------------------- 3 files changed, 24 insertions(+), 64 deletions(-) (limited to 'libjava') diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 445999c..7da809b 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2007-11-05 H.J. Lu + + * configure.ac: Don't run config-ml.in directly. + (multilib_arg): New. + * configure: Regenerated. + 2007-10-22 David Daney * include/jvm.h (_Jv_SetGCFreeSpaceDivisor): Declare new function. diff --git a/libjava/configure b/libjava/configure index e4074c7..b87c18a 100755 --- a/libjava/configure +++ b/libjava/configure @@ -18992,7 +18992,7 @@ ac_x_header_dirs=' /usr/openwin/share/include' if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for Intrinsic.h. + # Guess where to find include files, by looking for Xlib.h. # First, try using that file with no special directory specified. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -19000,7 +19000,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -19027,7 +19027,7 @@ else sed 's/^/| /' conftest.$ac_ext >&5 for ac_dir in $ac_x_header_dirs; do - if test -r "$ac_dir/X11/Intrinsic.h"; then + if test -r "$ac_dir/X11/Xlib.h"; then ac_x_includes=$ac_dir break fi @@ -19041,7 +19041,7 @@ if test "$ac_x_libraries" = no; then # See if we find them without any special options. # Don't add to $LIBS permanently. ac_save_LIBS=$LIBS - LIBS="-lXt $LIBS" + LIBS="-lX11 $LIBS" if test x$gcc_no_link = xyes; then { { echo "$as_me:$LINENO: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&5 echo "$as_me: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&2;} @@ -19053,11 +19053,11 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include int main () { -XtMalloc (0) +XrmInitialize () ; return 0; } @@ -27785,11 +27785,13 @@ here=`${PWDCMD-pwd}` ac_config_files="$ac_config_files Makefile libgcj.pc libgcj.spec libgcj-test.spec gcj/Makefile include/Makefile testsuite/Makefile" - ac_config_files="$ac_config_files scripts/jar" - - - ac_config_commands="$ac_config_commands default" +if test ${multilib} = yes; then + multilib_arg="--enable-multilib" +else + multilib_arg= +fi + ac_config_files="$ac_config_files scripts/jar" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -28948,17 +28950,6 @@ fi -srcdir=${srcdir} -host=${host} -target=${target} -with_multisubdir=${with_multisubdir} -ac_configure_args="${multilib_arg} ${ac_configure_args}" -CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} -multi_basedir=${multi_basedir} -CC="${CC}" -CXX="${CXX}" -ORIGINAL_LD_FOR_MULTILIBS="${ORIGINAL_LD_FOR_MULTILIBS}" - _ACEOF @@ -28997,7 +28988,6 @@ do "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "libtool" ) CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; - "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; "include/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;; "gcj/libgcj-config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS gcj/libgcj-config.h" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 @@ -30996,20 +30986,6 @@ compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ _LT_EOF ;; - default ) # Only add multilib support code if we just rebuilt top-level Makefile. -case " $CONFIG_FILES " in - *" Makefile "*) - LD="${ORIGINAL_LD_FOR_MULTILIBS}" - ac_file=Makefile . ${multi_basedir}/./libjava/../config-ml.in - ;; -esac -for ac_multi_file in $CONFIG_FILES; do - case $ac_multi_file in - */Makefile) - grep "^MULTI[^ ]* =" Makefile >> "$ac_multi_file" ;; - esac -done - ;; esac done _ACEOF diff --git a/libjava/configure.ac b/libjava/configure.ac index 6d06ec6..6640b12 100644 --- a/libjava/configure.ac +++ b/libjava/configure.ac @@ -1622,33 +1622,11 @@ include/Makefile testsuite/Makefile ]) -AC_CONFIG_FILES([scripts/jar], [chmod +x scripts/jar]) - -AC_CONFIG_COMMANDS([default], -[# Only add multilib support code if we just rebuilt top-level Makefile. -case " $CONFIG_FILES " in - *" Makefile "*) - LD="${ORIGINAL_LD_FOR_MULTILIBS}" - ac_file=Makefile . ${multi_basedir}/./libjava/../config-ml.in - ;; -esac -for ac_multi_file in $CONFIG_FILES; do - case $ac_multi_file in - */Makefile) - grep "^MULTI[[^ ]]* =" Makefile >> "$ac_multi_file" ;; - esac -done -], -srcdir=${srcdir} -host=${host} -target=${target} -with_multisubdir=${with_multisubdir} -ac_configure_args="${multilib_arg} ${ac_configure_args}" -CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} -multi_basedir=${multi_basedir} -CC="${CC}" -CXX="${CXX}" -ORIGINAL_LD_FOR_MULTILIBS="${ORIGINAL_LD_FOR_MULTILIBS}" -) +if test ${multilib} = yes; then + multilib_arg="--enable-multilib" +else + multilib_arg= +fi +AC_CONFIG_FILES([scripts/jar], [chmod +x scripts/jar]) AC_OUTPUT -- cgit v1.1