As autogen.sh works with libtool v2, the old autogen.sh.ltv2 is no longer

needed.  Modified autofixer.sh to only check for libtool v1 and copy over
autogen.sh.ltv1 if needed.



git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@2817 7ae35d74-ebe9-4afe-98af-79ac388436b8
Hamlib-1.2.11
Nate Bargmann, N0NB 2010-01-28 12:31:42 +00:00
rodzic f698692e83
commit e9e75fffa3
2 zmienionych plików z 2 dodań i 106 usunięć

Wyświetl plik

@ -10,10 +10,6 @@
V1AUTOGEN='autogen.sh.ltv1'
V1CONFIG='configure.ac.ltv1'
# Version 2 (and later?) files
V2AUTOGEN='autogen.sh.ltv2'
V2CONFIG='configure.ac.ltv2'
# Destinations
AUTOGEN='autogen.sh'
CONFIG='configure.ac'
@ -27,19 +23,14 @@ fi
vers=$( echo $(libtool --version) | \
sed '1,1s/ltmain.*tool) //; 1,1s/ .*$//; 2,$d')
# Test first digit of version. If it's '1', use libtool v1 setup, otherwise
# use libtool v2.
# Test first digit of version. If it's '1', use libtool v1 setup
echo Libtool version $vers detected.
if [ $vers \< "1.99.99" ]; then
if [ $vers \< "1.99.99" ]; then
cp $V1AUTOGEN $AUTOGEN
cp $V1CONFIG $CONFIG
echo Libtool v1 configured.
else
cp $V2AUTOGEN $AUTOGEN
cp $V2CONFIG $CONFIG
echo Libtool v2 configured.
fi
echo
echo "** You may now run sh ./autogen.sh **"

Wyświetl plik

@ -1,95 +0,0 @@
#!/bin/sh
# Run this to generate or regenerate all the initial makefiles, etc.
# Taken from glib CVS
# Change the following to match the versions installed on your system
LIBTOOLIZE=libtoolize
AUTOCONF=autoconf
AUTOHEADER=autoheader
AUTOMAKE=automake
ACLOCAL=aclocal
#
# FreeBSD 6.2 uses this
#
#AUTOCONF=autoconf259
#AUTOHEAD=autoheader259
#AUTOMAKE=automake19
#ACLOCAL=aclocal19
#
# Debian etch uses this
#
#AUTOCONF=autoconf
#AUTOHEADER=autoheader
#AUTOMAKE=automake-1.9
#ACLOCAL=aclocal-1.9
# Needed on Gentoo
export WANT_AUTOCONF_2_5 # 2.54 or higher, not 2.53a or 2.13
ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I macros"
srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
ORIGDIR=`pwd`
cd $srcdir
PROJECT=hamlib
TEST_TYPE=-f
FILE=include/hamlib/rig.h
DIE=0
($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "You must have libtool installed to compile $PROJECT."
echo "Download the appropriate package for your distribution,"
echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
DIE=1
}
($AUTOCONF --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "You must have autoconf installed to compile $PROJECT."
echo "Download the appropriate package for your distribution,"
echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
DIE=1
}
($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "You must have automake installed to compile $PROJECT."
echo "Get ftp://sourceware.cygnus.com/pub/automake/automake-1.5.tar.gz"
echo "(or a newer version if it is available)"
DIE=1
}
if test "$DIE" -eq 1; then
exit 1
fi
test $TEST_TYPE $FILE || {
echo "You must run this script in the top-level $PROJECT directory"
exit 1
}
if test -z "$*"; then
echo "I am going to run ./configure with no arguments - if you wish "
echo "to pass any to it, please specify them on the $0 command line."
fi
# Are we looking for the compiler on a foreign system?
case $CC in
*xlc | *xlc\ * | *lcc | *lcc\ *) am_opt=--include-deps;;
esac
$ACLOCAL $ACLOCAL_FLAGS
# optionally feature autoheader
($AUTOHEADER --version) < /dev/null > /dev/null 2>&1 && $AUTOHEADER
$LIBTOOLIZE -c -i --force
$AUTOMAKE -a $am_opt
$AUTOCONF
cd $ORIGDIR
$srcdir/configure --enable-maintainer-mode "$@"