[foo-cvs] foo/elkfoo Makefile.am, 1.5, 1.6 bootstrap, 1.5, 1.6 configure.ac, 1.19, 1.20 acinclude.m4, 1.1, NONE

[Martin R. <ru...@us...>]

Update of /cvsroot/foo/foo/elkfoo
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv634

Modified Files:
	Makefile.am bootstrap configure.ac 
Removed Files:
	acinclude.m4 
Log Message:
adopt build system to newer versions of autotools

--- acinclude.m4 DELETED ---

Index: configure.ac
===================================================================
RCS file: /cvsroot/foo/foo/elkfoo/configure.ac,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** configure.ac	24 Mar 2009 18:31:01 -0000	1.19
--- configure.ac	27 Apr 2010 15:46:28 -0000	1.20
***************
*** 10,16 ****
  AC_PREREQ(2.57)
  AC_CONFIG_SRCDIR([src/main.c])
! AC_CONFIG_AUX_DIR(autotools)
  AC_CANONICAL_TARGET([])
  AM_INIT_AUTOMAKE($PACKAGE_NAME,$PACKAGE_VERSION)
  AM_CONFIG_HEADER(src/config.h)
  
--- 10,18 ----
  AC_PREREQ(2.57)
  AC_CONFIG_SRCDIR([src/main.c])
! AC_CONFIG_MACRO_DIR([m4])
! AC_CONFIG_AUX_DIR(.auto)
  AC_CANONICAL_TARGET([])
  AM_INIT_AUTOMAKE($PACKAGE_NAME,$PACKAGE_VERSION)
+ dnl AM_MAINTAINER_MODE
  AM_CONFIG_HEADER(src/config.h)
  

Index: bootstrap
===================================================================
RCS file: /cvsroot/foo/foo/elkfoo/bootstrap,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** bootstrap	9 Mar 2009 00:54:46 -0000	1.5
--- bootstrap	27 Apr 2010 15:46:28 -0000	1.6
***************
*** 1,77 ****
  #! /bin/sh
  
- ##  bootstrap file for libfoo
- # 2004 martin rumori (fo...@ru...)
- 
  ##  $Id$
  
! # 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
  
  # Check for libtool
! libtoolize="no"
! if libtoolize --version >/dev/null 2>&1; then
!   libtoolize="libtoolize"
! elif glibtoolize --version >/dev/null 2>&1; then
!   libtoolize="glibtoolize"
  fi
  
! if test "$libtoolize" = "no"; then
!   set +x
!   echo "$0: you need libtool"
!   exit 1
  fi
  
  # Remove old cruft
! rm -f aclocal.m4 configure config.guess config.log config.sub config.cache config.h.in config.h compile ltmain.sh libtool ltconfig missing mkinstalldirs depcomp install-sh INSTALL
! rm -Rf autom4te.cache autotools
! mkdir autotools
  
! ${libtoolize} --copy --force
  
! if test -f "ltmain.sh"; then
!   echo "$0: working around a minor libtool issue"
!   mv ltmain.sh autotools/
  fi
  
! aclocal${amvers}
! autoconf
! autoheader
! automake${amvers} --add-missing --copy
--- 1,142 ----
  #! /bin/sh
  
  ##  $Id$
  
! # 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
! 
! # 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
  
  # 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/elkfoo/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile.am	14 Dec 2007 19:41:44 -0000	1.5
--- Makefile.am	27 Apr 2010 15:46:28 -0000	1.6
***************
*** 8,11 ****
--- 8,12 ----
  SUBDIRS = include src scm scripts examples
  DIST_SUBDIRS = $(SUBDIRS) m4
+ ACLOCAL_AMFLAGS = -I m4
  
  EXTRA_DIST = \