-diff -urN atm.old/aclocal.m4 atm.dev/aclocal.m4
---- atm.old/aclocal.m4 2007-10-20 16:57:33.418005734 +0200
-+++ atm.dev/aclocal.m4 2007-10-20 16:58:38.609720794 +0200
-@@ -1,992 +1,19 @@
+Index: linux-atm-2.4.1/aclocal.m4
+===================================================================
+--- linux-atm-2.4.1.orig/aclocal.m4 2007-10-20 21:45:35.714867704 +0200
++++ linux-atm-2.4.1/aclocal.m4 2007-10-20 21:46:56.439467936 +0200
+@@ -1,989 +1,21 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
- AC_MSG_RESULT(missing)
-fi
-AC_SUBST($1)])
--
--
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
+
++# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+
-dnl AM_PROG_LEX
-dnl Look for flex, lex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT
-AC_DEFUN([AM_PROG_LEX],
-AC_CHECK_PROGS(LEX, flex lex, $missing_dir/missing flex)
-AC_PROG_LEX
-AC_DECL_YYTEXT])
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-
- # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-
--# serial 47 AC_PROG_LIBTOOL
--# Debian $Rev$
+# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL
+-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
++libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
- # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -1096,7 +123,7 @@
+ # serial 47 AC_PROG_LIBTOOL
+ # Debian $Rev: 9373 $
+@@ -1096,7 +128,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
# Same as above, but do not quote variable references.
-@@ -1116,7 +143,7 @@
+@@ -1116,7 +148,7 @@
default_ofile=libtool
can_build_shared=yes
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -1136,6 +163,7 @@
+@@ -1136,6 +168,7 @@
test -z "$AS" && AS=as
test -z "$CC" && CC=cc
test -z "$LTCC" && LTCC=$CC
test -z "$DLLTOOL" && DLLTOOL=dlltool
test -z "$LD" && LD=ld
test -z "$LN_S" && LN_S="ln -s"
-@@ -1155,15 +183,17 @@
+@@ -1155,15 +188,17 @@
if test -n "$RANLIB"; then
case $host_os in
openbsd*)
# Only perform the check for file, if the check method requires it
case $deplibs_check_method in
file_magic*)
-@@ -1204,11 +234,56 @@
+@@ -1204,11 +239,56 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
# _LT_AC_SYS_LIBPATH_AIX
# ----------------------
# Links a minimal program and checks the executable
-@@ -1281,15 +356,15 @@
+@@ -1281,15 +361,15 @@
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
(test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
then
break
-@@ -1458,7 +533,7 @@
+@@ -1458,7 +538,7 @@
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
*32-bit*)
case $host in
x86_64-*linux*)
-@@ -1509,6 +584,22 @@
+@@ -1509,6 +589,22 @@
CFLAGS="$SAVE_CFLAGS"
fi
;;
AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-@@ -1540,7 +631,7 @@
+@@ -1540,7 +636,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 \
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -1550,8 +641,10 @@
+@@ -1550,8 +646,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
$2=yes
fi
fi
-@@ -1577,11 +670,16 @@
+@@ -1577,11 +675,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
else
$2=yes
fi
-@@ -1640,17 +738,61 @@
+@@ -1640,17 +743,61 @@
lt_cv_sys_max_cmd_len=8192;
;;
teststring=$teststring$teststring
done
teststring=
-@@ -1670,7 +812,7 @@
+@@ -1670,7 +817,7 @@
# _LT_AC_CHECK_DLFCN
AC_DEFUN([_LT_AC_CHECK_DLFCN],
[AC_CHECK_HEADERS(dlfcn.h)dnl
])# _LT_AC_CHECK_DLFCN
-@@ -1678,7 +820,7 @@
+@@ -1678,7 +825,7 @@
# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
if test "$cross_compiling" = yes; then :
-@@ -1744,17 +886,19 @@
+@@ -1744,17 +891,19 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
esac
else :
# compilation failed
-@@ -1766,7 +910,7 @@
+@@ -1766,7 +915,7 @@
# AC_LIBTOOL_DLOPEN_SELF
AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
if test "x$enable_dlopen" != xyes; then
-@@ -1837,7 +981,7 @@
+@@ -1837,7 +986,7 @@
test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
save_LDFLAGS="$LDFLAGS"
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
-@@ -1850,7 +994,7 @@
+@@ -1850,7 +999,7 @@
])
if test "x$lt_cv_dlopen_self" = xyes; then
AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
lt_cv_dlopen_self_static, [dnl
_LT_AC_TRY_DLOPEN_SELF(
-@@ -1898,7 +1042,7 @@
+@@ -1898,7 +1047,7 @@
# Note that $ac_compile itself does not contain backslashes and begins
# with a dollar sign (not a hyphen), so the echo should work correctly.
lt_compile=`echo "$ac_compile" | $SED \
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -1910,11 +1054,13 @@
+@@ -1910,11 +1059,13 @@
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
$rm conftest*
# SGI C++ compiler will create directory out/ii_files/ for
# template instantiation
-@@ -1978,8 +1124,8 @@
+@@ -1978,8 +1129,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)" || \
# We can hardcode non-existant directories.
if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-@@ -2146,7 +1292,7 @@
+@@ -2146,7 +1297,7 @@
shlibpath_var=LIBRARY_PATH
;;
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -2174,7 +1320,8 @@
+@@ -2174,7 +1325,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -2204,7 +1351,7 @@
+@@ -2204,7 +1356,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
;;
esac
;;
-@@ -2227,7 +1374,7 @@
+@@ -2227,7 +1379,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
# 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"`
-@@ -2250,20 +1397,17 @@
+@@ -2250,20 +1402,17 @@
dynamic_linker=no
;;
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -2281,14 +1425,19 @@
+@@ -2281,14 +1430,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
esac
;;
-@@ -2308,7 +1457,7 @@
+@@ -2308,7 +1462,7 @@
version_type=sunos
need_lib_prefix=no
need_version=no
ia64*)
shrext_cmds='.so'
hardcode_into_libs=yes
-@@ -2348,6 +1497,18 @@
+@@ -2348,6 +1502,18 @@
postinstall_cmds='chmod 555 $lib'
;;
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -2391,7 +1552,7 @@
+@@ -2391,7 +1557,7 @@
;;
# This must be Linux ELF.
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -2407,7 +1568,7 @@
+@@ -2407,7 +1573,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
-@@ -2432,18 +1593,6 @@
+@@ -2432,18 +1598,6 @@
dynamic_linker='NetBSD ld.elf_so'
;;
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -2481,8 +1630,13 @@
+@@ -2481,8 +1635,13 @@
openbsd*)
version_type=sunos
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
-@@ -2520,13 +1674,6 @@
+@@ -2520,13 +1679,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -2552,7 +1699,7 @@
+@@ -2552,7 +1704,7 @@
need_version=yes
;;
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
-@@ -2585,6 +1732,29 @@
+@@ -2585,6 +1737,29 @@
fi
;;
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -2598,6 +1768,11 @@
+@@ -2598,6 +1773,11 @@
esac
AC_MSG_RESULT([$dynamic_linker])
test "$dynamic_linker" = no && can_build_shared=no
])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-@@ -2622,6 +1797,9 @@
+@@ -2622,6 +1802,9 @@
AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
fi
fi
# Extract list of available tagged configurations in $ofile.
# Note that this assumes the entire list is on one line.
-@@ -2648,7 +1826,9 @@
+@@ -2648,7 +1831,9 @@
case $tagname in
CXX)
AC_LIBTOOL_LANG_CXX_CONFIG
else
tagname=""
-@@ -2710,7 +1890,7 @@
+@@ -2710,7 +1895,7 @@
# AC_LIBTOOL_WIN32_DLL
# --------------------
AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
])# AC_LIBTOOL_WIN32_DLL
-@@ -2748,7 +1928,7 @@
+@@ -2748,7 +1933,7 @@
# AC_DISABLE_SHARED
# -----------------
AC_DEFUN([AC_DISABLE_SHARED],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
AC_ENABLE_SHARED(no)
-@@ -2884,7 +2064,7 @@
+@@ -2884,7 +2069,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
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
-@@ -2994,7 +2174,7 @@
+@@ -2994,7 +2179,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,
# 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'*)
-@@ -3026,7 +2206,7 @@
+@@ -3026,7 +2211,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,
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -3053,6 +2233,15 @@
+@@ -3053,6 +2238,15 @@
*) reload_flag=" $reload_flag" ;;
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
])# AC_PROG_LD_RELOAD_FLAG
-@@ -3086,7 +2275,7 @@
+@@ -3086,7 +2280,7 @@
lt_cv_deplibs_check_method=pass_all
;;
lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
lt_cv_file_magic_cmd='/usr/bin/file -L'
lt_cv_file_magic_test_file=/shlib/libc.so
-@@ -3109,13 +2298,13 @@
+@@ -3109,13 +2303,13 @@
lt_cv_deplibs_check_method=pass_all
;;
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -3131,7 +2320,7 @@
+@@ -3131,7 +2325,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
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
-@@ -3147,6 +2336,11 @@
+@@ -3147,6 +2341,11 @@
esac
;;
irix5* | irix6* | nonstopux*)
case $LD in
*-32|*"-32 ") libmagic=32-bit;;
-@@ -3158,11 +2352,11 @@
+@@ -3158,11 +2357,11 @@
;;
# This must be Linux ELF.
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
-@@ -3181,12 +2375,10 @@
+@@ -3181,12 +2380,10 @@
;;
openbsd*)
fi
;;
-@@ -3194,15 +2386,11 @@
+@@ -3194,15 +2391,11 @@
lt_cv_deplibs_check_method=pass_all
;;
case $host_vendor in
motorola)
lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-@@ -3223,10 +2411,13 @@
+@@ -3223,10 +2416,13 @@
siemens)
lt_cv_deplibs_check_method=pass_all
;;
lt_cv_deplibs_check_method=pass_all
;;
esac
-@@ -3246,36 +2437,43 @@
+@@ -3246,36 +2442,43 @@
# Let the user override the test.
lt_cv_path_NM="$NM"
else
test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
fi])
NM="$lt_cv_path_NM"
-@@ -3307,13 +2505,13 @@
+@@ -3307,13 +2510,13 @@
# -----------------------------------
# sets LIBLTDL to the link flags for the libltdl convenience library and
# LTDLINCL to the include flags for the libltdl header and adds
AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
case $enable_ltdl_convenience in
-@@ -3332,13 +2530,13 @@
+@@ -3332,13 +2535,13 @@
# -----------------------------------
# sets LIBLTDL to the link flags for the libltdl installable library and
# LTDLINCL to the include flags for the libltdl header and adds
# 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
-@@ -3376,10 +2574,21 @@
+@@ -3376,10 +2579,21 @@
# ---------------
AC_DEFUN([_LT_AC_LANG_CXX],
[AC_REQUIRE([AC_PROG_CXX])
# AC_LIBTOOL_F77
# --------------
-@@ -3419,7 +2628,7 @@
+@@ -3419,7 +2633,7 @@
# AC_LIBTOOL_RC
# enable support for Windows resource files
AC_DEFUN([AC_LIBTOOL_RC],
[AC_REQUIRE([LT_AC_PROG_RC])
-@@ -3452,36 +2661,9 @@
+@@ -3452,36 +2666,9 @@
_LT_AC_SYS_COMPILER
AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
AC_LIBTOOL_PROG_COMPILER_PIC($1)
-@@ -3491,9 +2673,9 @@
+@@ -3491,9 +2678,9 @@
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
AC_LIBTOOL_SYS_LIB_STRIP
AC_MSG_CHECKING([if libtool supports shared libraries])
AC_MSG_RESULT([$can_build_shared])
-@@ -3502,7 +2684,7 @@
+@@ -3502,7 +2689,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -3515,43 +2697,6 @@
+@@ -3515,43 +2702,6 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
;;
esac
AC_MSG_RESULT([$enable_shared])
-@@ -3577,7 +2722,7 @@
+@@ -3577,7 +2727,7 @@
AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
[AC_LANG_PUSH(C++)
AC_REQUIRE([AC_PROG_CXX])
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -3589,6 +2734,7 @@
+@@ -3589,6 +2739,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-@@ -3606,7 +2752,7 @@
+@@ -3606,7 +2757,7 @@
_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
# Source file extension for C++ test sources.
# Object file extension for compiled C++ test sources.
objext=o
-@@ -3616,11 +2762,15 @@
+@@ -3616,11 +2767,15 @@
lt_simple_compile_test_code="int some_variable = 0;\n"
# Code to be used in simple link tests
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -3631,18 +2781,18 @@
+@@ -3631,18 +2786,18 @@
if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
else
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -3731,6 +2881,7 @@
+@@ -3731,6 +2886,7 @@
;;
esac
done
esac
exp_sym_flag='-bexport'
-@@ -3749,7 +2900,7 @@
+@@ -3749,7 +2905,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GXX" = yes; then
# 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`
-@@ -3768,8 +2919,12 @@
+@@ -3768,8 +2924,12 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
fi
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -3796,12 +2951,12 @@
+@@ -3796,12 +2956,12 @@
_LT_AC_SYS_LIBPATH_AIX
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -3810,16 +2965,26 @@
+@@ -3810,16 +2970,26 @@
# -berok will link without error, but may produce a broken library.
_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
chorus*)
case $cc_basename in
*)
-@@ -3838,7 +3003,7 @@
+@@ -3838,7 +3008,7 @@
_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
# 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
-@@ -3847,70 +3012,81 @@
+@@ -3847,70 +3017,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -3921,14 +3097,14 @@
+@@ -3921,14 +3102,14 @@
;;
esac
;;
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -3945,11 +3121,11 @@
+@@ -3945,11 +3126,11 @@
# location of the library.
case $cc_basename in
_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -3959,7 +3135,7 @@
+@@ -3959,7 +3140,7 @@
# 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.
;;
*)
if test "$GXX" = yes; then
-@@ -3973,33 +3149,22 @@
+@@ -3973,33 +3154,22 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
;;
*)
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
-@@ -4010,14 +3175,17 @@
+@@ -4010,14 +3180,17 @@
esac
case $cc_basename in
;;
*)
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-@@ -4036,9 +3204,12 @@
+@@ -4036,9 +3209,12 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
;;
*)
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-@@ -4052,11 +3223,25 @@
+@@ -4052,11 +3228,25 @@
;;
esac
;;
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -4067,7 +3252,7 @@
+@@ -4067,7 +3257,7 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
else
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
fi
-@@ -4078,9 +3263,9 @@
+@@ -4078,9 +3268,9 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
;;
# Kuck and Associates, Inc. (KAI) C++ Compiler
# KCC will only create a shared library if the output file
-@@ -4105,17 +3290,41 @@
+@@ -4105,17 +3295,41 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
;;
# Compaq C++
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-@@ -4146,7 +3355,7 @@
+@@ -4146,7 +3360,7 @@
;;
mvs*)
case $cc_basename in
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
-@@ -4156,7 +3365,7 @@
+@@ -4156,7 +3370,7 @@
;;
esac
;;
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=
-@@ -4167,15 +3376,31 @@
+@@ -4167,15 +3381,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::"'
;;
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -4185,14 +3410,14 @@
+@@ -4185,14 +3415,14 @@
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
;;
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -4210,7 +3435,7 @@
+@@ -4210,7 +3440,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -4229,7 +3454,7 @@
+@@ -4229,7 +3459,7 @@
;;
osf4* | osf5*)
case $cc_basename in
# Kuck and Associates, Inc. (KAI) C++ Compiler
# KCC will only create a shared library if the output file
-@@ -4244,17 +3469,17 @@
+@@ -4244,17 +3474,17 @@
# the KAI C++ compiler.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
;;
$rm $lib.exp'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -4273,7 +3498,7 @@
+@@ -4273,7 +3503,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -4294,27 +3519,14 @@
+@@ -4294,27 +3524,14 @@
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
# Lucid
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -4327,36 +3539,33 @@
+@@ -4327,36 +3544,33 @@
;;
solaris*)
case $cc_basename in
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -4364,7 +3573,7 @@
+@@ -4364,7 +3578,7 @@
# in the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
;;
# Green Hills C++ Compiler
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-@@ -4402,12 +3611,63 @@
+@@ -4402,12 +3616,63 @@
;;
esac
;;
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -4440,8 +3700,6 @@
+@@ -4440,8 +3705,6 @@
AC_LIBTOOL_PROG_LD_SHLIBS($1)
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
AC_LIBTOOL_CONFIG($1)
-@@ -4459,7 +3717,7 @@
+@@ -4459,7 +3722,7 @@
])# AC_LIBTOOL_LANG_CXX_CONFIG
# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
# Figure out "hidden" library dependencies from verbose
# compiler output when linking a shared library.
# Parse the compiler output and extract the necessary
-@@ -4513,7 +3771,7 @@
+@@ -4513,7 +3776,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.
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -4589,13 +3847,37 @@
+@@ -4589,13 +3852,37 @@
$rm -f confest.$objext
# Ensure that the configuration vars for the C compiler are
# suitably defined. Those variables are subsequently used by
# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-@@ -4639,12 +3921,16 @@
+@@ -4639,12 +3926,16 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
AC_MSG_CHECKING([if libtool supports shared libraries])
AC_MSG_RESULT([$can_build_shared])
-@@ -4654,7 +3940,7 @@
+@@ -4654,7 +3945,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -4663,7 +3949,9 @@
+@@ -4663,7 +3954,9 @@
fi
;;
aix4* | aix5*)
;;
esac
AC_MSG_RESULT([$enable_shared])
-@@ -4673,8 +3961,6 @@
+@@ -4673,8 +3966,6 @@
test "$enable_shared" = yes || enable_static=yes
AC_MSG_RESULT([$enable_static])
_LT_AC_TAGVAR(GCC, $1)="$G77"
_LT_AC_TAGVAR(LD, $1)="$LD"
-@@ -4684,8 +3970,6 @@
+@@ -4684,8 +3975,6 @@
AC_LIBTOOL_PROG_LD_SHLIBS($1)
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
AC_LIBTOOL_CONFIG($1)
-@@ -4714,20 +3998,27 @@
+@@ -4714,20 +4003,27 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
AC_LIBTOOL_PROG_COMPILER_PIC($1)
AC_LIBTOOL_PROG_CC_C_O($1)
-@@ -4735,8 +4026,6 @@
+@@ -4735,8 +4031,6 @@
AC_LIBTOOL_PROG_LD_SHLIBS($1)
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
AC_LIBTOOL_CONFIG($1)
-@@ -4746,7 +4035,7 @@
+@@ -4746,7 +4040,7 @@
# AC_LIBTOOL_LANG_RC_CONFIG
# Ensure that the configuration vars for the Windows resource compiler are
# suitably defined. Those variables are subsequently used by
# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-@@ -4770,11 +4059,16 @@
+@@ -4770,11 +4064,16 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
AC_LIBTOOL_CONFIG($1)
-@@ -4804,7 +4098,7 @@
+@@ -4804,7 +4103,7 @@
# 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.
SED SHELL STRIP \
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-@@ -4910,7 +4204,7 @@
+@@ -4910,7 +4209,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
-@@ -4921,11 +4215,11 @@
+@@ -4921,11 +4220,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -4956,6 +4250,12 @@
+@@ -4956,6 +4255,12 @@
# The host system.
host_alias=$host_alias
host=$host
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -4967,6 +4267,9 @@
+@@ -4967,6 +4272,9 @@
# A C compiler.
LTCC=$lt_LTCC
# A language-specific compiler.
CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
-@@ -5032,7 +4335,7 @@
+@@ -5032,7 +4340,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -5306,9 +4609,6 @@
+@@ -5306,9 +4614,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
# 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'"
-@@ -5330,15 +4630,31 @@
+@@ -5330,15 +4635,31 @@
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'"
;;
sysv4)
symcode='[[DFNSTU]]'
;;
-@@ -5361,8 +4677,11 @@
+@@ -5361,8 +4682,11 @@
# Try without a prefix undercore, then with it.
for ac_symprfx in "" "_"; do
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -5518,6 +4837,10 @@
+@@ -5518,6 +4842,10 @@
# DJGPP does not support shared libraries at all
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
;;
sysv4*MP*)
if test -d /usr/nec; then
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-@@ -5526,7 +4849,7 @@
+@@ -5526,7 +4854,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
hppa*64*|ia64*)
;;
*)
-@@ -5551,18 +4874,28 @@
+@@ -5551,18 +4879,28 @@
;;
chorus*)
case $cc_basename in
# Green Hills C++ Compiler
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
;;
-@@ -5570,22 +4903,22 @@
+@@ -5570,22 +4908,22 @@
;;
esac
;;
hppa*64*|ia64*)
# +Z the default
;;
-@@ -5598,9 +4931,13 @@
+@@ -5598,9 +4936,13 @@
;;
esac
;;
_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.
-@@ -5609,20 +4946,26 @@
+@@ -5609,20 +4951,26 @@
;;
esac
;;
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -5639,25 +4982,25 @@
+@@ -5639,25 +4987,25 @@
;;
mvs*)
case $cc_basename in
# Digital/Compaq C++
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -5671,24 +5014,15 @@
+@@ -5671,24 +5019,15 @@
;;
psos*)
;;
# Green Hills C++ Compiler
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
;;
-@@ -5698,12 +5032,12 @@
+@@ -5698,12 +5037,12 @@
;;
sunos4*)
case $cc_basename in
# Lucid
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
;;
-@@ -5713,7 +5047,7 @@
+@@ -5713,7 +5052,7 @@
;;
tandem*)
case $cc_basename in
# NonStop-UX NCC 3.20
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
;;
-@@ -5721,7 +5055,14 @@
+@@ -5721,7 +5060,14 @@
;;
esac
;;
;;
vxworks*)
;;
-@@ -5768,6 +5109,11 @@
+@@ -5768,6 +5114,11 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
;;
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -5784,7 +5130,7 @@
+@@ -5784,7 +5135,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
hppa*64*|ia64*)
# +Z the default
;;
-@@ -5810,6 +5156,16 @@
+@@ -5810,6 +5161,16 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
fi
;;
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -5821,7 +5177,7 @@
+@@ -5821,7 +5182,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.
hppa*64*|ia64*)
# +Z the default
;;
-@@ -5844,13 +5200,20 @@
+@@ -5844,13 +5205,20 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
ccc*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
# All Alpha code is PIC.
-@@ -5865,15 +5228,15 @@
+@@ -5865,15 +5233,15 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
;;
sunos4*)
-@@ -5882,7 +5245,7 @@
+@@ -5882,7 +5250,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -5895,6 +5258,17 @@
+@@ -5895,6 +5263,17 @@
fi
;;
uts4*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -5922,7 +5296,7 @@
+@@ -5922,7 +5301,7 @@
[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
fi
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-@@ -5931,6 +5305,16 @@
+@@ -5931,6 +5310,16 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
;;
esac
])
-@@ -5955,9 +5339,9 @@
+@@ -5955,9 +5344,9 @@
_LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
;;
cygwin* | mingw*)
_LT_AC_TAGVAR(link_all_deplibs, $1)=no
;;
*)
-@@ -6001,7 +5385,8 @@
+@@ -6001,7 +5390,8 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
case $host_os in
cygwin* | mingw* | pw32*)
# FIXME: the MSVC++ port hasn't been tested in a loooong time
-@@ -6011,6 +5396,10 @@
+@@ -6011,6 +5401,10 @@
with_gnu_ld=no
fi
;;
openbsd*)
with_gnu_ld=no
;;
-@@ -6021,6 +5410,27 @@
+@@ -6021,6 +5415,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -6071,10 +5481,10 @@
+@@ -6071,10 +5486,10 @@
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
_LT_AC_TAGVAR(always_export_symbols, $1)=no
_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
# 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
-@@ -6083,13 +5493,60 @@
+@@ -6083,13 +5498,60 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -6099,7 +5556,7 @@
+@@ -6099,7 +5561,7 @@
fi
;;
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
_LT_AC_TAGVAR(ld_shlibs, $1)=no
cat <<EOF 1>&2
-@@ -6120,6 +5577,33 @@
+@@ -6120,6 +5582,33 @@
fi
;;
sunos4*)
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -6127,32 +5611,6 @@
+@@ -6127,32 +5616,6 @@
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-@@ -6163,16 +5621,11 @@
+@@ -6163,16 +5626,11 @@
;;
esac
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -6184,7 +5637,7 @@
+@@ -6184,7 +5642,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -6218,6 +5671,7 @@
+@@ -6218,6 +5676,7 @@
break
fi
done
esac
exp_sym_flag='-bexport'
-@@ -6236,7 +5690,7 @@
+@@ -6236,7 +5695,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GCC" = yes; then
# 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`
-@@ -6255,8 +5709,12 @@
+@@ -6255,8 +5714,12 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
fi
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -6264,11 +5722,11 @@
+@@ -6264,11 +5727,11 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
fi
fi
-@@ -6282,12 +5740,12 @@
+@@ -6282,12 +5745,12 @@
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -6296,13 +5754,11 @@
+@@ -6296,13 +5759,11 @@
# -berok will link without error, but may produce a broken library.
_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
fi
fi
;;
-@@ -6315,7 +5771,7 @@
+@@ -6315,7 +5776,7 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
;;
-@@ -6336,57 +5792,57 @@
+@@ -6336,57 +5797,57 @@
_LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
# FIXME: Should let the user specify the lib program.
_LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
fi
;;
-@@ -6420,7 +5876,7 @@
+@@ -6420,7 +5881,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
_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
-@@ -6443,47 +5899,62 @@
+@@ -6443,47 +5904,62 @@
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
;;
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-@@ -6507,7 +5978,7 @@
+@@ -6507,7 +5983,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
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
-@@ -6531,6 +6002,7 @@
+@@ -6531,6 +6007,7 @@
_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
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
else
-@@ -6576,7 +6048,7 @@
+@@ -6576,7 +6053,7 @@
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
# Both c and cxx compiler support -rpath directly
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -6584,21 +6056,15 @@
+@@ -6584,21 +6061,15 @@
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
;;
_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'
-@@ -6607,8 +6073,18 @@
+@@ -6607,8 +6078,18 @@
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
esac
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
-@@ -6665,36 +6141,45 @@
+@@ -6665,36 +6146,45 @@
fi
;;
;;
uts4*)
-@@ -6712,11 +6197,6 @@
+@@ -6712,11 +6202,6 @@
AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
#
# Do we need to explicitly link libc?
#
-@@ -6744,6 +6224,7 @@
+@@ -6744,6 +6229,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -6869,7 +6350,7 @@
+@@ -6869,7 +6355,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
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -6894,8 +6375,878 @@
+@@ -6894,8 +6380,878 @@
fi
done
done
+AC_SUBST([am__untar])
+]) # _AM_PROG_TAR
+
-diff -urN atm.old/configure atm.dev/configure
---- atm.old/configure 2007-10-20 16:57:33.442007099 +0200
-+++ atm.dev/configure 2007-10-20 16:59:45.781548702 +0200
+Index: linux-atm-2.4.1/configure
+===================================================================
+--- linux-atm-2.4.1.orig/configure 2007-10-20 21:45:35.770870894 +0200
++++ linux-atm-2.4.1/configure 2007-10-20 21:45:44.283355992 +0200
@@ -1,25 +1,54 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
{ (exit 0); exit 0; }
_ACEOF
-diff -urN atm.old/depcomp atm.dev/depcomp
---- atm.old/depcomp 1970-01-01 01:00:00.000000000 +0100
-+++ atm.dev/depcomp 2006-11-27 03:51:31.000000000 +0100
+Index: linux-atm-2.4.1/depcomp
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-atm-2.4.1/depcomp 2007-10-20 21:45:44.287356221 +0200
@@ -0,0 +1,530 @@
+#! /bin/sh
+# depcomp - compile a program generating dependencies as side-effects
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
-diff -urN atm.old/doc/Makefile.in atm.dev/doc/Makefile.in
---- atm.old/doc/Makefile.in 2007-10-20 16:57:33.430006415 +0200
-+++ atm.dev/doc/Makefile.in 2007-10-20 17:01:40.796103006 +0200
+Index: linux-atm-2.4.1/doc/Makefile.in
+===================================================================
+--- linux-atm-2.4.1.orig/doc/Makefile.in 2007-10-20 21:45:35.722868157 +0200
++++ linux-atm-2.4.1/doc/Makefile.in 2007-10-20 21:45:44.291356451 +0200
@@ -1,6 +1,8 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -urN atm.old/ltmain.sh atm.dev/ltmain.sh
---- atm.old/ltmain.sh 2007-10-20 16:57:33.241995701 +0200
-+++ atm.dev/ltmain.sh 2006-03-22 01:06:55.000000000 +0100
+Index: linux-atm-2.4.1/ltmain.sh
+===================================================================
+--- linux-atm-2.4.1.orig/ltmain.sh 2007-10-20 21:45:35.514856307 +0200
++++ linux-atm-2.4.1/ltmain.sh 2007-10-20 21:45:44.295356677 +0200
@@ -1,7 +1,7 @@
# ltmain.sh - Provide generalized library-building support services.
# NOTE: Changing this file will not affect anything until you rerun configure.
# Local Variables:
# mode:shell-script
-diff -urN atm.old/m4/Makefile.in atm.dev/m4/Makefile.in
---- atm.old/m4/Makefile.in 2007-10-20 16:57:33.430006415 +0200
-+++ atm.dev/m4/Makefile.in 2007-10-20 17:01:40.868107114 +0200
+Index: linux-atm-2.4.1/m4/Makefile.in
+===================================================================
+--- linux-atm-2.4.1.orig/m4/Makefile.in 2007-10-20 21:45:35.726868386 +0200
++++ linux-atm-2.4.1/m4/Makefile.in 2007-10-20 21:45:44.303357132 +0200
@@ -1,6 +1,8 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN atm.old/Makefile.in atm.dev/Makefile.in
---- atm.old/Makefile.in 2007-10-20 16:57:33.430006415 +0200
-+++ atm.dev/Makefile.in 2007-10-20 17:01:41.372135833 +0200
+Index: linux-atm-2.4.1/Makefile.in
+===================================================================
+--- linux-atm-2.4.1.orig/Makefile.in 2007-10-20 21:45:35.730868614 +0200
++++ linux-atm-2.4.1/Makefile.in 2007-10-20 21:45:44.307357360 +0200
@@ -1,6 +1,8 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -urN atm.old/src/arpd/Makefile.in atm.dev/src/arpd/Makefile.in
---- atm.old/src/arpd/Makefile.in 2007-10-20 16:57:33.434006644 +0200
-+++ atm.dev/src/arpd/Makefile.in 2007-10-20 17:01:41.076118963 +0200
+Index: linux-atm-2.4.1/src/arpd/Makefile.in
+===================================================================
+--- linux-atm-2.4.1.orig/src/arpd/Makefile.in 2007-10-20 21:45:35.746869525 +0200
++++ linux-atm-2.4.1/src/arpd/Makefile.in 2007-10-20 21:45:44.311357591 +0200
@@ -1,6 +1,8 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN atm.old/src/include/Makefile.in atm.dev/src/include/Makefile.in
---- atm.old/src/include/Makefile.in 2007-10-20 16:57:33.430006415 +0200
-+++ atm.dev/src/include/Makefile.in 2007-10-20 17:01:41.168124207 +0200
+Index: linux-atm-2.4.1/src/include/Makefile.in
+===================================================================
+--- linux-atm-2.4.1.orig/src/include/Makefile.in 2007-10-20 21:45:35.734868844 +0200
++++ linux-atm-2.4.1/src/include/Makefile.in 2007-10-20 21:45:44.315357817 +0200
@@ -1,6 +1,8 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN atm.old/src/lib/Makefile.am atm.dev/src/lib/Makefile.am
---- atm.old/src/lib/Makefile.am 2001-10-09 23:46:42.000000000 +0200
-+++ atm.dev/src/lib/Makefile.am 2007-10-20 17:01:38.015944565 +0200
+Index: linux-atm-2.4.1/src/lib/Makefile.am
+===================================================================
+--- linux-atm-2.4.1.orig/src/lib/Makefile.am 2007-10-20 21:45:34.310787689 +0200
++++ linux-atm-2.4.1/src/lib/Makefile.am 2007-10-20 21:45:44.319358043 +0200
@@ -2,7 +2,7 @@
lib_LTLIBRARIES = libatm.la
-diff -urN atm.old/src/lib/Makefile.in atm.dev/src/lib/Makefile.in
---- atm.old/src/lib/Makefile.in 2007-10-20 16:57:33.430006415 +0200
-+++ atm.dev/src/lib/Makefile.in 2007-10-20 17:01:41.280130590 +0200
+Index: linux-atm-2.4.1/src/lib/Makefile.in
+===================================================================
+--- linux-atm-2.4.1.orig/src/lib/Makefile.in 2007-10-20 21:45:35.738869071 +0200
++++ linux-atm-2.4.1/src/lib/Makefile.in 2007-10-20 21:45:44.323358271 +0200
@@ -1,6 +1,8 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -urN atm.old/src/Makefile.in atm.dev/src/Makefile.in
---- atm.old/src/Makefile.in 2007-10-20 16:57:33.454007784 +0200
-+++ atm.dev/src/Makefile.in 2007-10-20 17:01:40.948111660 +0200
+Index: linux-atm-2.4.1/src/Makefile.in
+===================================================================
+--- linux-atm-2.4.1.orig/src/Makefile.in 2007-10-20 21:45:35.786871805 +0200
++++ linux-atm-2.4.1/src/Makefile.in 2007-10-20 21:45:44.327358500 +0200
@@ -1,6 +1,8 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
projects / openwrt.git / blobdiff