diff --git a/alliance/src/autostuff b/alliance/src/autostuff index ab37ac02..261c4578 100755 --- a/alliance/src/autostuff +++ b/alliance/src/autostuff @@ -34,12 +34,21 @@ ## - dirs : to build only in dirs ################################################### +set -e + +libtoolize="libtoolize" + +if [ "`uname`" = "Darwin" ]; then + libtoolize="g${libtoolize}" +fi + ## Is it a clean if test "$1" = "clean" ; then find . -name Makefile.in -exec rm {} \; -print find . -name aclocal.m4 -exec rm {} \; -print find . -name configure -exec rm {} \; -print find . -name autom4te.cache -exec rm -r {} \; -print + rm -f configure.ac rm -f mkinstalldirs rm -f missing rm -f install-sh @@ -89,38 +98,38 @@ ordered_dirs="$ordered_dirs $dirs" AC_OUTPUT=`find $ordered_dirs -name Makefile.am | sed "s,\.am,,"` -rm -f configure.in -echo "" >> configure.in -echo "AC_INIT(./autostuff)" >> configure.in -echo "AM_INIT_AUTOMAKE(alliance, 5.0)" >> configure.in -echo "" >> configure.in -echo "AM_PROG_LEX" >> configure.in -echo "AM_PROG_LIBTOOL" >> configure.in -echo "AC_CHECK_HEADERS(fcntl.h malloc.h strings.h sys/time.h unistd.h)" >> configure.in -echo "AC_CHECK_HEADERS(strings.h unistd.h)" >> configure.in -echo "AC_CHECK_LIB(gen, basename)" >> configure.in -echo "AC_CHECK_LIB(iberty, basename)" >> configure.in -echo "AC_CHECK_LIB(m, exp)" >> configure.in -echo "AC_CHECK_LIB(m, floor)" >> configure.in -echo "AC_CHECK_LIB(m, pow)" >> configure.in -echo "AC_CHECK_LIB(m, sqrt)" >> configure.in -echo "AC_CHECK_PROG(SED, sed, sed)" >> configure.in -echo "AC_CHECK_PROGS(SED, gsed sed)" >> configure.in -echo "AC_C_CONST" >> configure.in -echo "AC_FUNC_VFORK" >> configure.in -echo "AC_HEADER_STDC" >> configure.in -echo "AC_HEADER_SYS_WAIT" >> configure.in -echo "AC_PATH_XTRA" >> configure.in -echo "AC_PROG_CC" >> configure.in -echo "AC_PROG_CPP" >> configure.in -echo "AC_PROG_CXX" >> configure.in -echo "AC_PROG_INSTALL" >> configure.in -echo "AC_PROG_MAKE_SET" >> configure.in -echo "AC_PROG_LIBTOOL" >> configure.in -echo "AC_PROG_YACC" >> configure.in -echo "AC_TYPE_SIGNAL" >> configure.in +rm -f configure.ac +echo "" >> configure.ac +echo "AC_INIT(./autostuff)" >> configure.ac +echo "AM_INIT_AUTOMAKE(alliance, 5.0)" >> configure.ac +echo "" >> configure.ac +echo "AM_PROG_LEX" >> configure.ac +echo "AM_PROG_LIBTOOL" >> configure.ac +echo "AC_CHECK_HEADERS(fcntl.h malloc.h strings.h sys/time.h unistd.h)" >> configure.ac +echo "AC_CHECK_HEADERS(strings.h unistd.h)" >> configure.ac +echo "AC_CHECK_LIB(gen, basename)" >> configure.ac +echo "AC_CHECK_LIB(iberty, basename)" >> configure.ac +echo "AC_CHECK_LIB(m, exp)" >> configure.ac +echo "AC_CHECK_LIB(m, floor)" >> configure.ac +echo "AC_CHECK_LIB(m, pow)" >> configure.ac +echo "AC_CHECK_LIB(m, sqrt)" >> configure.ac +echo "AC_CHECK_PROG(SED, sed, sed)" >> configure.ac +echo "AC_CHECK_PROGS(SED, gsed sed)" >> configure.ac +echo "AC_C_CONST" >> configure.ac +echo "AC_FUNC_VFORK" >> configure.ac +echo "AC_HEADER_STDC" >> configure.ac +echo "AC_HEADER_SYS_WAIT" >> configure.ac +echo "AC_PATH_XTRA" >> configure.ac +echo "AC_PROG_CC" >> configure.ac +echo "AC_PROG_CPP" >> configure.ac +echo "AC_PROG_CXX" >> configure.ac +echo "AC_PROG_INSTALL" >> configure.ac +echo "AC_PROG_MAKE_SET" >> configure.ac +echo "AC_PROG_LIBTOOL" >> configure.ac +echo "AC_PROG_YACC" >> configure.ac +echo "AC_TYPE_SIGNAL" >> configure.ac -cat >> configure.in <<"EOF" +cat >> configure.ac <<"EOF" dnl dnl Check for X stuff dnl @@ -283,59 +292,59 @@ LDFLAGS="$ice_save_LDFLAGS" fi EOF -echo "AM_ALLIANCE" >> configure.in -echo "AM_CONDITIONAL([ALLIANCE_BUILD],[(exit 0)])" >> configure.in +echo "AM_ALLIANCE" >> configure.ac +echo "AM_CONDITIONAL([ALLIANCE_BUILD],[(exit 0)])" >> configure.ac -find $ordered_dirs -name configure.in | while read config; do +find $ordered_dirs -name configure.ac | while read config; do echo "Scanning $config" - echo "" >> configure.in - echo "dnl Infos extracted from $config" >> configure.in + echo "" >> configure.ac + echo "dnl Infos extracted from $config" >> configure.ac for version_line in `grep -ah _CUR= $config`; do - echo "$version_line" >> configure.in + echo "$version_line" >> configure.ac version_name=`echo $version_line | sed 's,=.*,,'` - echo "AC_SUBST($version_name)" >> configure.in + echo "AC_SUBST($version_name)" >> configure.ac done for version_line in `grep -ah _REV= $config`; do - echo "$version_line" >> configure.in + echo "$version_line" >> configure.ac version_name=`echo $version_line | sed 's,=.*,,'` - echo "AC_SUBST($version_name)" >> configure.in + echo "AC_SUBST($version_name)" >> configure.ac done for version_line in `grep -ah _REL= $config`; do - echo "$version_line" >> configure.in + echo "$version_line" >> configure.ac version_name=`echo $version_line | sed 's,=.*,,'` - echo "AC_SUBST($version_name)" >> configure.in + echo "AC_SUBST($version_name)" >> configure.ac done for dll_line in `grep -ah _DLL_VERSION= $config`; do - echo "$dll_line" >> configure.in + echo "$dll_line" >> configure.ac dll_name=`echo $dll_line | sed 's,=.*,,'` - echo "AC_SUBST($dll_name)" >> configure.in + echo "AC_SUBST($dll_name)" >> configure.ac done for version_line in `grep -ah _VERSION= $config | grep -v DLL`; do - echo "$version_line" >> configure.in + echo "$version_line" >> configure.ac version_name=`echo $version_line | sed 's,=.*,,'` - echo "AC_SUBST($version_name)" >> configure.in + echo "AC_SUBST($version_name)" >> configure.ac done done -echo "" >> configure.in -echo "TOOLSDIRS=\"$ordered_dirs\"" >> configure.in -echo "AC_SUBST(TOOLSDIRS)" >> configure.in +echo "" >> configure.ac +echo "TOOLSDIRS=\"$ordered_dirs\"" >> configure.ac +echo "AC_SUBST(TOOLSDIRS)" >> configure.ac -echo "" >> configure.in -echo "AC_OUTPUT([" >> configure.in -echo "Makefile" >> configure.in -echo "distrib/etc/alc_env.sh" >> configure.in -echo "distrib/etc/alc_env.csh" >> configure.in +echo "" >> configure.ac +echo "AC_OUTPUT([" >> configure.ac +echo "Makefile" >> configure.ac +echo "distrib/etc/alc_env.sh" >> configure.ac +echo "distrib/etc/alc_env.csh" >> configure.ac for template in $AC_OUTPUT; do - echo "$template" >> configure.in + echo "$template" >> configure.ac done -echo "])" >> configure.in +echo "])" >> configure.ac aclocal -I . -libtoolize --force --copy --automake +${libtoolize} --force --copy --automake automake --foreign --add-missing --copy autoconf