From 1a21dc61d0dfa0636f6fc2cb929b25f880943a40 Mon Sep 17 00:00:00 2001 From: Michael Jennings Date: Thu, 30 Dec 2004 00:58:45 +0000 Subject: Wed Dec 29 19:58:03 2004 Michael Jennings (mej) Attempting to move toward using newer autoSPLAT tools by default. ---------------------------------------------------------------------- SVN revision: 12634 --- ChangeLog | 4 ++++ autogen.sh | 34 +++++++++++++++++----------------- configure.in | 38 +++++++++++++++++++------------------- 3 files changed, 40 insertions(+), 36 deletions(-) diff --git a/ChangeLog b/ChangeLog index b2184ea..f4c4cdd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -722,3 +722,7 @@ replaced with macro calls like SPIF_STR_NEW()). A UTF-8-based string implementation is forthcoming. ---------------------------------------------------------------------- +Wed Dec 29 19:58:03 2004 Michael Jennings (mej) + +Attempting to move toward using newer autoSPLAT tools by default. +---------------------------------------------------------------------- diff --git a/autogen.sh b/autogen.sh index d7874b5..922c2e5 100755 --- a/autogen.sh +++ b/autogen.sh @@ -15,38 +15,38 @@ DIE=0 echo "Generating configuration files for libast, please wait...." LIBTOOLIZE_CHOICES="$LIBTOOLIZE libtoolize glibtoolize" -AUTOHEADER_CHOICES="$AUTOHEADER autoheader213 autoheader-2.13 autoheader" -ACLOCAL_CHOICES="$ACLOCAL aclocal14 aclocal-1.4 aclocal" -AUTOMAKE_CHOICES="$AUTOMAKE automake14 automake-1.4 automake" -AUTOCONF_CHOICES="$AUTOCONF autoconf213 autoconf-2.13 autoconf" +ACLOCAL_CHOICES="$ACLOCAL aclocal" +AUTOCONF_CHOICES="$AUTOCONF autoconf" +AUTOHEADER_CHOICES="$AUTOHEADER autoheader" +AUTOMAKE_CHOICES="$AUTOMAKE automake" for i in $LIBTOOLIZE_CHOICES ; do $i --version /dev/null 2>&1 && LIBTOOLIZE=$i && break done [ "x$LIBTOOLIZE" = "x" ] && broken libtool -for i in $AUTOHEADER_CHOICES ; do - $i --version /dev/null 2>&1 && AUTOHEADER=$i && break -done -[ "x$AUTOHEADER" = "x" ] && broken autoconf - for i in $ACLOCAL_CHOICES ; do $i --version /dev/null 2>&1 && ACLOCAL=$i && break done [ "x$ACLOCAL" = "x" ] && broken automake -for i in $AUTOMAKE_CHOICES ; do - $i --version /dev/null 2>&1 && AUTOMAKE=$i && break -done -[ "x$AUTOMAKE" = "x" ] && broken automake - for i in $AUTOCONF_CHOICES ; do $i --version /dev/null 2>&1 && AUTOCONF=$i && break done [ "x$AUTOCONF" = "x" ] && broken autoconf +for i in $AUTOHEADER_CHOICES ; do + $i --version /dev/null 2>&1 && AUTOHEADER=$i && break +done +[ "x$AUTOHEADER" = "x" ] && broken autoconf + +for i in $AUTOMAKE_CHOICES ; do + $i --version /dev/null 2>&1 && AUTOMAKE=$i && break +done +[ "x$AUTOMAKE" = "x" ] && broken automake + # Export them so configure can AC_SUBST() them. -export LIBTOOLIZE AUTOHEADER ACLOCAL AUTOMAKE AUTOCONF +export LIBTOOLIZE ACLOCAL AUTOCONF AUTOHEADER AUTOMAKE # Check for existing libast.m4 we can use. Use the local one if not. if test ! -f "`$ACLOCAL --print-ac-dir`/libast.m4"; then @@ -55,10 +55,10 @@ fi # Run the stuff. (set -x && $LIBTOOLIZE -c -f) -(set -x && $AUTOHEADER) (set -x && $ACLOCAL $ACLOCAL_FLAGS) -(set -x && $AUTOMAKE -a -c) (set -x && $AUTOCONF) +(set -x && $AUTOHEADER) +(set -x && $AUTOMAKE -a -c) # Run configure. ./configure "$@" diff --git a/configure.in b/configure.in index a65cf14..4fa505e 100644 --- a/configure.in +++ b/configure.in @@ -1,44 +1,44 @@ dnl# $Id$ -test "x$LIBTOOLIZE" = "x" && LIBTOOLIZE=true -test "x$AUTOHEADER" = "x" && AUTOHEADER=true -test "x$ACLOCAL" = "x" && ACLOCAL=true -test "x$AUTOMAKE" = "x" && AUTOMAKE=true -test "x$AUTOCONF" = "x" && AUTOCONF=true +test "x$LIBTOOLIZE" = "x" && LIBTOOLIZE=libtoolize +test "x$ACLOCAL" = "x" && ACLOCAL=aclocal +test "x$AUTOCONF" = "x" && AUTOCONF=autoconf +test "x$AUTOHEADER" = "x" && AUTOHEADER=autoheader +test "x$AUTOMAKE" = "x" && AUTOMAKE=automake AC_SUBST(LIBTOOLIZE) -AC_SUBST(AUTOHEADER) AC_SUBST(ACLOCAL) -AC_SUBST(AUTOMAKE) AC_SUBST(AUTOCONF) +AC_SUBST(AUTOHEADER) +AC_SUBST(AUTOMAKE) SAVE_LIBTOOLIZE="$LIBTOOLIZE" -SAVE_AUTOHEADER="$AUTOHEADER" SAVE_ACLOCAL="$ACLOCAL" -SAVE_AUTOMAKE="$AUTOMAKE" SAVE_AUTOCONF="$AUTOCONF" +SAVE_AUTOHEADER="$AUTOHEADER" +SAVE_AUTOMAKE="$AUTOMAKE" AC_INIT(configure.in) AM_INIT_AUTOMAKE(libast, 0.7) AC_DEFINE_UNQUOTED(LIBAST_VERSION, "$VERSION", [Version]) AM_CONFIG_HEADER(config.h include/libast/sysdefs.h) -LIBTOOLIZE="${SAVE_LIBTOOLIZE:-true}" -AUTOHEADER="${SAVE_AUTOHEADER:-true}" -ACLOCAL="${SAVE_ACLOCAL:-true}" -AUTOMAKE="${SAVE_AUTOMAKE:-true}" -AUTOCONF="${SAVE_AUTOCONF:-true}" +LIBTOOLIZE="${SAVE_LIBTOOLIZE:-libtoolize}" +ACLOCAL="${SAVE_ACLOCAL:-aclocal}" +AUTOCONF="${SAVE_AUTOCONF:-autoconf}" +AUTOHEADER="${SAVE_AUTOHEADER:-autoheader}" +AUTOMAKE="${SAVE_AUTOMAKE:-automake}" AC_MSG_CHECKING(for preferred libtoolize) AC_MSG_RESULT($LIBTOOLIZE) -AC_MSG_CHECKING(for preferred autoheader) -AC_MSG_RESULT($AUTOHEADER) AC_MSG_CHECKING(for preferred aclocal) AC_MSG_RESULT($ACLOCAL) -AC_MSG_CHECKING(for preferred automake) -AC_MSG_RESULT($AUTOMAKE) AC_MSG_CHECKING(for preferred autoconf) AC_MSG_RESULT($AUTOCONF) +AC_MSG_CHECKING(for preferred autoheader) +AC_MSG_RESULT($AUTOHEADER) +AC_MSG_CHECKING(for preferred automake) +AC_MSG_RESULT($AUTOMAKE) dnl# Set some basic variables AUTHORS="Michael Jennings (mej@eterm.org)" @@ -86,7 +86,7 @@ AC_SUBST(LDFLAGS) AC_SUBST(LIBS) basedir=. -AC_OUTPUT(${srcdir}/include/libast/types.h Makefile include/Makefile \ +AC_OUTPUT(include/libast/types.h Makefile include/Makefile \ include/libast/Makefile src/Makefile test/Makefile \ libast-config) test -f libast-config && chmod 755 libast-config -- cgit v1.2.1