From: Martin R. <ru...@us...> - 2010-04-27 15:46:54
|
Update of /cvsroot/foo/foo In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv690 Modified Files: Makefile.am README bootstrap configure.ac Log Message: adopt build system to newer versions of autotools Index: README =================================================================== RCS file: /cvsroot/foo/foo/README,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** README 24 Mar 2009 18:55:35 -0000 1.4 --- README 27 Apr 2010 15:46:44 -0000 1.5 *************** *** 4,8 **** -------------------------- ! last edited 2009-03-24 rumori this readme contains information about the requirements, installation --- 4,8 ---- -------------------------- ! last edited 2010-04-27 rumori this readme contains information about the requirements, installation *************** *** 36,41 **** ./bootstrap ! you'll need autoconf >= 2.50 to build the configure script. after ! that, you can continue like compiling from a release tarball. --- 36,42 ---- ./bootstrap ! you'll need autoconf >= 2.50 and automake >= 1.5 in order to bootstrap ! the package. after that, you can continue like compiling from a ! release tarball. *************** *** 56,60 **** specify the paths like this: ! CPPFLAGS=/nonste/include LDFLAGS=/nonstd/lib ./configure usually, foo will try to install its elk extension library (elkfoo.so) --- 57,66 ---- specify the paths like this: ! env CPPFLAGS=/nonste/include LDFLAGS=/nonstd/lib ./configure ! ! for a list of availabe configure time options of both subpackages ! libfoo and elkfoo, you might want to call ! ! ./configure --help=recursive usually, foo will try to install its elk extension library (elkfoo.so) *************** *** 93,96 **** --- 99,109 ---- $ sudo port install libsndfile + or, for flac support, + + $ sudo port install flac +universal + $ sudo port install libsndfile +flac +universal + + then user configure, as usual + $ ./configure [--enable-flac-support] Index: configure.ac =================================================================== RCS file: /cvsroot/foo/foo/configure.ac,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** configure.ac 10 Aug 2004 03:19:45 -0000 1.3 --- configure.ac 27 Apr 2010 15:46:44 -0000 1.4 *************** *** 9,13 **** AC_PREREQ(2.57) ! AC_CONFIG_AUX_DIR(autotools) AC_CANONICAL_TARGET([]) AM_INIT_AUTOMAKE($PACKAGE_NAME,$PACKAGE_VERSION) --- 9,13 ---- AC_PREREQ(2.57) ! AC_CONFIG_AUX_DIR(.auto) AC_CANONICAL_TARGET([]) AM_INIT_AUTOMAKE($PACKAGE_NAME,$PACKAGE_VERSION) Index: bootstrap =================================================================== RCS file: /cvsroot/foo/foo/bootstrap,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** bootstrap 9 Mar 2009 00:54:46 -0000 1.6 --- bootstrap 27 Apr 2010 15:46:44 -0000 1.7 *************** *** 2,53 **** ## bootstrap file for foo - # 2004 martin rumori (fo...@ru...) - ## $Id$ # subdirectories to bootstrap SUBDIRS="libfoo elkfoo" ! # Get a sane environment, just in case ! LANG=C ! export LANG # Check for automake ! if test -z $1; then ! amvers="no" ! if automake-1.10 --version >/dev/null 2>&1; then ! amvers="-1.10" ! elif automake-1.9 --version >/dev/null 2>&1; then ! amvers="-1.9" ! elif automake-1.8 --version >/dev/null 2>&1; then ! amvers="-1.8" ! elif automake-1.7 --version >/dev/null 2>&1; then ! amvers="-1.7" ! elif automake-1.6 --version >/dev/null 2>&1; then ! amvers="-1.6" ! elif automake-1.5 --version >/dev/null 2>&1; then ! amvers="-1.5" ! elif automake --version > /dev/null 2>&1; then ! amvers="`automake --version | sed -e '1s/[^0-9]*//' -e q`" ! if expr "$amvers" "<" "1.5" > /dev/null 2>&1; then ! amvers="no" ! else ! amvers="" ! fi fi ! if test "$amvers" = "no"; then ! set +x ! echo "$0: you need automake version 1.5 or later" exit 1 fi - else - amvers=$1 fi ! set -x ! set -e ! # bootstrapping subdirs for dir in ${SUBDIRS}; do (cd $dir && echo "bootstrapping $dir" && sh ./bootstrap ${amvers}) \ --- 2,115 ---- ## bootstrap file for foo ## $Id$ + ## 2004-2010 martin rumori (fo...@ru...), based on: + + # bootstrap: generic bootstrap/autogen.sh script for autotools projects + # + # Copyright (c) 2002-2009 Sam Hocevar <sa...@ho...> + # + # This program is free software. It comes without any warranty, to + # the extent permitted by applicable law. You can redistribute it + # and/or modify it under the terms of the Do What The Fuck You Want + # To Public License, Version 2, as published by Sam Hocevar. See + # http://sam.zoy.org/wtfpl/COPYING for more details. + # + # The latest version of this script can be found at the following place: + # http://caca.zoy.org/wiki/build + + # Die if an error occurs + set -e + # subdirectories to bootstrap SUBDIRS="libfoo elkfoo" ! # Guess whether we are using configure.ac or configure.in ! if test -f configure.ac; then ! conffile="configure.ac" ! elif test -f configure.in; then ! conffile="configure.in" ! else ! echo "$0: could not find configure.ac or configure.in" ! exit 1 ! fi ! ! # Check for needed features ! auxdir="`sed -ne 's/^[ \t]*A._CONFIG_AUX_DIR *([[ ]*\([^] )]*\).*/\1/p' $conffile`" ! pkgconfig="`grep '^[ \t]*PKG_PROG_PKG_CONFIG' $conffile >/dev/null 2>&1 && echo yes || echo no`" ! libtool="`grep '^[ \t]*A._PROG_LIBTOOL' $conffile >/dev/null 2>&1 && echo yes || echo no`" ! header="`grep '^[ \t]*A._CONFIG_HEADER' $conffile >/dev/null 2>&1 && echo yes || echo no`" ! makefile="`[ -f Makefile.am ] && echo yes || echo no`" ! aclocalflags="`sed -ne 's/^[ \t]*ACLOCAL_AMFLAGS[ \t]*=//p' Makefile.am 2>/dev/null || :`" # Check for automake ! amvers="no" ! for v in 11 10 9 8 7 6 5; do ! if automake-1.${v} --version >/dev/null 2>&1; then ! amvers="-1.${v}" ! break ! elif automake1.${v} --version >/dev/null 2>&1; then ! amvers="1.${v}" ! break ! fi ! done ! ! if test "${amvers}" = "no" && automake --version > /dev/null 2>&1; then ! amvers="`automake --version | sed -e '1s/[^0-9]*//' -e q`" ! if expr "$amvers" "<" "1.5" > /dev/null 2>&1; then ! amvers="no" ! else ! amvers="" fi + fi ! if test "$amvers" = "no"; then ! echo "$0: you need automake version 1.5 or later" ! exit 1 ! fi ! ! # Check for autoconf ! acvers="no" ! for v in "" "259" "253"; do ! if autoconf${v} --version >/dev/null 2>&1; then ! acvers="${v}" ! break ! fi ! done ! ! if test "$acvers" = "no"; then ! echo "$0: you need autoconf" ! exit 1 ! fi ! ! # Check for libtool ! if test "$libtool" = "yes"; then ! libtoolize="no" ! if glibtoolize --version >/dev/null 2>&1; then ! libtoolize="glibtoolize" ! else ! for v in "16" "15" "" "14"; do ! if libtoolize${v} --version >/dev/null 2>&1; then ! libtoolize="libtoolize${v}" ! break ! fi ! done ! fi ! ! if test "$libtoolize" = "no"; then ! echo "$0: you need libtool" exit 1 fi fi ! # Check for pkg-config ! if test "$pkgconfig" = "yes"; then ! if ! pkg-config --version >/dev/null 2>&1; then ! echo "$0: you need pkg-config" ! exit 1 ! fi ! fi ! # bootstrap subdirs for dir in ${SUBDIRS}; do (cd $dir && echo "bootstrapping $dir" && sh ./bootstrap ${amvers}) \ *************** *** 55,88 **** done ! # bootstrapping ourselves echo "bootstrapping toplevel" # Remove old cruft ! rm -f aclocal.m4 configure config.guess config.log config.sub config.cache compile missing mkinstalldirs install-sh INSTALL ! rm -Rf autom4te.cache autotools ! mkdir autotools ! aclocal${amvers} ! autoconf ! automake${amvers} --add-missing --copy ! # fix nasty automake-1.6 bug ! if test ! -e ./autotools/config.guess; then ! if test -e /usr/local/share/automake${amvers}/config.guess; then ! cp /usr/local/share/automake${amvers}/config.guess ./autotools/ ! elif test -e /usr/share/automake${amvers}/config.guess; then ! cp /usr/share/automake${amvers}/config.guess ./autotools/ ! else ! echo "./autotools/config.guess is missing, apparently due to an automake bug." ! fi fi ! if test ! -e ./autotools/config.sub; then ! if test -e /usr/local/share/automake${amvers}/config.sub; then ! cp /usr/local/share/automake${amvers}/config.sub ./autotools/ ! elif test -e /usr/share/automake${amvers}/config.sub; then ! cp /usr/share/automake${amvers}/config.sub ./autotools/ ! else ! echo "./autotools/config.sub is missing, apparently due to an automake bug." ! fi fi --- 117,157 ---- done ! # bootstrap ourselves echo "bootstrapping toplevel" # Remove old cruft ! for x in aclocal.m4 configure config.guess config.log config.sub config.cache config.h.in config.h compile libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 ltmain.sh libtool ltconfig missing mkinstalldirs depcomp install-sh; do rm -f $x autotools/$x; if test -n "$auxdir"; then rm -f "$auxdir/$x"; fi; done ! rm -Rf autom4te.cache ! if test -n "$auxdir"; then ! if test ! -d "$auxdir"; then ! mkdir "$auxdir" ! fi ! aclocalflags="${aclocalflags} -I $auxdir -I ." ! fi ! # Explain what we are doing from now ! set -x ! # Bootstrap package ! if test "$libtool" = "yes"; then ! ${libtoolize} --copy --force ! if test -n "$auxdir" -a ! "$auxdir" = "." -a -f "ltmain.sh"; then ! echo "$0: working around a minor libtool issue" ! mv ltmain.sh "$auxdir/" ! fi fi ! aclocal${amvers} ${aclocalflags} ! autoconf${acvers} ! if test "$header" = "yes"; then ! autoheader${acvers} fi + if test "$makefile" = "yes"; then + #add --include-deps if you want to bootstrap with any other compiler than gcc + #automake${amvers} --add-missing --copy --include-deps + automake${amvers} --foreign --add-missing --copy + fi + + # Remove cruft that we no longer want + rm -Rf autom4te.cache + Index: Makefile.am =================================================================== RCS file: /cvsroot/foo/foo/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.am 7 Aug 2004 23:56:11 -0000 1.1 --- Makefile.am 27 Apr 2010 15:46:44 -0000 1.2 *************** *** 7,11 **** SUBDIRS = libfoo elkfoo ! DIST_SUBDIRS = $(SUBDIRS) autotools EXTRA_DIST = \ --- 7,11 ---- SUBDIRS = libfoo elkfoo ! DIST_SUBDIRS = $(SUBDIRS) EXTRA_DIST = \ |