fdo-mirrors/upower
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/upower/upower.git synced 2025-12-20 05:30:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes to the autogen.sh script

Browse source 
- Proper formatting and indenting
- Tell aclocal that we use m4/ as macro directory and the final dist
  tarball actually contains the m4/ directory.
- Run intltoolize before aclocal, so aclocal does not append intltool.m4
  to aclocal.m4

Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com>
This commit is contained in:
Michael Biebl 2010-03-26 08:10:11 +01:00 • committed by Martin Pitt
parent f435bf07ac
commit 42ecfd7bdc
1 changed files with 31 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
autogen.sh
View file

@ -1,6 +1,8 @@
#!/bin/sh #!/bin/sh
# Run this to generate all the initial makefiles, etc. # Run this to generate all the initial makefiles, etc.
ACLOCAL_FLAGS="-I m4"
touch ChangeLog touch ChangeLog
srcdir=`dirname $0` srcdir=`dirname $0`
@ -32,11 +34,11 @@ DIE=0
} }
(gtkdocize --flavour no-tmpl) < /dev/null > /dev/null 2>&1 || { (gtkdocize --flavour no-tmpl) < /dev/null > /dev/null 2>&1 || {
echo echo
echo "You must have gtk-doc installed to compile $PROJECT." echo "You must have gtk-doc installed to compile $PROJECT."
echo "Install the appropriate package for your distribution," echo "Install the appropriate package for your distribution,"
echo "or get the source tarball at http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/" echo "or get the source tarball at http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/"
DIE=1 DIE=1
} }
(automake --version) < /dev/null > /dev/null 2>&1 || { (automake --version) < /dev/null > /dev/null 2>&1 || {
@ -73,26 +75,32 @@ xlc )
am_opt=--include-deps;; am_opt=--include-deps;;
esac esac
aclocalinclude="$ACLOCAL_FLAGS" aclocalinclude="$ACLOCAL_FLAGS"
if grep "^LT_INIT" configure.ac >/dev/null; then if grep "^LT_INIT" configure.ac >/dev/null; then
if test -z "$NO_LIBTOOLIZE" ; then if test -z "$NO_LIBTOOLIZE" ; then
echo "Running libtoolize..." echo "Running libtoolize..."
libtoolize --force --copy libtoolize --force --copy
fi fi
fi fi
echo "Running aclocal $aclocalinclude ..."
aclocal $aclocalinclude echo "Running intltoolize ..."
if grep "^AC_CONFIG_HEADERS" configure.ac >/dev/null; then intltoolize --copy --force --automake
echo "Running autoheader..."
autoheader echo "Running aclocal $aclocalinclude ..."
fi aclocal $aclocalinclude
echo "Running automake --add-missing --gnu -Wno-portability $am_opt ..."
automake --add-missing --gnu -Wno-portability $am_opt if grep "^AC_CONFIG_HEADERS" configure.ac >/dev/null; then
echo "Running autoconf ..." echo "Running autoheader..."
autoconf autoheader
fi
echo "Running automake --add-missing --gnu -Wno-portability $am_opt ..."
automake --add-missing --gnu -Wno-portability $am_opt
echo "Running autoconf ..."
autoconf
intltoolize --copy --force --automake || exit 1
conf_flags="--enable-maintainer-mode --enable-gtk-doc" conf_flags="--enable-maintainer-mode --enable-gtk-doc"