From b0b0c853c78986dbb724928f2bd2b13a735c7626 Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Tue, 11 May 2010 08:48:43 +0000 Subject: [PATCH] Add UDEV_PC and SELINUX_PC substituted variables --- configure | 8 +++++++- configure.in | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/configure b/configure index f0ce6915f..2f8781ce3 100755 --- 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}'` + + diff --git a/configure.in b/configure.in index 459455997..b2a6e0c44 100644 --- a/configure.in +++ b/configure.in @@ -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) -- 2.43.5