"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "m4/lib-link.m4" between
pulseaudio-14.0.tar.xz and pulseaudio-14.2.tar.xz

About: PulseAudio is a networked sound server (for POSIX OSes), a proxy for your sound applications.

lib-link.m4  (pulseaudio-14.0.tar.xz):lib-link.m4  (pulseaudio-14.2.tar.xz)
# lib-link.m4 serial 31 # lib-link.m4 serial 26 (gettext-0.18.2)
dnl Copyright (C) 2001-2020 Free Software Foundation, Inc. dnl Copyright (C) 2001-2016 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it, dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved. dnl with or without modifications, as long as this notice is preserved.
dnl From Bruno Haible. dnl From Bruno Haible.
AC_PREREQ([2.61]) AC_PREREQ([2.54])
dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
dnl the libraries corresponding to explicit and implicit dependencies. dnl the libraries corresponding to explicit and implicit dependencies.
dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
dnl augments the CPPFLAGS variable. dnl augments the CPPFLAGS variable.
dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem. dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
AC_DEFUN([AC_LIB_LINKFLAGS], AC_DEFUN([AC_LIB_LINKFLAGS],
[ [
AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
skipping to change at line 127 skipping to change at line 127
dnl acl_libext, dnl acl_libext,
dnl acl_shlibext, dnl acl_shlibext,
dnl acl_libname_spec, dnl acl_libname_spec,
dnl acl_library_names_spec, dnl acl_library_names_spec,
dnl acl_hardcode_libdir_flag_spec, dnl acl_hardcode_libdir_flag_spec,
dnl acl_hardcode_libdir_separator, dnl acl_hardcode_libdir_separator,
dnl acl_hardcode_direct, dnl acl_hardcode_direct,
dnl acl_hardcode_minus_L. dnl acl_hardcode_minus_L.
AC_DEFUN([AC_LIB_RPATH], AC_DEFUN([AC_LIB_RPATH],
[ [
dnl Complain if config.rpath is missing. dnl Tell automake >= 1.10 to complain if config.rpath is missing.
AC_REQUIRE_AUX_FILE([config.rpath]) m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS
AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [ AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [
CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
. ./conftest.sh . ./conftest.sh
rm -f ./conftest.sh rm -f ./conftest.sh
acl_cv_rpath=done acl_cv_rpath=done
skipping to change at line 190 skipping to change at line 190
dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem. dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
AC_DEFUN([AC_LIB_LINKFLAGS_BODY], AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
[ [
AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-], pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
[ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$ 1])]) pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$ 1])])
pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-], pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
[ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKU P, lib[$1])]) pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKU P, lib[$1])])
dnl Autoconf >= 2.61 supports dots in --with options.
pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.6
1]),[-1],[m4_translit(PACK,[.],[_])],PACK)])
dnl By default, look in $includedir and $libdir. dnl By default, look in $includedir and $libdir.
use_additional=yes use_additional=yes
AC_LIB_WITH_FINAL_PREFIX([ AC_LIB_WITH_FINAL_PREFIX([
eval additional_includedir=\"$includedir\" eval additional_includedir=\"$includedir\"
eval additional_libdir=\"$libdir\" eval additional_libdir=\"$libdir\"
eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\"
eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
]) ])
AC_ARG_WITH(PACK[-prefix], AC_ARG_WITH(P_A_C_K[-prefix],
[[ --with-]]PACK[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/l [[ --with-]]P_A_C_K[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DI
ib R/lib
--without-]]PACK[[-prefix don't search for ]PACKLIBS[ in includedir and li --without-]]P_A_C_K[[-prefix don't search for ]PACKLIBS[ in includedir and
bdir]], libdir]],
[ [
if test "X$withval" = "Xno"; then if test "X$withval" = "Xno"; then
use_additional=no use_additional=no
else else
if test "X$withval" = "X"; then if test "X$withval" = "X"; then
AC_LIB_WITH_FINAL_PREFIX([ AC_LIB_WITH_FINAL_PREFIX([
eval additional_includedir=\"$includedir\" eval additional_includedir=\"$includedir\"
eval additional_libdir=\"$libdir\" eval additional_libdir=\"$libdir\"
eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\"
eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
]) ])
else else
additional_includedir="$withval/include" additional_includedir="$withval/include"
additional_libdir="$withval/$acl_libdirstem" additional_libdir="$withval/$acl_libdirstem"
additional_libdir2="$withval/$acl_libdirstem2" if test "$acl_libdirstem2" != "$acl_libdirstem" \
additional_libdir3="$withval/$acl_libdirstem3" && ! test -d "$withval/$acl_libdirstem"; then
additional_libdir="$withval/$acl_libdirstem2"
fi
fi fi
fi fi
]) ])
if test "X$additional_libdir2" = "X$additional_libdir"; then
additional_libdir2=
fi
if test "X$additional_libdir3" = "X$additional_libdir"; then
additional_libdir3=
fi
dnl Search the library and its dependencies in $additional_libdir and dnl Search the library and its dependencies in $additional_libdir and
dnl $LDFLAGS. Using breadth-first-seach. dnl $LDFLAGS. Using breadth-first-seach.
LIB[]NAME= LIB[]NAME=
LTLIB[]NAME= LTLIB[]NAME=
INC[]NAME= INC[]NAME=
LIB[]NAME[]_PREFIX= LIB[]NAME[]_PREFIX=
dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been
dnl computed. So it has to be reset here. dnl computed. So it has to be reset here.
HAVE_LIB[]NAME= HAVE_LIB[]NAME=
rpathdirs= rpathdirs=
skipping to change at line 281 skipping to change at line 275
found_la= found_la=
found_so= found_so=
found_a= found_a=
eval libname=\"$acl_libname_spec\" # typically: libname=lib$name eval libname=\"$acl_libname_spec\" # typically: libname=lib$name
if test -n "$acl_shlibext"; then if test -n "$acl_shlibext"; then
shrext=".$acl_shlibext" # typically: shrext=.so shrext=".$acl_shlibext" # typically: shrext=.so
else else
shrext= shrext=
fi fi
if test $use_additional = yes; then if test $use_additional = yes; then
for additional_libdir_variable in additional_libdir additional_libdi dir="$additional_libdir"
r2 additional_libdir3; do dnl The same code as in the loop below:
if test "X$found_dir" = "X"; then dnl First look for a shared library.
eval dir=\$$additional_libdir_variable if test -n "$acl_shlibext"; then
if test -n "$dir"; then if test -f "$dir/$libname$shrext"; then
dnl The same code as in the loop below: found_dir="$dir"
dnl First look for a shared library. found_so="$dir/$libname$shrext"
if test -n "$acl_shlibext"; then else
if test -f "$dir/$libname$shrext" && acl_is_expected_elfclas if test "$acl_library_names_spec" = '$libname$shrext$versuffix';
s < "$dir/$libname$shrext"; then then
found_dir="$dir" ver=`(cd "$dir" && \
found_so="$dir/$libname$shrext" for f in "$libname$shrext".*; do echo "$f"; done \
else | sed -e "s,^$libname$shrext\\\\.,," \
if test "$acl_library_names_spec" = '$libname$shrext$versu | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
ffix'; then | sed 1q ) 2>/dev/null`
ver=`(cd "$dir" && \ if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
for f in "$libname$shrext".*; do echo "$f"; done \ found_dir="$dir"
| sed -e "s,^$libname$shrext\\\\.,," \ found_so="$dir/$libname$shrext.$ver"
| sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5
\
| sed 1q ) 2>/dev/null`
if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"
&& acl_is_expected_elfclass < "$dir/$libname$shrext.$ver"; then
found_dir="$dir"
found_so="$dir/$libname$shrext.$ver"
fi
else
eval library_names=\"$acl_library_names_spec\"
for f in $library_names; do
if test -f "$dir/$f" && acl_is_expected_elfclass < "$d
ir/$f"; then
found_dir="$dir"
found_so="$dir/$f"
break
fi
done
fi
fi
fi fi
dnl Then look for a static library. else
if test "X$found_dir" = "X"; then eval library_names=\"$acl_library_names_spec\"
if test -f "$dir/$libname.$acl_libext" && ${AR-ar} -p "$dir/ for f in $library_names; do
$libname.$acl_libext" | acl_is_expected_elfclass; then if test -f "$dir/$f"; then
found_dir="$dir" found_dir="$dir"
found_a="$dir/$libname.$acl_libext" found_so="$dir/$f"
fi break
fi
if test "X$found_dir" != "X"; then
if test -f "$dir/$libname.la"; then
found_la="$dir/$libname.la"
fi fi
fi done
fi fi
fi fi
done fi
dnl Then look for a static library.
if test "X$found_dir" = "X"; then
if test -f "$dir/$libname.$acl_libext"; then
found_dir="$dir"
found_a="$dir/$libname.$acl_libext"
fi
fi
if test "X$found_dir" != "X"; then
if test -f "$dir/$libname.la"; then
found_la="$dir/$libname.la"
fi
fi
fi fi
if test "X$found_dir" = "X"; then if test "X$found_dir" = "X"; then
for x in $LDFLAGS $LTLIB[]NAME; do for x in $LDFLAGS $LTLIB[]NAME; do
AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
case "$x" in case "$x" in
-L*) -L*)
dir=`echo "X$x" | sed -e 's/^X-L//'` dir=`echo "X$x" | sed -e 's/^X-L//'`
dnl First look for a shared library. dnl First look for a shared library.
if test -n "$acl_shlibext"; then if test -n "$acl_shlibext"; then
if test -f "$dir/$libname$shrext" && acl_is_expected_elfclas s < "$dir/$libname$shrext"; then if test -f "$dir/$libname$shrext"; then
found_dir="$dir" found_dir="$dir"
found_so="$dir/$libname$shrext" found_so="$dir/$libname$shrext"
else else
if test "$acl_library_names_spec" = '$libname$shrext$versu ffix'; then if test "$acl_library_names_spec" = '$libname$shrext$versu ffix'; then
ver=`(cd "$dir" && \ ver=`(cd "$dir" && \
for f in "$libname$shrext".*; do echo "$f"; done \ for f in "$libname$shrext".*; do echo "$f"; done \
| sed -e "s,^$libname$shrext\\\\.,," \ | sed -e "s,^$libname$shrext\\\\.,," \
| sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
| sed 1q ) 2>/dev/null` | sed 1q ) 2>/dev/null`
if test -n "$ver" && test -f "$dir/$libname$shrext.$ver" && acl_is_expected_elfclass < "$dir/$libname$shrext.$ver"; then if test -n "$ver" && test -f "$dir/$libname$shrext.$ver" ; then
found_dir="$dir" found_dir="$dir"
found_so="$dir/$libname$shrext.$ver" found_so="$dir/$libname$shrext.$ver"
fi fi
else else
eval library_names=\"$acl_library_names_spec\" eval library_names=\"$acl_library_names_spec\"
for f in $library_names; do for f in $library_names; do
if test -f "$dir/$f" && acl_is_expected_elfclass < "$d ir/$f"; then if test -f "$dir/$f"; then
found_dir="$dir" found_dir="$dir"
found_so="$dir/$f" found_so="$dir/$f"
break break
fi fi
done done
fi fi
fi fi
fi fi
dnl Then look for a static library. dnl Then look for a static library.
if test "X$found_dir" = "X"; then if test "X$found_dir" = "X"; then
if test -f "$dir/$libname.$acl_libext" && ${AR-ar} -p "$dir/ $libname.$acl_libext" | acl_is_expected_elfclass; then if test -f "$dir/$libname.$acl_libext"; then
found_dir="$dir" found_dir="$dir"
found_a="$dir/$libname.$acl_libext" found_a="$dir/$libname.$acl_libext"
fi fi
fi fi
if test "X$found_dir" != "X"; then if test "X$found_dir" != "X"; then
if test -f "$dir/$libname.la"; then if test -f "$dir/$libname.la"; then
found_la="$dir/$libname.la" found_la="$dir/$libname.la"
fi fi
fi fi
;; ;;
skipping to change at line 392 skipping to change at line 380
fi fi
if test "X$found_dir" != "X"; then if test "X$found_dir" != "X"; then
dnl Found the library. dnl Found the library.
LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name" LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
if test "X$found_so" != "X"; then if test "X$found_so" != "X"; then
dnl Linking with a shared library. We attempt to hardcode its dnl Linking with a shared library. We attempt to hardcode its
dnl directory into the executable's runpath, unless it's the dnl directory into the executable's runpath, unless it's the
dnl standard /usr/lib. dnl standard /usr/lib.
if test "$enable_rpath" = no \ if test "$enable_rpath" = no \
|| test "X$found_dir" = "X/usr/$acl_libdirstem" \ || test "X$found_dir" = "X/usr/$acl_libdirstem" \
|| test "X$found_dir" = "X/usr/$acl_libdirstem2" \ || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
|| test "X$found_dir" = "X/usr/$acl_libdirstem3"; then
dnl No hardcoding is needed. dnl No hardcoding is needed.
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
else else
dnl Use an explicit option to hardcode DIR into the resulting dnl Use an explicit option to hardcode DIR into the resulting
dnl binary. dnl binary.
dnl Potentially add DIR to ltrpathdirs. dnl Potentially add DIR to ltrpathdirs.
dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
haveit= haveit=
for x in $ltrpathdirs; do for x in $ltrpathdirs; do
if test "X$x" = "X$found_dir"; then if test "X$x" = "X$found_dir"; then
skipping to change at line 493 skipping to change at line 480
fi fi
additional_includedir="$basedir/include" additional_includedir="$basedir/include"
;; ;;
*/$acl_libdirstem2 | */$acl_libdirstem2/) */$acl_libdirstem2 | */$acl_libdirstem2/)
basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdir stem2/"'*$,,'` basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdir stem2/"'*$,,'`
if test "$name" = '$1'; then if test "$name" = '$1'; then
LIB[]NAME[]_PREFIX="$basedir" LIB[]NAME[]_PREFIX="$basedir"
fi fi
additional_includedir="$basedir/include" additional_includedir="$basedir/include"
;; ;;
*/$acl_libdirstem3 | */$acl_libdirstem3/)
basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdir
stem3/"'*$,,'`
if test "$name" = '$1'; then
LIB[]NAME[]_PREFIX="$basedir"
fi
additional_includedir="$basedir/include"
;;
esac esac
if test "X$additional_includedir" != "X"; then if test "X$additional_includedir" != "X"; then
dnl Potentially add $additional_includedir to $INCNAME. dnl Potentially add $additional_includedir to $INCNAME.
dnl But don't add it dnl But don't add it
dnl 1. if it's the standard /usr/include, dnl 1. if it's the standard /usr/include,
dnl 2. if it's /usr/local/include and we are using GCC on Linux, dnl 2. if it's /usr/local/include and we are using GCC on Linux,
dnl 3. if it's already present in $CPPFLAGS or the already dnl 3. if it's already present in $CPPFLAGS or the already
dnl constructed $INCNAME, dnl constructed $INCNAME,
dnl 4. if it doesn't exist as a directory. dnl 4. if it doesn't exist as a directory.
if test "X$additional_includedir" != "X/usr/include"; then if test "X$additional_includedir" != "X/usr/include"; then
skipping to change at line 550 skipping to change at line 530
save_libdir="$libdir" save_libdir="$libdir"
case "$found_la" in case "$found_la" in
*/* | *\\*) . "$found_la" ;; */* | *\\*) . "$found_la" ;;
*) . "./$found_la" ;; *) . "./$found_la" ;;
esac esac
libdir="$save_libdir" libdir="$save_libdir"
dnl We use only dependency_libs. dnl We use only dependency_libs.
for dep in $dependency_libs; do for dep in $dependency_libs; do
case "$dep" in case "$dep" in
-L*) -L*)
dependency_libdir=`echo "X$dep" | sed -e 's/^X-L//'` additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
dnl Potentially add $dependency_libdir to $LIBNAME and $LTLI dnl Potentially add $additional_libdir to $LIBNAME and $LTLI
BNAME. BNAME.
dnl But don't add it dnl But don't add it
dnl 1. if it's the standard /usr/lib, dnl 1. if it's the standard /usr/lib,
dnl 2. if it's /usr/local/lib and we are using GCC on Linu x, dnl 2. if it's /usr/local/lib and we are using GCC on Linu x,
dnl 3. if it's already present in $LDFLAGS or the already dnl 3. if it's already present in $LDFLAGS or the already
dnl constructed $LIBNAME, dnl constructed $LIBNAME,
dnl 4. if it doesn't exist as a directory. dnl 4. if it doesn't exist as a directory.
if test "X$dependency_libdir" != "X/usr/$acl_libdirstem" \ if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
&& test "X$dependency_libdir" != "X/usr/$acl_libdirstem2" && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"
\ ; then
&& test "X$dependency_libdir" != "X/usr/$acl_libdirstem3"
; then
haveit= haveit=
if test "X$dependency_libdir" = "X/usr/local/$acl_libdirst if test "X$additional_libdir" = "X/usr/local/$acl_libdirst
em" \ em" \
|| test "X$dependency_libdir" = "X/usr/local/$acl_libdi || test "X$additional_libdir" = "X/usr/local/$acl_libdi
rstem2" \ rstem2"; then
|| test "X$dependency_libdir" = "X/usr/local/$acl_libdi
rstem3"; then
if test -n "$GCC"; then if test -n "$GCC"; then
case $host_os in case $host_os in
linux* | gnu* | k*bsd*-gnu) haveit=yes;; linux* | gnu* | k*bsd*-gnu) haveit=yes;;
esac esac
fi fi
fi fi
if test -z "$haveit"; then if test -z "$haveit"; then
haveit= haveit=
for x in $LDFLAGS $LIB[]NAME; do for x in $LDFLAGS $LIB[]NAME; do
AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
if test "X$x" = "X-L$dependency_libdir"; then if test "X$x" = "X-L$additional_libdir"; then
haveit=yes haveit=yes
break break
fi fi
done done
if test -z "$haveit"; then if test -z "$haveit"; then
if test -d "$dependency_libdir"; then if test -d "$additional_libdir"; then
dnl Really add $dependency_libdir to $LIBNAME. dnl Really add $additional_libdir to $LIBNAME.
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$dependency_ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_
libdir" libdir"
fi fi
fi fi
haveit= haveit=
for x in $LDFLAGS $LTLIB[]NAME; do for x in $LDFLAGS $LTLIB[]NAME; do
AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
if test "X$x" = "X-L$dependency_libdir"; then if test "X$x" = "X-L$additional_libdir"; then
haveit=yes haveit=yes
break break
fi fi
done done
if test -z "$haveit"; then if test -z "$haveit"; then
if test -d "$dependency_libdir"; then if test -d "$additional_libdir"; then
dnl Really add $dependency_libdir to $LTLIBNAME. dnl Really add $additional_libdir to $LTLIBNAME.
LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$depen LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$addit
dency_libdir" ional_libdir"
fi fi
fi fi
fi fi
fi fi
;; ;;
-R*) -R*)
dir=`echo "X$dep" | sed -e 's/^X-R//'` dir=`echo "X$dep" | sed -e 's/^X-R//'`
if test "$enable_rpath" != no; then if test "$enable_rpath" != no; then
dnl Potentially add DIR to rpathdirs. dnl Potentially add DIR to rpathdirs.
dnl The rpathdirs will be appended to $LIBNAME at the end. dnl The rpathdirs will be appended to $LIBNAME at the end.
skipping to change at line 695 skipping to change at line 673
done done
fi fi
fi fi
if test "X$ltrpathdirs" != "X"; then if test "X$ltrpathdirs" != "X"; then
dnl When using libtool, the option that works for both libraries and dnl When using libtool, the option that works for both libraries and
dnl executables is -R. The -R options are cumulative. dnl executables is -R. The -R options are cumulative.
for found_dir in $ltrpathdirs; do for found_dir in $ltrpathdirs; do
LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir" LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
done done
fi fi
popdef([P_A_C_K])
popdef([PACKLIBS]) popdef([PACKLIBS])
popdef([PACKUP]) popdef([PACKUP])
popdef([PACK]) popdef([PACK])
popdef([NAME]) popdef([NAME])
]) ])
dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR, dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
dnl unless already present in VAR. dnl unless already present in VAR.
dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
dnl contains two or three consecutive elements that belong together. dnl contains two or three consecutive elements that belong together.
skipping to change at line 745 skipping to change at line 724
if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
dnl Use an explicit option to hardcode directories into the resulting dnl Use an explicit option to hardcode directories into the resulting
dnl binary. dnl binary.
rpathdirs= rpathdirs=
next= next=
for opt in $2; do for opt in $2; do
if test -n "$next"; then if test -n "$next"; then
dir="$next" dir="$next"
dnl No need to hardcode the standard /usr/lib. dnl No need to hardcode the standard /usr/lib.
if test "X$dir" != "X/usr/$acl_libdirstem" \ if test "X$dir" != "X/usr/$acl_libdirstem" \
&& test "X$dir" != "X/usr/$acl_libdirstem2" \ && test "X$dir" != "X/usr/$acl_libdirstem2"; then
&& test "X$dir" != "X/usr/$acl_libdirstem3"; then
rpathdirs="$rpathdirs $dir" rpathdirs="$rpathdirs $dir"
fi fi
next= next=
else else
case $opt in case $opt in
-L) next=yes ;; -L) next=yes ;;
-L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'` -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
dnl No need to hardcode the standard /usr/lib. dnl No need to hardcode the standard /usr/lib.
if test "X$dir" != "X/usr/$acl_libdirstem" \ if test "X$dir" != "X/usr/$acl_libdirstem" \
&& test "X$dir" != "X/usr/$acl_libdirstem2" \ && test "X$dir" != "X/usr/$acl_libdirstem2"; then
&& test "X$dir" != "X/usr/$acl_libdirstem3"; then
rpathdirs="$rpathdirs $dir" rpathdirs="$rpathdirs $dir"
fi fi
next= ;; next= ;;
*) next= ;; *) next= ;;
esac esac
fi fi
done done
if test "X$rpathdirs" != "X"; then if test "X$rpathdirs" != "X"; then
if test -n ""$3""; then if test -n ""$3""; then
dnl libtool is used for linking. Use -R options. dnl libtool is used for linking. Use -R options.
 End of changes. 30 change blocks. 
114 lines changed or deleted 83 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)