Attachment 13833 Details for Bug 14175 – 0001-Fix-the-build-with-automake-aclocal-1.10.patch

[patch] 0001-Fix-the-build-with-automake-aclocal-1.10.patch

0001-Fix-the-build-with-automake-aclocal-1.10.patch (text/plain), 6.82 KB, created by Marc-Andre Lureau on 2008-01-21 07:33:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marc-Andre Lureau

Created: 2008-01-21 07:33:46 UTC

Size: 6.82 KB

patch

obsolete

>From cc11148243b8471fefb18a5dc5e8c9e367539e92 Mon Sep 17 00:00:00 2001
>From: Marc-Andre Lureau (elmarco) <marcandre.lureau@gmail.com>
>Date: Mon, 21 Jan 2008 17:32:40 +0200
>Subject: [PATCH] Fix the build with automake/aclocal 1.10
>
>---
> autogen.sh                  |  179 +++++--------------------------------------
> libck-connector/Makefile.am |    2 +-
> 2 files changed, 19 insertions(+), 162 deletions(-)
>
>diff --git a/autogen.sh b/autogen.sh
>index ed8c2cb..baa8084 100755
>--- a/autogen.sh
>+++ b/autogen.sh
>@@ -1,175 +1,32 @@
> #!/bin/sh
> # Run this to generate all the initial makefiles, etc.
>-set -e
> 
>-PACKAGE=ConsoleKit
>-
>-LIBTOOLIZE=${LIBTOOLIZE-libtoolize}
>-LIBTOOLIZE_FLAGS="--copy --force"
>-AUTOHEADER=${AUTOHEADER-autoheader}
>-AUTOMAKE_FLAGS="--add-missing --gnu"
>-AUTOCONF=${AUTOCONF-autoconf}
>-
>-# automake 1.8 requires autoconf 2.58
>-# automake 1.7 requires autoconf 2.54
>-automake_min_vers=1.7
>-aclocal_min_vers=$automake_min_vers
>-autoconf_min_vers=2.54
>-libtoolize_min_vers=1.4
>-
>-# The awk-based string->number conversion we use needs a C locale to work 
>-# as expected. Setting LC_ALL overrides whether the user set LC_ALL,
>-# LC_NUMERIC, or LANG.
>-LC_ALL=C
>-
>-ARGV0=$0
>-
>-# Allow invocation from a separate build directory; in that case, we change
>-# to the source directory to run the auto*, then change back before running configure
>-srcdir=`dirname $ARGV0`
>+srcdir=`dirname $0`
> test -z "$srcdir" && srcdir=.
> 
>-ORIGDIR=`pwd`
>-
>-cd $srcdir
>-
>-if ($AUTOCONF --version) < /dev/null > /dev/null 2>&1 ; then
>-    if ($AUTOCONF --version | head -n 1 | awk 'NR==1 { if( $(NF) >= '$autoconf_min_vers') \
>-			       exit 1; exit 0; }');
>-    then
>-       echo "$ARGV0: ERROR: \`$AUTOCONF' is too old."
>-       $AUTOCONF --version
>-       echo "           (version $autoconf_min_vers or newer is required)"
>-       DIE="yes"
>-    fi
>-else
>-    echo $AUTOCONF: command not found
>-    echo
>-    echo "$ARGV0: ERROR: You must have \`autoconf' installed to compile $PACKAGE."
>-    echo "           (version $autoconf_min_vers or newer is required)"
>-    DIE="yes"
>-fi
>-
>-#
>-# Hunt for an appropriate version of automake and aclocal; we can't
>-# assume that 'automake' is necessarily the most recent installed version
>-#
>-# We check automake first to allow it to be a newer version than we know about.
>-#
>-if test x"$AUTOMAKE" = x || test x"$ACLOCAL" = x ; then
>-  am_ver=""
>-  for ver in "" "-1.9" "-1.8" "-1.7" ; do
>-    am="automake$ver"
>-    if ($am --version) < /dev/null > /dev/null 2>&1 ; then
>-      if ($am --version | head -n 1 | awk 'NR==1 { if( $(NF) >= '$automake_min_vers') \
>-	  		 exit 1; exit 0; }'); then : ; else
>-         am_ver=$ver
>-         break;
>-      fi
>-    fi
>-  done
>-
>-  AUTOMAKE=${AUTOMAKE-automake$am_ver}
>-  ACLOCAL=${ACLOCAL-aclocal$am_ver}
>-fi
>-
>-#
>-# Now repeat the tests with the copies we decided upon and error out if they
>-# aren't sufficiently new.
>-#
>-if ($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 ; then
>-  if ($AUTOMAKE --version | head -n 1 | awk 'NR==1 { if( $(NF) >= '$automake_min_vers') \
>-			     exit 1; exit 0; }');
>-     then
>-     echo "$ARGV0: ERROR: \`$AUTOMAKE' is too old."
>-     $AUTOMAKE --version
>-     echo "           (version $automake_min_vers or newer is required)"
>-     DIE="yes"
>-  fi
>-  if ($ACLOCAL --version) < /dev/null > /dev/null 2>&1; then
>-    if ($ACLOCAL --version | head -n 1 | awk 'NR==1 { if( $(NF) >= '$aclocal_min_vers' ) \
>-						exit 1; exit 0; }' );
>-    then
>-      echo "$ARGV0: ERROR: \`$ACLOCAL' is too old."
>-      $ACLOCAL --version
>-      echo "           (version $aclocal_min_vers or newer is required)"
>-      DIE="yes"
>-    fi
>-  else
>-    echo $ACLOCAL: command not found
>-    echo
>-    echo "$ARGV0: ERROR: Missing \`$ACLOCAL'"
>-    echo "           The version of $AUTOMAKE installed doesn't appear recent enough."
>-    DIE="yes"
>-  fi
>-else
>-    echo $AUTOMAKE: command not found
>-    echo
>-    echo "$ARGV0: ERROR: You must have \`automake' installed to compile $PACKAGE."
>-    echo "           (version $automake_min_vers or newer is required)"
>-    DIE="yes"
>-fi
>-
>-if ($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1 ; then
>-    if ($LIBTOOLIZE --version | awk 'NR==1 { if( $4 >= '$libtoolize_min_vers') \
>-			       exit 1; exit 0; }');
>-    then
>-       echo "$ARGV0: ERROR: \`$LIBTOOLIZE' is too old."
>-       echo "           (version $libtoolize_min_vers or newer is required)"
>-       DIE="yes"
>-    fi
>-else
>-    echo $LIBTOOLIZE: command not found
>-    echo
>-    echo "$ARGV0: ERROR: You must have \`libtoolize' installed to compile $PACKAGE."
>-    echo "           (version $libtoolize_min_vers or newer is required)"
>-    DIE="yes"
>-fi
>-
>-if test -z "$ACLOCAL_FLAGS"; then
>-    acdir=`$ACLOCAL --print-ac-dir`
>-    if [ ! -f $acdir/pkg.m4 ]; then
>-	echo "$ARGV0: Error: Could not find pkg-config macros."
>-	echo "        (Looked in $acdir/pkg.m4)"
>-	echo "        If pkg.m4 is available in /another/directory, please set"
>-	echo "        ACLOCAL_FLAGS=\"-I /another/directory\""
>-	echo "        Otherwise, please install pkg-config."
>-	echo ""
>-	echo "pkg-config is available from:"
>-	echo "http://www.freedesktop.org/software/pkgconfig/"
>-	DIE=yes
>-    fi
>-fi
>-
>-if test "X$DIE" != X; then
>-  exit 1
>-fi
>-
>+(test -f $srcdir/configure.ac) || {
>+    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
>+    echo " top-level package directory"
>+    exit 1
>+}
> 
> if test -z "$*"; then
>-  echo "$ARGV0:	Note: \`./configure' will be run with no arguments."
>-  echo "		If you wish to pass any to it, please specify them on the"
>-  echo "		\`$0' command line."
>+  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
> 
>-do_cmd() {
>-    echo "$ARGV0: running \`$@'"
>-    $@
>-}
>-
>-do_cmd $LIBTOOLIZE $LIBTOOLIZE_FLAGS
>-
>-do_cmd $ACLOCAL $ACLOCAL_FLAGS
>-
>-do_cmd $AUTOHEADER
>+(cd $srcdir && autoreconf --force --install) || exit 1
> 
>-do_cmd $AUTOMAKE $AUTOMAKE_FLAGS
>+conf_flags="--enable-maintainer-mode --enable-gtk-doc --cache-file=config.cache --disable-static"
> 
>-do_cmd $AUTOCONF
>-
>-cd $ORIGDIR || exit 1
>+if test x$NOCONFIGURE = x; then
>+  echo Running $srcdir/configure $conf_flags "$@" ...
>+  $srcdir/configure $conf_flags "$@" \
>+  && echo Now type \`make\' to compile. || exit 1
>+else
>+  echo Skipping configure process.
>+fi
> 
>-rm -f config.cache
> 
>-do_cmd $srcdir/configure --cache-file=config.cache --disable-static --enable-maintainer-mode --enable-gtk-doc ${1+"$@"} && echo "Now type \`make' to compile" || exit 1
>diff --git a/libck-connector/Makefile.am b/libck-connector/Makefile.am
>index 757c41e..5654363 100644
>--- a/libck-connector/Makefile.am
>+++ b/libck-connector/Makefile.am
>@@ -30,7 +30,7 @@ test_connector_SOURCES = 		\
> 
> 
> test_connector_LDADD =			\
>-	$(top_builddir)/libck-connector/libck-connector.la	\
>+	libck-connector.la	\
> 	$(LIBDBUS_LIBS)			\
> 	$(NULL)
> 
>-- 
>1.5.4.rc2.84.gf85fd
>

Actions: View | Splinter Review

Attachments on bug 14175: 13833

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.