RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: [email protected] Module: rpm Date: 08-Sep-2009 00:05:09 Branch: HEAD Handle: 2009090722050800 Modified files: rpm CHANGES configure.ac Log: - use RPM_CHECK_LIB() to detect -lsemanage. - use RPM_CHECK_LIB() to detect -lselinux. Summary: Revision Changes Path 1.3101 +2 -0 rpm/CHANGES 2.396 +22 -14 rpm/configure.ac ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/CHANGES ============================================================================ $ cvs diff -u -r1.3100 -r1.3101 CHANGES --- rpm/CHANGES 6 Sep 2009 20:54:34 -0000 1.3100 +++ rpm/CHANGES 7 Sep 2009 22:05:08 -0000 1.3101 @@ -1,5 +1,7 @@ 5.2b1 -> 5.3a1 + - jbj: use RPM_CHECK_LIB() to detect -lsemanage. + - jbj: use RPM_CHECK_LIB() to detect -lselinux. - jbj: retrofit TIMFOO_TO_TIMEBAR macros for the truly deprived. - jbj: retrofit *BSD st_[acm]timespec names if possible. - jbj: use HAVE_STRUCT_STAT_ST_BIRTHTIME, retrofit st_ctime for the deprived. @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac ============================================================================ $ cvs diff -u -r2.395 -r2.396 configure.ac --- rpm/configure.ac 6 Sep 2009 18:39:51 -0000 2.395 +++ rpm/configure.ac 7 Sep 2009 22:05:08 -0000 2.396 @@ -960,14 +960,6 @@ ]) AC_SUBST(WITH_LIBELF_DEBUGEDIT) -dnl # optional SELinux support -AC_ARG_WITH(selinux, AS_HELP_STRING([--with-selinux], [build RPM with SELinux support]), [ - if test ".$withval" = .yes; then - AC_DEFINE(WITH_SELINUX, 1, [Build with SELinux support?]) - LIBS="$LIBS -lselinux" - fi -]) - dnl # optional Perl language bindings WITH_PERL_SUBDIR="" WITH_PERL_SUBPACKAGE=0 @@ -1216,6 +1208,22 @@ esac ]) +dnl # Libselinux +RPM_CHECK_LIB( + [Libselinux], [selinux], + [selinux], [is_selinux_enabled], [selinux/selinux.h], + [no,external:none], [], + [ AC_DEFINE(WITH_SELINUX, 1, [Define if building with Libselinux]) + ], []) + +dnl # Libsemanage +RPM_CHECK_LIB( + [Libsemanage], [semanage], + [semanage], [semanage_handle_create], [semanage/semanage.h], + [no,external:none], [], + [ AC_DEFINE(WITH_SEMANAGE, 1, [Define if building with Libsemnage]) + ], []) + dnl # Expat dnl RPM_CHECK_LIB( dnl [Expat], [expat], @@ -1225,12 +1233,12 @@ dnl ], []) dnl # Libtasn1 -RPM_CHECK_LIB( - [Libtasn1], [libtasn1], - [tasn1], [asn1_array2tree], [libtasn1.h], - [no,external:none], [], - [ AC_DEFINE(WITH_LIBTASN1, 1, [Define if building with Libtasn1]) - ], []) +dnl RPM_CHECK_LIB( +dnl [Libtasn1], [libtasn1], +dnl [tasn1], [asn1_array2tree], [libtasn1.h], +dnl [no,external:none], [], +dnl [ AC_DEFINE(WITH_LIBTASN1, 1, [Define if building with Libtasn1]) +dnl ], []) dnl # Pakchois dnl RPM_CHECK_LIB( @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
