From mod_ftp-commits-return-31-apmail-incubator-mod_ftp-commits-archive=incubator.apache.org@incubator.apache.org Tue Jun 27 18:20:39 2006 Return-Path: Delivered-To: apmail-incubator-mod_ftp-commits-archive@www.apache.org Received: (qmail 81286 invoked from network); 27 Jun 2006 18:20:39 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 27 Jun 2006 18:20:39 -0000 Received: (qmail 38185 invoked by uid 500); 27 Jun 2006 18:20:38 -0000 Delivered-To: apmail-incubator-mod_ftp-commits-archive@incubator.apache.org Received: (qmail 38142 invoked by uid 500); 27 Jun 2006 18:20:38 -0000 Mailing-List: contact mod_ftp-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: mod_ftp-dev@incubator.apache.org Delivered-To: mailing list mod_ftp-commits@incubator.apache.org Delivered-To: moderator for mod_ftp-commits@incubator.apache.org Received: (qmail 65829 invoked by uid 99); 27 Jun 2006 17:41:08 -0000 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r417537 - in /incubator/mod_ftp/trunk: buildconf configure.in Date: Tue, 27 Jun 2006 17:40:46 -0000 To: mod_ftp-commits@incubator.apache.org From: wrowe@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060627174046.940741A9844@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: wrowe Date: Tue Jun 27 10:40:45 2006 New Revision: 417537 URL: http://svn.apache.org/viewvc?rev=417537&view=rev Log: Doesn't yet build, but getting closer by a crawl Modified: incubator/mod_ftp/trunk/buildconf incubator/mod_ftp/trunk/configure.in Modified: incubator/mod_ftp/trunk/buildconf URL: http://svn.apache.org/viewvc/incubator/mod_ftp/trunk/buildconf?rev=417537&r1=417536&r2=417537&view=diff ============================================================================== --- incubator/mod_ftp/trunk/buildconf (original) +++ incubator/mod_ftp/trunk/buildconf Tue Jun 27 10:40:45 2006 @@ -76,11 +76,8 @@ exit 1 fi -# These are temporary until Roy finishes the other build changes -# touch .deps -rm -f aclocal.m4 -rm -f generated_lists +rm -f aclocal.m4 generated_lists $config_h_in config.cache # Remove autoconf 2.5x cache directories rm -rf autom4te*.cache @@ -99,24 +96,61 @@ $httpd_src_dir/build/PrintPath $httpd_src_dir/build/apr_common.m4 \ $httpd_src_dir/build/find_apr.m4 $httpd_src_dir/build/find_apu.m4 build +libtoolize=`build/PrintPath glibtoolize libtoolize15 libtoolize14 libtoolize` +if [ "x$libtoolize" = "x" ]; then + echo "libtoolize not found in path" + exit 1 +fi + +# Create the libtool helper files +# +# Note: we copy (rather than link) them to simplify distribution. +# Note: APR supplies its own config.guess and config.sub -- we do not +# rely on libtool's versions +# +echo "Copying libtool helper files ..." + # Remove any libtool files so one can switch between libtool 1.3 # and libtool 1.4 by simply rerunning the buildconf script. -(cd build ; rm -f ltconfig ltmain.sh) +(cd build ; rm -f ltconfig ltmain.sh libtool.m4) + +$libtoolize --copy --automake -# Optionally copy libtool-1.3.x files -if [ -f $apr_src_dir/build/ltconfig ]; then - cp $apr_src_dir/build/ltconfig build +if [ -f libtool.m4 ]; then + ltfile=`pwd`/libtool.m4 +else + ltfindcmd="`sed -n \"/=[^\\\`]/p;/libtool_m4=/{s/.*=/echo /p;q;}\" \ + < $libtoolize`" + ltfile=${LIBTOOL_M4-`eval "$ltfindcmd"`} + # Expecting the code above to be very portable, but just in case... + if [ -z "$ltfile" -o ! -f "$ltfile" ]; then + ltpath=`dirname $libtoolize` + ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4 + fi fi -if [ -f $apr_src_dir/build/ltmain.sh ]; then - cp $apr_src_dir/build/ltmain.sh build + +if [ ! -f $ltfile ]; then + echo "$ltfile not found" + exit 1 +fi + +echo "buildconf: Using libtool.m4 at ${ltfile}." + +sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' \ + < $ltfile > build/libtool.m4 + +if [ -f ltsugar.m4 ]; then + rm -f build/ltsugar.m4 + mv ltsugar.m4 build/ltsugar.m4 fi +# Clean up any leftovers +rm -f aclocal.m4 libtool.m4 + echo rebuilding $config_h_in -rm -f $config_h_in ${AUTOHEADER:-autoheader} 2>&1 | grep -v "$cross_compile_warning" echo rebuilding configure -rm -f config.cache ${AUTOCONF:-autoconf} 2>&1 | grep -v "$cross_compile_warning" # Remove autoconf 2.5x cache directories Modified: incubator/mod_ftp/trunk/configure.in URL: http://svn.apache.org/viewvc/incubator/mod_ftp/trunk/configure.in?rev=417537&r1=417536&r2=417537&view=diff ============================================================================== --- incubator/mod_ftp/trunk/configure.in (original) +++ incubator/mod_ftp/trunk/configure.in Tue Jun 27 10:40:45 2006 @@ -8,11 +8,12 @@ AC_MINIX sinclude(build/apr_common.m4) -sinclude(build/find_apr.m4) -sinclude(build/find_apu.m4) -sinclude(aclocal.m4) +sinclude(build/apache2_check.m4) +sinclude(build/libtool.m4) +sinclude(build/ltsugar.m4) +dnl #sinclude(aclocal.m4) -APR_FIND_APR("$srcdir/srclib/apr", "./srclib/apr", 1, 1) +dnl #APR_FIND_APR("$srcdir/srclib/apr", "./srclib/apr", 1, 1) if test "$apr_found" = "no"; then AC_MSG_ERROR([APR not found. Please read the documentation.]) @@ -44,6 +45,7 @@ AC_PROG_CC AC_PROG_CPP AC_PROG_LIBTOOL +CHECK_APACHE2 AC_HEADER_STDC AC_CHECK_HEADERS( \