Index: ./autogen.sh =================================================================== --- ./SVN/text-base/autogen.sh Mon Sep 10 09:49:53 2001 +++ ./autogen.sh Mon Sep 10 11:45:18 2001 @@ -65,11 +65,8 @@ fi -# Run a quick test to ensure APR is kosher. -(cd apr && build/buildcheck.sh) || exit 1 - - - +# Run a quick test to ensure that our autoconf and libtool verison are ok +./buildcheck.sh || exit 1 # # Handle some libtool helper files Index: ./gen-make.py =================================================================== --- ./SVN/text-base/gen-make.py Mon Sep 10 09:49:53 2001 +++ ./gen-make.py Mon Sep 10 11:11:46 2001 @@ -110,14 +110,10 @@ dep_path = tlib.path if bldtype == 'lib': - # we need to hack around a libtool problem: it cannot record a - # dependency of one shared lib on another shared lib. - ### fix this by upgrading to the new libtool 1.4 release... # strip "lib" from the front so we have -lsvn_foo if lib[:3] == 'lib': lib = lib[3:] - libs.append('-L%s -l%s' - % (retreat + os.path.join(dep_path, '.libs'), lib)) + libs.append('-L%s -l%s' % (retreat + dep_path, lib)) else: # linking executables can refer to .la files libs.append(retreat + os.path.join(dep_path, lib + '.la')) @@ -192,15 +188,14 @@ ofile.write('\ninstall-mods-static: %s\n' '\t$(MKDIR) %s\n' - % (string.join(la_tweaked + s_files), - os.path.join('$(APACHE_TARGET)', '.libs'))) + % (string.join(la_tweaked + s_files), '$(APACHE_TARGET)')) for file in la_tweaked: dirname, fname = os.path.split(file) base = os.path.splitext(fname)[0] ofile.write('\t$(INSTALL_MOD_STATIC) %s %s\n' '\t$(INSTALL_MOD_STATIC) %s %s\n' - % (os.path.join(dirname, '.libs', base + '.a'), - os.path.join('$(APACHE_TARGET)', '.libs', base + '.a'), + % (os.path.join(dirname, base + '.a'), + os.path.join('$(APACHE_TARGET)', base + '.a'), file, os.path.join('$(APACHE_TARGET)', base + '.la'))) for file in s_files: Index: ./build.conf =================================================================== --- ./SVN/text-base/build.conf Mon Sep 10 09:49:52 2001 +++ ./build.conf Mon Sep 10 11:04:58 2001 @@ -101,7 +101,7 @@ type = lib path = subversion/libsvn_ra_dav ### hack to deal with libtool's busted intra-library dependencies -libs = -L$(abs_builddir)/neon/src/.libs -lneon +libs = -L$(abs_builddir)/neon/src -lneon # Accessing repositories via direct libsvn_fs [libsvn_ra_local] Index: ./configure.in =================================================================== --- ./SVN/text-base/configure.in Mon Sep 10 09:49:51 2001 +++ ./configure.in Mon Sep 10 11:42:44 2001 @@ -4,6 +4,10 @@ dnl General Setup ----------------------- +dnl Ensure that subversion is configured with autoconf 2.50 +dnl Don't even think about removing this check! +AC_PREREQ(2.50) + dnl First line is *required*; sanity-checks that the our src dir exists. AC_INIT(subversion/include/svn_types.h) AC_CONFIG_AUX_DIR(ac-helpers) @@ -280,14 +284,14 @@ AC_DEFINE(SVN_LIBSVN_CLIENT_LINKS_RA_DAV, 1, [Defined if libsvn_client should link against libsvn_ra_dav]) SVN_RA_LIB_DEPS="subversion/libsvn_ra_dav/libsvn_ra_dav.la" - SVN_RA_LIB_LINK="-L\$(abs_builddir)/subversion/libsvn_ra_dav/.libs -lsvn_ra_dav \ - -L\$(abs_builddir)/neon/src/.libs -lneon $NEON_LIBS" + SVN_RA_LIB_LINK="-L\$(abs_builddir)/subversion/libsvn_ra_dav -lsvn_ra_dav \ + -L\$(abs_builddir)/neon/src -lneon $NEON_LIBS" if test "$svn_lib_berkeley_db" = "yes"; then AC_DEFINE(SVN_LIBSVN_CLIENT_LINKS_RA_LOCAL, 1, [Defined if libsvn_client should link against libsvn_ra_local]) SVN_RA_LIB_DEPS="$SVN_RA_LIB_DEPS subversion/libsvn_ra_local/libsvn_ra_local.la subversion/libsvn_repos/libsvn_repos.la subversion/libsvn_fs/libsvn_fs.la" - SVN_RA_LIB_LINK="$SVN_RA_LIB_LINK -L\$(abs_builddir)/subversion/libsvn_ra_local/.libs -lsvn_ra_local -L\$(abs_builddir)/subversion/libsvn_repos/.libs -lsvn_repos -L\$(abs_builddir)/subversion/libsvn_fs/.libs -lsvn_fs \$(SVN_DB_LIBS)" + SVN_RA_LIB_LINK="$SVN_RA_LIB_LINK -L\$(abs_builddir)/subversion/libsvn_ra_local -lsvn_ra_local -L\$(abs_builddir)/subversion/libsvn_repos -lsvn_repos -L\$(abs_builddir)/subversion/libsvn_fs -lsvn_fs \$(SVN_DB_LIBS)" fi fi