[Pkg-kde-commits] rev 2458 -
trunk/packages/kdeartwork/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Wed Nov 30 18:18:21 UTC 2005
Author: chrsmrtn
Date: 2005-11-30 18:18:20 +0000 (Wed, 30 Nov 2005)
New Revision: 2458
Modified:
trunk/packages/kdeartwork/debian/patches/98_buildprep.diff
Log:
Updated kdeartwork buildprep.
Modified: trunk/packages/kdeartwork/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdeartwork/debian/patches/98_buildprep.diff 2005-11-30 18:07:54 UTC (rev 2457)
+++ trunk/packages/kdeartwork/debian/patches/98_buildprep.diff 2005-11-30 18:18:20 UTC (rev 2458)
@@ -28,128 +28,7 @@
AC_TRY_COMPILE([
$2
],
-@@ -3351,63 +3339,63 @@
-
- AC_DEFUN([KDE_ENABLE_HIDDEN_VISIBILITY],
- [
-- AC_BEFORE([AC_PATH_QT_1_3], [KDE_ENABLE_HIDDEN_VISIBILITY])
--
-- AC_MSG_CHECKING([grepping for visibility push/pop in headers])
--
-- if test "x$GXX" = "xyes"; then
-- AC_LANG_SAVE
-- AC_LANG_CPLUSPLUS
-- AC_EGREP_CPP(
-- [GCC visibility push],
-- [ #include <exception>
-- ],
-- [
-- AC_MSG_RESULT(yes)
-- kde_stdc_visibility_patched=yes ],
-- [
-- AC_MSG_RESULT(no)
-- AC_MSG_WARN([Your libstdc++ doesn't appear to be patched for
-- visibility support. Disabling -fvisibility=hidden])
--
-- kde_stdc_visibility_patched=no ])
-- AC_LANG_RESTORE
--
-- kde_have_gcc_visibility=no
-- KDE_CHECK_COMPILER_FLAG(fvisibility=hidden,
-- [
-- kde_have_gcc_visibility=yes
-- AC_CACHE_CHECK([if Qt is patched for -fvisibility], kde_cv_val_qt_gcc_visibility_patched,
-- [
-- AC_LANG_SAVE
-- AC_LANG_CPLUSPLUS
--
-- safe_CXXFLAGS=$CXXFLAGS
-- CXXFLAGS="$CXXFLAGS $all_includes"
--
-- AC_TRY_COMPILE(
-- [
--#include <qglobal.h>
--#if Q_EXPORT - 0 != 0
--/* if this compiles, then Q_EXPORT is undefined */
--/* if Q_EXPORT is nonempty, this will break compilation */
--#endif
-- ], [/* elvis is alive */],
-- kde_cv_val_qt_gcc_visibility_patched=no, kde_cv_val_qt_gcc_visibility_patched=yes)
--
-- CXXFLAGS=$safe_CXXFLAGS
-- AC_LANG_RESTORE
-- ]
-- )
--
-- if test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
-- CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
-- KDE_CHECK_VISIBILITY_GCC_BUG
-- HAVE_GCC_VISIBILITY=1
-- AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
-- fi
-- ])
-- fi
-+dnl AC_BEFORE([AC_PATH_QT_1_3], [KDE_ENABLE_HIDDEN_VISIBILITY])
-+dnl
-+dnl AC_MSG_CHECKING([grepping for visibility push/pop in headers])
-+dnl
-+dnl if test "x$GXX" = "xyes"; then
-+dnl AC_LANG_SAVE
-+dnl AC_LANG_CPLUSPLUS
-+dnl AC_EGREP_CPP(
-+dnl [GCC visibility push],
-+dnl [ #include <exception>
-+dnl ],
-+dnl [
-+dnl AC_MSG_RESULT(yes)
-+dnl kde_stdc_visibility_patched=yes ],
-+dnl [
-+dnl AC_MSG_RESULT(no)
-+dnl AC_MSG_WARN([Your libstdc++ doesn't appear to be patched for
-+dnl visibility support. Disabling -fvisibility=hidden])
-+dnl
-+dnl kde_stdc_visibility_patched=no ])
-+dnl AC_LANG_RESTORE
-+dnl
-+dnl kde_have_gcc_visibility=no
-+dnl KDE_CHECK_COMPILER_FLAG(fvisibility=hidden,
-+dnl [
-+dnl kde_have_gcc_visibility=yes
-+dnl AC_CACHE_CHECK([if Qt is patched for -fvisibility], kde_cv_val_qt_gcc_visibility_patched,
-+dnl [
-+dnl AC_LANG_SAVE
-+dnl AC_LANG_CPLUSPLUS
-+dnl
-+dnl safe_CXXFLAGS=$CXXFLAGS
-+dnl CXXFLAGS="$CXXFLAGS $all_includes"
-+dnl
-+dnl AC_TRY_COMPILE(
-+dnl [
-+dnl#include <qglobal.h>
-+dnl#if Q_EXPORT - 0 != 0
-+dnl/* if this compiles, then Q_EXPORT is undefined */
-+dnl/* if Q_EXPORT is nonempty, this will break compilation */
-+dnl#endif
-+dnl ], [/* elvis is alive */],
-+dnl kde_cv_val_qt_gcc_visibility_patched=no, kde_cv_val_qt_gcc_visibility_patched=yes)
-+dnl
-+dnl CXXFLAGS=$safe_CXXFLAGS
-+dnl AC_LANG_RESTORE
-+dnl ]
-+dnl )
-+dnl
-+dnl if test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
-+dnl CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
-+dnl KDE_CHECK_VISIBILITY_GCC_BUG
-+dnl HAVE_GCC_VISIBILITY=1
-+dnl AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
-+dnl fi
-+dnl ])
-+dnl fi
- ])
-
- AC_DEFUN([KDE_ADD_DEPENDENCIES],
-@@ -5907,30 +5895,15 @@
+@@ -5917,30 +5905,15 @@
fi
])
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
@@ -185,7 +64,7 @@
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -5990,7 +5963,7 @@
+@@ -6000,7 +5973,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -194,7 +73,7 @@
AC_SUBST(LIBTOOL)dnl
# Prevent multiple expansion
-@@ -6040,7 +6013,7 @@
+@@ -6050,7 +6023,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -203,7 +82,7 @@
[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
# Same as above, but do not quote variable references.
-@@ -6060,7 +6033,7 @@
+@@ -6070,7 +6043,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -212,7 +91,7 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -6108,6 +6081,8 @@
+@@ -6118,6 +6091,8 @@
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
fi
@@ -221,7 +100,7 @@
# Only perform the check for file, if the check method requires it
case $deplibs_check_method in
file_magic*)
-@@ -6153,6 +6128,48 @@
+@@ -6163,6 +6138,48 @@
])# _LT_AC_SYS_COMPILER
@@ -270,7 +149,7 @@
# _LT_AC_SYS_LIBPATH_AIX
# ----------------------
# Links a minimal program and checks the executable
-@@ -6225,15 +6242,15 @@
+@@ -6235,15 +6252,15 @@
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
@@ -289,7 +168,7 @@
(test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
then
break
-@@ -6402,14 +6419,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
@@ -306,7 +185,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -6421,7 +6437,6 @@
+@@ -6431,7 +6447,6 @@
esac
;;
*64-bit*)
@@ -314,7 +193,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -6486,7 +6501,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 \
@@ -323,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)
-@@ -6496,8 +6511,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
@@ -336,7 +215,7 @@
$2=yes
fi
fi
-@@ -6523,11 +6540,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
@@ -354,7 +233,7 @@
else
$2=yes
fi
-@@ -6551,7 +6573,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
@@ -363,7 +242,7 @@
case $build_os in
msdosdjgpp*)
-@@ -6580,20 +6602,53 @@
+@@ -6590,20 +6612,53 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -423,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.
-@@ -6689,7 +6744,7 @@
+@@ -6699,7 +6754,7 @@
}]
EOF
if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -432,7 +311,7 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) $1 ;;
-@@ -6743,7 +6798,7 @@
+@@ -6753,7 +6808,7 @@
lt_cv_dlopen_self=yes
])
;;
@@ -441,7 +320,7 @@
*)
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
-@@ -6832,20 +6887,13 @@
+@@ -6842,20 +6897,13 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -463,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)
-@@ -6857,13 +6905,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
@@ -486,7 +365,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -6922,8 +6975,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)" || \
@@ -497,7 +376,7 @@
# We can hardcode non-existant directories.
if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-@@ -6980,7 +7033,7 @@
+@@ -6990,7 +7043,7 @@
*)
AC_MSG_RESULT([no])
;;
@@ -506,7 +385,7 @@
fi
])# AC_LIBTOOL_SYS_LIB_STRIP
-@@ -6993,7 +7046,7 @@
+@@ -7003,7 +7056,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -515,7 +394,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -7003,7 +7056,20 @@
+@@ -7013,7 +7066,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -537,7 +416,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -7068,7 +7134,7 @@
+@@ -7078,7 +7144,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -546,7 +425,7 @@
;;
beos*)
-@@ -7077,7 +7143,7 @@
+@@ -7087,7 +7153,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -555,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}'
-@@ -7093,7 +7159,7 @@
+@@ -7103,7 +7169,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -564,7 +443,7 @@
need_version=no
need_lib_prefix=no
-@@ -7105,7 +7171,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~
@@ -574,7 +453,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -7135,7 +7202,7 @@
+@@ -7145,7 +7212,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -583,7 +462,7 @@
;;
esac
;;
-@@ -7158,7 +7225,7 @@
+@@ -7168,7 +7235,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -592,7 +471,7 @@
# 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"`
-@@ -7181,7 +7248,7 @@
+@@ -7191,7 +7258,7 @@
dynamic_linker=no
;;
@@ -601,7 +480,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -7193,8 +7260,17 @@
+@@ -7203,8 +7270,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -621,7 +500,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -7212,7 +7288,7 @@
+@@ -7222,7 +7298,7 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -630,7 +509,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -7239,9 +7315,9 @@
+@@ -7249,9 +7325,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -642,7 +521,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -7256,7 +7332,7 @@
+@@ -7266,7 +7342,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -651,7 +530,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -7267,7 +7343,7 @@
+@@ -7277,7 +7353,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -660,7 +539,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -7329,22 +7405,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'
@@ -689,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,
-@@ -7354,6 +7427,30 @@
+@@ -7364,6 +7437,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -720,7 +599,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -7363,7 +7460,7 @@
+@@ -7373,7 +7470,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -729,7 +608,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -7392,7 +7489,11 @@
+@@ -7402,7 +7499,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -742,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
-@@ -7412,7 +7513,7 @@
+@@ -7422,7 +7523,7 @@
os2*)
libname_spec='$name'
@@ -751,7 +630,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -7558,7 +7659,9 @@
+@@ -7568,7 +7669,9 @@
case $tagname in
CXX)
@@ -762,7 +641,7 @@
AC_LIBTOOL_LANG_CXX_CONFIG
else
tagname=""
-@@ -7620,7 +7723,7 @@
+@@ -7630,7 +7733,7 @@
# AC_LIBTOOL_WIN32_DLL
# --------------------
@@ -771,7 +650,7 @@
AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
])# AC_LIBTOOL_WIN32_DLL
-@@ -7794,7 +7897,7 @@
+@@ -7804,7 +7907,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -780,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
-@@ -7904,7 +8007,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,
@@ -789,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'*)
-@@ -7936,7 +8039,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,
@@ -798,7 +677,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -7963,6 +8066,15 @@
+@@ -7973,6 +8076,15 @@
*) reload_flag=" $reload_flag" ;;
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -814,7 +693,7 @@
])# AC_PROG_LD_RELOAD_FLAG
-@@ -7996,44 +8108,36 @@
+@@ -8006,44 +8118,36 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -870,7 +749,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -8049,7 +8153,7 @@
+@@ -8059,7 +8163,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -879,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
-@@ -8066,42 +8170,21 @@
+@@ -8076,42 +8180,21 @@
;;
irix5* | irix6* | nonstopux*)
@@ -929,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
-@@ -8120,19 +8203,14 @@
+@@ -8130,19 +8213,14 @@
;;
openbsd*)
@@ -951,7 +830,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -8142,7 +8220,6 @@
+@@ -8152,7 +8230,6 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
@@ -959,7 +838,7 @@
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -8250,13 +8327,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
@@ -980,7 +859,7 @@
AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
case $enable_ltdl_convenience in
-@@ -8275,13 +8352,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
@@ -1001,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
-@@ -8319,10 +8396,21 @@
+@@ -8329,10 +8406,21 @@
# ---------------
AC_DEFUN([_LT_AC_LANG_CXX],
[AC_REQUIRE([AC_PROG_CXX])
@@ -1024,7 +903,7 @@
# AC_LIBTOOL_F77
# --------------
-@@ -8395,6 +8483,10 @@
+@@ -8405,6 +8493,10 @@
_LT_AC_SYS_COMPILER
@@ -1035,7 +914,7 @@
#
# Check for any special shared library compilation flags.
#
-@@ -8408,7 +8500,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])
@@ -1044,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
-@@ -8449,7 +8541,7 @@
+@@ -8459,7 +8551,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -1053,7 +932,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -8458,48 +8550,11 @@
+@@ -8468,48 +8560,11 @@
fi
;;
@@ -1104,7 +983,7 @@
esac
AC_MSG_RESULT([$enable_shared])
-@@ -8524,7 +8579,7 @@
+@@ -8534,7 +8589,7 @@
AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
[AC_LANG_PUSH(C++)
AC_REQUIRE([AC_PROG_CXX])
@@ -1113,7 +992,7 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -8553,7 +8608,7 @@
+@@ -8563,7 +8618,7 @@
_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
# Source file extension for C++ test sources.
@@ -1122,7 +1001,7 @@
# Object file extension for compiled C++ test sources.
objext=o
-@@ -8568,6 +8623,10 @@
+@@ -8578,6 +8633,10 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -1133,7 +1012,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -8589,7 +8648,7 @@
+@@ -8599,7 +8658,7 @@
CC=${CXX-"c++"}
compiler=$CC
_LT_AC_TAGVAR(compiler, $1)=$CC
@@ -1142,7 +1021,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -8607,8 +8666,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
@@ -1153,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'
-@@ -8634,7 +8693,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.
@@ -1162,7 +1041,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -8664,8 +8723,22 @@
+@@ -8674,8 +8733,22 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -1187,7 +1066,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -8682,7 +8755,7 @@
+@@ -8692,7 +8765,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GXX" = yes; then
@@ -1196,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`
-@@ -8703,6 +8776,9 @@
+@@ -8713,6 +8786,9 @@
fi
esac
shared_flag='-shared'
@@ -1206,7 +1085,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -8711,15 +8787,16 @@
+@@ -8721,15 +8797,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -1227,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.
-@@ -8728,13 +8805,12 @@
+@@ -8738,13 +8815,12 @@
_LT_AC_SYS_LIBPATH_AIX
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -1243,7 +1122,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -8748,8 +8824,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
@@ -1254,7 +1133,7 @@
fi
fi
;;
-@@ -8762,16 +8838,17 @@
+@@ -8772,16 +8848,17 @@
esac
;;
@@ -1274,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
-@@ -8780,70 +8857,81 @@
+@@ -8790,70 +8867,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -1408,7 +1287,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8854,14 +8942,14 @@
+@@ -8864,14 +8952,14 @@
;;
esac
;;
@@ -1425,7 +1304,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -8878,12 +8966,12 @@
+@@ -8888,12 +8976,12 @@
# location of the library.
case $cc_basename in
@@ -1441,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.
-@@ -8892,11 +8980,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.
@@ -1455,7 +1334,7 @@
else
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8906,7 +8994,7 @@
+@@ -8916,7 +9004,7 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -1464,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'
-@@ -8922,7 +9010,7 @@
+@@ -8932,7 +9020,7 @@
;;
esac
fi
@@ -1473,7 +1352,7 @@
hppa*64*)
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -8943,17 +9031,17 @@
+@@ -8953,17 +9041,17 @@
esac
case $cc_basename in
@@ -1495,7 +1374,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -8969,12 +9057,12 @@
+@@ -8979,12 +9067,12 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -1510,7 +1389,7 @@
;;
esac
fi
-@@ -8987,9 +9075,9 @@
+@@ -8997,9 +9085,9 @@
;;
irix5* | irix6*)
case $cc_basename in
@@ -1522,7 +1401,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -9000,9 +9088,9 @@
+@@ -9010,9 +9098,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -1534,7 +1413,7 @@
fi
fi
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -9013,14 +9101,14 @@
+@@ -9023,14 +9111,14 @@
;;
linux*)
case $cc_basename in
@@ -1552,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.
-@@ -9038,20 +9126,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'
;;
@@ -1603,7 +1482,7 @@
runpath_var=LD_RUN_PATH
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9079,7 +9191,7 @@
+@@ -9089,7 +9201,7 @@
;;
mvs*)
case $cc_basename in
@@ -1612,7 +1491,7 @@
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
-@@ -9089,7 +9201,7 @@
+@@ -9099,7 +9211,7 @@
;;
esac
;;
@@ -1621,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=
-@@ -9100,15 +9212,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::"'
;;
@@ -1655,7 +1534,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9118,14 +9246,14 @@
+@@ -9128,14 +9256,14 @@
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -1673,7 +1552,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9143,7 +9271,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}\*'
@@ -1682,7 +1561,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9162,13 +9290,13 @@
+@@ -9172,13 +9300,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -1698,7 +1577,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9177,17 +9305,17 @@
+@@ -9187,17 +9315,17 @@
# the KAI C++ compiler.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
;;
@@ -1720,7 +1599,7 @@
$rm $lib.exp'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9206,7 +9334,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}\*'
@@ -1729,7 +1608,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9230,7 +9358,7 @@
+@@ -9240,7 +9368,7 @@
sco*)
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case $cc_basename in
@@ -1738,7 +1617,7 @@
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
-@@ -9242,12 +9370,12 @@
+@@ -9252,12 +9380,12 @@
;;
sunos4*)
case $cc_basename in
@@ -1753,7 +1632,7 @@
# Lucid
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -9260,36 +9388,33 @@
+@@ -9270,36 +9398,33 @@
;;
solaris*)
case $cc_basename in
@@ -1802,7 +1681,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -9297,9 +9422,9 @@
+@@ -9307,9 +9432,9 @@
# in the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
;;
@@ -1814,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'
-@@ -9309,9 +9434,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
@@ -1826,7 +1705,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9320,9 +9445,9 @@
+@@ -9330,9 +9455,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -1838,7 +1717,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9340,7 +9465,7 @@
+@@ -9350,7 +9475,7 @@
;;
tandem*)
case $cc_basename in
@@ -1847,7 +1726,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -9450,7 +9575,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.
@@ -1856,7 +1735,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -9490,7 +9615,7 @@
+@@ -9500,7 +9625,7 @@
fi
;;
@@ -1865,7 +1744,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -9526,6 +9651,21 @@
+@@ -9536,6 +9661,21 @@
$rm -f confest.$objext
@@ -1887,7 +1766,7 @@
case " $_LT_AC_TAGVAR(postdeps, $1) " in
*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
esac
-@@ -9576,12 +9716,16 @@
+@@ -9586,12 +9726,16 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -1905,7 +1784,7 @@
AC_MSG_CHECKING([if libtool supports shared libraries])
AC_MSG_RESULT([$can_build_shared])
-@@ -9591,7 +9735,7 @@
+@@ -9601,7 +9745,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -1914,7 +1793,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -9599,8 +9743,10 @@
+@@ -9609,8 +9753,10 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -1927,7 +1806,7 @@
;;
esac
AC_MSG_RESULT([$enable_shared])
-@@ -9651,20 +9797,27 @@
+@@ -9661,20 +9807,27 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
@@ -1956,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
-@@ -9711,11 +9864,16 @@
+@@ -9721,11 +9874,16 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -1973,7 +1852,7 @@
_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
AC_LIBTOOL_CONFIG($1)
-@@ -9741,11 +9899,12 @@
+@@ -9751,11 +9909,12 @@
# without removal of \ escapes.
if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
@@ -1988,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 \
-@@ -9795,7 +9954,7 @@
+@@ -9805,7 +9964,7 @@
_LT_AC_TAGVAR(archive_cmds, $1) | \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
_LT_AC_TAGVAR(module_cmds, $1) | \
@@ -1997,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 | \
-@@ -9861,11 +10020,11 @@
+@@ -9871,11 +10030,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -2011,7 +1890,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -9896,6 +10055,12 @@
+@@ -9906,6 +10065,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -2024,7 +1903,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -9926,7 +10091,7 @@
+@@ -9936,7 +10101,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -2033,7 +1912,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -9957,7 +10122,7 @@
+@@ -9967,7 +10132,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -2042,7 +1921,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -9972,7 +10137,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)
@@ -2051,7 +1930,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -10201,7 +10366,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.
@@ -2063,7 +1942,7 @@
fi
])# AC_LIBTOOL_CONFIG
-@@ -10243,9 +10411,6 @@
+@@ -10253,9 +10421,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
@@ -2073,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'"
-@@ -10267,6 +10432,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'"
;;
@@ -2087,7 +1966,7 @@
irix* | nonstopux*)
symcode='[[BCDEGRST]]'
;;
-@@ -10274,7 +10446,7 @@
+@@ -10284,7 +10456,7 @@
symcode='[[BCDEGQRST]]'
;;
solaris* | sysv5*)
@@ -2096,7 +1975,7 @@
;;
sysv4)
symcode='[[DFNSTU]]'
-@@ -10292,14 +10464,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'*)
@@ -2116,7 +1995,7 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -10463,7 +10638,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.
@@ -2125,7 +2004,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -10488,18 +10663,28 @@
+@@ -10498,18 +10673,28 @@
;;
chorus*)
case $cc_basename in
@@ -2157,7 +2036,7 @@
# Green Hills C++ Compiler
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
;;
-@@ -10507,22 +10692,22 @@
+@@ -10517,22 +10702,22 @@
;;
esac
;;
@@ -2184,7 +2063,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -10537,7 +10722,7 @@
+@@ -10547,7 +10732,7 @@
;;
irix5* | irix6* | nonstopux*)
case $cc_basename in
@@ -2193,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.
-@@ -10548,18 +10733,24 @@
+@@ -10558,18 +10743,24 @@
;;
linux*)
case $cc_basename in
@@ -2222,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.
-@@ -10576,25 +10767,25 @@
+@@ -10586,25 +10777,25 @@
;;
mvs*)
case $cc_basename in
@@ -2253,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
-@@ -10610,7 +10801,7 @@
+@@ -10620,7 +10811,7 @@
;;
sco*)
case $cc_basename in
@@ -2262,7 +2141,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;;
*)
-@@ -10619,13 +10810,13 @@
+@@ -10629,13 +10820,13 @@
;;
solaris*)
case $cc_basename in
@@ -2278,7 +2157,7 @@
# Green Hills C++ Compiler
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
;;
-@@ -10635,12 +10826,12 @@
+@@ -10645,12 +10836,12 @@
;;
sunos4*)
case $cc_basename in
@@ -2293,7 +2172,7 @@
# Lucid
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
;;
-@@ -10650,7 +10841,7 @@
+@@ -10660,7 +10851,7 @@
;;
tandem*)
case $cc_basename in
@@ -2302,7 +2181,7 @@
# NonStop-UX NCC 3.20
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
;;
-@@ -10721,7 +10912,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.
@@ -2311,7 +2190,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -10747,6 +10938,16 @@
+@@ -10757,6 +10948,16 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -2328,7 +2207,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -10758,7 +10959,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.
@@ -2337,7 +2216,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -10782,12 +10983,19 @@
+@@ -10792,12 +10993,19 @@
;;
linux*)
@@ -2358,7 +2237,7 @@
ccc*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
# All Alpha code is PIC.
-@@ -10808,9 +11016,14 @@
+@@ -10818,9 +11026,14 @@
;;
solaris*)
@@ -2374,7 +2253,7 @@
;;
sunos4*)
-@@ -10832,6 +11045,11 @@
+@@ -10842,6 +11055,11 @@
fi
;;
@@ -2386,7 +2265,7 @@
uts4*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -10859,7 +11077,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
@@ -2395,7 +2274,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-@@ -10892,7 +11110,10 @@
+@@ -10902,7 +11120,10 @@
_LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -2407,7 +2286,7 @@
;;
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -10918,7 +11139,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)=
@@ -2416,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*
-@@ -10935,7 +11156,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=
@@ -2426,7 +2305,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
# FIXME: the MSVC++ port hasn't been tested in a loooong time
-@@ -10955,6 +11177,27 @@
+@@ -10965,6 +11187,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -2454,7 +2333,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -10992,7 +11235,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
@@ -2463,7 +2342,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -11002,13 +11245,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'
@@ -2480,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
-@@ -11017,19 +11260,51 @@
+@@ -11027,19 +11270,51 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -2489,10 +2368,9 @@
else
- ld_shlibs=no
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
-- netbsd*)
++ fi
++ ;;
++
+ linux*)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ tmp_addflag=
@@ -2522,9 +2400,10 @@
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
+ else
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ fi
-+ ;;
-+
+ fi
+ ;;
+
+- netbsd*)
+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -2537,7 +2416,7 @@
fi
;;
-@@ -11047,8 +11322,8 @@
+@@ -11057,8 +11332,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -2548,7 +2427,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -11063,24 +11338,19 @@
+@@ -11073,24 +11348,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -2580,7 +2459,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -11114,9 +11384,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
@@ -2603,7 +2482,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -11133,7 +11414,7 @@
+@@ -11143,7 +11424,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GCC" = yes; then
@@ -2612,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`
-@@ -11154,6 +11435,9 @@
+@@ -11164,6 +11445,9 @@
fi
esac
shared_flag='-shared'
@@ -2622,7 +2501,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -11162,29 +11446,29 @@
+@@ -11172,29 +11456,29 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -2661,7 +2540,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -11198,8 +11482,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
@@ -2672,7 +2551,7 @@
fi
fi
;;
-@@ -11212,7 +11496,7 @@
+@@ -11222,7 +11506,7 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -2681,7 +2560,7 @@
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
;;
-@@ -11222,69 +11506,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)=' '
@@ -2797,7 +2676,7 @@
;;
dgux*)
-@@ -11317,8 +11601,8 @@
+@@ -11327,8 +11611,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -2808,7 +2687,7 @@
_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
-@@ -11326,7 +11610,7 @@
+@@ -11336,7 +11620,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -2817,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
-@@ -11342,16 +11626,16 @@
+@@ -11352,16 +11636,16 @@
hpux10* | hpux11*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -2838,7 +2717,7 @@
hppa*64*|ia64*)
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
;;
-@@ -11361,7 +11645,7 @@
+@@ -11371,7 +11655,7 @@
esac
fi
if test "$with_gnu_ld" = no; then
@@ -2847,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'
-@@ -11394,7 +11678,7 @@
+@@ -11404,7 +11688,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -2856,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'
-@@ -11404,7 +11688,7 @@
+@@ -11414,7 +11698,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -2865,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
-@@ -11427,7 +11711,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
@@ -2875,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
-@@ -11437,7 +11722,7 @@
+@@ -11447,7 +11732,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
;;
*)
@@ -2884,7 +2763,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
;;
esac
-@@ -11448,14 +11733,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
@@ -2901,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'
-@@ -11467,13 +11752,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}\*'
@@ -2917,7 +2796,7 @@
# Both c and cxx compiler support -rpath directly
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -11492,10 +11777,12 @@
+@@ -11502,10 +11787,12 @@
solaris*)
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
if test "$GCC" = yes; then
@@ -2932,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'
-@@ -11504,8 +11791,18 @@
+@@ -11514,8 +11801,18 @@
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
@@ -2953,7 +2832,7 @@
esac
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
-@@ -11514,7 +11811,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.
@@ -2962,7 +2841,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -11574,9 +11871,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
@@ -2974,7 +2853,7 @@
fi
runpath_var='LD_RUN_PATH'
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11634,7 +11931,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
@@ -2983,7 +2862,7 @@
if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
soname=conftest
lib=conftest
-@@ -11768,7 +12065,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
@@ -3078,15 +2957,6 @@
done
fi
-@@ -1957,7 +1959,7 @@
-
-
- # Define the identity of the package.
-- PACKAGE=kdeartwork
-+ PACKAGE=kdeartwork-rc1
- VERSION="3.5"
-
-
@@ -2088,6 +2090,31 @@
@@ -10864,17 +10734,15 @@
sed "$ac_vpsub
--- configure.in
+++ configure.in
-@@ -40,7 +40,9 @@
- AC_ARG_PROGRAM
-
+@@ -42,6 +42,8 @@
dnl Automake doc recommends to do this only here. (Janos)
--AM_INIT_AUTOMAKE(kdeartwork, "3.5") dnl searches for some needed programs
-+AM_INIT_AUTOMAKE(kdeartwork-rc1, "3.5") dnl searches for some needed programs
-+
-+AM_MAINTAINER_MODE
+ AM_INIT_AUTOMAKE(kdeartwork, "3.5.0") dnl searches for some needed programs
++AM_MAINTAINER_MODE
++
KDE_SET_PREFIX
+ dnl generate the config header
--- emoticons/BoxedEmoticonSet/Makefile.in
+++ emoticons/BoxedEmoticonSet/Makefile.in
@@ -195,6 +195,9 @@
More information about the pkg-kde-commits
mailing list