From 36dbd149dad95d1a3f7a2331f9818997a22dcef8 Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Tue, 21 Sep 2010 15:03:56 +0000
Subject: [PATCH] On Linux: More tolerance towards failures of ldconfig

---
 libisoburn/trunk/Makefile.am                 | 2 +-
 libisoburn/trunk/acinclude.m4                | 2 +-
 libisoburn/trunk/configure.ac                | 2 +-
 libisoburn/trunk/xorriso/xorriso_timestamp.h | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libisoburn/trunk/Makefile.am b/libisoburn/trunk/Makefile.am
index 797b0d49..405ac582 100644
--- a/libisoburn/trunk/Makefile.am
+++ b/libisoburn/trunk/Makefile.am
@@ -129,7 +129,7 @@ install-exec-hook:
 	ln -s xorriso "$(DESTDIR)$(bindir)"/osirrox
 	if test -e "$(DESTDIR)$(bindir)"/xorrecord ; then rm "$(DESTDIR)$(bindir)"/xorrecord ; else echo ; fi
 	ln -s xorriso "$(DESTDIR)$(bindir)"/xorrecord
-	$(LIBBURNIA_LDCONFIG_CMD) "$(DESTDIR)$(libdir)"
+	$(LIBBURNIA_LDCONFIG_CMD) "$(DESTDIR)$(libdir)" || echo 'NOTE: Explicite dynamic library configuration failed. If needed, configure manually for:' "$(DESTDIR)$(libdir)"
 
 
 # Alternative to the disabled .PHONY above.
diff --git a/libisoburn/trunk/acinclude.m4 b/libisoburn/trunk/acinclude.m4
index bf8fa997..ccc499a6 100644
--- a/libisoburn/trunk/acinclude.m4
+++ b/libisoburn/trunk/acinclude.m4
@@ -18,7 +18,7 @@ AC_DEFUN([TARGET_SHIZZLE],
 
   AC_MSG_CHECKING([target operating system])
 
-  LIBBURNIA_LDCONFIG_CMD="echo 'NOTE: No explicit dynamic library configuration done. E.g. on GNU/Linux: ldconfig'"
+  LIBBURNIA_LDCONFIG_CMD="echo 'No ldconfig run performed. If needed, configure manually for:'"
   case $target in
     *-*-linux*)
       ARCH=linux
diff --git a/libisoburn/trunk/configure.ac b/libisoburn/trunk/configure.ac
index 21073d19..0f81ce8b 100644
--- a/libisoburn/trunk/configure.ac
+++ b/libisoburn/trunk/configure.ac
@@ -277,7 +277,7 @@ AC_ARG_ENABLE(ldconfig-at-install,
 if test x$ldconfig_at_install = xyes; then
     dummy=dummy
 else
-    LIBBURNIA_LDCONFIG_CMD="echo 'NOTE: Explicit dynamic library configuration is disabled. E.g. on GNU/Linux: ldconfig'"
+    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)
diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h
index 7954fd28..7e622e77 100644
--- a/libisoburn/trunk/xorriso/xorriso_timestamp.h
+++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2010.09.21.142424"
+#define Xorriso_timestamP "2010.09.21.150325"