Attachment 51882 Details for Bug 38150 – Do not AC_SUBsT _CFLAGS and _LIBS

[patch] Do not AC_SUBsT _CFLAGS and _LIBS

0002-configure.ac-Do-not-AC_SUBST-_CFLAGS-and-_LIBS.patch (text/plain), 2.81 KB, created by Javier Jardón on 2011-10-02 15:44:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Javier Jardón

Created: 2011-10-02 15:44:37 UTC

Size: 2.81 KB

patch

obsolete

>From df5777abf33b60de7afcd60f4bead4e7c2110763 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
>Date: Sun, 2 Oct 2011 23:19:29 +0100
>Subject: [PATCH 2/5] configure.ac: Do not AC_SUBST _CFLAGS and _LIBS
>
>PKG_CHECK_MODULES already do this
>---
> configure.ac |   13 -------------
> 1 files changed, 0 insertions(+), 13 deletions(-)
>
>diff --git a/configure.ac b/configure.ac
>index 18dc3fe..61fcaa8 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -129,20 +129,14 @@ AC_SUBST(CAP_LIBS)
> m4_pattern_forbid([^_?PKG_[A-Z_]+$],[*** pkg.m4 missing, please install pkg-config])
> 
> PKG_CHECK_MODULES(UDEV, [ libudev >= 172 ])
>-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
>@@ -288,8 +282,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
>@@ -329,8 +321,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
>@@ -340,9 +330,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.4
>

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.