From 3fe40ed4ae5655700afa68f1116b6bde41e7228a Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Fri, 2 Sep 2011 11:03:13 +0000 Subject: [PATCH] PKG_CHECK_MODULES test of ./configure now only with --enable-pkg-check-modules --- libisoburn/trunk/configure.ac | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/libisoburn/trunk/configure.ac b/libisoburn/trunk/configure.ac index 17d775f9..f5d28d46 100644 --- a/libisoburn/trunk/configure.ac +++ b/libisoburn/trunk/configure.ac @@ -198,7 +198,7 @@ AC_SUBST(ZLIB_DEF) dnl ts B00928 AC_ARG_ENABLE(libjte, -[ --enable-libjte Enable use of libjte by xorriso, default=yes], +[ --enable-libjte Enable use of libjte by xorriso, default=yes], , enable_libjte=yes) if test "x$enable_libjte" = xyes; then LIBJTE_DEF="-DXorriso_with_libjtE" @@ -213,7 +213,7 @@ dnl Just for the case that it is necessary to give link option -lcdio not only dnl with libburn but also with libburn apps like xorriso. dnl On SuSE 10.2 this is not needed. libburn finds libcdio on its own. AC_ARG_ENABLE(libcdio, -[ --enable-libcdio Enable EXPERIMENTAL use of libcdio as system adapter, default=no], +[ --enable-libcdio Enable EXPERIMENTAL use of libcdio as system adapter, default=no], , enable_libcdio=no) if test x$enable_libcdio = xyes; then dnl Check whether there is libcdio-devel and libcdio-runtime. @@ -228,7 +228,7 @@ AC_SUBST(LIBCDIO_DEF) AC_ARG_ENABLE(external-filters, -[ --enable-external-filters Enable use of external filter programs by xorriso, default=yes], +[ --enable-external-filters Enable use of external filter programs by xorriso, default=yes], , enable_external_filters=yes) if test x"$enable_external_filters" = xyes; then EXTF_DEF="-DXorriso_allow_external_filterS" @@ -268,7 +268,7 @@ AC_SUBST(XORRISO_DVD_OBS_64K) # simple feature to declare function names "global:" or "local:". Only the # global ones are visible to applications at library load time. AC_ARG_ENABLE(versioned-libs, -[ --enable-versioned-libs Enable strict symbol encapsulation , default=yes], +[ --enable-versioned-libs Enable strict symbol encapsulation , default=yes], , enable_versioned_libs=yes) if test x$enable_versioned_libs = xyes; then vers_libs_test=no @@ -302,11 +302,24 @@ AC_CHECK_HEADER(libisofs/libisofs.h) # ------- Visible mark in configure : Start of library check -dnl Check for proper library versions -LIBBURN_REQUIRED=1.1.4 -LIBISOFS_REQUIRED=1.1.5 -PKG_CHECK_MODULES(LIBBURN, libburn-1 >= $LIBBURN_REQUIRED) -PKG_CHECK_MODULES(LIBISOFS, libisofs-1 >= $LIBISOFS_REQUIRED) +# Check for proper library versions if this is desired. +# (It fails too often on too many systems.) +AC_ARG_ENABLE(pkg-check-modules, +[ --enable-pkg-check-modules Enable pkg-config check for libburn and libisofs , default=no], + , enable_pkg_check_modules=no) +if test x$enable_pkg_check_modules = xyes; then + +dnl if PKG_CHECK_MODULES is to be used after this if-block, +dnl then it might be necessary to perform PKG_PROG_PKG_CONFIG before the block. + + LIBBURN_REQUIRED=1.1.4 + LIBISOFS_REQUIRED=1.1.5 + PKG_CHECK_MODULES(LIBBURN, libburn-1 >= $LIBBURN_REQUIRED) + PKG_CHECK_MODULES(LIBISOFS, libisofs-1 >= $LIBISOFS_REQUIRED) +else + echo "checking for LIBBURN... skipped, no --enable-pkg-check-modules" + echo "checking for LIBISOFS... skipped, no --enable-pkg-check-modules" +fi # ------- Visible mark in configure : End of library check