Attachment 47809 Details for Bug 38150 – Update autotools config a bit

[patch] Update autotools config a bit

0001-Update-autotools-configuration-a-bit.patch (text/plain), 4.40 KB, created by Javier Jardón on 2011-06-10 06:30:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Javier Jardón

Created: 2011-06-10 06:30:30 UTC

Size: 4.40 KB

patch

obsolete

>From 0610a8a044f04639a8aa789c76aac4790a80cd0d Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
>Date: Fri, 10 Jun 2011 14:23:46 +0100
>Subject: [PATCH] Update autotools configuration a bit
>
>Use xz to generate tarballs and do not generate gz ones
>Use AC_CONFIG_AUX_DIR to clean the tree a bit of autogenerated files
>PKG_CHECK_MODULES already AC_SUBST the needed vars
>---
> Makefile.am  |    2 +-
> configure.ac |   28 ++++++++++------------------
> 2 files changed, 11 insertions(+), 19 deletions(-)
>
>diff --git a/Makefile.am b/Makefile.am
>index ee16f98..16d3700 100644
>--- a/Makefile.am
>+++ b/Makefile.am
>@@ -15,7 +15,7 @@
> #  You should have received a copy of the GNU General Public License
> #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
> 
>-ACLOCAL_AMFLAGS = -I m4
>+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
> 
> # Dirs of external packages
> dbuspolicydir=@dbuspolicydir@
>diff --git a/configure.ac b/configure.ac
>index 85a14c6..baf5d0d 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -15,18 +15,23 @@
> #  You should have received a copy of the GNU General Public License
> #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
> 
>-AC_PREREQ(2.63)
>+AC_PREREQ([2.64])
>+
>+AC_INIT([systemd],
>+        [28],
>+        [https://bugs.freedesktop.org/enter_bug.cgi?product=systemd],
>+        [systemd],
>+        [http://www.freedesktop.org/wiki/Software/systemd])
> 
>-AC_INIT([systemd],[28],[systemd-devel@lists.freedesktop.org])
> AC_CONFIG_SRCDIR([src/main.c])
> AC_CONFIG_MACRO_DIR([m4])
> AC_CONFIG_HEADERS([config.h])
>+AC_CONFIG_AUX_DIR([build-aux])
>+
> AC_USE_SYSTEM_EXTENSIONS
> AC_SYS_LARGEFILE
> 
>-AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability silent-rules tar-pax subdir-objects dist-bzip2])
>-
>-AC_SUBST(PACKAGE_URL, [http://www.freedesktop.org/wiki/Software/systemd])
>+AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability silent-rules tar-pax subdir-objects no-dist-gzip dist-xz])
> 
> AC_CANONICAL_HOST
> AC_DEFINE_UNQUOTED([CANONICAL_HOST], "$host", [Canonical host string.])
>@@ -112,20 +117,14 @@ AC_CHECK_HEADERS([sys/capability.h], [], [AC_MSG_ERROR([*** POSIX caps headers n
> m4_pattern_forbid([^_?PKG_[A-Z_]+$],[*** pkg.m4 missing, please install pkg-config])
> 
> PKG_CHECK_MODULES(UDEV, [ libudev >= 160 ])
>-AC_SUBST(UDEV_CFLAGS)
>-AC_SUBST(UDEV_LIBS)
> 
> PKG_CHECK_MODULES(DBUS, [ dbus-1 >= 1.3.2 ])
>-AC_SUBST(DBUS_CFLAGS)
>-AC_SUBST(DBUS_LIBS)
> 
> have_selinux=no
> AC_ARG_ENABLE(selinux, AS_HELP_STRING([--disable-selinux], [Disable optional SELINUX support]))
> if test "x$enable_selinux" != "xno"; then
>         PKG_CHECK_MODULES(SELINUX, [ libselinux ],
>                 [AC_DEFINE(HAVE_SELINUX, 1, [Define if SELinux is available]) have_selinux=yes], have_selinux=no)
>-        AC_SUBST(SELINUX_CFLAGS)
>-        AC_SUBST(SELINUX_LIBS)
>         if test "x$have_selinux" = xno -a "x$enable_selinux" = xyes; then
>                 AC_MSG_ERROR([*** SELinux support requested but libraries not found])
>         fi
>@@ -234,8 +233,6 @@ AC_ARG_ENABLE(libcryptsetup, AS_HELP_STRING([--disable-libcryptsetup], [disable
> if test "x$enable_libcryptsetup" != "xno"; then
>         PKG_CHECK_MODULES(LIBCRYPTSETUP, [ libcryptsetup ],
>                 [AC_DEFINE(HAVE_LIBCRYPTSETUP, 1, [Define if libcryptsetup is available]) have_libcryptsetup=yes], have_libcryptsetup=no)
>-        AC_SUBST(LIBCRYPTSETUP_CFLAGS)
>-        AC_SUBST(LIBCRYPTSETUP_LIBS)
>         if test "x$have_libcryptsetup" = xno -a "x$enable_libcryptsetup" = xyes; then
>                 AC_MSG_ERROR([*** libcryptsetup support requested but libraries not found])
>         fi
>@@ -254,8 +251,6 @@ AC_ARG_ENABLE(gtk, AS_HELP_STRING([--disable-gtk], [disable GTK tools]))
> if test "x$enable_gtk" != "xno"; then
>         PKG_CHECK_MODULES(GTK, [ gtk+-2.0 glib-2.0 > 2.26 gio-unix-2.0 ],
>                 [AC_DEFINE(HAVE_GTK, 1, [Define if GTK is available]) have_gtk=yes], have_gtk=no)
>-        AC_SUBST(GTK_CFLAGS)
>-        AC_SUBST(GTK_LIBS)
>         if test "x$have_gtk" = xno -a "x$enable_gtk" = xyes; then
>                 AC_MSG_ERROR([*** gtk support requested but libraries not found])
>         fi
>@@ -265,9 +260,6 @@ AM_CONDITIONAL(HAVE_GTK, [test "$have_gtk" = "yes"])
> if test "$have_gtk" = "yes"; then
>         PKG_CHECK_MODULES(LIBNOTIFY, [ libnotify ])
>         PKG_CHECK_EXISTS([ libnotify >= 0.7.0 ], [ libnotify07=yes ])
>-
>-        AC_SUBST(LIBNOTIFY_CFLAGS)
>-        AC_SUBST(LIBNOTIFY_LIBS)
> fi
> AM_CONDITIONAL(LIBNOTIFY07, [ test "$libnotify07" = "yes" ])
> 
>-- 
>1.7.5.2
>

Actions: View | Splinter Review

Attachments on bug 38150: 47809 | 51881 | 51882 | 51883 | 51884 | 51885 | 60160 | 60161

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.