OSDN Git Service

Added the --enable-selinux switch to the configure script. If set, it adds -lselinux...
authorDavid Cantrell <dcantrel@mortise.boston.redhat.com>
Sun, 3 Dec 2006 23:25:41 +0000 (18:25 -0500)
committerDavid Cantrell <dcantrel@mortise.boston.redhat.com>
Sun, 3 Dec 2006 23:25:41 +0000 (18:25 -0500)
configure.ac
libparted/Makefile.am

index f762aa2..8200564 100644 (file)
@@ -19,10 +19,10 @@ dnl if backwards compatibility has been broken (eg. functions removed,
 dnl function signatures changed),
 dnl set PED_BINARY_AGE _and_ PED_INTERFACE_AGE to 0.
 PED_MAJOR_VERSION=1
-PED_MINOR_VERSION=8
-PED_MICRO_VERSION=0
-PED_INTERFACE_AGE=0
-PED_BINARY_AGE=0
+PED_MINOR_VERSION=9
+PED_MICRO_VERSION=9
+PED_INTERFACE_AGE=1
+PED_BINARY_AGE=1
 PED_VERSION_SUFFIX=
 PED_VERSION=$PED_MAJOR_VERSION.$PED_MINOR_VERSION.$PED_MICRO_VERSION$PED_VERSION_SUFFIX
 
@@ -74,6 +74,11 @@ if test "$enable_device_mapper" = yes; then
        AC_DEFINE(ENABLE_DEVICE_MAPPER, 1, [device mapper (libdevmapper) support])
 fi
 
+AC_ARG_ENABLE(selinux,
+       [  --enable-selinux        enable SELinux support [default=no]], ,
+       enable_selinux=no
+)
+
 AC_ARG_ENABLE(discover-only,
        [  --enable-discover-only  support only reading/probing [default=no]], ,
        enable_discover_only=no
@@ -249,6 +254,13 @@ if test "$enable_device_mapper" = yes; then
 fi
 AC_SUBST(DM_LIBS)
 
+dnl Check for SELinux
+SELINUX_LIBS=""
+if test "$enable_selinux" = yes; then
+       SELINUX_LIBS="-lselinux -lsepol"
+fi
+AC_SUBST(SELINUX_LIBS)
+
 dnl Check for libreiserfs
 REISER_LIBS=""
 if test "$enable_dynamic_loading" = no -a "$enable_discover_only" = no; then
index ffa829f..0cb7c09 100644 (file)
@@ -33,6 +33,7 @@ EXTRA_libparted_la_SOURCES    = arch/linux.c          \
 libparted_la_LIBADD   = @OS_LIBS@                      \
                        @DL_LIBS@                       \
                        @DM_LIBS@                       \
+                       @SELINUX_LIBS@          \
                        fs/libfs.la                     \
                        labels/liblabels.la