Index: ltconfig =================================================================== RCS file: /home/cvspublic/kaffe/ltconfig,v retrieving revision 1.4 diff -u -r1.4 ltconfig --- ltconfig 1999/01/11 06:37:30 1.4 +++ ltconfig 1999/01/11 18:29:54 @@ -1294,6 +1294,14 @@ hardcode_shlibpath_var=no ;; + sysv4.3*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs' + hardcode_direct=no + hardcode_minus_L=no + hardcode_shlibpath_var=no + export_dynamic_flag_spec='-Bexport' + ;; + uts4*) archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs' hardcode_libdir_flag_spec='-L$libdir' @@ -1410,11 +1418,11 @@ main(){nm_test_var='a';nm_test_func();return(0);} EOF - echo "$progname:1413: checking if global_symbol_pipe works" >&5 - if { (eval echo $progname:1414: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then + echo "$progname:1421: checking if global_symbol_pipe works" >&5 + if { (eval echo $progname:1422: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then # Now try to grab the symbols. nlist=conftest.nm - if { echo "$progname:1417: eval \"$NM conftest.$objext | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then + if { echo "$progname:1425: eval \"$NM conftest.$objext | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then @@ -1472,7 +1480,7 @@ save_CFLAGS="$CFLAGS" LIBS="conftestm.$objext" CFLAGS="$CFLAGS$no_builtin_flag" - if { (eval echo $progname:1475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + if { (eval echo $progname:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then pipe_works=yes else echo "$progname: failed program was:" >&5 Index: ltmain.sh =================================================================== RCS file: /home/cvspublic/kaffe/ltmain.sh,v retrieving revision 1.4 diff -u -r1.4 ltmain.sh --- ltmain.sh 1999/01/10 23:20:38 1.4 +++ ltmain.sh 1999/01/11 18:29:55 @@ -1252,6 +1252,7 @@ libext=al oldlibs="$output_objdir/$libname.$libext $oldlibs" build_libtool_libs=convenience + build_old_libs=yes dependency_libs="$deplibs" if test -n "$vinfo"; then Index: configure.in =================================================================== RCS file: /home/cvspublic/kaffe/configure.in,v retrieving revision 1.54 diff -u -r1.54 configure.in --- configure.in 1999/01/11 17:54:55 1.54 +++ configure.in 1999/01/11 18:29:56 @@ -22,10 +22,24 @@ AC_MSG_RESULT([$test_version, too old, not using]);; esac]) +dnl ========================================================================= +dnl Allow disabling of autoconf/automake +dnl ------------------------------------------------------------------------- +AC_MSG_CHECKING([maintainer mode]) +AC_ARG_ENABLE(maintainer,[ --enable-maintainer Enable autoconf/automake]) +if test x"$enable_maintainer" = x"yes" ; then + AC_MSG_RESULT([enabling autoconf/automake, check versions]) TEST_VERSION(ACLOCAL, 1.3e|1.4, "$missing_dir/missing aclocal") TEST_VERSION(AUTOCONF, 2.12.2|2.13|2.14, "$missing_dir/missing autoconf") TEST_VERSION(AUTOMAKE, 1.3e|1.4, "$missing_dir/missing automake") TEST_VERSION(AUTOHEADER, 2.12.2|2.13|2.14, "$missing_dir/missing autoheader") +else + AC_MSG_RESULT([disabling autoconf/automake]) + ACLOCAL="$missing_dir/missing aclocal" + AUTOCONF="$missing_dir/missing autoconf" + AUTOMAKE="$missing_dir/missing automake" + AUTOHEADER="$missing_dir/missing autoheader" +fi dnl needed for autoheader to find acconfig.h AUTOHEADER="$AUTOHEADER --localdir config" @@ -37,7 +51,7 @@ dnl Allow specification of header-file and library directories dnl ------------------------------------------------------------------------- -AC_ARG_WITH(includes,[ --with-includes=dirs Search specified directories for header files], CPPFLAGS="$CPPFLAGS"`echo " $withval" | sed 's/ / -I/g'`) +AC_ARG_WITH(includes,[ --with-includes=dirs Search specified directories for header files], CPPFLAGS="$CPPFLAGS"`echo " $withval" | sed 's/ / -I/g'`) AC_ARG_WITH(libraries,[ --with-libraries=dirs Search specified directories for libraries], LDFLAGS="$LDFLAGS"`echo " $withval" | sed 's/ / -L/g'`) dnl Find the compiler early on in case we need to override. @@ -452,7 +466,7 @@ dnl Do we build a timing measuring vm? dnl ------------------------------------------------------------------------- -AC_ARG_WITH(timing,[ --with-timing Time vm execution]) +AC_ARG_WITH(timing,[ --with-timing Time vm execution]) if test "$with_timing" = "yes" ; then if test $have_rusage = "no" ; then Index: FAQ/FAQ.automake =================================================================== RCS file: /home/cvspublic/kaffe/FAQ/FAQ.automake,v retrieving revision 1.5 diff -u -r1.5 FAQ.automake --- FAQ.automake 1999/01/10 22:16:43 1.5 +++ FAQ.automake 1999/01/11 18:29:56 @@ -9,6 +9,9 @@ automake is supposed to work with perl4, but it apparently doesn't, which means you probably need perl5 as well. +- in order to mofify the Makefiles and configure.in, you need also configure + with the option --enable-maintainer. + ************************************************************************** Kaffe has adopted GNU automake to ease the maintenance of Makefiles. Index: libltdl/configure.in =================================================================== RCS file: /home/cvspublic/kaffe/libltdl/configure.in,v retrieving revision 1.4 diff -u -r1.4 configure.in --- configure.in 1999/01/11 10:41:00 1.4 +++ configure.in 1999/01/11 18:29:56 @@ -24,10 +24,24 @@ AC_MSG_RESULT([$test_version, too old, not using]);; esac]) +dnl ========================================================================= +dnl Allow disabling of autoconf/automake +dnl ------------------------------------------------------------------------- +AC_MSG_CHECKING([maintainer mode]) +AC_ARG_ENABLE(maintainer,[ --enable-maintainer Enable autoconf/automake]) +if test x"$enable_maintainer" = x"yes" ; then + AC_MSG_RESULT([enabling autoconf/automake, check versions]) TEST_VERSION(ACLOCAL, 1.3e|1.4, "$missing_dir/missing aclocal") TEST_VERSION(AUTOCONF, 2.12.2|2.13|2.14, "$missing_dir/missing autoconf") TEST_VERSION(AUTOMAKE, 1.3e|1.4, "$missing_dir/missing automake") TEST_VERSION(AUTOHEADER, 2.12.2|2.13|2.14, "$missing_dir/missing autoheader") +else + AC_MSG_RESULT([disabling autoconf/automake]) + ACLOCAL="$missing_dir/missing aclocal" + AUTOCONF="$missing_dir/missing autoconf" + AUTOMAKE="$missing_dir/missing automake" + AUTOHEADER="$missing_dir/missing autoheader" +fi AC_ARG_ENABLE(ltdl-install, [--enable-ltdl-install install libltdl])