]> sourceware.org Git - lvm2.git/commitdiff
Add UDEV_PC and SELINUX_PC substituted variables
authorZdenek Kabelac <zkabelac@redhat.com>
Tue, 11 May 2010 08:48:43 +0000 (08:48 +0000)
committerZdenek Kabelac <zkabelac@redhat.com>
Tue, 11 May 2010 08:48:43 +0000 (08:48 +0000)
configure
configure.in

index f0ce6915f7e00323fcd6a72d223a26b91e1d2056..2f8781ce3f1c9fdd63a4144ccccb6e394847249c 100755 (executable)
--- a/configure
+++ b/configure
@@ -649,10 +649,12 @@ interface
 WRITE_INSTALL
 UDEV_SYNC
 UDEV_RULES
+UDEV_PC
 UDEV_LIBS
 STATIC_LINK
 STATICDIR
 SNAPSHOTS
+SELINUX_PC
 SELINUX_LIBS
 READLINE_LIBS
 PTHREAD_LIBS
@@ -12327,7 +12329,7 @@ fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_udev_udev_queue_get_udev_is_active" >&5
 $as_echo "$ac_cv_lib_udev_udev_queue_get_udev_is_active" >&6; }
 if test "x$ac_cv_lib_udev_udev_queue_get_udev_is_active" = x""yes; then
-  UDEV_LIBS="-ludev"
+  UDEV_PC="libudev"; UDEV_LIBS="-ludev"
 else
   { { $as_echo "$as_me:$LINENO: error: bailing out... libudev library is required" >&5
 $as_echo "$as_me: error: bailing out... libudev library is required" >&2;}
@@ -13141,12 +13143,14 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
                SELINUX_LIBS="-lselinux $SELINUX_LIBS"
+               SELINUX_PC="libselinux"
                HAVE_SELINUX=yes
 else
 
                { $as_echo "$as_me:$LINENO: WARNING: Disabling selinux" >&5
 $as_echo "$as_me: WARNING: Disabling selinux" >&2;}
                SELINUX_LIBS=
+               SELINUX_PC=
                HAVE_SELINUX=no
 fi
 
@@ -15607,6 +15611,8 @@ LVM_LIBAPI=`echo "$VER" | $AWK -F '[()]' '{print $2}'`
 
 
 
+
+
 
 
 
index 459455997a0f9eeba7371f5ccdd0a68bdedf97f8..b2a6e0c441648edb5afde7da35a90f34a0318c85 100644 (file)
@@ -659,7 +659,9 @@ UDEV_SYNC=$enableval, UDEV_SYNC=no)
 AC_MSG_RESULT($UDEV_SYNC)
 
 if test x$UDEV_SYNC = xyes; then
-       AC_CHECK_LIB(udev, udev_queue_get_udev_is_active, UDEV_LIBS="-ludev", AC_MSG_ERROR(bailing out... libudev library is required))
+       AC_CHECK_LIB(udev, udev_queue_get_udev_is_active,
+                    [UDEV_PC="libudev"; UDEV_LIBS="-ludev"],
+                    [AC_MSG_ERROR([bailing out... libudev library is required])])
        AC_DEFINE([UDEV_SYNC_SUPPORT], 1, [Define to 1 to enable synchronisation with udev processing.])
 fi
 
@@ -831,9 +833,11 @@ if test x$SELINUX = xyes; then
                AC_CHECK_HEADERS([selinux/selinux.h],, hard_bailout)
                AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.])
                SELINUX_LIBS="-lselinux $SELINUX_LIBS"
+               SELINUX_PC="libselinux"
                HAVE_SELINUX=yes ], [
                AC_MSG_WARN(Disabling selinux)
                SELINUX_LIBS=
+               SELINUX_PC=
                HAVE_SELINUX=no ])
 fi
 
@@ -1117,10 +1121,12 @@ AC_SUBST(SACKPT_LIBS)
 AC_SUBST(SALCK_CFLAGS)
 AC_SUBST(SALCK_LIBS)
 AC_SUBST(SELINUX_LIBS)
+AC_SUBST(SELINUX_PC)
 AC_SUBST(SNAPSHOTS)
 AC_SUBST(STATICDIR)
 AC_SUBST(STATIC_LINK)
 AC_SUBST(UDEV_LIBS)
+AC_SUBST(UDEV_PC)
 AC_SUBST(UDEV_RULES)
 AC_SUBST(UDEV_SYNC)
 AC_SUBST(WRITE_INSTALL)
This page took 0.055514 seconds and 5 git commands to generate.