From a08f7592fd935b975fc2e20f7764ed90bb29baa8 Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Wed, 22 Sep 2010 10:54:56 +0000
Subject: [PATCH] On Linux: Run ldconfig during make install,if not
 --disable-ldconfig-at-install

---
 libburn/trunk/Makefile.am                 |  3 +++
 libburn/trunk/README                      |  5 +++++
 libburn/trunk/acinclude.m4                |  2 ++
 libburn/trunk/cdrskin/cdrskin_timestamp.h |  2 +-
 libburn/trunk/configure.ac                | 11 +++++++++++
 5 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/libburn/trunk/Makefile.am b/libburn/trunk/Makefile.am
index 022332c5..4fa005ef 100644
--- a/libburn/trunk/Makefile.am
+++ b/libburn/trunk/Makefile.am
@@ -75,6 +75,9 @@ libburn_libburn_la_SOURCES = \
 libinclude_HEADERS = \
 	libburn/libburn.h 
 
+install-exec-hook:
+	$(LIBBURNIA_LDCONFIG_CMD) "$(DESTDIR)$(libdir)" || echo 'NOTE: Explicite dynamic library configuration failed. If needed, configure manually for:' "$(DESTDIR)$(libdir)"
+
 ## ========================================================================= ##
 
 ## Build test applications
diff --git a/libburn/trunk/README b/libburn/trunk/README
index 0809dbf0..15f04618 100644
--- a/libburn/trunk/README
+++ b/libburn/trunk/README
@@ -60,6 +60,11 @@ Warning: The trunk might contain experimental features which might not
 
                         Special ./configure options
 
+make install on GNU/Linux will try to run program ldconfig with the library
+installation directory as only argument. Failure to do so will not abort
+installation. One may disable ldconfig by ./configure option:
+   --disable-ldconfig-at-install
+
 In some situations Linux may deliver a better write performance to drives if
 the track input is read with O_DIRECT (see man 2 open). The API call
 burn_os_open_track_src() and the input readers of cdrskin and libburn fifo
diff --git a/libburn/trunk/acinclude.m4 b/libburn/trunk/acinclude.m4
index 48f865ee..3dabc4b0 100644
--- a/libburn/trunk/acinclude.m4
+++ b/libburn/trunk/acinclude.m4
@@ -16,11 +16,13 @@ AC_DEFUN([TARGET_SHIZZLE],
 
   AC_MSG_CHECKING([target operating system])
 
+  LIBBURNIA_LDCONFIG_CMD="echo 'No ldconfig run performed. If needed, configure manually for:'"
   
   case $target_os in
     linux*)
       ARCH=linux
       LIBBURN_ARCH_LIBS=
+      LIBBURNIA_LDCONFIG_CMD=ldconfig
       ;;
     freebsd*)
       ARCH=freebsd
diff --git a/libburn/trunk/cdrskin/cdrskin_timestamp.h b/libburn/trunk/cdrskin/cdrskin_timestamp.h
index 2fb71448..f76722fe 100644
--- a/libburn/trunk/cdrskin/cdrskin_timestamp.h
+++ b/libburn/trunk/cdrskin/cdrskin_timestamp.h
@@ -1 +1 @@
-#define Cdrskin_timestamP "2010.09.17.073827"
+#define Cdrskin_timestamP "2010.09.22.105426"
diff --git a/libburn/trunk/configure.ac b/libburn/trunk/configure.ac
index aec64f87..3f9f2724 100644
--- a/libburn/trunk/configure.ac
+++ b/libburn/trunk/configure.ac
@@ -264,6 +264,17 @@ else
     echo "disabled strict symbol encapsulation"
 fi
 
+AC_ARG_ENABLE(ldconfig-at-install,
+[  --enable-ldconfig-at-install    On GNU/Linux run ldconfig, default=yes],
+               , ldconfig_at_install=yes)
+if test x$ldconfig_at_install = xyes; then 
+    dummy=dummy
+else
+    LIBBURNIA_LDCONFIG_CMD="echo 'NOTE: ldconfig is disabled. If needed, configure manually for:'"
+    echo "disabled run of ldconfig during installation on GNU/Linux"
+fi  
+AC_SUBST(LIBBURNIA_LDCONFIG_CMD)
+
 
 dnl Add compiler-specific flags