PolicyKit: Branch 'master'

David Zeuthen david at kemper.freedesktop.org
Wed Apr 10 07:29:49 PDT 2013


 autogen.sh   |    2 +-
 configure.ac |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7caa88f1eb8d01ab935f1d1e34a0db20f554448b
Author: Nuno Araujo <nuno.araujo at russo79.com>
Date:   Tue Jan 15 17:47:22 2013 +0100

    Fix the build with automake 1.13
    
    In Automake 1.13, the long-deprecated macro AM_CONFIG_HEADER (deprecated
    since 2002) has been removed in favour of AC_CONFIG_HEADERS.
    
    Signed-off-by: David Zeuthen <zeuthen at gmail.com>

diff --git a/autogen.sh b/autogen.sh
index d08b00a..3407ae0 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -99,7 +99,7 @@ esac
       fi
       echo "Running aclocal $aclocalinclude ..."
       aclocal $aclocalinclude
-      if grep "^AM_CONFIG_HEADER" configure.ac >/dev/null; then
+      if grep "^AC_CONFIG_HEADERS" configure.ac >/dev/null; then
 	echo "Running autoheader..."
 	autoheader
       fi
diff --git a/configure.ac b/configure.ac
index 40f0cd7..7d2dfcd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.59c)
 AC_INIT(polkit, 0.111 http://lists.freedesktop.org/mailman/listinfo/polkit-devel)
 AM_INIT_AUTOMAKE(polkit, 0.111)
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
 AM_MAINTAINER_MODE
 
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])


More information about the hal-commit mailing list