libburnia/libisoburn
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

On Linux: Run ldconfig during make install,if not --disable-ldconfig-at-install

Browse Source
This commit is contained in:
Thomas Schmitt 2010-09-21 14:25:46 +00:00
parent aeaa715d8d
commit 4b3a671d27
4 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -129,6 +129,7 @@ install-exec-hook:
ln -s xorriso "$(DESTDIR)$(bindir)"/osirrox ln -s xorriso "$(DESTDIR)$(bindir)"/osirrox
if test -e "$(DESTDIR)$(bindir)"/xorrecord ; then rm "$(DESTDIR)$(bindir)"/xorrecord ; else echo ; fi if test -e "$(DESTDIR)$(bindir)"/xorrecord ; then rm "$(DESTDIR)$(bindir)"/xorrecord ; else echo ; fi
ln -s xorriso "$(DESTDIR)$(bindir)"/xorrecord ln -s xorriso "$(DESTDIR)$(bindir)"/xorrecord
$(LIBBURNIA_LDCONFIG_CMD) "$(DESTDIR)$(libdir)"
# Alternative to the disabled .PHONY above. # Alternative to the disabled .PHONY above.

2
acinclude.m4
View File

@ -18,10 +18,12 @@ AC_DEFUN([TARGET_SHIZZLE],
AC_MSG_CHECKING([target operating system]) 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 case $target in
*-*-linux*) *-*-linux*)
ARCH=linux ARCH=linux
LIBBURN_ARCH_LIBS= LIBBURN_ARCH_LIBS=
LIBBURNIA_LDCONFIG_CMD=ldconfig
;; ;;
*-*-freebsd*) *-*-freebsd*)
ARCH=freebsd ARCH=freebsd

15
configure.ac
View File

@ -241,7 +241,7 @@ AC_SUBST(EXTF_SUID_DEF)
AC_ARG_ENABLE(dvd-obs-64k, AC_ARG_ENABLE(dvd-obs-64k,
[ --enable-dvd-obs-64k 64 KB default size for xorriso DVD/BD writing, default=no], [ --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 if test x$enable_dvd_obs_64k = xyes; then
XORRISO_DVD_OBS_64K="-DXorriso_dvd_obs_default_64K" XORRISO_DVD_OBS_64K="-DXorriso_dvd_obs_default_64K"
echo "enabled xorriso write size default 64 KB on DVD and BD" echo "enabled xorriso write size default 64 KB on DVD and BD"
@ -271,6 +271,19 @@ else
echo "disabled strict symbol encapsulation" echo "disabled strict symbol encapsulation"
fi 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(libburn/libburn.h)
AC_CHECK_HEADER(libisofs/libisofs.h) AC_CHECK_HEADER(libisofs/libisofs.h)

2
xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2010.09.19.135354" #define Xorriso_timestamP "2010.09.21.142424"