[pkg-kde-commits] rev 2668 - trunk/packages/akode/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Mon Dec 19 15:45:43 UTC 2005
Author: chrsmrtn
Date: 2005-12-19 15:45:41 +0000 (Mon, 19 Dec 2005)
New Revision: 2668
Modified:
trunk/packages/akode/debian/patches/98_buildprep.diff
Log:
Buildprep update.
Modified: trunk/packages/akode/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/akode/debian/patches/98_buildprep.diff 2005-12-19 15:45:23 UTC (rev 2667)
+++ trunk/packages/akode/debian/patches/98_buildprep.diff 2005-12-19 15:45:41 UTC (rev 2668)
@@ -28,7 +28,7 @@
AC_TRY_COMPILE([
$2
],
-@@ -5888,30 +5876,15 @@
+@@ -5917,30 +5905,15 @@
fi
])
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
@@ -64,7 +64,7 @@
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -5971,7 +5944,7 @@
+@@ -6000,7 +5973,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -73,7 +73,7 @@
AC_SUBST(LIBTOOL)dnl
# Prevent multiple expansion
-@@ -6021,7 +5994,7 @@
+@@ -6050,7 +6023,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -82,7 +82,7 @@
[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
# Same as above, but do not quote variable references.
-@@ -6041,7 +6014,7 @@
+@@ -6070,7 +6043,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -91,7 +91,7 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -6089,6 +6062,8 @@
+@@ -6118,6 +6091,8 @@
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
fi
@@ -100,7 +100,7 @@
# Only perform the check for file, if the check method requires it
case $deplibs_check_method in
file_magic*)
-@@ -6134,6 +6109,48 @@
+@@ -6163,6 +6138,48 @@
])# _LT_AC_SYS_COMPILER
@@ -149,7 +149,7 @@
# _LT_AC_SYS_LIBPATH_AIX
# ----------------------
# Links a minimal program and checks the executable
-@@ -6206,15 +6223,15 @@
+@@ -6235,15 +6252,15 @@
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
@@ -168,7 +168,7 @@
(test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
then
break
-@@ -6383,14 +6400,13 @@
+@@ -6412,14 +6429,13 @@
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
@@ -185,7 +185,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -6402,7 +6418,6 @@
+@@ -6431,7 +6447,6 @@
esac
;;
*64-bit*)
@@ -193,7 +193,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -6467,7 +6482,7 @@
+@@ -6496,7 +6511,7 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -202,7 +202,7 @@
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -6477,8 +6492,10 @@
+@@ -6506,8 +6521,10 @@
echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
@@ -215,7 +215,7 @@
$2=yes
fi
fi
-@@ -6504,11 +6521,16 @@
+@@ -6533,11 +6550,16 @@
LDFLAGS="$LDFLAGS $3"
printf "$lt_simple_link_test_code" > conftest.$ac_ext
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -233,7 +233,7 @@
else
$2=yes
fi
-@@ -6532,7 +6554,7 @@
+@@ -6561,7 +6583,7 @@
AC_MSG_CHECKING([the maximum length of command line arguments])
AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
i=0
@@ -242,7 +242,7 @@
case $build_os in
msdosdjgpp*)
-@@ -6561,20 +6583,53 @@
+@@ -6590,20 +6612,53 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -302,7 +302,7 @@
# Add a significant safety factor because C++ compilers can tack on massive
# amounts of additional arguments before passing them to the linker.
# It appears as though 1/2 is a usable value.
-@@ -6670,7 +6725,7 @@
+@@ -6699,7 +6754,7 @@
}]
EOF
if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -311,7 +311,7 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) $1 ;;
-@@ -6724,7 +6779,7 @@
+@@ -6753,7 +6808,7 @@
lt_cv_dlopen_self=yes
])
;;
@@ -320,7 +320,7 @@
*)
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
-@@ -6813,20 +6868,13 @@
+@@ -6842,20 +6897,13 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -342,7 +342,7 @@
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -6838,13 +6886,18 @@
+@@ -6867,13 +6915,18 @@
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -365,7 +365,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -6903,8 +6956,8 @@
+@@ -6932,8 +6985,8 @@
[AC_MSG_CHECKING([how to hardcode library paths into programs])
_LT_AC_TAGVAR(hardcode_action, $1)=
if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
@@ -376,7 +376,7 @@
# We can hardcode non-existant directories.
if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-@@ -6961,7 +7014,7 @@
+@@ -6990,7 +7043,7 @@
*)
AC_MSG_RESULT([no])
;;
@@ -385,7 +385,7 @@
fi
])# AC_LIBTOOL_SYS_LIB_STRIP
-@@ -6974,7 +7027,7 @@
+@@ -7003,7 +7056,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -394,7 +394,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -6984,7 +7037,20 @@
+@@ -7013,7 +7066,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -416,7 +416,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -7049,7 +7115,7 @@
+@@ -7078,7 +7144,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -425,7 +425,7 @@
;;
beos*)
-@@ -7058,7 +7124,7 @@
+@@ -7087,7 +7153,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -434,7 +434,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -7074,7 +7140,7 @@
+@@ -7103,7 +7169,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -443,7 +443,7 @@
need_version=no
need_lib_prefix=no
-@@ -7086,7 +7152,8 @@
+@@ -7115,7 +7181,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -453,7 +453,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -7116,7 +7183,7 @@
+@@ -7145,7 +7212,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -462,7 +462,7 @@
;;
esac
;;
-@@ -7139,7 +7206,7 @@
+@@ -7168,7 +7235,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -471,16 +471,16 @@
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -7162,7 +7229,7 @@
+@@ -7191,7 +7258,7 @@
dynamic_linker=no
;;
--freebsd*-gnu*)
+-kfreebsd*-gnu*)
+kfreebsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -7174,8 +7241,17 @@
+@@ -7203,8 +7270,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -500,7 +500,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -7193,7 +7269,7 @@
+@@ -7222,7 +7298,7 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -509,7 +509,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -7220,9 +7296,9 @@
+@@ -7249,9 +7325,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -521,7 +521,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -7237,7 +7313,7 @@
+@@ -7266,7 +7342,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -530,7 +530,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -7248,7 +7324,7 @@
+@@ -7277,7 +7353,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -539,7 +539,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -7310,22 +7386,19 @@
+@@ -7339,22 +7415,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -568,7 +568,7 @@
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
-@@ -7335,6 +7408,30 @@
+@@ -7364,6 +7437,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -599,7 +599,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -7344,7 +7441,7 @@
+@@ -7373,7 +7470,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -608,7 +608,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -7373,7 +7470,11 @@
+@@ -7402,7 +7499,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -621,7 +621,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -7393,7 +7494,7 @@
+@@ -7422,7 +7523,7 @@
os2*)
libname_spec='$name'
@@ -630,7 +630,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -7539,7 +7640,9 @@
+@@ -7568,7 +7669,9 @@
case $tagname in
CXX)
@@ -641,7 +641,7 @@
AC_LIBTOOL_LANG_CXX_CONFIG
else
tagname=""
-@@ -7601,7 +7704,7 @@
+@@ -7630,7 +7733,7 @@
# AC_LIBTOOL_WIN32_DLL
# --------------------
@@ -650,7 +650,7 @@
AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
])# AC_LIBTOOL_WIN32_DLL
-@@ -7775,7 +7878,7 @@
+@@ -7804,7 +7907,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -659,7 +659,7 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
-@@ -7885,7 +7988,7 @@
+@@ -7914,7 +8017,7 @@
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
lt_cv_path_LD="$ac_dir/$ac_prog"
# Check to see if the program is GNU ld. I'd rather use --version,
@@ -668,7 +668,7 @@
# Break only if it was the GNU/non-GNU ld that we prefer.
case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
-@@ -7917,7 +8020,7 @@
+@@ -7946,7 +8049,7 @@
AC_DEFUN([AC_PROG_LD_GNU],
[AC_REQUIRE([AC_PROG_EGREP])dnl
AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
@@ -677,7 +677,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -7944,6 +8047,15 @@
+@@ -7973,6 +8076,15 @@
*) reload_flag=" $reload_flag" ;;
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -693,7 +693,7 @@
])# AC_PROG_LD_RELOAD_FLAG
-@@ -7977,44 +8089,36 @@
+@@ -8006,44 +8118,36 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -737,7 +737,7 @@
lt_cv_deplibs_check_method=pass_all
;;
--freebsd*)
+-freebsd* | kfreebsd*-gnu)
+freebsd* | kfreebsd*-gnu | dragonfly*)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
@@ -749,7 +749,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -8030,7 +8134,7 @@
+@@ -8059,7 +8163,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -758,7 +758,7 @@
ia64*)
lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-@@ -8047,42 +8151,21 @@
+@@ -8076,42 +8180,21 @@
;;
irix5* | irix6* | nonstopux*)
@@ -808,7 +808,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
-@@ -8101,19 +8184,14 @@
+@@ -8130,19 +8213,14 @@
;;
openbsd*)
@@ -830,7 +830,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -8123,7 +8201,6 @@
+@@ -8152,7 +8230,6 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
@@ -838,7 +838,7 @@
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -8231,13 +8308,13 @@
+@@ -8260,13 +8337,13 @@
# -----------------------------------
# sets LIBLTDL to the link flags for the libltdl convenience library and
# LTDLINCL to the include flags for the libltdl header and adds
@@ -859,7 +859,7 @@
AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
case $enable_ltdl_convenience in
-@@ -8256,13 +8333,13 @@
+@@ -8285,13 +8362,13 @@
# -----------------------------------
# sets LIBLTDL to the link flags for the libltdl installable library and
# LTDLINCL to the include flags for the libltdl header and adds
@@ -880,7 +880,7 @@
# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-@@ -8300,10 +8377,21 @@
+@@ -8329,10 +8406,21 @@
# ---------------
AC_DEFUN([_LT_AC_LANG_CXX],
[AC_REQUIRE([AC_PROG_CXX])
@@ -903,7 +903,7 @@
# AC_LIBTOOL_F77
# --------------
-@@ -8376,6 +8464,10 @@
+@@ -8405,6 +8493,10 @@
_LT_AC_SYS_COMPILER
@@ -914,7 +914,7 @@
#
# Check for any special shared library compilation flags.
#
-@@ -8389,7 +8481,7 @@
+@@ -8418,7 +8510,7 @@
fi
if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
@@ -923,7 +923,7 @@
else
AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
_LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
-@@ -8430,7 +8522,7 @@
+@@ -8459,7 +8551,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -932,7 +932,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -8439,48 +8531,11 @@
+@@ -8468,48 +8560,11 @@
fi
;;
@@ -983,7 +983,7 @@
esac
AC_MSG_RESULT([$enable_shared])
-@@ -8505,7 +8560,7 @@
+@@ -8534,7 +8589,7 @@
AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
[AC_LANG_PUSH(C++)
AC_REQUIRE([AC_PROG_CXX])
@@ -992,7 +992,7 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -8534,7 +8589,7 @@
+@@ -8563,7 +8618,7 @@
_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
# Source file extension for C++ test sources.
@@ -1001,7 +1001,7 @@
# Object file extension for compiled C++ test sources.
objext=o
-@@ -8549,6 +8604,10 @@
+@@ -8578,6 +8633,10 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -1012,7 +1012,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -8570,7 +8629,7 @@
+@@ -8599,7 +8658,7 @@
CC=${CXX-"c++"}
compiler=$CC
_LT_AC_TAGVAR(compiler, $1)=$CC
@@ -1021,7 +1021,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -8588,8 +8647,8 @@
+@@ -8617,8 +8676,8 @@
# Check if GNU C++ uses GNU ld as the underlying linker, since the
# archiving commands below assume that GNU ld is being used.
if test "$with_gnu_ld" = yes; then
@@ -1032,7 +1032,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -8615,7 +8674,7 @@
+@@ -8644,7 +8703,7 @@
# linker, instead of GNU ld. If possible, this setting should
# overridden to take advantage of the native linker features on
# the platform it is being used on.
@@ -1041,7 +1041,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -8645,8 +8704,22 @@
+@@ -8674,8 +8733,22 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -1066,7 +1066,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -8663,7 +8736,7 @@
+@@ -8692,7 +8765,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GXX" = yes; then
@@ -1075,7 +1075,7 @@
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
-@@ -8684,6 +8757,9 @@
+@@ -8713,6 +8786,9 @@
fi
esac
shared_flag='-shared'
@@ -1085,7 +1085,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -8692,15 +8768,16 @@
+@@ -8721,15 +8797,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -1106,7 +1106,7 @@
if test "$aix_use_runtimelinking" = yes; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
-@@ -8709,13 +8786,12 @@
+@@ -8738,13 +8815,12 @@
_LT_AC_SYS_LIBPATH_AIX
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -1122,7 +1122,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -8729,8 +8805,8 @@
+@@ -8758,8 +8834,8 @@
# Exported symbols can be pulled into shared objects from archives
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
@@ -1133,7 +1133,7 @@
fi
fi
;;
-@@ -8743,16 +8819,17 @@
+@@ -8772,16 +8848,17 @@
esac
;;
@@ -1153,7 +1153,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -8761,70 +8838,81 @@
+@@ -8790,70 +8867,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -1287,7 +1287,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8835,14 +8923,14 @@
+@@ -8864,14 +8952,14 @@
;;
esac
;;
@@ -1299,12 +1299,12 @@
freebsd-elf*)
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
;;
-- freebsd*)
+- freebsd* | kfreebsd*-gnu)
+ freebsd* | kfreebsd*-gnu | dragonfly*)
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -8859,12 +8947,12 @@
+@@ -8888,12 +8976,12 @@
# location of the library.
case $cc_basename in
@@ -1320,7 +1320,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -8873,11 +8961,11 @@
+@@ -8902,11 +8990,11 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -1334,7 +1334,7 @@
else
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8887,7 +8975,7 @@
+@@ -8916,7 +9004,7 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -1343,7 +1343,7 @@
hppa*64*)
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-@@ -8903,7 +8991,7 @@
+@@ -8932,7 +9020,7 @@
;;
esac
fi
@@ -1352,7 +1352,7 @@
hppa*64*)
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -8924,17 +9012,17 @@
+@@ -8953,17 +9041,17 @@
esac
case $cc_basename in
@@ -1374,7 +1374,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -8950,12 +9038,12 @@
+@@ -8979,12 +9067,12 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -1389,7 +1389,7 @@
;;
esac
fi
-@@ -8968,9 +9056,9 @@
+@@ -8997,9 +9085,9 @@
;;
irix5* | irix6*)
case $cc_basename in
@@ -1401,7 +1401,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -8981,9 +9069,9 @@
+@@ -9010,9 +9098,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -1413,7 +1413,7 @@
fi
fi
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -8994,14 +9082,14 @@
+@@ -9023,14 +9111,14 @@
;;
linux*)
case $cc_basename in
@@ -1431,7 +1431,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -9019,20 +9107,44 @@
+@@ -9048,20 +9136,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -1482,7 +1482,7 @@
runpath_var=LD_RUN_PATH
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9060,7 +9172,7 @@
+@@ -9089,7 +9201,7 @@
;;
mvs*)
case $cc_basename in
@@ -1491,7 +1491,7 @@
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
-@@ -9070,7 +9182,7 @@
+@@ -9099,7 +9211,7 @@
;;
esac
;;
@@ -1500,7 +1500,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -9081,15 +9193,31 @@
+@@ -9110,15 +9222,31 @@
# Workaround some broken pre-1.5 toolchains
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
;;
@@ -1534,7 +1534,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9099,14 +9227,14 @@
+@@ -9128,14 +9256,14 @@
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -1552,7 +1552,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9124,7 +9252,7 @@
+@@ -9153,7 +9281,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -1561,7 +1561,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9143,13 +9271,13 @@
+@@ -9172,13 +9300,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -1577,7 +1577,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9158,17 +9286,17 @@
+@@ -9187,17 +9315,17 @@
# the KAI C++ compiler.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
;;
@@ -1599,7 +1599,7 @@
$rm $lib.exp'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9187,7 +9315,7 @@
+@@ -9216,7 +9344,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -1608,7 +1608,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9211,7 +9339,7 @@
+@@ -9240,7 +9368,7 @@
sco*)
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case $cc_basename in
@@ -1617,7 +1617,7 @@
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
-@@ -9223,12 +9351,12 @@
+@@ -9252,12 +9380,12 @@
;;
sunos4*)
case $cc_basename in
@@ -1632,7 +1632,7 @@
# Lucid
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -9241,36 +9369,33 @@
+@@ -9270,36 +9398,33 @@
;;
solaris*)
case $cc_basename in
@@ -1681,7 +1681,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -9278,9 +9403,9 @@
+@@ -9307,9 +9432,9 @@
# in the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
;;
@@ -1693,7 +1693,7 @@
# The C++ compiler must be used to create the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -9290,9 +9415,9 @@
+@@ -9319,9 +9444,9 @@
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
if $CC --version | grep -v '^2\.7' > /dev/null; then
@@ -1705,7 +1705,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9301,9 +9426,9 @@
+@@ -9330,9 +9455,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -1717,7 +1717,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9321,7 +9446,7 @@
+@@ -9350,7 +9475,7 @@
;;
tandem*)
case $cc_basename in
@@ -1726,7 +1726,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -9431,7 +9556,7 @@
+@@ -9460,7 +9585,7 @@
# The `*' in the case matches for architectures that use `case' in
# $output_verbose_cmd can trigger glob expansion during the loop
# eval without this substitution.
@@ -1735,7 +1735,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -9471,7 +9596,7 @@
+@@ -9500,7 +9625,7 @@
fi
;;
@@ -1744,7 +1744,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -9507,6 +9632,21 @@
+@@ -9536,6 +9661,21 @@
$rm -f confest.$objext
@@ -1766,7 +1766,7 @@
case " $_LT_AC_TAGVAR(postdeps, $1) " in
*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
esac
-@@ -9557,12 +9697,16 @@
+@@ -9586,12 +9726,16 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -1784,7 +1784,7 @@
AC_MSG_CHECKING([if libtool supports shared libraries])
AC_MSG_RESULT([$can_build_shared])
-@@ -9572,7 +9716,7 @@
+@@ -9601,7 +9745,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -1793,7 +1793,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -9580,8 +9724,10 @@
+@@ -9609,8 +9753,10 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -1806,7 +1806,7 @@
;;
esac
AC_MSG_RESULT([$enable_shared])
-@@ -9632,20 +9778,27 @@
+@@ -9661,20 +9807,27 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
@@ -1835,7 +1835,7 @@
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
## the running order or otherwise move them around unless you know exactly
-@@ -9692,11 +9845,16 @@
+@@ -9721,11 +9874,16 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -1852,7 +1852,7 @@
_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
AC_LIBTOOL_CONFIG($1)
-@@ -9722,11 +9880,12 @@
+@@ -9751,11 +9909,12 @@
# without removal of \ escapes.
if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
@@ -1867,7 +1867,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -9776,7 +9935,7 @@
+@@ -9805,7 +9964,7 @@
_LT_AC_TAGVAR(archive_cmds, $1) | \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
_LT_AC_TAGVAR(module_cmds, $1) | \
@@ -1876,7 +1876,7 @@
_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
_LT_AC_TAGVAR(export_symbols_cmds, $1) | \
extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -9842,11 +10001,11 @@
+@@ -9871,11 +10030,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -1890,7 +1890,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -9877,6 +10036,12 @@
+@@ -9906,6 +10065,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -1903,7 +1903,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -9907,7 +10072,7 @@
+@@ -9936,7 +10101,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -1912,7 +1912,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -9938,7 +10103,7 @@
+@@ -9967,7 +10132,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -1921,7 +1921,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -9953,7 +10118,7 @@
+@@ -9982,7 +10147,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
@@ -1930,7 +1930,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -10182,7 +10347,10 @@
+@@ -10211,7 +10376,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -1942,7 +1942,7 @@
fi
])# AC_LIBTOOL_CONFIG
-@@ -10224,9 +10392,6 @@
+@@ -10253,9 +10421,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
@@ -1952,7 +1952,7 @@
# Transform an extracted symbol line into a proper C declaration
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-@@ -10248,6 +10413,13 @@
+@@ -10277,6 +10442,13 @@
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
@@ -1966,7 +1966,7 @@
irix* | nonstopux*)
symcode='[[BCDEGRST]]'
;;
-@@ -10255,7 +10427,7 @@
+@@ -10284,7 +10456,7 @@
symcode='[[BCDEGQRST]]'
;;
solaris* | sysv5*)
@@ -1975,7 +1975,7 @@
;;
sysv4)
symcode='[[DFNSTU]]'
-@@ -10273,14 +10445,17 @@
+@@ -10302,14 +10474,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -1995,7 +1995,7 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -10444,7 +10619,7 @@
+@@ -10473,7 +10648,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -2004,7 +2004,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -10469,18 +10644,28 @@
+@@ -10498,18 +10673,28 @@
;;
chorus*)
case $cc_basename in
@@ -2036,11 +2036,11 @@
# Green Hills C++ Compiler
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
;;
-@@ -10488,22 +10673,22 @@
+@@ -10517,22 +10702,22 @@
;;
esac
;;
-- freebsd*)
+- freebsd* | kfreebsd*-gnu)
+ freebsd* | kfreebsd*-gnu | dragonfly*)
# FreeBSD uses GNU C++
;;
@@ -2063,7 +2063,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -10518,7 +10703,7 @@
+@@ -10547,7 +10732,7 @@
;;
irix5* | irix6* | nonstopux*)
case $cc_basename in
@@ -2072,7 +2072,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
# CC pic flag -KPIC is the default.
-@@ -10529,18 +10714,24 @@
+@@ -10558,18 +10743,24 @@
;;
linux*)
case $cc_basename in
@@ -2101,7 +2101,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -10557,25 +10748,25 @@
+@@ -10586,25 +10777,25 @@
;;
mvs*)
case $cc_basename in
@@ -2132,7 +2132,7 @@
# Digital/Compaq C++
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -10591,7 +10782,7 @@
+@@ -10620,7 +10811,7 @@
;;
sco*)
case $cc_basename in
@@ -2141,7 +2141,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;;
*)
-@@ -10600,13 +10791,13 @@
+@@ -10629,13 +10820,13 @@
;;
solaris*)
case $cc_basename in
@@ -2157,7 +2157,7 @@
# Green Hills C++ Compiler
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
;;
-@@ -10616,12 +10807,12 @@
+@@ -10645,12 +10836,12 @@
;;
sunos4*)
case $cc_basename in
@@ -2172,7 +2172,7 @@
# Lucid
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
;;
-@@ -10631,7 +10822,7 @@
+@@ -10660,7 +10851,7 @@
;;
tandem*)
case $cc_basename in
@@ -2181,7 +2181,7 @@
# NonStop-UX NCC 3.20
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
;;
-@@ -10702,7 +10893,7 @@
+@@ -10731,7 +10922,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -2190,7 +2190,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -10728,6 +10919,16 @@
+@@ -10757,6 +10948,16 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -2207,7 +2207,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -10739,7 +10940,7 @@
+@@ -10768,7 +10969,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -2216,7 +2216,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -10763,12 +10964,19 @@
+@@ -10792,12 +10993,19 @@
;;
linux*)
@@ -2237,7 +2237,7 @@
ccc*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
# All Alpha code is PIC.
-@@ -10789,9 +10997,14 @@
+@@ -10818,9 +11026,14 @@
;;
solaris*)
@@ -2253,7 +2253,7 @@
;;
sunos4*)
-@@ -10813,6 +11026,11 @@
+@@ -10842,6 +11055,11 @@
fi
;;
@@ -2265,7 +2265,7 @@
uts4*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -10840,7 +11058,7 @@
+@@ -10869,7 +11087,7 @@
[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
fi
@@ -2274,7 +2274,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-@@ -10873,7 +11091,10 @@
+@@ -10902,7 +11120,10 @@
_LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -2286,7 +2286,7 @@
;;
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -10899,7 +11120,7 @@
+@@ -10928,7 +11149,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
@@ -2295,7 +2295,7 @@
_LT_AC_TAGVAR(always_export_symbols, $1)=no
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
# include_expsyms should be a list of space-separated symbols to be *always*
-@@ -10916,7 +11137,8 @@
+@@ -10945,7 +11166,8 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -2305,7 +2305,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
# FIXME: the MSVC++ port hasn't been tested in a loooong time
-@@ -10936,6 +11158,27 @@
+@@ -10965,6 +11187,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -2333,7 +2333,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -10973,7 +11216,7 @@
+@@ -11002,7 +11245,7 @@
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -2342,7 +2342,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10983,13 +11226,13 @@
+@@ -11012,13 +11255,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -2359,7 +2359,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -10998,19 +11241,51 @@
+@@ -11027,19 +11270,51 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -2416,7 +2416,7 @@
fi
;;
-@@ -11028,8 +11303,8 @@
+@@ -11057,8 +11332,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -2427,7 +2427,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -11044,24 +11319,19 @@
+@@ -11073,24 +11348,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -2459,7 +2459,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -11095,9 +11365,20 @@
+@@ -11124,9 +11394,20 @@
else
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
fi
@@ -2482,7 +2482,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -11114,7 +11395,7 @@
+@@ -11143,7 +11424,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GCC" = yes; then
@@ -2491,7 +2491,7 @@
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
-@@ -11135,6 +11416,9 @@
+@@ -11164,6 +11445,9 @@
fi
esac
shared_flag='-shared'
@@ -2501,7 +2501,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -11143,29 +11427,29 @@
+@@ -11172,29 +11456,29 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -2540,7 +2540,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -11179,8 +11463,8 @@
+@@ -11208,8 +11492,8 @@
# Exported symbols can be pulled into shared objects from archives
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
@@ -2551,7 +2551,7 @@
fi
fi
;;
-@@ -11193,7 +11477,7 @@
+@@ -11222,7 +11506,7 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -2560,7 +2560,7 @@
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
;;
-@@ -11203,69 +11487,69 @@
+@@ -11232,69 +11516,69 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -2676,18 +2676,18 @@
;;
dgux*)
-@@ -11298,8 +11582,8 @@
+@@ -11327,8 +11611,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-- freebsd*)
+- freebsd* | kfreebsd*-gnu)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
+ freebsd* | kfreebsd*-gnu | dragonfly*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11307,7 +11591,7 @@
+@@ -11336,7 +11620,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -2696,7 +2696,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -11323,16 +11607,16 @@
+@@ -11352,16 +11636,16 @@
hpux10* | hpux11*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -2717,7 +2717,7 @@
hppa*64*|ia64*)
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
;;
-@@ -11342,7 +11626,7 @@
+@@ -11371,7 +11655,7 @@
esac
fi
if test "$with_gnu_ld" = no; then
@@ -2726,7 +2726,7 @@
hppa*64*)
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-@@ -11375,7 +11659,7 @@
+@@ -11404,7 +11688,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -2735,7 +2735,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-@@ -11385,7 +11669,7 @@
+@@ -11414,7 +11698,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -2744,7 +2744,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -11408,7 +11692,8 @@
+@@ -11437,7 +11721,8 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -2754,7 +2754,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
else
-@@ -11418,7 +11703,7 @@
+@@ -11447,7 +11732,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
;;
*)
@@ -2763,7 +2763,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
;;
esac
-@@ -11429,14 +11714,14 @@
+@@ -11458,14 +11743,14 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
@@ -2780,7 +2780,7 @@
else
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -11448,13 +11733,13 @@
+@@ -11477,13 +11762,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -2796,7 +2796,7 @@
# Both c and cxx compiler support -rpath directly
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -11473,10 +11758,12 @@
+@@ -11502,10 +11787,12 @@
solaris*)
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
if test "$GCC" = yes; then
@@ -2811,7 +2811,7 @@
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -11485,8 +11772,18 @@
+@@ -11514,8 +11801,18 @@
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
@@ -2832,7 +2832,7 @@
esac
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
-@@ -11495,7 +11792,7 @@
+@@ -11524,7 +11821,7 @@
if test "x$host_vendor" = xsequent; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
@@ -2841,7 +2841,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -11555,9 +11852,9 @@
+@@ -11584,9 +11881,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
_LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -2853,7 +2853,7 @@
fi
runpath_var='LD_RUN_PATH'
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11615,7 +11912,7 @@
+@@ -11644,7 +11941,7 @@
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -2862,7 +2862,7 @@
if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
soname=conftest
lib=conftest
-@@ -11749,7 +12046,7 @@
+@@ -11778,7 +12075,7 @@
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
# along with /bin/sed that truncates output.
for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
@@ -2871,66 +2871,9 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
---- aclocal.m4
-+++ aclocal.m4
-@@ -501,6 +501,35 @@
- rmdir .tst 2>/dev/null
- AC_SUBST([am__leading_dot])])
-
-+# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
-+# From Jim Meyering
-+
-+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 4
-+
-+AC_DEFUN([AM_MAINTAINER_MODE],
-+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-+ dnl maintainer-mode is disabled by default
-+ AC_ARG_ENABLE(maintainer-mode,
-+[ --enable-maintainer-mode enable make rules and dependencies not useful
-+ (and sometimes confusing) to the casual installer],
-+ USE_MAINTAINER_MODE=$enableval,
-+ USE_MAINTAINER_MODE=no)
-+ AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-+ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
-+ MAINT=$MAINTAINER_MODE_TRUE
-+ AC_SUBST(MAINT)dnl
-+]
-+)
-+
-+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-+
- # Check to see how 'make' treats includes. -*- Autoconf -*-
-
- # Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
--- akode/akodeplay/Makefile.in
+++ akode/akodeplay/Makefile.in
-@@ -158,6 +158,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- NOOPT_CFLAGS = @NOOPT_CFLAGS@
- NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-@@ -269,7 +272,7 @@
-
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -278,9 +281,9 @@
+@@ -278,9 +278,9 @@
#>- exit 1;; \
#>- esac; \
#>- done; \
@@ -2942,7 +2885,7 @@
#>+ 12
@for dep in $?; do \
case '$(am__configure_deps)' in \
-@@ -290,9 +293,9 @@
+@@ -290,9 +290,9 @@
exit 1;; \
esac; \
done; \
@@ -2954,19 +2897,7 @@
cd $(top_srcdir) && perl admin/am_edit akode/akodeplay/Makefile.in
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -307,9 +310,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-binPROGRAMS: $(bin_PROGRAMS)
- @$(NORMAL_INSTALL)
-@@ -574,9 +577,9 @@
+@@ -574,9 +574,9 @@
exit 1;; \
esac; \
done; \
@@ -2980,26 +2911,7 @@
--- akode/lib/Makefile.in
+++ akode/lib/Makefile.in
-@@ -182,6 +182,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- NOOPT_CFLAGS = @NOOPT_CFLAGS@
- NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-@@ -313,7 +316,7 @@
-
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -322,9 +325,9 @@
+@@ -322,9 +322,9 @@
#>- exit 1;; \
#>- esac; \
#>- done; \
@@ -3011,7 +2923,7 @@
#>+ 12
@for dep in $?; do \
case '$(am__configure_deps)' in \
-@@ -334,9 +337,9 @@
+@@ -334,9 +334,9 @@
exit 1;; \
esac; \
done; \
@@ -3023,28 +2935,7 @@
cd $(top_srcdir) && perl admin/am_edit akode/lib/Makefile.in
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -351,9 +354,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- akode_export.h: stamp-h2
-@@ -365,7 +368,7 @@
- stamp-h2: $(srcdir)/akode_export.h.in $(top_builddir)/config.status
- @rm -f stamp-h2
- cd $(top_builddir) && $(SHELL) ./config.status akode/lib/akode_export.h
--$(srcdir)/akode_export.h.in: $(am__configure_deps)
-+$(srcdir)/akode_export.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_srcdir) && $(AUTOHEADER)
- rm -f stamp-h2
- touch $@
-@@ -689,9 +692,9 @@
+@@ -689,9 +689,9 @@
exit 1;; \
esac; \
done; \
@@ -3058,26 +2949,7 @@
--- akode/Makefile.in
+++ akode/Makefile.in
-@@ -146,6 +146,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- NOOPT_CFLAGS = @NOOPT_CFLAGS@
- NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-@@ -253,7 +256,7 @@
- all: docs-am all-recursive
-
- .SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -262,9 +265,9 @@
+@@ -262,9 +262,9 @@
#>- exit 1;; \
#>- esac; \
#>- done; \
@@ -3089,7 +2961,7 @@
#>+ 12
@for dep in $?; do \
case '$(am__configure_deps)' in \
-@@ -274,9 +277,9 @@
+@@ -274,9 +274,9 @@
exit 1;; \
esac; \
done; \
@@ -3101,19 +2973,7 @@
cd $(top_srcdir) && perl admin/am_edit akode/Makefile.in
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -291,9 +294,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- akode-config: $(top_builddir)/config.status $(srcdir)/akode-config.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-@@ -605,7 +608,7 @@
+@@ -605,7 +605,7 @@
.NOEXPORT:
#>+ 2
@@ -3122,7 +2982,7 @@
#>+ 2
docs-am:
-@@ -620,9 +623,9 @@
+@@ -620,9 +620,9 @@
exit 1;; \
esac; \
done; \
@@ -3136,26 +2996,7 @@
--- akode/plugins/alsa_sink/Makefile.in
+++ akode/plugins/alsa_sink/Makefile.in
-@@ -165,6 +165,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- NOOPT_CFLAGS = @NOOPT_CFLAGS@
- NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-@@ -278,7 +281,7 @@
-
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -287,9 +290,9 @@
+@@ -287,9 +287,9 @@
#>- exit 1;; \
#>- esac; \
#>- done; \
@@ -3167,7 +3008,7 @@
#>+ 12
@for dep in $?; do \
case '$(am__configure_deps)' in \
-@@ -299,9 +302,9 @@
+@@ -299,9 +299,9 @@
exit 1;; \
esac; \
done; \
@@ -3179,19 +3020,7 @@
cd $(top_srcdir) && perl admin/am_edit akode/plugins/alsa_sink/Makefile.in
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -316,9 +319,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
-@@ -600,9 +603,9 @@
+@@ -600,9 +600,9 @@
exit 1;; \
esac; \
done; \
@@ -3205,26 +3034,7 @@
--- akode/plugins/ffmpeg_decoder/Makefile.in
+++ akode/plugins/ffmpeg_decoder/Makefile.in
-@@ -166,6 +166,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- NOOPT_CFLAGS = @NOOPT_CFLAGS@
- NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-@@ -279,7 +282,7 @@
-
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -288,9 +291,9 @@
+@@ -288,9 +288,9 @@
#>- exit 1;; \
#>- esac; \
#>- done; \
@@ -3236,7 +3046,7 @@
#>+ 12
@for dep in $?; do \
case '$(am__configure_deps)' in \
-@@ -300,9 +303,9 @@
+@@ -300,9 +300,9 @@
exit 1;; \
esac; \
done; \
@@ -3248,19 +3058,7 @@
cd $(top_srcdir) && perl admin/am_edit akode/plugins/ffmpeg_decoder/Makefile.in
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -317,9 +320,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
-@@ -601,9 +604,9 @@
+@@ -601,9 +601,9 @@
exit 1;; \
esac; \
done; \
@@ -3274,26 +3072,7 @@
--- akode/plugins/jack_sink/Makefile.in
+++ akode/plugins/jack_sink/Makefile.in
-@@ -165,6 +165,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- NOOPT_CFLAGS = @NOOPT_CFLAGS@
- NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-@@ -278,7 +281,7 @@
-
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -287,9 +290,9 @@
+@@ -287,9 +287,9 @@
#>- exit 1;; \
#>- esac; \
#>- done; \
@@ -3305,7 +3084,7 @@
#>+ 12
@for dep in $?; do \
case '$(am__configure_deps)' in \
-@@ -299,9 +302,9 @@
+@@ -299,9 +299,9 @@
exit 1;; \
esac; \
done; \
@@ -3317,19 +3096,7 @@
cd $(top_srcdir) && perl admin/am_edit akode/plugins/jack_sink/Makefile.in
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -316,9 +319,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
-@@ -600,9 +603,9 @@
+@@ -600,9 +600,9 @@
exit 1;; \
esac; \
done; \
@@ -3343,26 +3110,7 @@
--- akode/plugins/Makefile.in
+++ akode/plugins/Makefile.in
-@@ -142,6 +142,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- NOOPT_CFLAGS = @NOOPT_CFLAGS@
- NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-@@ -263,7 +266,7 @@
- all: docs-am all-recursive
-
- .SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -272,9 +275,9 @@
+@@ -272,9 +272,9 @@
#>- exit 1;; \
#>- esac; \
#>- done; \
@@ -3374,7 +3122,7 @@
#>+ 12
@for dep in $?; do \
case '$(am__configure_deps)' in \
-@@ -284,9 +287,9 @@
+@@ -284,9 +284,9 @@
exit 1;; \
esac; \
done; \
@@ -3386,19 +3134,7 @@
cd $(top_srcdir) && perl admin/am_edit akode/plugins/Makefile.in
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -301,9 +304,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
-@@ -605,9 +608,9 @@
+@@ -605,9 +605,9 @@
exit 1;; \
esac; \
done; \
@@ -3412,26 +3148,7 @@
--- akode/plugins/mpc_decoder/Makefile.in
+++ akode/plugins/mpc_decoder/Makefile.in
-@@ -179,6 +179,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- NOOPT_CFLAGS = @NOOPT_CFLAGS@
- NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-@@ -293,7 +296,7 @@
-
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -302,9 +305,9 @@
+@@ -302,9 +302,9 @@
#>- exit 1;; \
#>- esac; \
#>- done; \
@@ -3443,7 +3160,7 @@
#>+ 12
@for dep in $?; do \
case '$(am__configure_deps)' in \
-@@ -314,9 +317,9 @@
+@@ -314,9 +314,9 @@
exit 1;; \
esac; \
done; \
@@ -3455,19 +3172,7 @@
cd $(top_srcdir) && perl admin/am_edit akode/plugins/mpc_decoder/Makefile.in
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -331,9 +334,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
-@@ -719,9 +722,9 @@
+@@ -719,9 +719,9 @@
exit 1;; \
esac; \
done; \
@@ -3481,26 +3186,7 @@
--- akode/plugins/mpc_decoder/mppdec/Makefile.in
+++ akode/plugins/mpc_decoder/mppdec/Makefile.in
-@@ -157,6 +157,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- NOOPT_CFLAGS = @NOOPT_CFLAGS@
- NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-@@ -269,7 +272,7 @@
-
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -278,9 +281,9 @@
+@@ -278,9 +278,9 @@
#>- exit 1;; \
#>- esac; \
#>- done; \
@@ -3512,7 +3198,7 @@
#>+ 12
@for dep in $?; do \
case '$(am__configure_deps)' in \
-@@ -290,9 +293,9 @@
+@@ -290,9 +290,9 @@
exit 1;; \
esac; \
done; \
@@ -3524,19 +3210,7 @@
cd $(top_srcdir) && perl admin/am_edit akode/plugins/mpc_decoder/mppdec/Makefile.in
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -307,9 +310,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- clean-noinstLTLIBRARIES:
-@@ -560,9 +563,9 @@
+@@ -560,9 +560,9 @@
exit 1;; \
esac; \
done; \
@@ -3550,26 +3224,7 @@
--- akode/plugins/mpeg_decoder/Makefile.in
+++ akode/plugins/mpeg_decoder/Makefile.in
-@@ -166,6 +166,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- NOOPT_CFLAGS = @NOOPT_CFLAGS@
- NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-@@ -279,7 +282,7 @@
-
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -288,9 +291,9 @@
+@@ -288,9 +288,9 @@
#>- exit 1;; \
#>- esac; \
#>- done; \
@@ -3581,7 +3236,7 @@
#>+ 12
@for dep in $?; do \
case '$(am__configure_deps)' in \
-@@ -300,9 +303,9 @@
+@@ -300,9 +300,9 @@
exit 1;; \
esac; \
done; \
@@ -3593,19 +3248,7 @@
cd $(top_srcdir) && perl admin/am_edit akode/plugins/mpeg_decoder/Makefile.in
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -317,9 +320,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
-@@ -601,9 +604,9 @@
+@@ -601,9 +601,9 @@
exit 1;; \
esac; \
done; \
@@ -3619,26 +3262,7 @@
--- akode/plugins/oss_sink/Makefile.in
+++ akode/plugins/oss_sink/Makefile.in
-@@ -165,6 +165,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- NOOPT_CFLAGS = @NOOPT_CFLAGS@
- NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-@@ -278,7 +281,7 @@
-
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -287,9 +290,9 @@
+@@ -287,9 +287,9 @@
#>- exit 1;; \
#>- esac; \
#>- done; \
@@ -3650,7 +3274,7 @@
#>+ 12
@for dep in $?; do \
case '$(am__configure_deps)' in \
-@@ -299,9 +302,9 @@
+@@ -299,9 +299,9 @@
exit 1;; \
esac; \
done; \
@@ -3662,19 +3286,7 @@
cd $(top_srcdir) && perl admin/am_edit akode/plugins/oss_sink/Makefile.in
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -316,9 +319,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
-@@ -600,9 +603,9 @@
+@@ -600,9 +600,9 @@
exit 1;; \
esac; \
done; \
@@ -3688,26 +3300,7 @@
--- akode/plugins/polyp_sink/Makefile.in
+++ akode/plugins/polyp_sink/Makefile.in
-@@ -165,6 +165,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- NOOPT_CFLAGS = @NOOPT_CFLAGS@
- NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-@@ -278,7 +281,7 @@
-
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -287,9 +290,9 @@
+@@ -287,9 +287,9 @@
#>- exit 1;; \
#>- esac; \
#>- done; \
@@ -3719,7 +3312,7 @@
#>+ 12
@for dep in $?; do \
case '$(am__configure_deps)' in \
-@@ -299,9 +302,9 @@
+@@ -299,9 +299,9 @@
exit 1;; \
esac; \
done; \
@@ -3731,19 +3324,7 @@
cd $(top_srcdir) && perl admin/am_edit akode/plugins/polyp_sink/Makefile.in
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -316,9 +319,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
-@@ -600,9 +603,9 @@
+@@ -600,9 +600,9 @@
exit 1;; \
esac; \
done; \
@@ -3757,26 +3338,7 @@
--- akode/plugins/src_resampler/Makefile.in
+++ akode/plugins/src_resampler/Makefile.in
-@@ -166,6 +166,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- NOOPT_CFLAGS = @NOOPT_CFLAGS@
- NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-@@ -279,7 +282,7 @@
-
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -288,9 +291,9 @@
+@@ -288,9 +288,9 @@
#>- exit 1;; \
#>- esac; \
#>- done; \
@@ -3788,7 +3350,7 @@
#>+ 12
@for dep in $?; do \
case '$(am__configure_deps)' in \
-@@ -300,9 +303,9 @@
+@@ -300,9 +300,9 @@
exit 1;; \
esac; \
done; \
@@ -3800,19 +3362,7 @@
cd $(top_srcdir) && perl admin/am_edit akode/plugins/src_resampler/Makefile.in
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -317,9 +320,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
-@@ -601,9 +604,9 @@
+@@ -601,9 +601,9 @@
exit 1;; \
esac; \
done; \
@@ -3826,26 +3376,7 @@
--- akode/plugins/sun_sink/Makefile.in
+++ akode/plugins/sun_sink/Makefile.in
-@@ -163,6 +163,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- NOOPT_CFLAGS = @NOOPT_CFLAGS@
- NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-@@ -276,7 +279,7 @@
-
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -285,9 +288,9 @@
+@@ -285,9 +285,9 @@
#>- exit 1;; \
#>- esac; \
#>- done; \
@@ -3857,7 +3388,7 @@
#>+ 12
@for dep in $?; do \
case '$(am__configure_deps)' in \
-@@ -297,9 +300,9 @@
+@@ -297,9 +297,9 @@
exit 1;; \
esac; \
done; \
@@ -3869,19 +3400,7 @@
cd $(top_srcdir) && perl admin/am_edit akode/plugins/sun_sink/Makefile.in
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -314,9 +317,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
-@@ -598,9 +601,9 @@
+@@ -598,9 +598,9 @@
exit 1;; \
esac; \
done; \
@@ -3895,26 +3414,7 @@
--- akode/plugins/xiph_decoder/Makefile.in
+++ akode/plugins/xiph_decoder/Makefile.in
-@@ -173,6 +173,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- NOOPT_CFLAGS = @NOOPT_CFLAGS@
- NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-@@ -286,7 +289,7 @@
-
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -295,9 +298,9 @@
+@@ -295,9 +295,9 @@
#>- exit 1;; \
#>- esac; \
#>- done; \
@@ -3926,7 +3426,7 @@
#>+ 12
@for dep in $?; do \
case '$(am__configure_deps)' in \
-@@ -307,9 +310,9 @@
+@@ -307,9 +307,9 @@
exit 1;; \
esac; \
done; \
@@ -3938,28 +3438,16 @@
cd $(top_srcdir) && perl admin/am_edit akode/plugins/xiph_decoder/Makefile.in
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -324,9 +327,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+@@ -592,7 +592,7 @@
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
-@@ -592,7 +595,7 @@
-
#>+ 2
-KDE_DIST=Makefile.in xiph_decoder.h vorbis_decoder.h flac_decoder.h Makefile.am speex_decoder.h
+KDE_DIST=Makefile.in vorbis_decoder.h xiph_decoder.h flac_decoder.h Makefile.am speex_decoder.h
#>+ 3
clean-closures:
-@@ -611,9 +614,9 @@
+@@ -611,9 +611,9 @@
exit 1;; \
esac; \
done; \
@@ -3992,57 +3480,7 @@
(test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
then
break
-@@ -464,7 +464,7 @@
- # include <unistd.h>
- #endif"
-
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar USER_INCLUDES USER_LDFLAGS CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN all_includes all_libraries AUTODIRS LIBFLAC LIBOGGFLAC SPEEXLIBS MADLIBS LIBSAMPLERATE PKG_CONFIG JACK_CFLAGS JACK_LIBADD JACK_LDFLAGS POLYP_CFLAGS POLYP_LIBADD POLYP_LDFLAGS AVCODEC_CFLAGS AVCODEC_LIBADD AVCODEC_LDFLAGS AVFORMAT_CFLAGS AVFORMAT_LIBADD AVFORMAT_LDFLAGS AKODE_LIBDL LIBPTHREAD LIBSEM include_mpeg_decoder_TRUE include_mpeg_decoder_FALSE LIBOSSAUDIO LIBASOUND VORBIS_LIBS VORBISFILE_LIBS include_xiph_decoder_TRUE include_xiph_decoder_FALSE include_src_resampler_TRUE include_src_resampler_FALSE include_alsa_sink_TRUE include_alsa_sink_FALSE include_oss_sink_TRUE include_oss_sink_FALSE include_sun_sink_TRUE include_sun_sink_FALSE include_jack_sink_TRUE include_jack_sink_FALSE include_polyp_sink_TRUE include_polyp_sink_FALSE include_ffmpeg_decoder_TRUE include_ffmpeg_decoder_FALSE TOPSUBDIRS akode_SUBDIR_included_TRUE akode_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT USER_INCLUDES USER_LDFLAGS CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN all_includes all_libraries AUTODIRS LIBFLAC LIBOGGFLAC SPEEXLIBS MADLIBS LIBSAMPLERATE PKG_CONFIG JACK_CFLAGS JACK_LIBADD JACK_LDFLAGS POLYP_CFLAGS POLYP_LIBADD POLYP_LDFLAGS AVCODEC_CFLAGS AVCODEC_LIBADD AVCODEC_LDFLAGS AVFORMAT_CFLAGS AVFORMAT_LIBADD AVFORMAT_LDFLAGS AKODE_LIBDL LIBPTHREAD LIBSEM include_mpeg_decoder_TRUE include_mpeg_decoder_FALSE LIBOSSAUDIO LIBASOUND VORBIS_LIBS VORBISFILE_LIBS include_xiph_decoder_TRUE include_xiph_decoder_FALSE include_src_resampler_TRUE include_src_resampler_FALSE include_alsa_sink_TRUE include_alsa_sink_FALSE include_oss_sink_TRUE include_oss_sink_FALSE include_sun_sink_TRUE include_sun_sink_FALSE include_jack_sink_TRUE include_jack_sink_FALSE include_polyp_sink_TRUE include_polyp_sink_FALSE include_ffmpeg_decoder_TRUE include_ffmpeg_decoder_FALSE TOPSUBDIRS akode_SUBDIR_included_TRUE akode_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
- ac_subst_files=''
-
- # Initialize some variables set by options.
-@@ -1025,6 +1025,8 @@
- Optional Features:
- --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
- --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
-+ --enable-maintainer-mode enable make rules and dependencies not useful
-+ (and sometimes confusing) to the casual installer
- --disable-fast-perl disable fast Makefile generation (needs perl)
- --enable-debug=ARG enables debug symbols (yes|no|full) default=no
- --disable-debug disables debug output and debug symbols default=no
-@@ -2089,6 +2091,31 @@
-
-
-
-+echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
-+ # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
-+if test "${enable_maintainer_mode+set}" = set; then
-+ enableval="$enable_maintainer_mode"
-+ USE_MAINTAINER_MODE=$enableval
-+else
-+ USE_MAINTAINER_MODE=no
-+fi;
-+ echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
-+
-+
-+if test $USE_MAINTAINER_MODE = yes; then
-+ MAINTAINER_MODE_TRUE=
-+ MAINTAINER_MODE_FALSE='#'
-+else
-+ MAINTAINER_MODE_TRUE='#'
-+ MAINTAINER_MODE_FALSE=
-+fi
-+
-+ MAINT=$MAINTAINER_MODE_TRUE
-+
-+
-+
-
-
- if test "x$prefix" = "xNONE"; then
-@@ -6524,183 +6551,6 @@
+@@ -6524,183 +6524,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -4226,7 +3664,7 @@
fi
-@@ -6869,7 +6719,7 @@
+@@ -6869,7 +6692,7 @@
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
# along with /bin/sed that truncates output.
for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
@@ -4235,7 +3673,7 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -6974,7 +6824,7 @@
+@@ -6974,7 +6797,7 @@
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
lt_cv_path_LD="$ac_dir/$ac_prog"
# Check to see if the program is GNU ld. I'd rather use --version,
@@ -4244,7 +3682,7 @@
# Break only if it was the GNU/non-GNU ld that we prefer.
case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
-@@ -7008,7 +6858,7 @@
+@@ -7008,7 +6831,7 @@
if test "${lt_cv_prog_gnu_ld+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -4253,7 +3691,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -7038,6 +6888,15 @@
+@@ -7038,6 +6861,15 @@
*) reload_flag=" $reload_flag" ;;
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -4269,7 +3707,7 @@
echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
-@@ -7124,44 +6983,36 @@
+@@ -7124,44 +6956,36 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -4312,7 +3750,7 @@
lt_cv_deplibs_check_method=pass_all
;;
--freebsd*)
+-freebsd* | kfreebsd*-gnu)
+freebsd* | kfreebsd*-gnu | dragonfly*)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
@@ -4324,7 +3762,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -7177,7 +7028,7 @@
+@@ -7177,7 +7001,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -4333,7 +3771,7 @@
ia64*)
lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-@@ -7194,42 +7045,21 @@
+@@ -7194,42 +7018,21 @@
;;
irix5* | irix6* | nonstopux*)
@@ -4383,7 +3821,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
-@@ -7248,19 +7078,14 @@
+@@ -7248,19 +7051,14 @@
;;
openbsd*)
@@ -4405,7 +3843,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -7270,7 +7095,6 @@
+@@ -7270,7 +7068,6 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
@@ -4413,16 +3851,16 @@
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -7347,7 +7171,7 @@
+@@ -7347,7 +7144,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 7350 "configure"' > conftest.$ac_ext
-+ echo '#line 7174 "configure"' > conftest.$ac_ext
++ echo '#line 7147 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7390,14 +7214,13 @@
+@@ -7390,14 +7187,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -4439,7 +3877,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -7409,7 +7232,6 @@
+@@ -7409,7 +7205,6 @@
esac
;;
*64-bit*)
@@ -4447,7 +3885,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -7896,6 +7718,243 @@
+@@ -7896,6 +7691,243 @@
done
@@ -4691,16 +4129,16 @@
ac_ext=f
ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -7988,7 +8047,7 @@
+@@ -7988,7 +8020,7 @@
# Provide some information about the compiler.
-echo "$as_me:7991:" \
-+echo "$as_me:8050:" \
++echo "$as_me:8023:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-@@ -8141,7 +8200,7 @@
+@@ -8141,7 +8173,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
i=0
@@ -4709,7 +4147,7 @@
case $build_os in
msdosdjgpp*)
-@@ -8170,20 +8229,53 @@
+@@ -8170,20 +8202,53 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -4769,7 +4207,7 @@
# Add a significant safety factor because C++ compilers can tack on massive
# amounts of additional arguments before passing them to the linker.
# It appears as though 1/2 is a usable value.
-@@ -8220,9 +8312,6 @@
+@@ -8220,9 +8285,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
@@ -4779,7 +4217,7 @@
# Transform an extracted symbol line into a proper C declaration
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-@@ -8244,6 +8333,13 @@
+@@ -8244,6 +8306,13 @@
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
@@ -4793,7 +4231,7 @@
irix* | nonstopux*)
symcode='[BCDEGRST]'
;;
-@@ -8251,7 +8347,7 @@
+@@ -8251,7 +8320,7 @@
symcode='[BCDEGQRST]'
;;
solaris* | sysv5*)
@@ -4802,7 +4240,7 @@
;;
sysv4)
symcode='[DFNSTU]'
-@@ -8269,14 +8365,17 @@
+@@ -8269,14 +8338,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -4822,7 +4260,7 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -8438,7 +8537,7 @@
+@@ -8438,7 +8510,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -4831,7 +4269,7 @@
sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
# Same as above, but do not quote variable references.
-@@ -8458,7 +8557,7 @@
+@@ -8458,7 +8530,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -4840,7 +4278,7 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -8743,6 +8842,17 @@
+@@ -8743,6 +8815,17 @@
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
fi
@@ -4858,7 +4296,7 @@
# Only perform the check for file, if the check method requires it
case $deplibs_check_method in
file_magic*)
-@@ -8768,7 +8878,7 @@
+@@ -8768,7 +8851,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -4867,7 +4305,7 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
-@@ -8830,7 +8940,7 @@
+@@ -8830,7 +8913,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -4876,7 +4314,7 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
-@@ -8929,6 +9039,20 @@
+@@ -8929,6 +9012,20 @@
compiler=$CC
@@ -4897,7 +4335,7 @@
#
# Check for any special shared library compilation flags.
#
-@@ -8965,11 +9089,16 @@
+@@ -8965,11 +9062,16 @@
LDFLAGS="$LDFLAGS $lt_prog_compiler_static"
printf "$lt_simple_link_test_code" > conftest.$ac_ext
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -4915,7 +4353,7 @@
else
lt_prog_compiler_static_works=yes
fi
-@@ -9015,18 +9144,20 @@
+@@ -9015,18 +9117,20 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -4924,12 +4362,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9021: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9150: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9123: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9025: \$? = $ac_status" >&5
-+ echo "$as_me:9154: \$? = $ac_status" >&5
++ echo "$as_me:9127: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
@@ -4941,7 +4379,7 @@
lt_cv_prog_compiler_rtti_exceptions=yes
fi
fi
-@@ -9103,7 +9234,7 @@
+@@ -9103,7 +9207,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -4950,7 +4388,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9129,6 +9260,16 @@
+@@ -9129,6 +9233,16 @@
lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -4967,7 +4405,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -9140,7 +9281,7 @@
+@@ -9140,7 +9254,7 @@
lt_prog_compiler_wl='-Wl,'
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -4976,7 +4414,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9164,12 +9305,19 @@
+@@ -9164,12 +9278,19 @@
;;
linux*)
@@ -4997,7 +4435,7 @@
ccc*)
lt_prog_compiler_wl='-Wl,'
# All Alpha code is PIC.
-@@ -9190,9 +9338,14 @@
+@@ -9190,9 +9311,14 @@
;;
solaris*)
@@ -5013,7 +4451,7 @@
;;
sunos4*)
-@@ -9214,6 +9367,11 @@
+@@ -9214,6 +9340,11 @@
fi
;;
@@ -5025,7 +4463,7 @@
uts4*)
lt_prog_compiler_pic='-pic'
lt_prog_compiler_static='-Bstatic'
-@@ -9248,18 +9406,20 @@
+@@ -9248,18 +9379,20 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -5034,12 +4472,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9254: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9412: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9385: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9258: \$? = $ac_status" >&5
-+ echo "$as_me:9416: \$? = $ac_status" >&5
++ echo "$as_me:9389: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
@@ -5051,7 +4489,7 @@
lt_prog_compiler_pic_works=yes
fi
fi
-@@ -9280,7 +9440,7 @@
+@@ -9280,7 +9413,7 @@
fi
fi
@@ -5060,7 +4498,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic=
-@@ -9302,38 +9462,36 @@
+@@ -9302,38 +9435,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -5082,12 +4520,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9321: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9474: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9447: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9325: \$? = $ac_status" >&5
-+ echo "$as_me:9478: \$? = $ac_status" >&5
++ echo "$as_me:9451: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -5111,7 +4549,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -9404,6 +9562,16 @@
+@@ -9404,6 +9535,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -5128,7 +4566,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -9424,6 +9592,27 @@
+@@ -9424,6 +9565,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -5156,7 +4594,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -9461,7 +9650,7 @@
+@@ -9461,7 +9623,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -5165,7 +4603,7 @@
else
ld_shlibs=no
fi
-@@ -9471,13 +9660,13 @@
+@@ -9471,13 +9633,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
@@ -5182,7 +4620,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -9486,19 +9675,51 @@
+@@ -9486,19 +9648,51 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -5238,7 +4676,7 @@
fi
;;
-@@ -9516,8 +9737,8 @@
+@@ -9516,8 +9710,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -5249,7 +4687,7 @@
else
ld_shlibs=no
fi
-@@ -9532,24 +9753,19 @@
+@@ -9532,24 +9726,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -5281,7 +4719,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9583,9 +9799,20 @@
+@@ -9583,9 +9772,20 @@
else
export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
fi
@@ -5304,7 +4742,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -9602,7 +9829,7 @@
+@@ -9602,7 +9802,7 @@
link_all_deplibs=yes
if test "$GCC" = yes; then
@@ -5313,7 +4751,7 @@
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
-@@ -9623,6 +9850,9 @@
+@@ -9623,6 +9823,9 @@
fi
esac
shared_flag='-shared'
@@ -5323,7 +4761,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -9631,21 +9861,22 @@
+@@ -9631,21 +9834,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -5351,7 +4789,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -9696,14 +9927,13 @@
+@@ -9696,14 +9900,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -5369,7 +4807,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -9767,8 +9997,8 @@
+@@ -9767,8 +9970,8 @@
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec=' '
archive_cmds_need_lc=yes
@@ -5380,7 +4818,7 @@
fi
fi
;;
-@@ -9781,7 +10011,7 @@
+@@ -9781,7 +9984,7 @@
ld_shlibs=no
;;
@@ -5389,7 +4827,7 @@
export_dynamic_flag_spec=-rdynamic
;;
-@@ -9791,13 +10021,13 @@
+@@ -9791,13 +9994,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
@@ -5406,7 +4844,7 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds='true'
# FIXME: Should let the user specify the lib program.
-@@ -9807,52 +10037,52 @@
+@@ -9807,52 +10010,52 @@
;;
darwin* | rhapsody*)
@@ -5499,18 +4937,18 @@
fi
;;
-@@ -9886,8 +10116,8 @@
+@@ -9886,8 +10089,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-- freebsd*)
+- freebsd* | kfreebsd*-gnu)
- archive_cmds='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
+ freebsd* | kfreebsd*-gnu | dragonfly*)
+ archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
-@@ -9895,7 +10125,7 @@
+@@ -9895,7 +10098,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -5519,7 +4957,7 @@
else
archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -9911,16 +10141,16 @@
+@@ -9911,16 +10114,16 @@
hpux10* | hpux11*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -5540,7 +4978,7 @@
hppa*64*|ia64*)
archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
;;
-@@ -9930,7 +10160,7 @@
+@@ -9930,7 +10133,7 @@
esac
fi
if test "$with_gnu_ld" = no; then
@@ -5549,7 +4987,7 @@
hppa*64*)
hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
hardcode_libdir_flag_spec_ld='+b $libdir'
-@@ -9963,7 +10193,7 @@
+@@ -9963,7 +10166,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -5558,7 +4996,7 @@
else
archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_ld='-rpath $libdir'
-@@ -9973,7 +10203,7 @@
+@@ -9973,7 +10176,7 @@
link_all_deplibs=yes
;;
@@ -5567,7 +5005,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -9996,7 +10226,8 @@
+@@ -9996,7 +10199,8 @@
hardcode_direct=yes
hardcode_shlibpath_var=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -5577,7 +5015,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
-@@ -10006,7 +10237,7 @@
+@@ -10006,7 +10210,7 @@
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
@@ -5586,7 +5024,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
-@@ -10017,14 +10248,14 @@
+@@ -10017,14 +10221,14 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -5603,7 +5041,7 @@
else
allow_undefined_flag=' -expect_unresolved \*'
archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -10036,13 +10267,13 @@
+@@ -10036,13 +10240,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -5619,7 +5057,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10061,10 +10292,12 @@
+@@ -10061,10 +10265,12 @@
solaris*)
no_undefined_flag=' -z text'
if test "$GCC" = yes; then
@@ -5634,7 +5072,7 @@
archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -10073,8 +10306,18 @@
+@@ -10073,8 +10279,18 @@
hardcode_shlibpath_var=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -5655,7 +5093,7 @@
esac
link_all_deplibs=yes
;;
-@@ -10083,7 +10326,7 @@
+@@ -10083,7 +10299,7 @@
if test "x$host_vendor" = xsequent; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
@@ -5664,7 +5102,7 @@
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -10143,9 +10386,9 @@
+@@ -10143,9 +10359,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -5676,7 +5114,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var=no
-@@ -10251,7 +10494,7 @@
+@@ -10251,7 +10467,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -5685,7 +5123,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -10261,7 +10504,20 @@
+@@ -10261,7 +10477,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -5707,7 +5145,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -10326,7 +10582,7 @@
+@@ -10326,7 +10555,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -5716,7 +5154,7 @@
;;
beos*)
-@@ -10335,7 +10591,7 @@
+@@ -10335,7 +10564,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -5725,7 +5163,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10351,7 +10607,7 @@
+@@ -10351,7 +10580,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -5734,7 +5172,7 @@
need_version=no
need_lib_prefix=no
-@@ -10363,7 +10619,8 @@
+@@ -10363,7 +10592,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -5744,7 +5182,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -10393,7 +10650,7 @@
+@@ -10393,7 +10623,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -5753,7 +5191,7 @@
;;
esac
;;
-@@ -10416,7 +10673,7 @@
+@@ -10416,7 +10646,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -5762,16 +5200,16 @@
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -10439,7 +10696,7 @@
+@@ -10439,7 +10669,7 @@
dynamic_linker=no
;;
--freebsd*-gnu*)
+-kfreebsd*-gnu*)
+kfreebsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10451,8 +10708,17 @@
+@@ -10451,8 +10681,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -5791,7 +5229,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -10470,7 +10736,7 @@
+@@ -10470,7 +10709,7 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -5800,7 +5238,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -10497,9 +10763,9 @@
+@@ -10497,9 +10736,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -5812,7 +5250,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -10514,7 +10780,7 @@
+@@ -10514,7 +10753,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -5821,7 +5259,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10525,7 +10791,7 @@
+@@ -10525,7 +10764,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -5830,7 +5268,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10587,22 +10853,19 @@
+@@ -10587,22 +10826,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -5859,7 +5297,7 @@
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
-@@ -10612,6 +10875,30 @@
+@@ -10612,6 +10848,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -5890,7 +5328,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10621,7 +10908,7 @@
+@@ -10621,7 +10881,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -5899,7 +5337,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -10650,7 +10937,11 @@
+@@ -10650,7 +10910,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -5912,7 +5350,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -10670,7 +10961,7 @@
+@@ -10670,7 +10934,7 @@
os2*)
libname_spec='$name'
@@ -5921,7 +5359,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -10772,8 +11063,8 @@
+@@ -10772,8 +11036,8 @@
echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" || \
@@ -5932,16 +5370,16 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct" != no &&
-@@ -11432,7 +11723,7 @@
+@@ -11432,7 +11696,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11435 "configure"
-+#line 11726 "configure"
++#line 11699 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11498,7 +11789,7 @@
+@@ -11498,7 +11762,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -5950,16 +5388,16 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -11530,7 +11821,7 @@
+@@ -11530,7 +11794,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11533 "configure"
-+#line 11824 "configure"
++#line 11797 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11596,7 +11887,7 @@
+@@ -11596,7 +11860,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -5968,7 +5406,7 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -11646,7 +11937,7 @@
+@@ -11646,7 +11910,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -5977,7 +5415,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -11655,47 +11946,10 @@
+@@ -11655,47 +11919,10 @@
fi
;;
@@ -6026,7 +5464,7 @@
;;
esac
echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -11721,7 +11975,8 @@
+@@ -11721,7 +11948,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -6036,7 +5474,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -11835,11 +12090,11 @@
+@@ -11835,11 +12063,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -6050,7 +5488,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -11869,6 +12124,12 @@
+@@ -11869,6 +12097,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -6063,7 +5501,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -11899,7 +12160,7 @@
+@@ -11899,7 +12133,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -6072,7 +5510,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -11930,7 +12191,7 @@
+@@ -11930,7 +12164,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -6081,7 +5519,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -11945,7 +12206,7 @@
+@@ -11945,7 +12179,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o
@@ -6090,7 +5528,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -12172,7 +12433,10 @@
+@@ -12172,7 +12406,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -6102,7 +5540,7 @@
fi
-@@ -12237,7 +12501,9 @@
+@@ -12237,7 +12474,9 @@
case $tagname in
CXX)
@@ -6113,7 +5551,7 @@
ac_ext=cc
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -12274,7 +12540,7 @@
+@@ -12274,7 +12513,7 @@
compiler_lib_search_path_CXX=
# Source file extension for C++ test sources.
@@ -6122,7 +5560,7 @@
# Object file extension for compiled C++ test sources.
objext=o
-@@ -12295,6 +12561,20 @@
+@@ -12295,6 +12534,20 @@
compiler=$CC
@@ -6143,7 +5581,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -12316,7 +12596,16 @@
+@@ -12316,7 +12569,16 @@
CC=${CXX-"c++"}
compiler=$CC
compiler_CXX=$CC
@@ -6161,7 +5599,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -12387,7 +12676,7 @@
+@@ -12387,7 +12649,7 @@
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
lt_cv_path_LD="$ac_dir/$ac_prog"
# Check to see if the program is GNU ld. I'd rather use --version,
@@ -6170,7 +5608,7 @@
# Break only if it was the GNU/non-GNU ld that we prefer.
case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
-@@ -12421,7 +12710,7 @@
+@@ -12421,7 +12683,7 @@
if test "${lt_cv_prog_gnu_ld+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -6179,7 +5617,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -12440,8 +12729,8 @@
+@@ -12440,8 +12702,8 @@
# Check if GNU C++ uses GNU ld as the underlying linker, since the
# archiving commands below assume that GNU ld is being used.
if test "$with_gnu_ld" = yes; then
@@ -6190,7 +5628,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12467,7 +12756,7 @@
+@@ -12467,7 +12729,7 @@
# linker, instead of GNU ld. If possible, this setting should
# overridden to take advantage of the native linker features on
# the platform it is being used on.
@@ -6199,7 +5637,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -12498,8 +12787,22 @@
+@@ -12498,8 +12760,22 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -6224,7 +5662,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -12516,7 +12819,7 @@
+@@ -12516,7 +12792,7 @@
link_all_deplibs_CXX=yes
if test "$GXX" = yes; then
@@ -6233,7 +5671,7 @@
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
-@@ -12537,6 +12840,9 @@
+@@ -12537,6 +12813,9 @@
fi
esac
shared_flag='-shared'
@@ -6243,7 +5681,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -12545,15 +12851,16 @@
+@@ -12545,15 +12824,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -6264,7 +5702,7 @@
if test "$aix_use_runtimelinking" = yes; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
-@@ -12612,13 +12919,12 @@
+@@ -12612,13 +12892,12 @@
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -6280,7 +5718,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -12682,8 +12988,8 @@
+@@ -12682,8 +12961,8 @@
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec_CXX=' '
archive_cmds_need_lc_CXX=yes
@@ -6291,7 +5729,7 @@
fi
fi
;;
-@@ -12696,16 +13002,17 @@
+@@ -12696,16 +12975,17 @@
esac
;;
@@ -6311,7 +5749,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -12714,70 +13021,81 @@
+@@ -12714,70 +12994,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -6445,7 +5883,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -12788,14 +13106,14 @@
+@@ -12788,14 +13079,14 @@
;;
esac
;;
@@ -6457,12 +5895,12 @@
freebsd-elf*)
archive_cmds_need_lc_CXX=no
;;
-- freebsd*)
+- freebsd* | kfreebsd*-gnu)
+ freebsd* | kfreebsd*-gnu | dragonfly*)
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -12812,12 +13130,12 @@
+@@ -12812,12 +13103,12 @@
# location of the library.
case $cc_basename in
@@ -6478,7 +5916,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -12826,11 +13144,11 @@
+@@ -12826,11 +13117,11 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -6492,7 +5930,7 @@
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -12840,7 +13158,7 @@
+@@ -12840,7 +13131,7 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -6501,7 +5939,7 @@
hppa*64*)
hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
-@@ -12856,7 +13174,7 @@
+@@ -12856,7 +13147,7 @@
;;
esac
fi
@@ -6510,7 +5948,7 @@
hppa*64*)
hardcode_direct_CXX=no
hardcode_shlibpath_var_CXX=no
-@@ -12877,17 +13195,17 @@
+@@ -12877,17 +13168,17 @@
esac
case $cc_basename in
@@ -6532,7 +5970,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -12903,12 +13221,12 @@
+@@ -12903,12 +13194,12 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -6547,7 +5985,7 @@
;;
esac
fi
-@@ -12921,9 +13239,9 @@
+@@ -12921,9 +13212,9 @@
;;
irix5* | irix6*)
case $cc_basename in
@@ -6559,7 +5997,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -12934,9 +13252,9 @@
+@@ -12934,9 +13225,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -6571,7 +6009,7 @@
fi
fi
link_all_deplibs_CXX=yes
-@@ -12947,14 +13265,14 @@
+@@ -12947,14 +13238,14 @@
;;
linux*)
case $cc_basename in
@@ -6589,7 +6027,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -12972,20 +13290,44 @@
+@@ -12972,20 +13263,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -6640,7 +6078,7 @@
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13013,7 +13355,7 @@
+@@ -13013,7 +13328,7 @@
;;
mvs*)
case $cc_basename in
@@ -6649,7 +6087,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
-@@ -13023,7 +13365,7 @@
+@@ -13023,7 +13338,7 @@
;;
esac
;;
@@ -6658,7 +6096,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -13034,15 +13376,31 @@
+@@ -13034,15 +13349,31 @@
# Workaround some broken pre-1.5 toolchains
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
;;
@@ -6692,7 +6130,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13052,14 +13410,14 @@
+@@ -13052,14 +13383,14 @@
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -6710,7 +6148,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13077,7 +13435,7 @@
+@@ -13077,7 +13408,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -6719,7 +6157,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13096,13 +13454,13 @@
+@@ -13096,13 +13427,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -6735,7 +6173,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13111,17 +13469,17 @@
+@@ -13111,17 +13442,17 @@
# the KAI C++ compiler.
old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
;;
@@ -6757,7 +6195,7 @@
$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13140,7 +13498,7 @@
+@@ -13140,7 +13471,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -6766,7 +6204,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13164,7 +13522,7 @@
+@@ -13164,7 +13495,7 @@
sco*)
archive_cmds_need_lc_CXX=no
case $cc_basename in
@@ -6775,7 +6213,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
-@@ -13176,12 +13534,12 @@
+@@ -13176,12 +13507,12 @@
;;
sunos4*)
case $cc_basename in
@@ -6790,7 +6228,7 @@
# Lucid
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13194,36 +13552,33 @@
+@@ -13194,36 +13525,33 @@
;;
solaris*)
case $cc_basename in
@@ -6839,7 +6277,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -13231,9 +13586,9 @@
+@@ -13231,9 +13559,9 @@
# in the archive.
old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
;;
@@ -6851,7 +6289,7 @@
# The C++ compiler must be used to create the archive.
old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13243,9 +13598,9 @@
+@@ -13243,9 +13571,9 @@
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
if $CC --version | grep -v '^2\.7' > /dev/null; then
@@ -6863,7 +6301,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13254,9 +13609,9 @@
+@@ -13254,9 +13582,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -6875,7 +6313,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13274,7 +13629,7 @@
+@@ -13274,7 +13602,7 @@
;;
tandem*)
case $cc_basename in
@@ -6884,7 +6322,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13331,7 +13686,7 @@
+@@ -13331,7 +13659,7 @@
# The `*' in the case matches for architectures that use `case' in
# $output_verbose_cmd can trigger glob expansion during the loop
# eval without this substitution.
@@ -6893,7 +6331,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -13371,7 +13726,7 @@
+@@ -13371,7 +13699,7 @@
fi
;;
@@ -6902,7 +6340,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -13407,6 +13762,20 @@
+@@ -13407,6 +13735,20 @@
$rm -f confest.$objext
@@ -6923,7 +6361,7 @@
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -13462,7 +13831,7 @@
+@@ -13462,7 +13804,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -6932,7 +6370,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -13487,18 +13856,28 @@
+@@ -13487,18 +13829,28 @@
;;
chorus*)
case $cc_basename in
@@ -6964,11 +6402,11 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13506,22 +13885,22 @@
+@@ -13506,22 +13858,22 @@
;;
esac
;;
-- freebsd*)
+- freebsd* | kfreebsd*-gnu)
+ freebsd* | kfreebsd*-gnu | dragonfly*)
# FreeBSD uses GNU C++
;;
@@ -6991,7 +6429,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -13536,7 +13915,7 @@
+@@ -13536,7 +13888,7 @@
;;
irix5* | irix6* | nonstopux*)
case $cc_basename in
@@ -7000,7 +6438,7 @@
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_static_CXX='-non_shared'
# CC pic flag -KPIC is the default.
-@@ -13547,18 +13926,24 @@
+@@ -13547,18 +13899,24 @@
;;
linux*)
case $cc_basename in
@@ -7028,7 +6466,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13575,25 +13960,25 @@
+@@ -13575,25 +13933,25 @@
;;
mvs*)
case $cc_basename in
@@ -7059,7 +6497,7 @@
# Digital/Compaq C++
lt_prog_compiler_wl_CXX='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -13609,7 +13994,7 @@
+@@ -13609,7 +13967,7 @@
;;
sco*)
case $cc_basename in
@@ -7068,7 +6506,7 @@
lt_prog_compiler_pic_CXX='-fPIC'
;;
*)
-@@ -13618,13 +14003,13 @@
+@@ -13618,13 +13976,13 @@
;;
solaris*)
case $cc_basename in
@@ -7084,7 +6522,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-PIC'
;;
-@@ -13634,12 +14019,12 @@
+@@ -13634,12 +13992,12 @@
;;
sunos4*)
case $cc_basename in
@@ -7099,7 +6537,7 @@
# Lucid
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13649,7 +14034,7 @@
+@@ -13649,7 +14007,7 @@
;;
tandem*)
case $cc_basename in
@@ -7108,7 +6546,7 @@
# NonStop-UX NCC 3.20
lt_prog_compiler_pic_CXX='-KPIC'
;;
-@@ -13690,18 +14075,20 @@
+@@ -13690,18 +14048,20 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -7117,12 +6555,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13696: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14081: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14054: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13700: \$? = $ac_status" >&5
-+ echo "$as_me:14085: \$? = $ac_status" >&5
++ echo "$as_me:14058: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
@@ -7134,7 +6572,7 @@
lt_prog_compiler_pic_works_CXX=yes
fi
fi
-@@ -13722,7 +14109,7 @@
+@@ -13722,7 +14082,7 @@
fi
fi
@@ -7143,7 +6581,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_CXX=
-@@ -13744,38 +14131,36 @@
+@@ -13744,38 +14104,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -7165,12 +6603,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13763: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14143: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14116: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13767: \$? = $ac_status" >&5
-+ echo "$as_me:14147: \$? = $ac_status" >&5
++ echo "$as_me:14120: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -7194,7 +6632,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -13825,7 +14210,10 @@
+@@ -13825,7 +14183,10 @@
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -7206,7 +6644,7 @@
;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -13908,7 +14296,7 @@
+@@ -13908,7 +14269,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -7215,7 +6653,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -13918,7 +14306,20 @@
+@@ -13918,7 +14279,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -7237,7 +6675,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -13983,7 +14384,7 @@
+@@ -13983,7 +14357,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -7246,7 +6684,7 @@
;;
beos*)
-@@ -13992,7 +14393,7 @@
+@@ -13992,7 +14366,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -7255,7 +6693,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14008,7 +14409,7 @@
+@@ -14008,7 +14382,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -7264,7 +6702,7 @@
need_version=no
need_lib_prefix=no
-@@ -14020,7 +14421,8 @@
+@@ -14020,7 +14394,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -7274,7 +6712,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -14050,7 +14452,7 @@
+@@ -14050,7 +14425,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -7283,7 +6721,7 @@
;;
esac
;;
-@@ -14073,7 +14475,7 @@
+@@ -14073,7 +14448,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -7292,16 +6730,16 @@
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -14096,7 +14498,7 @@
+@@ -14096,7 +14471,7 @@
dynamic_linker=no
;;
--freebsd*-gnu*)
+-kfreebsd*-gnu*)
+kfreebsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14108,8 +14510,17 @@
+@@ -14108,8 +14483,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -7321,7 +6759,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -14127,7 +14538,7 @@
+@@ -14127,7 +14511,7 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -7330,7 +6768,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -14154,9 +14565,9 @@
+@@ -14154,9 +14538,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -7342,7 +6780,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -14171,7 +14582,7 @@
+@@ -14171,7 +14555,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -7351,7 +6789,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14182,7 +14593,7 @@
+@@ -14182,7 +14566,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -7360,7 +6798,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14244,22 +14655,19 @@
+@@ -14244,22 +14628,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -7389,7 +6827,7 @@
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
-@@ -14269,6 +14677,30 @@
+@@ -14269,6 +14650,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -7420,7 +6858,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14278,7 +14710,7 @@
+@@ -14278,7 +14683,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -7429,7 +6867,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -14307,7 +14739,11 @@
+@@ -14307,7 +14712,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -7442,7 +6880,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -14327,7 +14763,7 @@
+@@ -14327,7 +14736,7 @@
os2*)
libname_spec='$name'
@@ -7451,7 +6889,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -14429,8 +14865,8 @@
+@@ -14429,8 +14838,8 @@
echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
hardcode_action_CXX=
if test -n "$hardcode_libdir_flag_spec_CXX" || \
@@ -7462,16 +6900,16 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_CXX" != no &&
-@@ -15089,7 +15525,7 @@
+@@ -15089,7 +15498,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 15092 "configure"
-+#line 15528 "configure"
++#line 15501 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15155,7 +15591,7 @@
+@@ -15155,7 +15564,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -7480,16 +6918,16 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -15187,7 +15623,7 @@
+@@ -15187,7 +15596,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 15190 "configure"
-+#line 15626 "configure"
++#line 15599 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15253,7 +15689,7 @@
+@@ -15253,7 +15662,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -7498,7 +6936,7 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -15304,7 +15740,8 @@
+@@ -15304,7 +15713,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -7508,7 +6946,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -15404,6 +15841,12 @@
+@@ -15404,6 +15814,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -7521,7 +6959,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -15434,7 +15877,7 @@
+@@ -15434,7 +15850,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -7530,7 +6968,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -15465,7 +15908,7 @@
+@@ -15465,7 +15881,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -7539,7 +6977,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -15480,7 +15923,7 @@
+@@ -15480,7 +15896,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
@@ -7548,7 +6986,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -15682,7 +16125,10 @@
+@@ -15682,7 +16098,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -7560,7 +6998,7 @@
fi
-@@ -15758,12 +16204,35 @@
+@@ -15758,12 +16177,35 @@
compiler=$CC
@@ -7597,7 +7035,7 @@
echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-@@ -15776,7 +16245,7 @@
+@@ -15776,7 +16218,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -7606,7 +7044,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -15784,8 +16253,10 @@
+@@ -15784,8 +16226,10 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -7619,7 +7057,7 @@
;;
esac
echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -15862,7 +16333,7 @@
+@@ -15862,7 +16306,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -7628,7 +7066,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -15888,6 +16359,16 @@
+@@ -15888,6 +16332,16 @@
lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -7645,7 +7083,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -15899,7 +16380,7 @@
+@@ -15899,7 +16353,7 @@
lt_prog_compiler_wl_F77='-Wl,'
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -7654,7 +7092,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -15923,12 +16404,19 @@
+@@ -15923,12 +16377,19 @@
;;
linux*)
@@ -7675,7 +7113,7 @@
ccc*)
lt_prog_compiler_wl_F77='-Wl,'
# All Alpha code is PIC.
-@@ -15949,9 +16437,14 @@
+@@ -15949,9 +16410,14 @@
;;
solaris*)
@@ -7691,7 +7129,7 @@
;;
sunos4*)
-@@ -15973,6 +16466,11 @@
+@@ -15973,6 +16439,11 @@
fi
;;
@@ -7703,7 +7141,7 @@
uts4*)
lt_prog_compiler_pic_F77='-pic'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16007,18 +16505,20 @@
+@@ -16007,18 +16478,20 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -7712,12 +7150,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16013: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16511: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16484: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16017: \$? = $ac_status" >&5
-+ echo "$as_me:16515: \$? = $ac_status" >&5
++ echo "$as_me:16488: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
@@ -7729,7 +7167,7 @@
lt_prog_compiler_pic_works_F77=yes
fi
fi
-@@ -16039,7 +16539,7 @@
+@@ -16039,7 +16512,7 @@
fi
fi
@@ -7738,7 +7176,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_F77=
-@@ -16061,38 +16561,36 @@
+@@ -16061,38 +16534,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -7760,12 +7198,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16080: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16573: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16546: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16084: \$? = $ac_status" >&5
-+ echo "$as_me:16577: \$? = $ac_status" >&5
++ echo "$as_me:16550: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -7789,7 +7227,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -16163,6 +16661,16 @@
+@@ -16163,6 +16634,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -7806,7 +7244,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -16183,6 +16691,27 @@
+@@ -16183,6 +16664,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -7834,7 +7272,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -16220,7 +16749,7 @@
+@@ -16220,7 +16722,7 @@
allow_undefined_flag_F77=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -7843,7 +7281,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16230,13 +16759,13 @@
+@@ -16230,13 +16732,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec_F77='-L$libdir'
@@ -7860,7 +7298,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -16245,19 +16774,51 @@
+@@ -16245,19 +16747,51 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -7917,7 +7355,7 @@
fi
;;
-@@ -16275,8 +16836,8 @@
+@@ -16275,8 +16809,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -7928,7 +7366,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16291,24 +16852,19 @@
+@@ -16291,24 +16825,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -7960,7 +7398,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16342,9 +16898,20 @@
+@@ -16342,9 +16871,20 @@
else
export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
fi
@@ -7983,7 +7421,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -16361,7 +16928,7 @@
+@@ -16361,7 +16901,7 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes; then
@@ -7992,7 +7430,7 @@
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
-@@ -16382,6 +16949,9 @@
+@@ -16382,6 +16922,9 @@
fi
esac
shared_flag='-shared'
@@ -8002,7 +7440,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -16390,21 +16960,22 @@
+@@ -16390,21 +16933,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -8030,7 +7468,7 @@
program main
end
-@@ -16445,14 +17016,13 @@
+@@ -16445,14 +16989,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -8048,7 +7486,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -16506,8 +17076,8 @@
+@@ -16506,8 +17049,8 @@
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec_F77=' '
archive_cmds_need_lc_F77=yes
@@ -8059,7 +7497,7 @@
fi
fi
;;
-@@ -16520,7 +17090,7 @@
+@@ -16520,7 +17063,7 @@
ld_shlibs_F77=no
;;
@@ -8068,7 +7506,7 @@
export_dynamic_flag_spec_F77=-rdynamic
;;
-@@ -16530,68 +17100,68 @@
+@@ -16530,68 +17073,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_F77=' '
@@ -8181,18 +7619,18 @@
fi
;;
-@@ -16625,8 +17195,8 @@
+@@ -16625,8 +17168,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-- freebsd*)
+- freebsd* | kfreebsd*-gnu)
- archive_cmds_F77='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
+ freebsd* | kfreebsd*-gnu | dragonfly*)
+ archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
-@@ -16634,7 +17204,7 @@
+@@ -16634,7 +17177,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -8201,7 +7639,7 @@
else
archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -16650,16 +17220,16 @@
+@@ -16650,16 +17193,16 @@
hpux10* | hpux11*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -8222,7 +7660,7 @@
hppa*64*|ia64*)
archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
;;
-@@ -16669,7 +17239,7 @@
+@@ -16669,7 +17212,7 @@
esac
fi
if test "$with_gnu_ld" = no; then
@@ -8231,7 +7669,7 @@
hppa*64*)
hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
hardcode_libdir_flag_spec_ld_F77='+b $libdir'
-@@ -16702,7 +17272,7 @@
+@@ -16702,7 +17245,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -8240,7 +7678,7 @@
else
archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
-@@ -16712,7 +17282,7 @@
+@@ -16712,7 +17255,7 @@
link_all_deplibs_F77=yes
;;
@@ -8249,7 +7687,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -16735,7 +17305,8 @@
+@@ -16735,7 +17278,8 @@
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -8259,7 +7697,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
export_dynamic_flag_spec_F77='${wl}-E'
else
-@@ -16745,7 +17316,7 @@
+@@ -16745,7 +17289,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
;;
*)
@@ -8268,7 +7706,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
;;
esac
-@@ -16756,14 +17327,14 @@
+@@ -16756,14 +17300,14 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
allow_undefined_flag_F77=unsupported
@@ -8285,7 +7723,7 @@
else
allow_undefined_flag_F77=' -expect_unresolved \*'
archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -16775,13 +17346,13 @@
+@@ -16775,13 +17319,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -8301,7 +7739,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -16800,10 +17371,12 @@
+@@ -16800,10 +17344,12 @@
solaris*)
no_undefined_flag_F77=' -z text'
if test "$GCC" = yes; then
@@ -8316,7 +7754,7 @@
archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -16812,8 +17385,18 @@
+@@ -16812,8 +17358,18 @@
hardcode_shlibpath_var_F77=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -8337,7 +7775,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -16822,7 +17405,7 @@
+@@ -16822,7 +17378,7 @@
if test "x$host_vendor" = xsequent; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
@@ -8346,7 +7784,7 @@
else
archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -16882,9 +17465,9 @@
+@@ -16882,9 +17438,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag_F77='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -8358,7 +7796,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var_F77=no
-@@ -16990,7 +17573,7 @@
+@@ -16990,7 +17546,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -8367,7 +7805,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -17000,7 +17583,20 @@
+@@ -17000,7 +17556,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -8389,7 +7827,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17065,7 +17661,7 @@
+@@ -17065,7 +17634,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -8398,7 +7836,7 @@
;;
beos*)
-@@ -17074,7 +17670,7 @@
+@@ -17074,7 +17643,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -8407,7 +7845,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17090,7 +17686,7 @@
+@@ -17090,7 +17659,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -8416,7 +7854,7 @@
need_version=no
need_lib_prefix=no
-@@ -17102,7 +17698,8 @@
+@@ -17102,7 +17671,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -8426,7 +7864,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -17132,7 +17729,7 @@
+@@ -17132,7 +17702,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -8435,7 +7873,7 @@
;;
esac
;;
-@@ -17155,7 +17752,7 @@
+@@ -17155,7 +17725,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -8444,16 +7882,16 @@
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -17178,7 +17775,7 @@
+@@ -17178,7 +17748,7 @@
dynamic_linker=no
;;
--freebsd*-gnu*)
+-kfreebsd*-gnu*)
+kfreebsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17190,8 +17787,17 @@
+@@ -17190,8 +17760,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -8473,7 +7911,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -17209,7 +17815,7 @@
+@@ -17209,7 +17788,7 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -8482,7 +7920,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -17236,9 +17842,9 @@
+@@ -17236,9 +17815,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -8494,7 +7932,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -17253,7 +17859,7 @@
+@@ -17253,7 +17832,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -8503,7 +7941,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17264,7 +17870,7 @@
+@@ -17264,7 +17843,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -8512,7 +7950,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17326,22 +17932,19 @@
+@@ -17326,22 +17905,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -8541,7 +7979,7 @@
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
-@@ -17351,6 +17954,30 @@
+@@ -17351,6 +17927,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -8572,7 +8010,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17360,7 +17987,7 @@
+@@ -17360,7 +17960,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -8581,7 +8019,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -17389,7 +18016,11 @@
+@@ -17389,7 +17989,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -8594,7 +8032,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -17409,7 +18040,7 @@
+@@ -17409,7 +18013,7 @@
os2*)
libname_spec='$name'
@@ -8603,7 +8041,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -17511,8 +18142,8 @@
+@@ -17511,8 +18115,8 @@
echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
hardcode_action_F77=
if test -n "$hardcode_libdir_flag_spec_F77" || \
@@ -8614,7 +8052,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_F77" != no &&
-@@ -17588,7 +18219,8 @@
+@@ -17588,7 +18192,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -8624,7 +8062,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -17688,6 +18320,12 @@
+@@ -17688,6 +18293,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -8637,7 +8075,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -17718,7 +18356,7 @@
+@@ -17718,7 +18329,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -8646,7 +8084,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -17749,7 +18387,7 @@
+@@ -17749,7 +18360,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -8655,7 +8093,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -17764,7 +18402,7 @@
+@@ -17764,7 +18375,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
@@ -8664,7 +8102,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -17966,7 +18604,10 @@
+@@ -17966,7 +18577,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -8676,7 +8114,7 @@
fi
-@@ -17999,7 +18640,7 @@
+@@ -17999,7 +18613,7 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
@@ -8685,7 +8123,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -18010,15 +18651,41 @@
+@@ -18010,15 +18624,41 @@
compiler=$CC
@@ -8727,7 +8165,7 @@
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
## the running order or otherwise move them around unless you know exactly
-@@ -18045,18 +18712,20 @@
+@@ -18045,18 +18685,20 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -8736,12 +8174,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18051: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18718: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18691: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18055: \$? = $ac_status" >&5
-+ echo "$as_me:18722: \$? = $ac_status" >&5
++ echo "$as_me:18695: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
@@ -8753,7 +8191,7 @@
lt_cv_prog_compiler_rtti_exceptions=yes
fi
fi
-@@ -18133,7 +18802,7 @@
+@@ -18133,7 +18775,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -8762,7 +8200,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18159,6 +18828,16 @@
+@@ -18159,6 +18801,16 @@
lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -8779,7 +8217,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -18170,7 +18849,7 @@
+@@ -18170,7 +18822,7 @@
lt_prog_compiler_wl_GCJ='-Wl,'
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -8788,7 +8226,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18194,12 +18873,19 @@
+@@ -18194,12 +18846,19 @@
;;
linux*)
@@ -8809,7 +8247,7 @@
ccc*)
lt_prog_compiler_wl_GCJ='-Wl,'
# All Alpha code is PIC.
-@@ -18220,9 +18906,14 @@
+@@ -18220,9 +18879,14 @@
;;
solaris*)
@@ -8825,7 +8263,7 @@
;;
sunos4*)
-@@ -18244,6 +18935,11 @@
+@@ -18244,6 +18908,11 @@
fi
;;
@@ -8837,7 +8275,7 @@
uts4*)
lt_prog_compiler_pic_GCJ='-pic'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18278,18 +18974,20 @@
+@@ -18278,18 +18947,20 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -8846,12 +8284,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18284: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18980: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18953: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18288: \$? = $ac_status" >&5
-+ echo "$as_me:18984: \$? = $ac_status" >&5
++ echo "$as_me:18957: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
@@ -8863,7 +8301,7 @@
lt_prog_compiler_pic_works_GCJ=yes
fi
fi
-@@ -18310,7 +19008,7 @@
+@@ -18310,7 +18981,7 @@
fi
fi
@@ -8872,7 +8310,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_GCJ=
-@@ -18332,38 +19030,36 @@
+@@ -18332,38 +19003,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -8894,12 +8332,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18351: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19042: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19015: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18355: \$? = $ac_status" >&5
-+ echo "$as_me:19046: \$? = $ac_status" >&5
++ echo "$as_me:19019: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8923,7 +8361,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -18434,6 +19130,16 @@
+@@ -18434,6 +19103,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -8940,7 +8378,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -18454,6 +19160,27 @@
+@@ -18454,6 +19133,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -8968,7 +8406,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -18491,7 +19218,7 @@
+@@ -18491,7 +19191,7 @@
allow_undefined_flag_GCJ=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -8977,7 +8415,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18501,13 +19228,13 @@
+@@ -18501,13 +19201,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec_GCJ='-L$libdir'
@@ -8994,7 +8432,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -18516,19 +19243,51 @@
+@@ -18516,19 +19216,51 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -9051,7 +8489,7 @@
fi
;;
-@@ -18546,8 +19305,8 @@
+@@ -18546,8 +19278,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -9062,7 +8500,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18562,24 +19321,19 @@
+@@ -18562,24 +19294,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -9094,7 +8532,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18613,9 +19367,20 @@
+@@ -18613,9 +19340,20 @@
else
export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
fi
@@ -9117,7 +8555,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -18632,7 +19397,7 @@
+@@ -18632,7 +19370,7 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes; then
@@ -9126,7 +8564,7 @@
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
-@@ -18653,6 +19418,9 @@
+@@ -18653,6 +19391,9 @@
fi
esac
shared_flag='-shared'
@@ -9136,7 +8574,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -18661,21 +19429,22 @@
+@@ -18661,21 +19402,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -9164,7 +8602,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -18726,14 +19495,13 @@
+@@ -18726,14 +19468,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -9182,7 +8620,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -18797,8 +19565,8 @@
+@@ -18797,8 +19538,8 @@
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec_GCJ=' '
archive_cmds_need_lc_GCJ=yes
@@ -9193,7 +8631,7 @@
fi
fi
;;
-@@ -18811,7 +19579,7 @@
+@@ -18811,7 +19552,7 @@
ld_shlibs_GCJ=no
;;
@@ -9202,7 +8640,7 @@
export_dynamic_flag_spec_GCJ=-rdynamic
;;
-@@ -18821,68 +19589,68 @@
+@@ -18821,68 +19562,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_GCJ=' '
@@ -9315,18 +8753,18 @@
fi
;;
-@@ -18916,8 +19684,8 @@
+@@ -18916,8 +19657,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-- freebsd*)
+- freebsd* | kfreebsd*-gnu)
- archive_cmds_GCJ='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
+ freebsd* | kfreebsd*-gnu | dragonfly*)
+ archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
-@@ -18925,7 +19693,7 @@
+@@ -18925,7 +19666,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -9335,7 +8773,7 @@
else
archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -18941,16 +19709,16 @@
+@@ -18941,16 +19682,16 @@
hpux10* | hpux11*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -9356,7 +8794,7 @@
hppa*64*|ia64*)
archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
;;
-@@ -18960,7 +19728,7 @@
+@@ -18960,7 +19701,7 @@
esac
fi
if test "$with_gnu_ld" = no; then
@@ -9365,7 +8803,7 @@
hppa*64*)
hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
-@@ -18993,7 +19761,7 @@
+@@ -18993,7 +19734,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -9374,7 +8812,7 @@
else
archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
-@@ -19003,7 +19771,7 @@
+@@ -19003,7 +19744,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -9383,7 +8821,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -19026,7 +19794,8 @@
+@@ -19026,7 +19767,8 @@
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -9393,7 +8831,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
export_dynamic_flag_spec_GCJ='${wl}-E'
else
-@@ -19036,7 +19805,7 @@
+@@ -19036,7 +19778,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
;;
*)
@@ -9402,7 +8840,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
;;
esac
-@@ -19047,14 +19816,14 @@
+@@ -19047,14 +19789,14 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
allow_undefined_flag_GCJ=unsupported
@@ -9419,7 +8857,7 @@
else
allow_undefined_flag_GCJ=' -expect_unresolved \*'
archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -19066,13 +19835,13 @@
+@@ -19066,13 +19808,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -9435,7 +8873,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19091,10 +19860,12 @@
+@@ -19091,10 +19833,12 @@
solaris*)
no_undefined_flag_GCJ=' -z text'
if test "$GCC" = yes; then
@@ -9450,7 +8888,7 @@
archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -19103,8 +19874,18 @@
+@@ -19103,8 +19847,18 @@
hardcode_shlibpath_var_GCJ=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -9471,7 +8909,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -19113,7 +19894,7 @@
+@@ -19113,7 +19867,7 @@
if test "x$host_vendor" = xsequent; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
@@ -9480,7 +8918,7 @@
else
archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -19173,9 +19954,9 @@
+@@ -19173,9 +19927,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag_GCJ='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -9492,7 +8930,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var_GCJ=no
-@@ -19281,7 +20062,7 @@
+@@ -19281,7 +20035,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -9501,7 +8939,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -19291,7 +20072,20 @@
+@@ -19291,7 +20045,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -9523,7 +8961,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -19356,7 +20150,7 @@
+@@ -19356,7 +20123,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -9532,7 +8970,7 @@
;;
beos*)
-@@ -19365,7 +20159,7 @@
+@@ -19365,7 +20132,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -9541,7 +8979,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -19381,7 +20175,7 @@
+@@ -19381,7 +20148,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -9550,7 +8988,7 @@
need_version=no
need_lib_prefix=no
-@@ -19393,7 +20187,8 @@
+@@ -19393,7 +20160,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -9560,7 +8998,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -19423,7 +20218,7 @@
+@@ -19423,7 +20191,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -9569,7 +9007,7 @@
;;
esac
;;
-@@ -19446,7 +20241,7 @@
+@@ -19446,7 +20214,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -9578,16 +9016,16 @@
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -19469,7 +20264,7 @@
+@@ -19469,7 +20237,7 @@
dynamic_linker=no
;;
--freebsd*-gnu*)
+-kfreebsd*-gnu*)
+kfreebsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19481,8 +20276,17 @@
+@@ -19481,8 +20249,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -9607,7 +9045,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -19500,7 +20304,7 @@
+@@ -19500,7 +20277,7 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -9616,7 +9054,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -19527,9 +20331,9 @@
+@@ -19527,9 +20304,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -9628,7 +9066,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -19544,7 +20348,7 @@
+@@ -19544,7 +20321,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -9637,7 +9075,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19555,7 +20359,7 @@
+@@ -19555,7 +20332,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -9646,7 +9084,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -19617,22 +20421,19 @@
+@@ -19617,22 +20394,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -9675,7 +9113,7 @@
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
-@@ -19642,6 +20443,30 @@
+@@ -19642,6 +20416,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -9706,7 +9144,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -19651,7 +20476,7 @@
+@@ -19651,7 +20449,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -9715,7 +9153,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -19680,7 +20505,11 @@
+@@ -19680,7 +20478,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -9728,7 +9166,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -19700,7 +20529,7 @@
+@@ -19700,7 +20502,7 @@
os2*)
libname_spec='$name'
@@ -9737,7 +9175,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -19802,8 +20631,8 @@
+@@ -19802,8 +20604,8 @@
echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
hardcode_action_GCJ=
if test -n "$hardcode_libdir_flag_spec_GCJ" || \
@@ -9748,16 +9186,16 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_GCJ" != no &&
-@@ -20462,7 +21291,7 @@
+@@ -20462,7 +21264,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 20465 "configure"
-+#line 21294 "configure"
++#line 21267 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -20528,7 +21357,7 @@
+@@ -20528,7 +21330,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -9766,16 +9204,16 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -20560,7 +21389,7 @@
+@@ -20560,7 +21362,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 20563 "configure"
-+#line 21392 "configure"
++#line 21365 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -20626,7 +21455,7 @@
+@@ -20626,7 +21428,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -9784,7 +9222,7 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -20677,7 +21506,8 @@
+@@ -20677,7 +21479,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -9794,7 +9232,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -20777,6 +21607,12 @@
+@@ -20777,6 +21580,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -9807,7 +9245,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -20807,7 +21643,7 @@
+@@ -20807,7 +21616,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -9816,7 +9254,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -20838,7 +21674,7 @@
+@@ -20838,7 +21647,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -9825,7 +9263,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -20853,7 +21689,7 @@
+@@ -20853,7 +21662,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
@@ -9834,7 +9272,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21055,7 +21891,10 @@
+@@ -21055,7 +21864,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -9846,7 +9284,7 @@
fi
-@@ -21098,11 +21937,35 @@
+@@ -21098,11 +21910,35 @@
compiler=$CC
@@ -9882,7 +9320,7 @@
lt_cv_prog_compiler_c_o_RC=yes
# The else clause should only fire when bootstrapping the
-@@ -21118,7 +21981,8 @@
+@@ -21118,7 +21954,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -9892,7 +9330,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -21218,6 +22082,12 @@
+@@ -21218,6 +22055,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -9905,7 +9343,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21248,7 +22118,7 @@
+@@ -21248,7 +22091,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -9914,7 +9352,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21279,7 +22149,7 @@
+@@ -21279,7 +22122,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -9923,7 +9361,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21294,7 +22164,7 @@
+@@ -21294,7 +22137,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
@@ -9932,7 +9370,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21496,7 +22366,10 @@
+@@ -21496,7 +22339,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -9944,7 +9382,7 @@
fi
-@@ -21543,7 +22416,7 @@
+@@ -21543,7 +22389,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -9953,146 +9391,13 @@
# Prevent multiple expansion
-@@ -21606,6 +22479,31 @@
-
-
-
-+echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
-+ # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
-+if test "${enable_maintainer_mode+set}" = set; then
-+ enableval="$enable_maintainer_mode"
-+ USE_MAINTAINER_MODE=$enableval
-+else
-+ USE_MAINTAINER_MODE=no
-+fi;
-+ echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
-+
-+
-+if test $USE_MAINTAINER_MODE = yes; then
-+ MAINTAINER_MODE_TRUE=
-+ MAINTAINER_MODE_FALSE='#'
-+else
-+ MAINTAINER_MODE_TRUE='#'
-+ MAINTAINER_MODE_FALSE=
-+fi
-+
-+ MAINT=$MAINTAINER_MODE_TRUE
-+
-+
-+
- ac_config_headers="$ac_config_headers akode/lib/akode_export.h"
-
-
-@@ -26100,6 +26998,13 @@
- LTLIBOBJS=$ac_ltlibobjs
-
-
-+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
- if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
-@@ -26128,6 +27033,13 @@
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
-+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
- if test -z "${include_mpeg_decoder_TRUE}" && test -z "${include_mpeg_decoder_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"include_mpeg_decoder\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
-@@ -26781,6 +27693,9 @@
- s, at AMTAR@,$AMTAR,;t t
- s, at am__tar@,$am__tar,;t t
- s, at am__untar@,$am__untar,;t t
-+s, at MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
-+s, at MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
-+s, at MAINT@,$MAINT,;t t
- s, at USER_INCLUDES@,$USER_INCLUDES,;t t
- s, at USER_LDFLAGS@,$USER_LDFLAGS,;t t
- s, at CONF_FILES@,$CONF_FILES,;t t
---- configure.in
-+++ configure.in
-@@ -44,6 +44,8 @@
- dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdesupport,3.3)
-
-+AM_MAINTAINER_MODE
-+
- dnl almost the same like KDE_SET_PEFIX but the path is /usr/local
- dnl make /usr/local the default for the installation
- AC_PREFIX_DEFAULT(/usr/local)
-@@ -106,6 +108,8 @@
- dnl don't remove the below
- dnl AC_OUTPUT(akode/akode-config)
-
-+AM_MAINTAINER_MODE
-+
- AM_CONFIG_HEADER(akode/lib/akode_export.h)
-
- AC_DEFUN([AC_CHECK_LIBFLAC],
--- Makefile.in
+++ Makefile.in
-@@ -157,6 +157,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- NOOPT_CFLAGS = @NOOPT_CFLAGS@
- NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-@@ -268,7 +271,7 @@
- .SUFFIXES:
- am--refresh:
- @:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -310,12 +313,12 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- $(SHELL) ./config.status --recheck
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- #>- cd $(srcdir) && $(AUTOCONF)
- #>+ 2
- cd $(srcdir) && rm -f configure
- cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
- config.h: stamp-h1
-@@ -327,7 +330,7 @@
- stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
- @rm -f stamp-h1
- cd $(top_builddir) && $(SHELL) ./config.status config.h
--$(srcdir)/config.h.in: $(am__configure_deps)
-+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_srcdir) && $(AUTOHEADER)
- rm -f stamp-h1
- touch $@
-@@ -753,7 +756,7 @@
+@@ -753,7 +753,7 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=stamp-h.in subdirs Makefile.in configure.files config.h.in configure.in akode.lsm Makefile.cvs aclocal.m4 configure.in.in acinclude.m4 Makefile.am configure Makefile.am.in
+-KDE_DIST=subdirs Makefile.in configure.files config.h.in configure.in akode.lsm Makefile.cvs aclocal.m4 configure.in.in acinclude.m4 Makefile.am configure Makefile.am.in
+KDE_DIST=stamp-h.in subdirs Makefile.in configure.files config.h.in configure.in akode.lsm Makefile.cvs aclocal.m4 configure.in.in Makefile.am configure acinclude.m4 Makefile.am.in
#>+ 2
More information about the pkg-kde-commits
mailing list