From 2bd0c0c06bf0c167676c49e075a4372c6a010d8d Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Sun, 29 Mar 2009 16:43:25 +0000 Subject: [PATCH] Revoked revision 2552. Dynamic xorriso did not get linked with -lacl any more. --- libisoburn/trunk/configure.ac | 34 ++++++++++++++++++++ libisoburn/trunk/xorriso/xorriso_timestamp.h | 2 +- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/libisoburn/trunk/configure.ac b/libisoburn/trunk/configure.ac index e2c53042..3e01344f 100644 --- a/libisoburn/trunk/configure.ac +++ b/libisoburn/trunk/configure.ac @@ -108,8 +108,42 @@ else fi AC_SUBST(READLINE_DEF) +dnl ts A90329 +dnl ACL and xattr do not need to be enabled in libisoburn or xorriso source +dnl but without AC_CHECK_LIB() xorriso will not be linked with -lacl . +dnl On my Linux this does work with an ACL enabled libisofs but in general +dnl it seems not be right. +dnl So for now it seems to be best to do the same configuration for libisoburn +dnl and xorriso as for libisofs. + +AC_ARG_ENABLE(libacl, +[ --enable-libacl Enable use of libacl by libisofs, default=yes], + , enable_libacl=yes) +if test x$enable_libacl = xyes; then +dnl Check whether there is libacl-devel and libacl-runtime. +dnl If not, erase this macro which would enable use of acl_to_text and others + LIBACL_DEF="-DLibisofs_with_aaip_acL" +dnl The empty yes case obviously causes -lacl to be linked + AC_CHECK_HEADER(sys/acl.h, AC_CHECK_LIB(acl, acl_to_text, , LIBACL_DEF= ), LIBACL_DEF= ) +else + LIBACL_DEF= +fi +AC_SUBST(LIBACL_DEF) +AC_ARG_ENABLE(xattr, +[ --enable-xattr Enable use of xattr by libisofs, default=yes], + , enable_xattr=yes) +if test x$enable_xattr = xyes; then +dnl Check whether there is the header for Linux xattr. +dnl If not, erase this macro which would enable use of listxattr and others + XATTR_DEF="-DLibisofs_with_aaip_xattR" + AC_CHECK_HEADER(attr/xattr.h, AC_CHECK_LIB(c, listxattr, X= , XATTR_DEF= ), XATTR_DEF= ) +else + XATTR_DEF= +fi +AC_SUBST(XATTR_DEF) + AC_CHECK_HEADER(libburn/libburn.h) AC_CHECK_HEADER(libisofs/libisofs.h) diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h index 0e7441f0..3c4bdd2e 100644 --- a/libisoburn/trunk/xorriso/xorriso_timestamp.h +++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2009.03.22.090232" +#define Xorriso_timestamP "2009.03.29.164336"