From c1cc6e27bacbb2b165f6405316fb35e68248592a Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Tue, 7 Jul 2009 19:12:18 +0000 Subject: [PATCH] configure options --enable-libdir-pkgconfig and --enable-pkgconfig-path=DIR --- libburn/trunk/acinclude.m4 | 52 +++++++++++++++++++++++ libburn/trunk/cdrskin/cdrskin_timestamp.h | 2 +- libburn/trunk/configure.ac | 7 +++ 3 files changed, 60 insertions(+), 1 deletion(-) diff --git a/libburn/trunk/acinclude.m4 b/libburn/trunk/acinclude.m4 index f0d8623a..cad28241 100644 --- a/libburn/trunk/acinclude.m4 +++ b/libburn/trunk/acinclude.m4 @@ -25,3 +25,55 @@ AC_DEFUN([TARGET_SHIZZLE], AC_MSG_RESULT([$ARCH]) ]) + + +dnl LIBBURNIA_SET_PKGCONFIG determines the install directory for the *.pc file. +dnl Important: Must be performed _after_ TARGET_SHIZZLE +dnl +AC_DEFUN([LIBBURNIA_SET_PKGCONFIG], +[ +### for testing --enable-libdir-pkgconfig on Linux +### LIBBURNIA_PKGCONFDIR="$libdir"data/pkgconfig + +if test "x$LIBBURNIA_PKGCONFDIR" = "x$libdir"/pkgconfig +then + dummy=dummy +else + AC_ARG_ENABLE(libdir-pkgconfig, + [ --enable-libdir-pkgconfig Install to $libdir/pkgconfig on any OS, default=no], + , enable_libdir_pkgconfig="no") + AC_MSG_CHECKING([for --enable-libdir-pkgconfig]) + if test "x$enable_libdir_pkgconfig" = xyes + then + LIBBURNIA_PKGCONFDIR="$libdir"/pkgconfig + fi + AC_MSG_RESULT([$enable_libdir_pkgconfig]) +fi + +libburnia_pkgconfig_override="no" +AC_ARG_ENABLE(pkgconfig-path, +[ --enable-pkgconfig-path=DIR Absolute path of directory for libisofs-*.pc], +libburnia_pkgconfig_override="yes" , enable_pkgconfig_path="none") +AC_MSG_CHECKING([for overridden pkgconfig directory path]) +if test "x$enable_pkgconfig_path" = xno +then + libburnia_pkgconfig_override="no" +fi +if test "x$enable_pkgconfig_path" = x -o "x$enable_pkgconfig_path" = xyes +then + libburnia_pkgconfig_override="invalid argument" +fi +if test "x$libburnia_pkgconfig_override" = xyes +then + LIBBURNIA_PKGCONFDIR="$enable_pkgconfig_path" + AC_MSG_RESULT([$LIBBURNIA_PKGCONFDIR]) +else + AC_MSG_RESULT([$libburnia_pkgconfig_override]) +fi +AC_SUBST(LIBBURNIA_PKGCONFDIR) + +dnl For debugging only +### AC_MSG_RESULT([LIBBURNIA_PKGCONFDIR = $LIBBURNIA_PKGCONFDIR]) + +]) + diff --git a/libburn/trunk/cdrskin/cdrskin_timestamp.h b/libburn/trunk/cdrskin/cdrskin_timestamp.h index 0a673ad5..e114ad2e 100644 --- a/libburn/trunk/cdrskin/cdrskin_timestamp.h +++ b/libburn/trunk/cdrskin/cdrskin_timestamp.h @@ -1 +1 @@ -#define Cdrskin_timestamP "2009.06.14.095004" +#define Cdrskin_timestamP "2009.06.14.095833" diff --git a/libburn/trunk/configure.ac b/libburn/trunk/configure.ac index 0ab204ab..fac926d1 100644 --- a/libburn/trunk/configure.ac +++ b/libburn/trunk/configure.ac @@ -195,6 +195,13 @@ else CFLAGS="$CFLAGS -DDEBUG" fi + +dnl Determine target directory for libburn-*.pc +dnl Important: Must be performed _after_ TARGET_SHIZZLE +dnl +LIBBURNIA_SET_PKGCONFIG + + AC_CONFIG_FILES([ Makefile doc/doxygen.conf