aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--macros/ChangeLog4
-rw-r--r--macros/autogen.sh143
2 files changed, 78 insertions, 69 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog
index 68fc7411d1..dceba3a8c9 100644
--- a/macros/ChangeLog
+++ b/macros/ChangeLog
@@ -1,3 +1,7 @@
+1998-12-02 Raja R Harinath <harinath@cs.umn.edu>
+
+ * autogen.sh: "Improve" indentation and messages somewhat.
+
1998-12-01 Jeff Garzik <jgarzik@pobox.com>
* autogen.sh:
diff --git a/macros/autogen.sh b/macros/autogen.sh
index 89bf8da87c..782f69de14 100644
--- a/macros/autogen.sh
+++ b/macros/autogen.sh
@@ -4,114 +4,119 @@
DIE=0
(autoconf --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "**Error**: You must have "\`autoconf\'" installed to compile Gnome."
- echo "Download the appropriate package for your distribution,"
- echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
- DIE=1
+ echo
+ echo "**Error**: You must have \`autoconf' installed to compile Gnome."
+ echo "Download the appropriate package for your distribution,"
+ echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
+ DIE=1
}
(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
-(libtool --version) < /dev/null > /dev/null 2>&1 || {
+ (libtool --version) < /dev/null > /dev/null 2>&1 || {
echo
- echo "**Error**: You must have "\`libtool\'" installed to compile Gnome."
+ echo "**Error**: You must have \`libtool' installed to compile Gnome."
echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.2.tar.gz"
echo "(or a newer version if it is available)"
DIE=1
-}
+ }
}
grep "^AM_GNU_GETTEXT" $srcdir/configure.in >/dev/null && {
-grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \
-(gettext --version) < /dev/null > /dev/null 2>&1 || {
+ grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \
+ (gettext --version) < /dev/null > /dev/null 2>&1 || {
echo
- echo "**Error**: You must have "\`gettext\'" installed to compile Gnome."
+ echo "**Error**: You must have \`gettext' installed to compile Gnome."
echo "Get ftp://alpha.gnu.org/gnu/gettext-0.10.35.tar.gz"
echo "(or a newer version if it is available)"
DIE=1
-}
+ }
}
(automake --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "**Error**: You must have "\`automake\'" installed to compile Gnome."
- echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz"
- echo "(or a newer version if it is available)"
- DIE=1
- NO_AUTOMAKE=yes
+ echo
+ echo "**Error**: You must have \`automake' installed to compile Gnome."
+ echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz"
+ echo "(or a newer version if it is available)"
+ DIE=1
+ NO_AUTOMAKE=yes
}
# if no automake, don't bother testing for aclocal
test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "**Error**: Missing "\`aclocal\'". The version of "\`automake\'
- echo "installed doesn't appear recent enough."
- echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz"
- echo "(or a newer version if it is available)"
- DIE=1
+ echo
+ echo "**Error**: Missing \`aclocal'. The version of \`automake'"
+ echo "installed doesn't appear recent enough."
+ echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz"
+ echo "(or a newer version if it is available)"
+ DIE=1
}
if test "$DIE" -eq 1; then
- exit 1
+ exit 1
fi
if test -z "$*"; then
- echo "**Warning**: I am going to run "\`configure\'" with no arguments."
- echo "If you wish to pass any to it, please specify them on the"
- echo \`$0\'" command line."
- echo
+ echo "**Warning**: I am going to run \`configure' with no arguments."
+ echo "If you wish to pass any to it, please specify them on the"
+ echo \`$0\'" command line."
+ echo
fi
case $CC in
xlc )
- am_opt=--include-deps;;
+ am_opt=--include-deps;;
esac
-for j in `find $srcdir -name configure.in -print`
+for coin in `find $srcdir -name configure.in -print`
do
- i=`dirname $j`
- if test -f $i/NO-AUTO-GEN; then
- echo skipping $i -- flagged as no auto-gen
- else
- macrodirs=`sed -n -e 's,AM_ACLOCAL_INCLUDE(\(.*\)),\1,gp' < $j`
- echo processing $i
- ## debug
- test -n "$macrodirs" && echo \`aclocal\' will also look in \`$macrodirs\'
- (cd $i; \
- aclocalinclude="$ACLOCAL_FLAGS"; \
- for k in $macrodirs; do \
- if test -d $k; then aclocalinclude="$aclocalinclude -I $k"; \
- else echo "**Warning**: No such directory \`$k'. Ignored."; fi; \
- done; \
- if grep "^AM_GNU_GETTEXT" configure.in >/dev/null; then \
- if grep "sed.*POTFILES" configure.in >/dev/null; then \
- : do nothing -- we still have an old unmodified configure.in
- else
- echo "Running gettextize... Ignore non-fatal messages."; \
- echo "no" | gettextize --force; \
- fi \
- fi; \
- if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then \
- echo "Running libtoolize..."; \
- libtoolize --force; \
- fi
- aclocal $aclocalinclude; \
- if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then \
- echo "Running autoheader..."; \
- autoheader; \
- fi
- automake --add-missing --gnu $am_opt; autoconf)
- fi
+ dr=`dirname $coin`
+ if test -f $i/NO-AUTO-GEN; then
+ echo skipping $dr -- flagged as no auto-gen
+ else
+ echo processing $dr
+ macrodirs=`sed -n -e 's,AM_ACLOCAL_INCLUDE(\(.*\)),\1,gp' < $coin`
+ ( cd $dr
+ aclocalinclude="$ACLOCAL_FLAGS"
+ for k in $macrodirs; do
+ if test -d $k; then
+ aclocalinclude="$aclocalinclude -I $k"
+ ##else
+ ## echo "**Warning**: No such directory \`$k'. Ignored."
+ fi
+ done
+ if grep "^AM_GNU_GETTEXT" configure.in >/dev/null; then
+ if grep "sed.*POTFILES" configure.in >/dev/null; then
+ : do nothing -- we still have an old unmodified configure.in
+ else
+ echo "Running gettextize... Ignore non-fatal messages."
+ echo "no" | gettextize --force
+ fi
+ fi
+ if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
+ echo "Running libtoolize..."
+ libtoolize --force
+ fi
+ echo "Running aclocal $aclocalinclude ..."
+ aclocal $aclocalinclude
+ if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
+ echo "Running autoheader..."
+ autoheader
+ fi
+ echo "Running automake --gnu $am_opt ..."
+ automake --add-missing --gnu $am_opt
+ echo "Running autoconf ..."
+ autoconf
+ )
+ fi
done
conf_flags="--enable-maintainer-mode --enable-compile-warnings" #--enable-iso-c
if test x$NOCONFIGURE = x; then
-echo running $srcdir/configure $conf_flags "$@"
-
- $srcdir/configure $conf_flags "$@" \
- && echo Now type \`make\' to compile $PKG_NAME
+ echo Running $srcdir/configure $conf_flags "$@" ...
+ $srcdir/configure $conf_flags "$@" \
+ && echo Now type \`make\' to compile $PKG_NAME
else
-echo Skipping configure process.
+ echo Skipping configure process.
fi