summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Hughes <richard@hughsie.com>2008-11-11 13:39:32 +0000
committerRichard Hughes <richard@hughsie.com>2008-11-11 13:39:32 +0000
commit46ce9a587ff0ca088262c8dd57013c16823b141b (patch)
treeee9c9455fc58c199093cf2788f70650dfa165622
parentb5c05a5fb36275f9410532ed8cff00463ad34d09 (diff)
parentb7a56fc0dd4e6aae2887da0fffc7f60a0ec0839a (diff)
Merge branch 'master' of ssh://hughsient@git.freedesktop.org/git/DeviceKit/DeviceKit-power
-rwxr-xr-xautogen.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/autogen.sh b/autogen.sh
index cc9db84..d932c34 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -65,7 +65,7 @@ esac
aclocalinclude="$ACLOCAL_FLAGS"
- if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
+ if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then
if test -z "$NO_LIBTOOLIZE" ; then
echo "Running libtoolize..."
libtoolize --force --copy
@@ -73,11 +73,11 @@ esac
fi
echo "Running aclocal $aclocalinclude ..."
aclocal $aclocalinclude
- if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
+ if grep "^AM_CONFIG_HEADER" configure.ac >/dev/null; then
echo "Running autoheader..."
autoheader
fi
- echo "Running automake --gnu -Wno-portability $am_opt ..."
+ echo "Running automake --add-missing --gnu -Wno-portability $am_opt ..."
automake --add-missing --gnu -Wno-portability $am_opt
echo "Running autoconf ..."
autoconf