diff --git a/Makefile.am b/Makefile.am index 2da4d493..797b0d49 100644 --- a/Makefile.am +++ b/Makefile.am @@ -129,6 +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)" # Alternative to the disabled .PHONY above. diff --git a/acinclude.m4 b/acinclude.m4 index 73039746..bf8fa997 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -18,10 +18,12 @@ 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'" case $target in *-*-linux*) ARCH=linux LIBBURN_ARCH_LIBS= + LIBBURNIA_LDCONFIG_CMD=ldconfig ;; *-*-freebsd*) ARCH=freebsd diff --git a/configure.ac b/configure.ac index 35a86212..21073d19 100644 --- a/configure.ac +++ b/configure.ac @@ -241,7 +241,7 @@ AC_SUBST(EXTF_SUID_DEF) AC_ARG_ENABLE(dvd-obs-64k, [ --enable-dvd-obs-64k 64 KB default size for xorriso DVD/BD writing, default=no], - , enable_fifo_odirect=no) + , enable_dvd_obs_64=no) if test x$enable_dvd_obs_64k = xyes; then XORRISO_DVD_OBS_64K="-DXorriso_dvd_obs_default_64K" echo "enabled xorriso write size default 64 KB on DVD and BD" @@ -271,6 +271,19 @@ 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: Explicit dynamic library configuration is disabled. E.g. on GNU/Linux: ldconfig'" + echo "disabled run of ldconfig during installation on GNU/Linux" +fi +AC_SUBST(LIBBURNIA_LDCONFIG_CMD) + + + AC_CHECK_HEADER(libburn/libburn.h) AC_CHECK_HEADER(libisofs/libisofs.h) diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h index 37a43c7f..7954fd28 100644 --- a/xorriso/xorriso_timestamp.h +++ b/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2010.09.19.135354" +#define Xorriso_timestamP "2010.09.21.142424"