rev 15296 - in kde-extras/taskjuggler/trunk/debian: . patches
Fathi Boudra
fabo at alioth.debian.org
Thu Jul 16 08:07:33 UTC 2009
Author: fabo
Date: 2009-07-16 08:07:32 +0000 (Thu, 16 Jul 2009)
New Revision: 15296
Removed:
kde-extras/taskjuggler/trunk/debian/patches/98_buildprep.diff
Modified:
kde-extras/taskjuggler/trunk/debian/changelog
kde-extras/taskjuggler/trunk/debian/compat
kde-extras/taskjuggler/trunk/debian/control
kde-extras/taskjuggler/trunk/debian/patches/02_autotools_update.diff
kde-extras/taskjuggler/trunk/debian/patches/03_libtool_update.diff
kde-extras/taskjuggler/trunk/debian/patches/04_am_maintainer_mode.diff
kde-extras/taskjuggler/trunk/debian/patches/05_pedantic-errors.diff
kde-extras/taskjuggler/trunk/debian/patches/06_disable_no_undefined.diff
kde-extras/taskjuggler/trunk/debian/patches/11_fix_manpages_build.diff
kde-extras/taskjuggler/trunk/debian/patches/series
kde-extras/taskjuggler/trunk/debian/rules
Log:
* New upstream release:
- add configure option to build taskjuggler without kdepim3 dependencies.
(Closes: #528349, #534073)
* Bump compat/debhelper to 7.
* Update debian/control:
- remove libkcal2-dev | kdepim-dev build dependency.
- bump Standards-Version from 3.7.3 to 3.8.2 (no changes needed).
* Update debian/rules: add configure option --ical-support=no.
Modified: kde-extras/taskjuggler/trunk/debian/changelog
===================================================================
--- kde-extras/taskjuggler/trunk/debian/changelog 2009-07-15 23:00:45 UTC (rev 15295)
+++ kde-extras/taskjuggler/trunk/debian/changelog 2009-07-16 08:07:32 UTC (rev 15296)
@@ -1,17 +1,22 @@
-taskjuggler (2.4.1-2) UNRELEASED; urgency=low
+taskjuggler (2.4.3-1) unstable; urgency=low
- [ Sarah Hobbs ]
- * Recommend khelpcenter, so that the help and tutorial are usable.
+ * New upstream release:
+ - add configure option to build taskjuggler without kdepim3 dependencies.
+ (Closes: #528349, #534073)
+
+ [Fathi Boudra]
+ * Bump compat/debhelper to 7.
+ * Update debian/control:
+ - remove libkcal2-dev | kdepim-dev build dependency.
+ - bump Standards-Version from 3.7.3 to 3.8.2 (no changes needed).
+ * Update debian/rules: add configure option --ical-support=no.
+
+ [Sarah Hobbs]
+ * Recommend khelpcenter4, so that the help and tutorial are usable.
(LP: #238439) (Closes: #488112)
- [ Mark Purcell ]
- * Drop KDE3 support - now a QT3 only app
- - Fix "Please provide a installable version in a kde4 environment" (Closes: #528349)
- - Build-Depends: +libqt3-mt-dev -kdelibs4-dev
- - configure --with-kde-support=no
+ -- Fathi Boudra <fabo at debian.org> Thu, 16 Jul 2009 09:30:55 +0200
- -- Mark Purcell <msp at debian.org> Fri, 15 May 2009 18:39:09 +1000
-
taskjuggler (2.4.1-1) unstable; urgency=low
* New upstream release.
Modified: kde-extras/taskjuggler/trunk/debian/compat
===================================================================
--- kde-extras/taskjuggler/trunk/debian/compat 2009-07-15 23:00:45 UTC (rev 15295)
+++ kde-extras/taskjuggler/trunk/debian/compat 2009-07-16 08:07:32 UTC (rev 15296)
@@ -1 +1 @@
-6
+7
Modified: kde-extras/taskjuggler/trunk/debian/control
===================================================================
--- kde-extras/taskjuggler/trunk/debian/control 2009-07-15 23:00:45 UTC (rev 15295)
+++ kde-extras/taskjuggler/trunk/debian/control 2009-07-16 08:07:32 UTC (rev 15296)
@@ -3,12 +3,10 @@
Priority: optional
Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
Uploaders: Mark Purcell <msp at debian.org>, Fathi Boudra <fabo at debian.org>
-Build-Depends: cdbs, debhelper (>= 6), quilt, automake,
- libqt3-mt-dev,
- poster, docbook-to-man,
- docbook2x, docbook-utils, docbook-xml,
- openjade, xsltproc
-Standards-Version: 3.7.3
+Build-Depends: cdbs, debhelper (>= 7), quilt, automake, kdelibs4-dev,
+ poster, docbook2x, docbook-to-man, docbook-utils,
+ docbook-xml, openjade, xsltproc
+Standards-Version: 3.8.2
Homepage: http://www.taskjuggler.org
Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/taskjuggler/trunk
Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/taskjuggler/trunk
@@ -16,7 +14,7 @@
Package: taskjuggler
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, poster
-Recommends: khelpcenter
+Recommends: khelpcenter4
Description: Project management application
TaskJuggler is a project management tool for Linux and UNIX based
operating systems. Whether you want to plan your college's shifts for
Modified: kde-extras/taskjuggler/trunk/debian/patches/02_autotools_update.diff
===================================================================
--- kde-extras/taskjuggler/trunk/debian/patches/02_autotools_update.diff 2009-07-15 23:00:45 UTC (rev 15295)
+++ kde-extras/taskjuggler/trunk/debian/patches/02_autotools_update.diff 2009-07-16 08:07:32 UTC (rev 15296)
@@ -244,7 +244,7 @@
tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
rm -f "$tmpdepfile"
-@@ -57,7 +92,20 @@
+@@ -57,7 +92,20 @@ gcc3)
## gcc 3 implements dependency tracking that does exactly what
## we want. Yay! Note: for some reason libtool 1.4 doesn't like
## it if -MD -MP comes after the -MF stuff. Hmm.
@@ -266,7 +266,7 @@
stat=$?
if test $stat -eq 0; then :
else
-@@ -163,31 +211,43 @@
+@@ -163,31 +211,43 @@ sgi)
aix)
# The C for AIX Compiler uses -M and outputs the dependencies
@@ -320,7 +320,7 @@
else
# The sourcefile does not contain any dependencies, so just
# store a dummy comment line, to avoid errors with the Makefile
-@@ -198,11 +258,9 @@
+@@ -198,11 +258,9 @@ aix)
;;
icc)
@@ -334,7 +334,7 @@
# foo.o: sub/foo.c
# foo.o: sub/foo.h
# which is wrong. We want:
-@@ -210,6 +268,12 @@
+@@ -210,6 +268,12 @@ icc)
# sub/foo.o: sub/foo.h
# sub/foo.c:
# sub/foo.h:
@@ -347,7 +347,7 @@
"$@" -MD -MF "$tmpdepfile"
stat=$?
-@@ -219,45 +283,110 @@
+@@ -219,45 +283,110 @@ icc)
exit $stat
fi
rm -f "$depfile"
@@ -473,7 +473,7 @@
else
echo "#dummy" > "$depfile"
fi
-@@ -270,34 +399,42 @@
+@@ -270,34 +399,42 @@ tru64)
dashmstdout)
# Important note: in order to support this mode, a compiler *must*
@@ -542,7 +542,7 @@
rm -f "$depfile"
cat < "$tmpdepfile" > "$depfile"
tr ' ' '
-@@ -315,36 +452,40 @@
+@@ -315,36 +452,40 @@ dashXmstdout)
;;
makedepend)
@@ -610,7 +610,7 @@
' | \
## Some versions of the HPUX 10.20 sed can't process this invocation
## correctly. Breaking it into two sed invocations is a workaround.
-@@ -354,35 +495,40 @@
+@@ -354,35 +495,40 @@ makedepend)
cpp)
# Important note: in order to support this mode, a compiler *must*
@@ -677,7 +677,7 @@
rm -f "$depfile"
echo "$object : \\" > "$depfile"
cat < "$tmpdepfile" >> "$depfile"
-@@ -392,34 +538,27 @@
+@@ -392,34 +538,27 @@ cpp)
msvisualcpp)
# Important note: in order to support this mode, a compiler *must*
@@ -730,7 +730,7 @@
rm -f "$depfile"
echo "$object : \\" > "$depfile"
. "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
-@@ -439,3 +578,12 @@
+@@ -439,3 +578,12 @@ none)
esac
exit 0
@@ -1503,7 +1503,7 @@
# Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
-@@ -29,6 +33,8 @@
+@@ -29,6 +33,8 @@ if test $# -eq 0; then
fi
run=:
@@ -1512,7 +1512,7 @@
# In the cases where this matters, `missing' is being run in the
# srcdir already.
-@@ -38,18 +44,24 @@
+@@ -38,18 +44,24 @@ else
configure_ac=configure.in
fi
@@ -1543,7 +1543,7 @@
-h|--h|--he|--hel|--help)
echo "\
-@@ -67,6 +79,7 @@
+@@ -67,6 +79,7 @@ Supported PROGRAM values:
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
@@ -1551,7 +1551,7 @@
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
-@@ -74,11 +87,15 @@
+@@ -74,11 +87,15 @@ Supported PROGRAM values:
lex create \`lex.yy.c', if possible, from existing .c
makeinfo touch the output file
tar try tar, gnutar, gtar, then tar without non-portable flags
@@ -1569,7 +1569,7 @@
;;
-*)
-@@ -87,14 +104,44 @@
+@@ -87,14 +104,44 @@ Supported PROGRAM values:
exit 1
;;
@@ -1616,7 +1616,7 @@
you modified \`acinclude.m4' or \`${configure_ac}'. You might want
to install the \`Automake' and \`Perl' packages. Grab them from
any GNU archive site."
-@@ -102,13 +149,8 @@
+@@ -102,13 +149,8 @@ WARNING: \`$1' is missing on your system
;;
autoconf)
@@ -1631,7 +1631,7 @@
you modified \`${configure_ac}'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
archive site."
-@@ -116,13 +158,8 @@
+@@ -116,13 +158,8 @@ WARNING: \`$1' is missing on your system
;;
autoheader)
@@ -1646,7 +1646,7 @@
you modified \`acconfig.h' or \`${configure_ac}'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them
from any GNU archive site."
-@@ -130,7 +167,7 @@
+@@ -130,7 +167,7 @@ WARNING: \`$1' is missing on your system
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
@@ -1655,7 +1655,7 @@
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
-@@ -140,13 +177,8 @@
+@@ -140,13 +177,8 @@ WARNING: \`$1' is missing on your system
;;
automake*)
@@ -1670,7 +1670,7 @@
you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
You might want to install the \`Automake' and \`Perl' packages.
Grab them from any GNU archive site."
-@@ -156,20 +188,15 @@
+@@ -156,20 +188,15 @@ WARNING: \`$1' is missing on your system
;;
autom4te)
@@ -1696,7 +1696,7 @@
if test -f "$file"; then
touch $file
else
-@@ -185,74 +212,67 @@
+@@ -185,74 +212,67 @@ WARNING: \`$1' is needed, and you do not
bison|yacc)
echo 1>&2 "\
@@ -1787,7 +1787,7 @@
touch $file
else
test -z "$file" || exec >$file
-@@ -262,32 +282,36 @@
+@@ -262,32 +282,36 @@ WARNING: \`$1' is missing on your system
;;
makeinfo)
@@ -1838,7 +1838,7 @@
# We have already tried tar in the generic part.
# Look for gnutar/gtar before invocation to avoid ugly error
-@@ -300,13 +324,13 @@
+@@ -300,13 +324,13 @@ WARNING: \`$1' is missing on your system
fi
firstarg="$1"
if shift; then
@@ -1854,7 +1854,7 @@
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
-@@ -323,10 +347,10 @@
+@@ -323,10 +347,10 @@ WARNING: I can't seem to be able to run
*)
echo 1>&2 "\
@@ -1868,7 +1868,7 @@
this package. You may also peek at any GNU archive site, in case
some other package would contain this missing \`$1' program."
exit 1
-@@ -334,3 +358,10 @@
+@@ -334,3 +358,10 @@ WARNING: \`$1' is needed, and you do not
esac
exit 0
@@ -1925,7 +1925,7 @@
;;
-m) # -m PERM arg
shift
-@@ -23,6 +38,10 @@
+@@ -23,6 +38,10 @@ while test $# -gt 0 ; do
dirmode=$1
shift
;;
@@ -1936,7 +1936,7 @@
--) # stop option processing
shift
break
-@@ -50,30 +69,58 @@
+@@ -50,30 +69,58 @@ case $# in
0) exit 0 ;;
esac
@@ -2000,7 +2000,7 @@
case $pathcomp in
-*) pathcomp=./$pathcomp ;;
esac
-@@ -84,21 +131,21 @@
+@@ -84,21 +131,21 @@ do
mkdir "$pathcomp" || lasterr=$?
if test ! -d "$pathcomp"; then
@@ -2031,7 +2031,7 @@
done
done
-@@ -107,5 +154,8 @@
+@@ -107,5 +154,8 @@ exit $errstatus
# Local Variables:
# mode: shell-script
# sh-indentation: 2
@@ -2155,7 +2155,7 @@
done
# The program to run.
-@@ -67,77 +94,130 @@
+@@ -67,77 +94,130 @@ prog="$1"
shift
# Make any relative path in $prog absolute.
case "$prog" in
Modified: kde-extras/taskjuggler/trunk/debian/patches/03_libtool_update.diff
===================================================================
--- kde-extras/taskjuggler/trunk/debian/patches/03_libtool_update.diff 2009-07-15 23:00:45 UTC (rev 15295)
+++ kde-extras/taskjuggler/trunk/debian/patches/03_libtool_update.diff 2009-07-16 08:07:32 UTC (rev 15296)
@@ -35,7 +35,7 @@
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -82,7 +67,7 @@
+@@ -82,7 +67,7 @@ AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -44,7 +44,7 @@
AC_SUBST(LIBTOOL)dnl
# Prevent multiple expansion
-@@ -110,7 +95,6 @@
+@@ -110,7 +95,6 @@ AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
AC_REQUIRE([AC_OBJEXT])dnl
AC_REQUIRE([AC_EXEEXT])dnl
dnl
@@ -52,7 +52,7 @@
AC_LIBTOOL_SYS_MAX_CMD_LEN
AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
AC_LIBTOOL_OBJDIR
-@@ -132,7 +116,7 @@
+@@ -132,7 +116,7 @@ esac
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -61,7 +61,7 @@
[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
# Same as above, but do not quote variable references.
-@@ -152,7 +136,7 @@
+@@ -152,7 +136,7 @@ rm="rm -f"
default_ofile=libtool
can_build_shared=yes
@@ -70,7 +70,7 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -172,6 +156,7 @@
+@@ -172,6 +156,7 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
test -z "$AS" && AS=as
test -z "$CC" && CC=cc
test -z "$LTCC" && LTCC=$CC
@@ -78,7 +78,7 @@
test -z "$DLLTOOL" && DLLTOOL=dlltool
test -z "$LD" && LD=ld
test -z "$LN_S" && LN_S="ln -s"
-@@ -184,22 +169,24 @@
+@@ -184,22 +169,24 @@ test -z "$STRIP" && STRIP=:
test -z "$ac_objext" && ac_objext=o
# Determine commands to create old-style static archives.
@@ -106,7 +106,7 @@
# Only perform the check for file, if the check method requires it
case $deplibs_check_method in
file_magic*)
-@@ -209,6 +196,8 @@
+@@ -209,6 +196,8 @@ file_magic*)
;;
esac
@@ -115,7 +115,7 @@
AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
enable_win32_dll=yes, enable_win32_dll=no)
-@@ -240,11 +229,129 @@
+@@ -240,11 +229,129 @@ AC_DEFUN([_LT_AC_SYS_COMPILER],
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -245,7 +245,7 @@
# _LT_AC_SYS_LIBPATH_AIX
# ----------------------
# Links a minimal program and checks the executable
-@@ -254,12 +361,20 @@
+@@ -254,12 +361,20 @@ compiler=$CC
# If we don't find anything, use the default library path according
# to the aix ld manual.
AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
@@ -271,7 +271,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
])# _LT_AC_SYS_LIBPATH_AIX
-@@ -317,15 +432,15 @@
+@@ -317,15 +432,15 @@ fi
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
@@ -290,7 +290,7 @@
(test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
then
break
-@@ -490,18 +605,21 @@
+@@ -490,18 +605,21 @@ ia64-*-hpux*)
rm -rf conftest*
;;
@@ -316,7 +316,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -513,8 +631,10 @@
+@@ -513,8 +631,10 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*li
esac
;;
*64-bit*)
@@ -328,7 +328,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
-@@ -547,6 +667,26 @@
+@@ -547,6 +667,26 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*li
CFLAGS="$SAVE_CFLAGS"
fi
;;
@@ -355,7 +355,7 @@
AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-@@ -570,7 +710,7 @@
+@@ -570,7 +710,7 @@ AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
AC_CACHE_CHECK([$1], [$2],
[$2=no
ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
@@ -364,7 +364,7 @@
lt_compiler_flag="$3"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -578,7 +718,7 @@
+@@ -578,7 +718,7 @@ AC_CACHE_CHECK([$1], [$2],
# 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 \
@@ -373,7 +373,7 @@
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -588,8 +728,10 @@
+@@ -588,8 +728,10 @@ AC_CACHE_CHECK([$1], [$2],
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
@@ -386,7 +386,7 @@
$2=yes
fi
fi
-@@ -609,22 +751,28 @@
+@@ -609,22 +751,28 @@ fi
# ------------------------------------------------------------
# Check whether the given compiler option works
AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
@@ -419,7 +419,7 @@
LDFLAGS="$save_LDFLAGS"
])
-@@ -643,7 +791,7 @@
+@@ -643,7 +791,7 @@ AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
AC_MSG_CHECKING([the maximum length of command line arguments])
AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
i=0
@@ -428,7 +428,7 @@
case $build_os in
msdosdjgpp*)
-@@ -672,24 +820,77 @@
+@@ -672,24 +820,77 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
lt_cv_sys_max_cmd_len=8192;
;;
@@ -524,7 +524,7 @@
;;
esac
])
-@@ -702,7 +903,7 @@
+@@ -702,7 +903,7 @@ fi
# _LT_AC_CHECK_DLFCN
@@ -533,7 +533,7 @@
AC_DEFUN([_LT_AC_CHECK_DLFCN],
[AC_CHECK_HEADERS(dlfcn.h)dnl
])# _LT_AC_CHECK_DLFCN
-@@ -710,7 +911,7 @@
+@@ -710,7 +911,7 @@ AC_DEFUN([_LT_AC_CHECK_DLFCN],
# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
@@ -542,7 +542,7 @@
AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
if test "$cross_compiling" = yes; then :
-@@ -776,17 +977,19 @@
+@@ -776,17 +977,19 @@ int main ()
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -564,7 +564,7 @@
esac
else :
# compilation failed
-@@ -798,7 +1001,7 @@
+@@ -798,7 +1001,7 @@ rm -fr conftest*
# AC_LIBTOOL_DLOPEN_SELF
@@ -573,7 +573,7 @@
AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
if test "x$enable_dlopen" != xyes; then
-@@ -835,12 +1038,12 @@
+@@ -835,12 +1038,12 @@ else
lt_cv_dlopen_self=yes
])
;;
@@ -588,7 +588,7 @@
[AC_CHECK_FUNC([dlopen],
[lt_cv_dlopen="dlopen"],
[AC_CHECK_LIB([dl], [dlopen],
-@@ -848,7 +1051,7 @@
+@@ -848,7 +1051,7 @@ else
[AC_CHECK_LIB([svld], [dlopen],
[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
[AC_CHECK_LIB([dld], [dld_link],
@@ -597,7 +597,7 @@
])
])
])
-@@ -869,7 +1072,7 @@
+@@ -869,7 +1072,7 @@ else
test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
save_LDFLAGS="$LDFLAGS"
@@ -606,7 +606,7 @@
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
-@@ -882,7 +1085,7 @@
+@@ -882,7 +1085,7 @@ else
])
if test "x$lt_cv_dlopen_self" = xyes; then
@@ -615,7 +615,7 @@
AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
lt_cv_dlopen_self_static, [dnl
_LT_AC_TRY_DLOPEN_SELF(
-@@ -914,7 +1117,8 @@
+@@ -914,7 +1117,8 @@ fi
# ---------------------------------
# Check to see if options -c and -o are simultaneously supported by compiler
AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
@@ -625,7 +625,7 @@
AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
[_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
[_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-@@ -922,14 +1126,7 @@
+@@ -922,14 +1126,7 @@ AC_CACHE_CHECK([if $compiler supports -c
mkdir conftest
cd conftest
mkdir out
@@ -641,7 +641,7 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -937,7 +1134,7 @@
+@@ -937,7 +1134,7 @@ AC_CACHE_CHECK([if $compiler supports -c
# 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 \
@@ -650,7 +650,7 @@
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -949,13 +1146,18 @@
+@@ -949,13 +1146,18 @@ AC_CACHE_CHECK([if $compiler supports -c
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -673,7 +673,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -1014,8 +1216,8 @@
+@@ -1014,8 +1216,8 @@ AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LI
[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)" || \
@@ -684,7 +684,7 @@
# We can hardcode non-existant directories.
if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-@@ -1064,6 +1266,7 @@
+@@ -1064,6 +1266,7 @@ else
darwin*)
if test -n "$STRIP" ; then
striplib="$STRIP -x"
@@ -692,7 +692,7 @@
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
-@@ -1072,7 +1275,7 @@
+@@ -1072,7 +1275,7 @@ fi
*)
AC_MSG_RESULT([no])
;;
@@ -701,7 +701,7 @@
fi
])# AC_LIBTOOL_SYS_LIB_STRIP
-@@ -1081,11 +1284,12 @@
+@@ -1081,11 +1284,12 @@ fi
# -----------------------------
# PORTME Fill in your ld.so characteristics
AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
@@ -716,7 +716,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -1095,7 +1299,58 @@
+@@ -1095,7 +1299,58 @@ shlibpath_overrides_runpath=unknown
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -776,7 +776,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -1113,7 +1368,7 @@
+@@ -1113,7 +1368,7 @@ aix3*)
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -785,7 +785,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -1160,7 +1415,7 @@
+@@ -1160,7 +1415,7 @@ aix4* | aix5*)
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -794,7 +794,7 @@
;;
beos*)
-@@ -1169,7 +1424,7 @@
+@@ -1169,7 +1424,7 @@ beos*)
shlibpath_var=LIBRARY_PATH
;;
@@ -803,7 +803,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -1185,7 +1440,7 @@
+@@ -1185,7 +1440,7 @@ bsdi4*)
cygwin* | mingw* | pw32*)
version_type=windows
@@ -812,7 +812,7 @@
need_version=no
need_lib_prefix=no
-@@ -1197,7 +1452,8 @@
+@@ -1197,7 +1452,8 @@ cygwin* | mingw* | pw32*)
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -822,7 +822,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -1227,7 +1483,7 @@
+@@ -1227,7 +1483,7 @@ cygwin* | mingw* | pw32*)
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -831,7 +831,7 @@
;;
esac
;;
-@@ -1250,13 +1506,9 @@
+@@ -1250,13 +1506,9 @@ darwin* | rhapsody*)
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -848,7 +848,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -1273,20 +1525,17 @@
+@@ -1273,20 +1525,17 @@ freebsd1*)
dynamic_linker=no
;;
@@ -880,7 +880,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -1304,14 +1553,19 @@
+@@ -1304,14 +1553,19 @@ freebsd*)
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -902,7 +902,7 @@
esac
;;
-@@ -1331,9 +1585,9 @@
+@@ -1331,9 +1585,9 @@ hpux9* | hpux10* | hpux11*)
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -914,7 +914,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -1348,7 +1602,7 @@
+@@ -1348,7 +1602,7 @@ hpux9* | hpux10* | hpux11*)
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -923,7 +923,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -1359,7 +1613,7 @@
+@@ -1359,7 +1613,7 @@ hpux9* | hpux10* | hpux11*)
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -932,7 +932,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -1371,6 +1625,18 @@
+@@ -1371,6 +1625,18 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib'
;;
@@ -951,7 +951,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -1414,29 +1680,26 @@
+@@ -1414,29 +1680,26 @@ linux*oldld* | linux*aout* | linux*coff*
;;
# This must be Linux ELF.
@@ -988,7 +988,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,
-@@ -1446,6 +1709,18 @@
+@@ -1446,6 +1709,18 @@ linux*)
dynamic_linker='GNU/Linux ld.so'
;;
@@ -1007,7 +1007,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -1455,7 +1730,7 @@
+@@ -1455,7 +1730,7 @@ netbsd*)
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -1016,7 +1016,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -1483,8 +1758,13 @@
+@@ -1483,8 +1758,13 @@ nto-qnx*)
openbsd*)
version_type=sunos
@@ -1031,7 +1031,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
-@@ -1504,7 +1784,7 @@
+@@ -1504,7 +1784,7 @@ openbsd*)
os2*)
libname_spec='$name'
@@ -1040,7 +1040,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -1522,11 +1802,8 @@
+@@ -1522,11 +1802,8 @@ osf3* | osf4* | osf5*)
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -1054,7 +1054,7 @@
;;
solaris*)
-@@ -1554,7 +1831,7 @@
+@@ -1554,7 +1831,7 @@ sunos4*)
need_version=yes
;;
@@ -1063,7 +1063,7 @@
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'
-@@ -1587,6 +1864,29 @@
+@@ -1587,6 +1864,29 @@ sysv4*MP*)
fi
;;
@@ -1093,7 +1093,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -1600,13 +1900,26 @@
+@@ -1600,13 +1900,26 @@ uts4*)
esac
AC_MSG_RESULT([$dynamic_linker])
test "$dynamic_linker" = no && can_build_shared=no
@@ -1121,7 +1121,7 @@
[AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
[include additional configurations @<:@automatic@:>@])],
[tagnames="$withval"])
-@@ -1624,6 +1937,9 @@
+@@ -1624,6 +1937,9 @@ if test -f "$ltmain" && test -n "$tagnam
AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
fi
fi
@@ -1131,7 +1131,7 @@
# Extract list of available tagged configurations in $ofile.
# Note that this assumes the entire list is on one line.
-@@ -1650,7 +1966,9 @@
+@@ -1650,7 +1966,9 @@ if test -f "$ltmain" && test -n "$tagnam
case $tagname in
CXX)
@@ -1142,7 +1142,7 @@
AC_LIBTOOL_LANG_CXX_CONFIG
else
tagname=""
-@@ -1712,7 +2030,7 @@
+@@ -1712,7 +2030,7 @@ AC_DEFUN([AC_LIBTOOL_DLOPEN],
# AC_LIBTOOL_WIN32_DLL
# --------------------
@@ -1151,7 +1151,7 @@
AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
])# AC_LIBTOOL_WIN32_DLL
-@@ -1750,7 +2068,7 @@
+@@ -1750,7 +2068,7 @@ AC_ARG_ENABLE([shared],
# AC_DISABLE_SHARED
# -----------------
@@ -1160,7 +1160,7 @@
AC_DEFUN([AC_DISABLE_SHARED],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
AC_ENABLE_SHARED(no)
-@@ -1862,7 +2180,7 @@
+@@ -1862,7 +2180,7 @@ m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC
# AC_PATH_TOOL_PREFIX
# -------------------
@@ -1169,7 +1169,7 @@
AC_DEFUN([AC_PATH_TOOL_PREFIX],
[AC_REQUIRE([AC_PROG_EGREP])dnl
AC_MSG_CHECKING([for $1])
-@@ -1886,7 +2204,7 @@
+@@ -1886,7 +2204,7 @@ dnl not every word. This closes a longs
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -1178,7 +1178,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
-@@ -1925,7 +2243,7 @@
+@@ -1925,7 +2243,7 @@ fi
# AC_PATH_MAGIC
# -------------
@@ -1187,7 +1187,7 @@
AC_DEFUN([AC_PATH_MAGIC],
[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
if test -z "$lt_cv_path_MAGIC_CMD"; then
-@@ -1996,7 +2314,7 @@
+@@ -1996,7 +2314,7 @@ AC_CACHE_VAL(lt_cv_path_LD,
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,
@@ -1196,7 +1196,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'*)
-@@ -2028,7 +2346,7 @@
+@@ -2028,7 +2346,7 @@ AC_PROG_LD_GNU
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,
@@ -1205,7 +1205,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -2055,6 +2373,15 @@
+@@ -2055,6 +2373,15 @@ case $reload_flag in
*) reload_flag=" $reload_flag" ;;
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -1221,7 +1221,7 @@
])# AC_PROG_LD_RELOAD_FLAG
-@@ -2063,7 +2390,7 @@
+@@ -2063,7 +2390,7 @@ reload_cmds='$LD$reload_flag -o $output$
# how to check for library dependencies
# -- PORTME fill in with the dynamic library characteristics
AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
@@ -1230,7 +1230,7 @@
lt_cv_deplibs_check_method,
[lt_cv_file_magic_cmd='$MAGIC_CMD'
lt_cv_file_magic_test_file=
-@@ -2080,7 +2407,7 @@
+@@ -2080,7 +2407,7 @@ lt_cv_deplibs_check_method='unknown'
# whether `pass_all' will *always* work, you probably want this one.
case $host_os in
@@ -1239,7 +1239,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -2088,44 +2415,42 @@
+@@ -2088,44 +2415,42 @@ beos*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -1301,7 +1301,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -2141,7 +2466,7 @@
+@@ -2141,7 +2466,7 @@ gnu*)
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -1310,7 +1310,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
-@@ -2157,43 +2482,27 @@
+@@ -2157,43 +2482,27 @@ hpux10.20* | hpux11*)
esac
;;
@@ -1367,7 +1367,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
-@@ -2212,32 +2521,26 @@
+@@ -2212,32 +2521,26 @@ nto-qnx*)
;;
openbsd*)
@@ -1404,7 +1404,7 @@
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]]'
-@@ -2258,10 +2561,13 @@
+@@ -2258,10 +2561,13 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
siemens)
lt_cv_deplibs_check_method=pass_all
;;
@@ -1419,7 +1419,7 @@
lt_cv_deplibs_check_method=pass_all
;;
esac
-@@ -2281,36 +2587,43 @@
+@@ -2281,36 +2587,43 @@ AC_DEFUN([AC_PROG_NM],
# Let the user override the test.
lt_cv_path_NM="$NM"
else
@@ -1487,7 +1487,7 @@
test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
fi])
NM="$lt_cv_path_NM"
-@@ -2342,13 +2655,13 @@
+@@ -2342,13 +2655,13 @@ esac
# -----------------------------------
# sets LIBLTDL to the link flags for the libltdl convenience library and
# LTDLINCL to the include flags for the libltdl header and adds
@@ -1508,7 +1508,7 @@
AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
case $enable_ltdl_convenience in
-@@ -2367,13 +2680,13 @@
+@@ -2367,13 +2680,13 @@ AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
# -----------------------------------
# sets LIBLTDL to the link flags for the libltdl installable library and
# LTDLINCL to the include flags for the libltdl header and adds
@@ -1529,7 +1529,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
-@@ -2411,10 +2724,21 @@
+@@ -2411,10 +2724,21 @@ AC_DEFUN([AC_LIBTOOL_CXX],
# ---------------
AC_DEFUN([_LT_AC_LANG_CXX],
[AC_REQUIRE([AC_PROG_CXX])
@@ -1552,7 +1552,7 @@
# AC_LIBTOOL_F77
# --------------
-@@ -2454,7 +2778,7 @@
+@@ -2454,7 +2778,7 @@ _LT_AC_SHELL_INIT([tagnames=${tagnames+$
# AC_LIBTOOL_RC
@@ -1561,7 +1561,7 @@
# enable support for Windows resource files
AC_DEFUN([AC_LIBTOOL_RC],
[AC_REQUIRE([LT_AC_PROG_RC])
-@@ -2480,43 +2804,16 @@
+@@ -2480,43 +2804,16 @@ objext=o
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -1610,7 +1610,7 @@
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
-@@ -2530,9 +2827,9 @@
+@@ -2530,9 +2827,9 @@ AC_LIBTOOL_PROG_LD_SHLIBS($1)
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
AC_LIBTOOL_SYS_LIB_STRIP
@@ -1622,7 +1622,7 @@
AC_MSG_CHECKING([if libtool supports shared libraries])
AC_MSG_RESULT([$can_build_shared])
-@@ -2541,7 +2838,7 @@
+@@ -2541,7 +2838,7 @@ test "$can_build_shared" = "no" && enabl
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -1631,7 +1631,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -2550,37 +2847,11 @@
+@@ -2550,37 +2847,11 @@ aix3*)
fi
;;
@@ -1671,7 +1671,7 @@
esac
AC_MSG_RESULT([$enable_shared])
-@@ -2605,7 +2876,7 @@
+@@ -2605,7 +2876,7 @@ AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [
AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
[AC_LANG_PUSH(C++)
AC_REQUIRE([AC_PROG_CXX])
@@ -1680,7 +1680,7 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -2617,6 +2888,7 @@
+@@ -2617,6 +2888,7 @@ _LT_AC_TAGVAR(hardcode_libdir_flag_spec,
_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
@@ -1688,7 +1688,7 @@
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-@@ -2632,23 +2904,28 @@
+@@ -2632,23 +2904,28 @@ _LT_AC_TAGVAR(postdep_objects, $1)=
_LT_AC_TAGVAR(predeps, $1)=
_LT_AC_TAGVAR(postdeps, $1)=
_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
@@ -1720,7 +1720,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -2659,18 +2936,18 @@
+@@ -2659,18 +2936,18 @@ lt_save_path_LD=$lt_cv_path_LD
if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
else
@@ -1742,7 +1742,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -2688,8 +2965,8 @@
+@@ -2688,8 +2965,8 @@ if test "$GXX" = yes; then
# 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
@@ -1753,7 +1753,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -2715,7 +2992,7 @@
+@@ -2715,7 +2992,7 @@ if test "$GXX" = yes; then
# 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.
@@ -1762,7 +1762,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -2737,7 +3014,7 @@
+@@ -2737,7 +3014,7 @@ case $host_os in
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -1771,7 +1771,7 @@
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
-@@ -2745,8 +3022,23 @@
+@@ -2745,8 +3022,23 @@ case $host_os in
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -1797,7 +1797,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -2763,7 +3055,7 @@
+@@ -2763,7 +3055,7 @@ case $host_os in
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GXX" = yes; then
@@ -1806,7 +1806,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`
-@@ -2771,7 +3063,7 @@
+@@ -2771,7 +3063,7 @@ case $host_os in
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -1815,7 +1815,7 @@
else
# We have old collect2
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -2782,8 +3074,12 @@
+@@ -2782,8 +3074,12 @@ case $host_os in
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
fi
@@ -1828,7 +1828,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -2792,15 +3088,16 @@
+@@ -2792,15 +3088,16 @@ case $host_os in
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -1849,7 +1849,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.
-@@ -2809,13 +3106,12 @@
+@@ -2809,13 +3106,12 @@ case $host_os in
_LT_AC_SYS_LIBPATH_AIX
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -1865,7 +1865,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -2824,16 +3120,26 @@
+@@ -2824,16 +3120,26 @@ case $host_os in
# -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'
@@ -1897,7 +1897,7 @@
chorus*)
case $cc_basename in
*)
-@@ -2847,12 +3153,12 @@
+@@ -2847,12 +3153,12 @@ case $host_os in
# _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'
@@ -1912,7 +1912,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
-@@ -2861,59 +3167,53 @@
+@@ -2861,59 +3167,53 @@ case $host_os in
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -2009,7 +2009,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -2924,14 +3224,14 @@
+@@ -2924,14 +3224,14 @@ case $host_os in
;;
esac
;;
@@ -2026,7 +2026,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -2948,12 +3248,12 @@
+@@ -2948,12 +3248,12 @@ case $host_os in
# location of the library.
case $cc_basename in
@@ -2042,7 +2042,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -2962,11 +3262,11 @@
+@@ -2962,11 +3262,11 @@ case $host_os in
# 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.
@@ -2056,7 +2056,7 @@
else
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -2976,34 +3276,21 @@
+@@ -2976,34 +3276,21 @@ case $host_os in
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -2098,7 +2098,7 @@
*)
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-@@ -3013,17 +3300,20 @@
+@@ -3013,17 +3300,20 @@ case $host_os in
esac
case $cc_basename in
@@ -2125,7 +2125,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -3039,12 +3329,15 @@
+@@ -3039,12 +3329,15 @@ case $host_os in
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -2145,7 +2145,7 @@
;;
esac
fi
-@@ -3055,11 +3348,25 @@
+@@ -3055,11 +3348,25 @@ case $host_os in
;;
esac
;;
@@ -2173,7 +2173,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -3070,9 +3377,9 @@
+@@ -3070,9 +3377,9 @@ case $host_os in
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -2185,7 +2185,7 @@
fi
fi
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -3081,16 +3388,16 @@
+@@ -3081,16 +3388,16 @@ case $host_os in
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
;;
@@ -2206,7 +2206,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -3108,20 +3415,44 @@
+@@ -3108,20 +3415,44 @@ case $host_os in
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -2257,7 +2257,7 @@
runpath_var=LD_RUN_PATH
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -3137,6 +3468,29 @@
+@@ -3137,6 +3468,29 @@ case $host_os in
# dependencies.
output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
;;
@@ -2287,7 +2287,7 @@
esac
;;
lynxos*)
-@@ -3149,7 +3503,7 @@
+@@ -3149,7 +3503,7 @@ case $host_os in
;;
mvs*)
case $cc_basename in
@@ -2296,7 +2296,7 @@
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
-@@ -3159,7 +3513,7 @@
+@@ -3159,7 +3513,7 @@ case $host_os in
;;
esac
;;
@@ -2305,7 +2305,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=
-@@ -3170,15 +3524,35 @@
+@@ -3170,15 +3524,35 @@ case $host_os in
# 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::"'
;;
@@ -2343,7 +2343,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -3188,14 +3562,14 @@
+@@ -3188,14 +3562,14 @@ case $host_os in
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -2361,7 +2361,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -3213,7 +3587,7 @@
+@@ -3213,7 +3587,7 @@ case $host_os in
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -2370,7 +2370,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -3232,13 +3606,13 @@
+@@ -3232,13 +3606,13 @@ case $host_os in
;;
osf4* | osf5*)
case $cc_basename in
@@ -2386,7 +2386,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -3247,17 +3621,17 @@
+@@ -3247,17 +3621,17 @@ case $host_os in
# the KAI C++ compiler.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
;;
@@ -2408,7 +2408,7 @@
$rm $lib.exp'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -3276,7 +3650,7 @@
+@@ -3276,7 +3650,7 @@ case $host_os in
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -2417,7 +2417,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -3297,27 +3671,14 @@
+@@ -3297,27 +3671,14 @@ case $host_os in
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -2447,7 +2447,7 @@
# Lucid
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -3330,36 +3691,28 @@
+@@ -3330,36 +3691,28 @@ case $host_os in
;;
solaris*)
case $cc_basename in
@@ -2493,7 +2493,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -3367,9 +3720,9 @@
+@@ -3367,9 +3720,9 @@ case $host_os in
# in the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
;;
@@ -2505,7 +2505,7 @@
# The C++ compiler must be used to create the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -3379,9 +3732,9 @@
+@@ -3379,9 +3732,9 @@ case $host_os in
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
@@ -2517,7 +2517,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -3390,9 +3743,9 @@
+@@ -3390,9 +3743,9 @@ case $host_os in
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -2529,7 +2529,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -3401,16 +3754,73 @@
+@@ -3401,16 +3754,73 @@ case $host_os in
fi
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
@@ -2605,7 +2605,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -3447,8 +3857,6 @@
+@@ -3447,8 +3857,6 @@ AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
AC_LIBTOOL_PROG_LD_SHLIBS($1)
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2614,7 +2614,7 @@
AC_LIBTOOL_CONFIG($1)
-@@ -3466,12 +3874,13 @@
+@@ -3466,12 +3874,13 @@ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
])# AC_LIBTOOL_LANG_CXX_CONFIG
# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
@@ -2630,7 +2630,7 @@
dnl we can't use the lt_simple_compile_test_code here,
dnl because it contains code intended for an executable,
dnl not a library. It's possible we should let each
-@@ -3520,7 +3929,7 @@
+@@ -3520,7 +3929,7 @@ if AC_TRY_EVAL(ac_compile); then
# 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.
@@ -2639,7 +2639,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -3560,7 +3969,7 @@
+@@ -3560,7 +3969,7 @@ if AC_TRY_EVAL(ac_compile); then
fi
;;
@@ -2648,7 +2648,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -3596,13 +4005,74 @@
+@@ -3596,13 +4005,74 @@ fi
$rm -f confest.$objext
@@ -2724,7 +2724,7 @@
# 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'.
-@@ -3638,20 +4108,31 @@
+@@ -3638,20 +4108,31 @@ objext=o
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -2759,7 +2759,7 @@
AC_MSG_CHECKING([if libtool supports shared libraries])
AC_MSG_RESULT([$can_build_shared])
-@@ -3661,7 +4142,7 @@
+@@ -3661,7 +4142,7 @@ test "$can_build_shared" = "no" && enabl
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -2768,7 +2768,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -3669,8 +4150,10 @@
+@@ -3669,8 +4150,10 @@ aix3*)
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -2781,7 +2781,7 @@
;;
esac
AC_MSG_RESULT([$enable_shared])
-@@ -3680,8 +4163,6 @@
+@@ -3680,8 +4163,6 @@ AC_MSG_CHECKING([whether to build static
test "$enable_shared" = yes || enable_static=yes
AC_MSG_RESULT([$enable_static])
@@ -2790,7 +2790,7 @@
_LT_AC_TAGVAR(GCC, $1)="$G77"
_LT_AC_TAGVAR(LD, $1)="$LD"
-@@ -3691,8 +4172,6 @@
+@@ -3691,8 +4172,6 @@ AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
AC_LIBTOOL_PROG_LD_SHLIBS($1)
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2799,7 +2799,7 @@
AC_LIBTOOL_CONFIG($1)
-@@ -3718,23 +4197,30 @@
+@@ -3718,23 +4197,30 @@ objext=o
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -2832,7 +2832,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
-@@ -3746,8 +4232,6 @@
+@@ -3746,8 +4232,6 @@ AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
AC_LIBTOOL_PROG_LD_SHLIBS($1)
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2841,7 +2841,7 @@
AC_LIBTOOL_CONFIG($1)
-@@ -3757,7 +4241,7 @@
+@@ -3757,7 +4241,7 @@ CC="$lt_save_CC"
# AC_LIBTOOL_LANG_RC_CONFIG
@@ -2850,7 +2850,7 @@
# 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'.
-@@ -3773,7 +4257,7 @@
+@@ -3773,7 +4257,7 @@ objext=o
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -2859,7 +2859,7 @@
# Code to be used in simple link tests
lt_simple_link_test_code="$lt_simple_compile_test_code"
-@@ -3781,11 +4265,16 @@
+@@ -3781,11 +4265,16 @@ lt_simple_link_test_code="$lt_simple_com
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -2876,7 +2876,7 @@
_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
AC_LIBTOOL_CONFIG($1)
-@@ -3811,11 +4300,12 @@
+@@ -3811,11 +4300,12 @@ if test -f "$ltmain"; then
# without removal of \ escapes.
if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
@@ -2891,7 +2891,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 \
-@@ -3841,6 +4331,7 @@
+@@ -3841,6 +4331,7 @@ if test -f "$ltmain"; then
_LT_AC_TAGVAR(predeps, $1) \
_LT_AC_TAGVAR(postdeps, $1) \
_LT_AC_TAGVAR(compiler_lib_search_path, $1) \
@@ -2899,7 +2899,7 @@
_LT_AC_TAGVAR(archive_cmds, $1) \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) \
_LT_AC_TAGVAR(postinstall_cmds, $1) \
-@@ -3856,6 +4347,7 @@
+@@ -3856,6 +4347,7 @@ if test -f "$ltmain"; then
_LT_AC_TAGVAR(module_cmds, $1) \
_LT_AC_TAGVAR(module_expsym_cmds, $1) \
_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
@@ -2907,7 +2907,7 @@
_LT_AC_TAGVAR(exclude_expsyms, $1) \
_LT_AC_TAGVAR(include_expsyms, $1); do
-@@ -3865,7 +4357,7 @@
+@@ -3865,7 +4357,7 @@ if test -f "$ltmain"; then
_LT_AC_TAGVAR(archive_cmds, $1) | \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
_LT_AC_TAGVAR(module_cmds, $1) | \
@@ -2916,7 +2916,7 @@
_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
_LT_AC_TAGVAR(export_symbols_cmds, $1) | \
extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -3902,7 +4394,7 @@
+@@ -3902,7 +4394,7 @@ ifelse([$1], [],
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
@@ -2925,7 +2925,7 @@
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
-@@ -3931,11 +4423,11 @@
+@@ -3931,11 +4423,11 @@ ifelse([$1], [],
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -2939,7 +2939,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -3966,6 +4458,12 @@
+@@ -3966,6 +4458,12 @@ fast_install=$enable_fast_install
# The host system.
host_alias=$host_alias
host=$host
@@ -2952,7 +2952,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -3977,6 +4475,9 @@
+@@ -3977,6 +4475,9 @@ AR_FLAGS=$lt_AR_FLAGS
# A C compiler.
LTCC=$lt_LTCC
@@ -2962,7 +2962,7 @@
# A language-specific compiler.
CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
-@@ -3996,7 +4497,7 @@
+@@ -3996,7 +4497,7 @@ LN_S=$lt_LN_S
NM=$lt_NM
# A symbol stripping program
@@ -2971,7 +2971,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -4027,7 +4528,7 @@
+@@ -4027,7 +4528,7 @@ objext="$ac_objext"
libext="$libext"
# Shared library suffix (normally ".so").
@@ -2980,7 +2980,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -4042,7 +4543,7 @@
+@@ -4042,7 +4543,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
@@ -2989,7 +2989,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -4130,6 +4631,10 @@
+@@ -4130,6 +4631,10 @@ predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
# shared library.
postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
@@ -3000,7 +3000,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
-@@ -4218,7 +4723,7 @@
+@@ -4218,7 +4723,7 @@ sys_lib_search_path_spec=$lt_sys_lib_sea
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -3009,7 +3009,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
-@@ -4271,7 +4776,10 @@
+@@ -4271,7 +4776,10 @@ else
# 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.
@@ -3021,7 +3021,7 @@
fi
])# AC_LIBTOOL_CONFIG
-@@ -4298,6 +4806,7 @@
+@@ -4298,6 +4806,7 @@ fi
# ---------------------------------
AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
[AC_REQUIRE([AC_CANONICAL_HOST])
@@ -3029,7 +3029,7 @@
AC_REQUIRE([AC_PROG_NM])
AC_REQUIRE([AC_OBJEXT])
# Check for command to grab the raw symbol name followed by C symbol from nm.
-@@ -4313,9 +4822,6 @@
+@@ -4313,9 +4822,6 @@ symcode='[[BCDEGRST]]'
# Regexp to match symbols that can be accessed directly from C.
sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
@@ -3039,7 +3039,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'"
-@@ -4337,14 +4843,30 @@
+@@ -4337,14 +4843,30 @@ hpux*) # Its linker distinguishes data f
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'"
;;
@@ -3072,7 +3072,7 @@
;;
sysv4)
symcode='[[DFNSTU]]'
-@@ -4362,14 +4884,17 @@
+@@ -4362,14 +4884,17 @@ esac
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -3092,7 +3092,7 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -4459,7 +4984,7 @@
+@@ -4459,7 +4984,7 @@ EOF
echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
cat conftest.$ac_ext >&5
fi
@@ -3101,7 +3101,7 @@
# Do not use the global_symbol_pipe unless it works.
if test "$pipe_works" = yes; then
-@@ -4508,13 +5033,16 @@
+@@ -4508,13 +5033,16 @@ AC_MSG_CHECKING([for $compiler option to
# like `-m68040'.
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
;;
@@ -3121,7 +3121,7 @@
;;
darwin* | rhapsody*)
# PIC is the default on this platform
-@@ -4525,6 +5053,10 @@
+@@ -4525,6 +5053,10 @@ AC_MSG_CHECKING([for $compiler option to
# DJGPP does not support shared libraries at all
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
;;
@@ -3132,7 +3132,7 @@
sysv4*MP*)
if test -d /usr/nec; then
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-@@ -4533,7 +5065,7 @@
+@@ -4533,7 +5065,7 @@ AC_MSG_CHECKING([for $compiler option to
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -3141,7 +3141,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -4547,7 +5079,7 @@
+@@ -4547,7 +5079,7 @@ AC_MSG_CHECKING([for $compiler option to
esac
else
case $host_os in
@@ -3150,7 +3150,7 @@
# All AIX code is PIC.
if test "$host_cpu" = ia64; then
# AIX 5 now supports IA64 processor
-@@ -4558,18 +5090,28 @@
+@@ -4558,18 +5090,28 @@ AC_MSG_CHECKING([for $compiler option to
;;
chorus*)
case $cc_basename in
@@ -3182,7 +3182,7 @@
# Green Hills C++ Compiler
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
;;
-@@ -4577,22 +5119,22 @@
+@@ -4577,22 +5119,22 @@ AC_MSG_CHECKING([for $compiler option to
;;
esac
;;
@@ -3211,7 +3211,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -4605,9 +5147,13 @@
+@@ -4605,9 +5147,13 @@ AC_MSG_CHECKING([for $compiler option to
;;
esac
;;
@@ -3226,7 +3226,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.
-@@ -4616,20 +5162,26 @@
+@@ -4616,20 +5162,26 @@ AC_MSG_CHECKING([for $compiler option to
;;
esac
;;
@@ -3258,7 +3258,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -4637,6 +5189,14 @@
+@@ -4637,6 +5189,14 @@ AC_MSG_CHECKING([for $compiler option to
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
*)
@@ -3273,7 +3273,7 @@
;;
esac
;;
-@@ -4646,25 +5206,25 @@
+@@ -4646,25 +5206,25 @@ AC_MSG_CHECKING([for $compiler option to
;;
mvs*)
case $cc_basename in
@@ -3304,7 +3304,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
-@@ -4678,24 +5238,15 @@
+@@ -4678,24 +5238,15 @@ AC_MSG_CHECKING([for $compiler option to
;;
psos*)
;;
@@ -3331,7 +3331,7 @@
# Green Hills C++ Compiler
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
;;
-@@ -4705,12 +5256,12 @@
+@@ -4705,12 +5256,12 @@ AC_MSG_CHECKING([for $compiler option to
;;
sunos4*)
case $cc_basename in
@@ -3346,7 +3346,7 @@
# Lucid
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
;;
-@@ -4720,7 +5271,7 @@
+@@ -4720,7 +5271,7 @@ AC_MSG_CHECKING([for $compiler option to
;;
tandem*)
case $cc_basename in
@@ -3355,7 +3355,7 @@
# NonStop-UX NCC 3.20
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
;;
-@@ -4728,7 +5279,14 @@
+@@ -4728,7 +5279,14 @@ AC_MSG_CHECKING([for $compiler option to
;;
esac
;;
@@ -3371,7 +3371,7 @@
;;
vxworks*)
;;
-@@ -4759,14 +5317,17 @@
+@@ -4759,14 +5317,17 @@ AC_MSG_CHECKING([for $compiler option to
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
;;
@@ -3392,7 +3392,7 @@
;;
darwin* | rhapsody*)
-@@ -4775,6 +5336,11 @@
+@@ -4775,6 +5336,11 @@ AC_MSG_CHECKING([for $compiler option to
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
;;
@@ -3404,7 +3404,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -4791,7 +5357,7 @@
+@@ -4791,7 +5357,7 @@ AC_MSG_CHECKING([for $compiler option to
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -3413,7 +3413,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -4817,18 +5383,29 @@
+@@ -4817,18 +5383,29 @@ AC_MSG_CHECKING([for $compiler option to
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -3446,7 +3446,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -4851,18 +5428,41 @@
+@@ -4851,18 +5428,41 @@ AC_MSG_CHECKING([for $compiler option to
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
@@ -3490,7 +3490,7 @@
esac
;;
-@@ -4872,15 +5472,19 @@
+@@ -4872,15 +5472,19 @@ AC_MSG_CHECKING([for $compiler option to
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
@@ -3514,7 +3514,7 @@
;;
sunos4*)
-@@ -4889,7 +5493,7 @@
+@@ -4889,7 +5493,7 @@ AC_MSG_CHECKING([for $compiler option to
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
@@ -3523,7 +3523,7 @@
_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'
-@@ -4902,6 +5506,17 @@
+@@ -4902,6 +5506,17 @@ AC_MSG_CHECKING([for $compiler option to
fi
;;
@@ -3541,7 +3541,7 @@
uts4*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -4920,7 +5535,7 @@
+@@ -4920,7 +5535,7 @@ AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_co
#
if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
@@ -3550,7 +3550,7 @@
[$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
[case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
"" | " "*) ;;
-@@ -4929,7 +5544,7 @@
+@@ -4929,7 +5544,7 @@ if test -n "$_LT_AC_TAGVAR(lt_prog_compi
[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
fi
@@ -3559,7 +3559,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-@@ -4938,6 +5553,16 @@
+@@ -4938,6 +5553,16 @@ case "$host_os" in
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
;;
esac
@@ -3576,7 +3576,7 @@
])
-@@ -4945,11 +5570,12 @@
+@@ -4945,11 +5570,12 @@ esac
# ------------------------------------
# See if the linker supports building shared libraries.
AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
@@ -3591,7 +3591,7 @@
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-@@ -4962,12 +5588,16 @@
+@@ -4962,12 +5588,16 @@ ifelse([$1],[CXX],[
_LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -3609,7 +3609,7 @@
],[
runpath_var=
_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -4988,7 +5618,7 @@
+@@ -4988,7 +5618,7 @@ ifelse([$1],[CXX],[
_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
@@ -3618,7 +3618,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*
-@@ -4998,14 +5628,17 @@
+@@ -4998,14 +5628,17 @@ ifelse([$1],[CXX],[
# it will be wrapped by ` (' and `)$', so one must not match beginning or
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
# as well as any symbol that contains `d'.
@@ -3638,7 +3638,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
# FIXME: the MSVC++ port hasn't been tested in a loooong time
-@@ -5015,6 +5648,10 @@
+@@ -5015,6 +5648,10 @@ ifelse([$1],[CXX],[
with_gnu_ld=no
fi
;;
@@ -3649,7 +3649,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -5025,9 +5662,30 @@
+@@ -5025,9 +5662,30 @@ ifelse([$1],[CXX],[
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -3681,7 +3681,7 @@
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -5062,7 +5720,7 @@
+@@ -5062,7 +5720,7 @@ EOF
_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
@@ -3690,7 +3690,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -5072,13 +5730,13 @@
+@@ -5072,13 +5730,13 @@ EOF
# _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'
@@ -3707,7 +3707,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
-@@ -5087,23 +5745,79 @@
+@@ -5087,23 +5745,79 @@ EOF
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -3793,7 +3793,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
_LT_AC_TAGVAR(ld_shlibs, $1)=no
cat <<EOF 1>&2
-@@ -5117,13 +5831,40 @@
+@@ -5117,13 +5831,40 @@ EOF
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -3836,7 +3836,7 @@
sunos4*)
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -5133,24 +5874,19 @@
+@@ -5133,24 +5874,19 @@ EOF
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -3868,7 +3868,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -5162,14 +5898,14 @@
+@@ -5162,14 +5898,14 @@ EOF
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
@@ -3885,7 +3885,7 @@
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
-@@ -5184,9 +5920,21 @@
+@@ -5184,9 +5920,21 @@ EOF
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
@@ -3909,7 +3909,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -5203,7 +5951,7 @@
+@@ -5203,7 +5951,7 @@ EOF
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GCC" = yes; then
@@ -3918,7 +3918,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`
-@@ -5211,7 +5959,7 @@
+@@ -5211,7 +5959,7 @@ EOF
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -3927,7 +3927,7 @@
else
# We have old collect2
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -5222,8 +5970,12 @@
+@@ -5222,8 +5970,12 @@ EOF
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
fi
@@ -3940,7 +3940,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -5231,30 +5983,30 @@
+@@ -5231,30 +5983,30 @@ EOF
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -3982,7 +3982,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -5263,13 +6015,11 @@
+@@ -5263,13 +6015,11 @@ EOF
# -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'
@@ -3999,7 +3999,7 @@
fi
fi
;;
-@@ -5282,7 +6032,7 @@
+@@ -5282,7 +6032,7 @@ EOF
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -4008,7 +4008,7 @@
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
;;
-@@ -5292,58 +6042,68 @@
+@@ -5292,58 +6042,68 @@ EOF
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -4113,7 +4113,7 @@
;;
dgux*)
-@@ -5376,8 +6136,8 @@
+@@ -5376,8 +6136,8 @@ EOF
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -4124,7 +4124,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
-@@ -5385,7 +6145,7 @@
+@@ -5385,7 +6145,7 @@ EOF
hpux9*)
if test "$GCC" = yes; then
@@ -4133,7 +4133,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
-@@ -5399,47 +6159,62 @@
+@@ -5399,47 +6159,62 @@ EOF
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
;;
@@ -4220,7 +4220,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-@@ -5453,7 +6228,7 @@
+@@ -5453,7 +6228,7 @@ EOF
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -4229,7 +4229,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'
-@@ -5463,7 +6238,7 @@
+@@ -5463,7 +6238,7 @@ EOF
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -4238,7 +4238,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
-@@ -5483,23 +6258,28 @@
+@@ -5483,23 +6258,28 @@ EOF
;;
openbsd*)
@@ -4283,7 +4283,7 @@
fi
;;
-@@ -5507,14 +6287,14 @@
+@@ -5507,14 +6287,14 @@ EOF
_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
@@ -4300,7 +4300,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'
-@@ -5526,13 +6306,13 @@
+@@ -5526,13 +6306,13 @@ EOF
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}\*'
@@ -4316,7 +4316,7 @@
# Both c and cxx compiler support -rpath directly
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -5540,21 +6320,15 @@
+@@ -5540,21 +6320,15 @@ EOF
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
;;
@@ -4342,7 +4342,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'
-@@ -5563,8 +6337,17 @@
+@@ -5563,8 +6337,17 @@ EOF
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
@@ -4362,7 +4362,7 @@
esac
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
-@@ -5573,7 +6356,7 @@
+@@ -5573,7 +6356,7 @@ EOF
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.
@@ -4371,7 +4371,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -5621,36 +6404,45 @@
+@@ -5621,36 +6404,45 @@ EOF
fi
;;
@@ -4438,7 +4438,7 @@
;;
uts4*)
-@@ -5668,11 +6460,6 @@
+@@ -5668,11 +6460,6 @@ EOF
AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
@@ -4450,7 +4450,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -5692,14 +6479,15 @@
+@@ -5692,14 +6479,15 @@ x|xyes)
# to ld, don't add -lc before -lgcc.
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
@@ -4468,7 +4468,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -5794,6 +6582,30 @@
+@@ -5794,6 +6582,30 @@ AC_DEFUN([LT_AC_PROG_RC],
[AC_CHECK_TOOL(RC, windres, no)
])
@@ -4499,7 +4499,7 @@
############################################################
# NOTE: This macro has been submitted for inclusion into #
# GNU Autoconf as AC_PROG_SED. When it is available in #
-@@ -5816,18 +6628,19 @@
+@@ -5816,18 +6628,19 @@ do
test -z "$as_dir" && as_dir=.
for lt_ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4521,7 +4521,7 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -5854,5 +6667,6 @@
+@@ -5854,5 +6667,6 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xp
done
])
SED=$lt_cv_path_SED
@@ -4584,7 +4584,7 @@
# Check that we have a working $echo.
if test "X$1" = X--no-reexec; then
# Discard the --no-reexec flag, and continue.
-@@ -36,7 +72,7 @@
+@@ -36,7 +72,7 @@ elif test "X`($echo '\t') 2>/dev/null`"
:
else
# Restart under the correct shell, and then maybe $echo will work.
@@ -4593,7 +4593,7 @@
fi
if test "X$1" = X--fallback-echo; then
-@@ -45,19 +81,9 @@
+@@ -45,19 +81,9 @@ if test "X$1" = X--fallback-echo; then
cat <<EOF
$*
EOF
@@ -4614,7 +4614,7 @@
default_mode=
help="Try \`$progname --help' for more information."
magic="%%%MAGIC variable%%%"
-@@ -70,14 +96,15 @@
+@@ -70,14 +96,15 @@ rm="rm -f"
Xsed="${SED}"' -e 1s/^X//'
sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
# test EBCDIC or ASCII
@@ -4637,7 +4637,7 @@
;;
esac
-@@ -86,20 +113,30 @@
+@@ -86,20 +113,30 @@ esac
# These must not be set unconditionally because not all systems understand
# e.g. LANG=C (notably SCO).
# We save the old values to restore during execute mode.
@@ -4675,7 +4675,7 @@
fi
# Global variables.
-@@ -111,17 +148,62 @@
+@@ -111,17 +148,62 @@ run=
show="$echo"
show_help=
execute_dlfiles=
@@ -4739,7 +4739,7 @@
win32_libid_type="unknown"
win32_fileres=`file -L $1 2>/dev/null`
case $win32_fileres in
-@@ -130,17 +212,22 @@
+@@ -130,17 +212,22 @@ win32_libid () {
;;
*ar\ archive*) # could be an import, or static
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
@@ -4770,7 +4770,7 @@
win32_libid_type="x86 DLL"
;;
*executable*) # but shell scripts are "executable" too...
-@@ -154,9 +241,191 @@
+@@ -154,9 +241,191 @@ win32_libid () {
$echo $win32_libid_type
}
@@ -4962,7 +4962,7 @@
# Parse our command line options once, thoroughly.
while test "$#" -gt 0
do
-@@ -176,12 +445,13 @@
+@@ -176,12 +445,13 @@ do
;;
tag)
tagname="$arg"
@@ -4977,7 +4977,7 @@
;;
esac
-@@ -191,10 +461,10 @@
+@@ -191,10 +461,10 @@ do
# not specially marked.
;;
*)
@@ -4990,7 +4990,7 @@
else
$echo "$progname: ignoring unknown tag $tagname" 1>&2
fi
-@@ -218,26 +488,28 @@
+@@ -218,26 +488,28 @@ do
;;
--version)
@@ -5028,7 +5028,7 @@
;;
--dry-run | -n)
-@@ -256,7 +528,7 @@
+@@ -256,7 +528,7 @@ do
else
$echo "disable static libraries"
fi
@@ -5037,7 +5037,7 @@
;;
--finish) mode="finish" ;;
-@@ -268,13 +540,19 @@
+@@ -268,13 +540,19 @@ do
--quiet | --silent)
show=:
@@ -5058,7 +5058,7 @@
;;
-dlopen)
-@@ -285,7 +563,7 @@
+@@ -285,7 +563,7 @@ do
-*)
$echo "$modename: unrecognized option \`$arg'" 1>&2
$echo "$help" 1>&2
@@ -5067,7 +5067,7 @@
;;
*)
-@@ -298,9 +576,21 @@
+@@ -298,9 +576,21 @@ done
if test -n "$prevopt"; then
$echo "$modename: option \`$prevopt' requires an argument" 1>&2
$echo "$help" 1>&2
@@ -5090,7 +5090,7 @@
# If this variable is set in any of the actions, the command in it
# will be execed at the end. This prevents here-documents from being
# left over by shells.
-@@ -311,7 +601,7 @@
+@@ -311,7 +601,7 @@ if test -z "$show_help"; then
# Infer the operation mode.
if test -z "$mode"; then
$echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
@@ -5099,7 +5099,7 @@
case $nonopt in
*cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
mode=link
-@@ -354,7 +644,7 @@
+@@ -354,7 +644,7 @@ if test -z "$show_help"; then
if test -n "$execute_dlfiles" && test "$mode" != execute; then
$echo "$modename: unrecognized option \`-dlopen'" 1>&2
$echo "$help" 1>&2
@@ -5108,7 +5108,7 @@
fi
# Change the help message to a mode-specific one.
-@@ -369,13 +659,15 @@
+@@ -369,13 +659,15 @@ if test -z "$show_help"; then
# Get the compilation command and the source file.
base_compile=
srcfile="$nonopt" # always keep a non-empty value in "srcfile"
@@ -5125,7 +5125,7 @@
arg )
# do not "continue". Instead, add this to base_compile
lastarg="$arg"
-@@ -394,24 +686,19 @@
+@@ -394,24 +686,19 @@ if test -z "$show_help"; then
-o)
if test -n "$libobj" ; then
$echo "$modename: you cannot specify \`-o' more than once" 1>&2
@@ -5155,7 +5155,7 @@
continue
;;
-@@ -424,7 +711,7 @@
+@@ -424,7 +711,7 @@ if test -z "$show_help"; then
args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
lastarg=
save_ifs="$IFS"; IFS=','
@@ -5164,7 +5164,7 @@
IFS="$save_ifs"
# Double-quote args containing other shell metacharacters.
-@@ -462,7 +749,10 @@
+@@ -462,7 +749,10 @@ if test -z "$show_help"; then
case $lastarg in
# Double-quote args containing other shell metacharacters.
# Many Bourne shells cannot handle close brackets correctly
@@ -5176,7 +5176,7 @@
*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
lastarg="\"$lastarg\""
;;
-@@ -474,11 +764,11 @@
+@@ -474,11 +764,11 @@ if test -z "$show_help"; then
case $arg_mode in
arg)
$echo "$modename: you must specify an argument for -Xcompile"
@@ -5190,7 +5190,7 @@
;;
*)
# Get the name of the library object.
-@@ -500,9 +790,11 @@
+@@ -500,9 +790,11 @@ if test -z "$show_help"; then
*.class) xform=class ;;
*.cpp) xform=cpp ;;
*.cxx) xform=cxx ;;
@@ -5203,7 +5203,7 @@
esac
libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
-@@ -511,51 +803,39 @@
+@@ -511,51 +803,39 @@ if test -z "$show_help"; then
*.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
*)
$echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
@@ -5282,7 +5282,7 @@
objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
if test "X$xdir" = "X$obj"; then
-@@ -568,7 +848,7 @@
+@@ -568,7 +848,7 @@ if test -z "$show_help"; then
if test -z "$base_compile"; then
$echo "$modename: you must specify a compilation command" 1>&2
$echo "$help" 1>&2
@@ -5291,7 +5291,7 @@
fi
# Delete any leftover library objects.
-@@ -579,7 +859,7 @@
+@@ -579,7 +859,7 @@ if test -z "$show_help"; then
fi
$run $rm $removelist
@@ -5300,7 +5300,7 @@
# On Cygwin there's no "real" PIC flag so we must build both object types
case $host_os in
-@@ -598,7 +878,7 @@
+@@ -598,7 +878,7 @@ if test -z "$show_help"; then
output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
lockfile="$output_obj.lock"
removelist="$removelist $output_obj $lockfile"
@@ -5309,7 +5309,7 @@
else
output_obj=
need_locks=no
-@@ -608,7 +888,7 @@
+@@ -608,7 +888,7 @@ if test -z "$show_help"; then
# Lock this critical section if it is needed
# We use this script file to make the link, it avoids creating a new file
if test "$need_locks" = yes; then
@@ -5318,7 +5318,7 @@
$show "Waiting for $lockfile to be removed"
sleep 2
done
-@@ -626,14 +906,19 @@
+@@ -626,14 +906,19 @@ avoid parallel builds (make -j) in this
compiler."
$run $rm $removelist
@@ -5340,7 +5340,7 @@
$run $rm "$libobj" "${libobj}T"
-@@ -655,18 +940,18 @@
+@@ -655,18 +940,18 @@ EOF
fbsd_hideous_sh_bug=$base_compile
if test "$pic_mode" != no; then
@@ -5364,7 +5364,7 @@
fi
fi
-@@ -678,10 +963,10 @@
+@@ -678,10 +963,10 @@ EOF
$run $rm "$lobj" "$output_obj"
$show "$command"
@@ -5377,7 +5377,7 @@
fi
if test "$need_locks" = warn &&
-@@ -701,7 +986,7 @@
+@@ -701,7 +986,7 @@ avoid parallel builds (make -j) in this
compiler."
$run $rm $removelist
@@ -5386,7 +5386,7 @@
fi
# Just move the object if needed, then go on to compile the next one
-@@ -722,7 +1007,9 @@
+@@ -722,7 +1007,9 @@ pic_object='$objdir/$objname'
EOF
# Allow error messages only from the first compilation.
@@ -5397,7 +5397,7 @@
else
# No PIC object so indicate it doesn't exist in the libtool
# object file.
-@@ -736,9 +1023,9 @@
+@@ -736,9 +1023,9 @@ EOF
if test "$build_old_libs" = yes; then
if test "$pic_mode" != yes; then
# Don't build PIC code
@@ -5409,7 +5409,7 @@
fi
if test "$compiler_c_o" = yes; then
command="$command -o $obj"
-@@ -748,10 +1035,10 @@
+@@ -748,10 +1035,10 @@ EOF
command="$command$suppress_output"
$run $rm "$obj" "$output_obj"
$show "$command"
@@ -5422,7 +5422,7 @@
fi
if test "$need_locks" = warn &&
-@@ -771,7 +1058,7 @@
+@@ -771,7 +1058,7 @@ avoid parallel builds (make -j) in this
compiler."
$run $rm $removelist
@@ -5431,7 +5431,7 @@
fi
# Just move the object if needed
-@@ -809,7 +1096,7 @@
+@@ -809,7 +1096,7 @@ EOF
$run $rm "$lockfile"
fi
@@ -5440,7 +5440,7 @@
;;
# libtool link mode
-@@ -835,7 +1122,7 @@
+@@ -835,7 +1122,7 @@ EOF
;;
esac
libtool_args="$nonopt"
@@ -5449,7 +5449,7 @@
compile_command="$nonopt"
finalize_command="$nonopt"
-@@ -847,7 +1134,6 @@
+@@ -847,7 +1134,6 @@ EOF
old_convenience=
deplibs=
old_deplibs=
@@ -5457,7 +5457,7 @@
compiler_flags=
linker_flags=
dllsearchpath=
-@@ -868,6 +1154,8 @@
+@@ -868,6 +1154,8 @@ EOF
no_install=no
objs=
non_pic_objects=
@@ -5466,7 +5466,7 @@
prefer_static_libs=no
preload=no
prev=
-@@ -880,27 +1168,40 @@
+@@ -880,27 +1168,40 @@ EOF
thread_safe=no
vinfo=
vinfo_number=no
@@ -5512,7 +5512,7 @@
break
;;
esac
-@@ -912,7 +1213,6 @@
+@@ -912,7 +1213,6 @@ EOF
# Go through the arguments, transforming them on the way.
while test "$#" -gt 0; do
arg="$1"
@@ -5520,7 +5520,7 @@
shift
case $arg in
*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
-@@ -976,7 +1276,7 @@
+@@ -976,7 +1276,7 @@ EOF
export_symbols="$arg"
if test ! -f "$arg"; then
$echo "$modename: symbol file \`$arg' does not exist"
@@ -5529,7 +5529,7 @@
fi
prev=
continue
-@@ -991,6 +1291,11 @@
+@@ -991,6 +1291,11 @@ EOF
prev=
continue
;;
@@ -5541,7 +5541,7 @@
release)
release="-$arg"
prev=
-@@ -1023,7 +1328,7 @@
+@@ -1023,7 +1328,7 @@ EOF
test "$pic_object" = none && \
test "$non_pic_object" = none; then
$echo "$modename: cannot find name of object for \`$arg'" 1>&2
@@ -5550,7 +5550,7 @@
fi
# Extract subdirectory from the argument.
-@@ -1071,12 +1376,17 @@
+@@ -1071,12 +1376,17 @@ EOF
if test -z "$pic_object" || test "$pic_object" = none ; then
arg="$non_pic_object"
fi
@@ -5569,7 +5569,7 @@
else
# Dry-run case.
-@@ -1097,7 +1407,7 @@
+@@ -1097,7 +1407,7 @@ EOF
done
else
$echo "$modename: link input file \`$save_arg' does not exist"
@@ -5578,7 +5578,7 @@
fi
arg=$save_arg
prev=
-@@ -1109,7 +1419,7 @@
+@@ -1109,7 +1419,7 @@ EOF
[\\/]* | [A-Za-z]:[\\/]*) ;;
*)
$echo "$modename: only absolute run-paths are allowed" 1>&2
@@ -5587,7 +5587,7 @@
;;
esac
if test "$prev" = rpath; then
-@@ -1149,16 +1459,15 @@
+@@ -1149,16 +1459,15 @@ EOF
finalize_command="$finalize_command $qarg"
continue
;;
@@ -5613,7 +5613,7 @@
prev=
continue
;;
-@@ -1210,7 +1519,7 @@
+@@ -1210,7 +1519,7 @@ EOF
-export-symbols | -export-symbols-regex)
if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
$echo "$modename: more than one -exported-symbols argument is not allowed"
@@ -5622,7 +5622,7 @@
fi
if test "X$arg" = "X-export-symbols"; then
prev=expsyms
-@@ -1220,6 +1529,18 @@
+@@ -1220,6 +1529,18 @@ EOF
continue
;;
@@ -5641,7 +5641,7 @@
-inst-prefix-dir)
prev=inst_prefix
continue
-@@ -1246,7 +1567,8 @@
+@@ -1246,7 +1567,8 @@ EOF
absdir=`cd "$dir" && pwd`
if test -z "$absdir"; then
$echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
@@ -5651,7 +5651,7 @@
fi
dir="$absdir"
;;
-@@ -1260,10 +1582,15 @@
+@@ -1260,10 +1582,15 @@ EOF
esac
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
@@ -5667,7 +5667,7 @@
;;
esac
continue
-@@ -1272,32 +1599,35 @@
+@@ -1272,32 +1599,35 @@ EOF
-l*)
if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
case $host in
@@ -5714,7 +5714,7 @@
# Do not include libc_r directly, use -pthread flag.
continue
;;
-@@ -1307,18 +1637,47 @@
+@@ -1307,18 +1637,47 @@ EOF
continue
;;
@@ -5769,7 +5769,7 @@
# Unknown arguments in both finalize_command and compile_command need
# to be aesthetically quoted because they are evaled later.
arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-@@ -1329,9 +1688,7 @@
+@@ -1329,9 +1688,7 @@ EOF
esac
compile_command="$compile_command $arg"
finalize_command="$finalize_command $arg"
@@ -5780,7 +5780,7 @@
continue
;;
-@@ -1347,9 +1704,9 @@
+@@ -1347,9 +1704,9 @@ EOF
-no-install)
case $host in
@@ -5792,7 +5792,7 @@
$echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
$echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
fast_install=no
-@@ -1371,6 +1728,11 @@
+@@ -1371,6 +1728,11 @@ EOF
-o) prev=output ;;
@@ -5804,7 +5804,7 @@
-release)
prev=release
continue
-@@ -1393,7 +1755,7 @@
+@@ -1393,7 +1755,7 @@ EOF
[\\/]* | [A-Za-z]:[\\/]*) ;;
*)
$echo "$modename: only absolute run-paths are allowed" 1>&2
@@ -5813,7 +5813,7 @@
;;
esac
case "$xrpath " in
-@@ -1403,7 +1765,7 @@
+@@ -1403,7 +1765,7 @@ EOF
continue
;;
@@ -5822,7 +5822,7 @@
# The effects of -static are defined in a previous loop.
# We used to do the same as -all-static on platforms that
# didn't have a PIC flag, but the assumption that the effects
-@@ -1479,11 +1841,6 @@
+@@ -1479,11 +1841,6 @@ EOF
continue
;;
@@ -5834,7 +5834,7 @@
# Some other compiler flag.
-* | +*)
# Unknown arguments in both finalize_command and compile_command need
-@@ -1494,7 +1851,6 @@
+@@ -1494,7 +1851,6 @@ EOF
arg="\"$arg\""
;;
esac
@@ -5842,7 +5842,7 @@
;;
*.$objext)
-@@ -1522,7 +1878,7 @@
+@@ -1522,7 +1878,7 @@ EOF
test "$pic_object" = none && \
test "$non_pic_object" = none; then
$echo "$modename: cannot find name of object for \`$arg'" 1>&2
@@ -5851,7 +5851,7 @@
fi
# Extract subdirectory from the argument.
-@@ -1570,12 +1926,17 @@
+@@ -1570,12 +1926,17 @@ EOF
if test -z "$pic_object" || test "$pic_object" = none ; then
arg="$non_pic_object"
fi
@@ -5870,7 +5870,7 @@
else
# Dry-run case.
-@@ -1629,7 +1990,6 @@
+@@ -1629,7 +1990,6 @@ EOF
arg="\"$arg\""
;;
esac
@@ -5878,7 +5878,7 @@
;;
esac # arg
-@@ -1643,48 +2003,7 @@
+@@ -1643,48 +2003,7 @@ EOF
if test -n "$prev"; then
$echo "$modename: the \`$prevarg' option requires an argument" 1>&2
$echo "$help" 1>&2
@@ -5928,7 +5928,7 @@
fi
if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-@@ -1717,9 +2036,9 @@
+@@ -1717,9 +2036,9 @@ EOF
if test ! -d "$output_objdir"; then
$show "$mkdir $output_objdir"
$run $mkdir $output_objdir
@@ -5941,7 +5941,7 @@
fi
fi
-@@ -1728,7 +2047,7 @@
+@@ -1728,7 +2047,7 @@ EOF
"")
$echo "$modename: you must specify an output file" 1>&2
$echo "$help" 1>&2
@@ -5950,7 +5950,7 @@
;;
*.$libext) linkmode=oldlib ;;
*.lo | *.$objext) linkmode=obj ;;
-@@ -1738,7 +2057,7 @@
+@@ -1738,7 +2057,7 @@ EOF
case $host in
*cygwin* | *mingw* | *pw32*)
@@ -5959,7 +5959,7 @@
duplicate_compiler_generated_deps=yes
;;
*)
-@@ -1782,7 +2101,6 @@
+@@ -1782,7 +2101,6 @@ EOF
newlib_search_path=
need_relink=no # whether we're linking any uninstalled libtool libraries
notinst_deplibs= # not-installed libtool libraries
@@ -5967,7 +5967,7 @@
case $linkmode in
lib)
passes="conv link"
-@@ -1791,7 +2109,7 @@
+@@ -1791,7 +2109,7 @@ EOF
*.la) ;;
*)
$echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
@@ -5976,7 +5976,7 @@
;;
esac
done
-@@ -1817,7 +2135,10 @@
+@@ -1817,7 +2135,10 @@ EOF
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
@@ -5988,7 +5988,7 @@
esac
fi
if test "$pass" = dlopen; then
-@@ -1829,18 +2150,28 @@
+@@ -1829,18 +2150,28 @@ EOF
lib=
found=no
case $deplib in
@@ -6023,7 +6023,7 @@
# Search the libtool library
lib="$searchdir/lib${name}${search_ext}"
if test -f "$lib"; then
-@@ -1901,18 +2232,6 @@
+@@ -1901,18 +2232,6 @@ EOF
fi
fi
;; # -l
@@ -6042,7 +6042,7 @@
-L*)
case $linkmode in
lib)
-@@ -1928,11 +2247,11 @@
+@@ -1928,11 +2247,11 @@ EOF
fi
if test "$pass" = scan; then
deplibs="$deplib $deplibs"
@@ -6055,7 +6055,7 @@
;;
*)
$echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
-@@ -1960,7 +2279,22 @@
+@@ -1960,7 +2279,22 @@ EOF
fi
case $linkmode in
lib)
@@ -6079,7 +6079,7 @@
$echo
$echo "*** Warning: Trying to link with static lib archive $deplib."
$echo "*** I have the capability to make that library automatically link in when"
-@@ -2010,15 +2344,15 @@
+@@ -2010,15 +2344,15 @@ EOF
esac # case $deplib
if test "$found" = yes || test -f "$lib"; then :
else
@@ -6098,7 +6098,7 @@
fi
ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-@@ -2034,6 +2368,8 @@
+@@ -2034,6 +2368,8 @@ EOF
# it will not redefine variables installed, or shouldnotlink
installed=yes
shouldnotlink=no
@@ -6107,7 +6107,7 @@
# Read the .la file
case $lib in
-@@ -2041,13 +2377,6 @@
+@@ -2041,13 +2377,6 @@ EOF
*) . ./$lib ;;
esac
@@ -6121,7 +6121,7 @@
if test "$linkmode,$pass" = "lib,link" ||
test "$linkmode,$pass" = "prog,scan" ||
{ test "$linkmode" != prog && test "$linkmode" != lib; }; then
-@@ -2058,33 +2387,32 @@
+@@ -2058,33 +2387,32 @@ EOF
if test "$pass" = conv; then
# Only check for convenience libraries
deplibs="$lib $deplibs"
@@ -6168,7 +6168,7 @@
# Get the name of the library we link against.
linklib=
for l in $old_library $library_names; do
-@@ -2092,16 +2420,18 @@
+@@ -2092,16 +2420,18 @@ EOF
done
if test -z "$linklib"; then
$echo "$modename: cannot find name of link library for \`$lib'" 1>&2
@@ -6190,7 +6190,7 @@
# If there is no dlname, no dlopen support or we're linking
# statically, we need to preload. We also need to preload any
# dependent libraries so libltdl's deplib preloader doesn't
-@@ -2138,11 +2468,19 @@
+@@ -2138,11 +2468,19 @@ EOF
dir="$libdir"
absdir="$libdir"
fi
@@ -6214,7 +6214,7 @@
fi # $installed = yes
name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-@@ -2150,7 +2488,7 @@
+@@ -2150,7 +2488,7 @@ EOF
if test "$pass" = dlpreopen; then
if test -z "$libdir"; then
$echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
@@ -6223,7 +6223,7 @@
fi
# Prefer using a static library (so that no silly _DYNAMIC symbols
# are required to link).
-@@ -2177,7 +2515,7 @@
+@@ -2177,7 +2515,7 @@ EOF
continue
fi
@@ -6232,7 +6232,7 @@
if test "$linkmode" = prog && test "$pass" != link; then
newlib_search_path="$newlib_search_path $ladir"
deplibs="$lib $deplibs"
-@@ -2213,14 +2551,16 @@
+@@ -2213,14 +2551,16 @@ EOF
if test "$linkmode,$pass" = "prog,link"; then
if test -n "$library_names" &&
@@ -6252,7 +6252,7 @@
esac
fi
-@@ -2257,24 +2597,29 @@
+@@ -2257,24 +2597,29 @@ EOF
fi
link_static=no # Whether the deplib will be linked statically
@@ -6288,7 +6288,7 @@
if test "$linkmode" = lib &&
test "$hardcode_into_libs" = yes; then
# Hardcode the library path.
-@@ -2332,9 +2677,10 @@
+@@ -2332,9 +2677,10 @@ EOF
else
$show "extracting exported symbol list from \`$soname'"
save_ifs="$IFS"; IFS='~'
@@ -6300,7 +6300,7 @@
$show "$cmd"
$run eval "$cmd" || exit $?
done
-@@ -2345,9 +2691,10 @@
+@@ -2345,9 +2691,10 @@ EOF
if test -f "$output_objdir/$newlib"; then :; else
$show "generating import library for \`$soname'"
save_ifs="$IFS"; IFS='~'
@@ -6312,7 +6312,7 @@
$show "$cmd"
$run eval "$cmd" || exit $?
done
-@@ -2368,11 +2715,15 @@
+@@ -2368,11 +2715,15 @@ EOF
if test "$hardcode_direct" = no; then
add="$dir/$linklib"
case $host in
@@ -6332,7 +6332,7 @@
$echo "** Warning, lib $linklib is a module, not a shared library"
if test -z "$old_library" ; then
$echo
-@@ -2380,7 +2731,7 @@
+@@ -2380,7 +2731,7 @@ EOF
$echo "** The link will probably fail, sorry"
else
add="$dir/$old_library"
@@ -6341,7 +6341,7 @@
fi
esac
elif test "$hardcode_minus_L" = no; then
-@@ -2403,9 +2754,9 @@
+@@ -2403,9 +2754,9 @@ EOF
add_dir="-L$dir"
# Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then
@@ -6353,7 +6353,7 @@
;;
esac
fi
-@@ -2422,7 +2773,7 @@
+@@ -2422,7 +2773,7 @@ EOF
if test "$lib_linked" != yes; then
$echo "$modename: configuration error: unsupported hardcode properties"
@@ -6362,7 +6362,7 @@
fi
if test -n "$add_shlibpath"; then
-@@ -2465,7 +2816,8 @@
+@@ -2465,7 +2816,8 @@ EOF
esac
add="-l$name"
elif test "$hardcode_automatic" = yes; then
@@ -6372,7 +6372,7 @@
add="$inst_prefix_dir$libdir/$linklib"
else
add="$libdir/$linklib"
-@@ -2475,9 +2827,9 @@
+@@ -2475,9 +2827,9 @@ EOF
add_dir="-L$libdir"
# Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then
@@ -6384,7 +6384,7 @@
;;
esac
fi
-@@ -2536,17 +2888,16 @@
+@@ -2536,17 +2888,16 @@ EOF
fi
fi
else
@@ -6406,7 +6406,7 @@
# Extract -R from dependency_libs
temp_deplibs=
for libdir in $dependency_libs; do
-@@ -2560,7 +2911,7 @@
+@@ -2560,7 +2911,7 @@ EOF
esac
done
dependency_libs="$temp_deplibs"
@@ -6415,7 +6415,7 @@
newlib_search_path="$newlib_search_path $absdir"
# Link against this library
-@@ -2602,76 +2953,70 @@
+@@ -2602,76 +2953,70 @@ EOF
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
if test -z "$libdir"; then
$echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
@@ -6525,7 +6525,7 @@
esac
done
fi # link_all_deplibs != no
-@@ -2758,7 +3103,8 @@
+@@ -2758,7 +3103,8 @@ EOF
eval $var=\"$tmp_libs\"
done # for var
fi
@@ -6535,7 +6535,7 @@
tmp_libs=
for i in $dependency_libs ; do
case " $predeps $postdeps $compiler_lib_search_path " in
-@@ -2779,9 +3125,10 @@
+@@ -2779,9 +3125,10 @@ EOF
case $linkmode in
oldlib)
@@ -6549,7 +6549,7 @@
if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
-@@ -2818,19 +3165,19 @@
+@@ -2818,19 +3165,19 @@ EOF
case $outputname in
lib*)
name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
@@ -6572,7 +6572,7 @@
eval libname=\"$libname_spec\"
else
libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-@@ -2841,7 +3188,7 @@
+@@ -2841,7 +3188,7 @@ EOF
if test -n "$objs"; then
if test "$deplibs_check_method" != pass_all; then
$echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
@@ -6581,7 +6581,7 @@
else
$echo
$echo "*** Warning: Linking the shared library $output against the non-libtool"
-@@ -2889,13 +3236,13 @@
+@@ -2889,13 +3236,13 @@ EOF
if test -n "$8"; then
$echo "$modename: too many parameters to \`-version-info'" 1>&2
$echo "$help" 1>&2
@@ -6597,7 +6597,7 @@
case $vinfo_number in
yes)
number_major="$2"
-@@ -2909,7 +3256,7 @@
+@@ -2909,7 +3256,7 @@ EOF
# which has an extra 1 added just for fun
#
case $version_type in
@@ -6606,7 +6606,7 @@
current=`expr $number_major + $number_minor`
age="$number_minor"
revision="$number_revision"
-@@ -2920,9 +3267,15 @@
+@@ -2920,9 +3267,15 @@ EOF
age="0"
;;
irix|nonstopux)
@@ -6623,7 +6623,7 @@
;;
esac
;;
-@@ -2935,36 +3288,36 @@
+@@ -2935,36 +3288,36 @@ EOF
# Check that each of the things are valid numbers.
case $current in
@@ -6670,7 +6670,7 @@
fi
# Calculate the version variables.
-@@ -2981,6 +3334,7 @@
+@@ -2981,6 +3334,7 @@ EOF
versuffix="$major.$age.$revision"
# Darwin ld doesn't like 0 for these options...
minor_current=`expr $current + 1`
@@ -6678,7 +6678,7 @@
verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
;;
-@@ -2995,8 +3349,11 @@
+@@ -2995,8 +3349,11 @@ EOF
;;
irix | nonstopux)
@@ -6692,7 +6692,7 @@
case $version_type in
nonstopux) verstring_prefix=nonstopux ;;
*) verstring_prefix=sgi ;;
-@@ -3053,7 +3410,7 @@
+@@ -3053,7 +3410,7 @@ EOF
*)
$echo "$modename: unknown library version type \`$version_type'" 1>&2
$echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
@@ -6701,7 +6701,7 @@
;;
esac
-@@ -3107,6 +3464,12 @@
+@@ -3107,6 +3464,12 @@ EOF
*.$objext)
;;
$output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
@@ -6714,7 +6714,7 @@
removelist="$removelist $p"
;;
*) ;;
-@@ -3127,11 +3490,11 @@
+@@ -3127,11 +3490,11 @@ EOF
fi
# Eliminate all temporary directories.
@@ -6731,7 +6731,7 @@
if test -n "$xrpath"; then
# If the user specified any rpath flags, then add them.
-@@ -3143,7 +3506,7 @@
+@@ -3143,7 +3506,7 @@ EOF
*) finalize_rpath="$finalize_rpath $libdir" ;;
esac
done
@@ -6740,7 +6740,7 @@
dependency_libs="$temp_xrpath $dependency_libs"
fi
fi
-@@ -3176,20 +3539,19 @@
+@@ -3176,20 +3539,19 @@ EOF
;;
*-*-rhapsody* | *-*-darwin1.[012])
# Rhapsody C library is in the System framework
@@ -6769,7 +6769,7 @@
;;
*)
# Add libc to deplibs on all other systems if necessary.
-@@ -3233,13 +3595,12 @@
+@@ -3233,13 +3595,12 @@ EOF
int main() { return 0; }
EOF
$rm conftest
@@ -6786,7 +6786,7 @@
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $i "*)
-@@ -3274,13 +3635,11 @@
+@@ -3274,13 +3635,11 @@ EOF
# Error occurred in the first compile. Let's try to salvage
# the situation: Compile a separate program for each library.
for i in $deplibs; do
@@ -6802,7 +6802,7 @@
ldd_output=`ldd conftest`
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
-@@ -3312,7 +3671,7 @@
+@@ -3312,7 +3671,7 @@ EOF
droppeddeps=yes
$echo
$echo "*** Warning! Library $i is needed by this library but I was not able to"
@@ -6811,7 +6811,7 @@
$echo "*** library that it depends on before this library will be fully"
$echo "*** functional. Installing it before continuing would be even better."
fi
-@@ -3326,7 +3685,7 @@
+@@ -3326,7 +3685,7 @@ EOF
set dummy $deplibs_check_method
file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
for a_deplib in $deplibs; do
@@ -6820,7 +6820,7 @@
# If $name is empty we are operating on a -L argument.
if test "$name" != "" && test "$name" != "0"; then
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-@@ -3395,7 +3754,7 @@
+@@ -3395,7 +3754,7 @@ EOF
set dummy $deplibs_check_method
match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
for a_deplib in $deplibs; do
@@ -6829,7 +6829,7 @@
# If $name is empty we are operating on a -L argument.
if test -n "$name" && test "$name" != "0"; then
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-@@ -3475,7 +3834,7 @@
+@@ -3475,7 +3834,7 @@ EOF
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library is the System framework
@@ -6838,7 +6838,7 @@
;;
esac
-@@ -3521,17 +3880,39 @@
+@@ -3521,17 +3880,39 @@ EOF
fi
fi
fi
@@ -6885,7 +6885,7 @@
# All the library-specific variables (install_libdir is set above).
library_names=
old_library=
-@@ -3544,7 +3925,7 @@
+@@ -3544,7 +3925,7 @@ EOF
hardcode_libdirs=
dep_rpath=
rpath="$finalize_rpath"
@@ -6894,7 +6894,7 @@
for libdir in $rpath; do
if test -n "$hardcode_libdir_flag_spec"; then
if test -n "$hardcode_libdir_separator"; then
-@@ -3576,7 +3957,10 @@
+@@ -3576,7 +3957,10 @@ EOF
test -n "$hardcode_libdirs"; then
libdir="$hardcode_libdirs"
if test -n "$hardcode_libdir_flag_spec_ld"; then
@@ -6906,7 +6906,7 @@
else
eval dep_rpath=\"$hardcode_libdir_flag_spec\"
fi
-@@ -3599,7 +3983,7 @@
+@@ -3599,7 +3983,7 @@ EOF
fi
# Get the real and link names of the library.
@@ -6915,7 +6915,7 @@
eval library_names=\"$library_names_spec\"
set dummy $library_names
realname="$2"
-@@ -3615,6 +3999,7 @@
+@@ -3615,6 +3999,7 @@ EOF
fi
lib="$output_objdir/$realname"
@@ -6923,7 +6923,7 @@
for link
do
linknames="$linknames $link"
-@@ -3629,10 +4014,11 @@
+@@ -3629,10 +4014,11 @@ EOF
$show "generating symbol list for \`$libname.la'"
export_symbols="$output_objdir/$libname.exp"
$run $rm $export_symbols
@@ -6936,7 +6936,7 @@
if len=`expr "X$cmd" : ".*"` &&
test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
$show "$cmd"
-@@ -3642,6 +4028,9 @@
+@@ -3642,6 +4028,9 @@ EOF
# The command line is too long to execute in one step.
$show "using reloadable object file for export list..."
skipped_export=:
@@ -6946,7 +6946,7 @@
fi
done
IFS="$save_ifs"
-@@ -3662,12 +4051,12 @@
+@@ -3662,12 +4051,12 @@ EOF
for test_deplib in $deplibs; do
case " $convenience " in
*" $test_deplib "*) ;;
@@ -6961,7 +6961,7 @@
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec"; then
-@@ -3675,67 +4064,13 @@
+@@ -3675,67 +4064,13 @@ EOF
eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
else
gentop="$output_objdir/${outputname}x"
@@ -7032,7 +7032,7 @@
if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
eval flag=\"$thread_safe_flag_spec\"
linker_flags="$linker_flags $flag"
-@@ -3746,31 +4081,27 @@
+@@ -3746,31 +4081,27 @@ EOF
$run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
fi
@@ -7074,7 +7074,7 @@
test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
:
else
-@@ -3789,6 +4120,7 @@
+@@ -3789,6 +4120,7 @@ EOF
save_libobjs=$libobjs
fi
save_output=$output
@@ -7082,7 +7082,7 @@
# Clear the reloadable object creation command queue and
# initialize k to one.
-@@ -3798,13 +4130,13 @@
+@@ -3798,13 +4130,13 @@ EOF
delfiles=
last_robj=
k=1
@@ -7098,7 +7098,7 @@
test "$len" -le "$max_cmd_len"; }; then
objlist="$objlist $obj"
else
-@@ -3818,9 +4150,9 @@
+@@ -3818,9 +4150,9 @@ EOF
# the last one created.
eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
fi
@@ -7110,7 +7110,7 @@
objlist=$obj
len=1
fi
-@@ -3840,13 +4172,13 @@
+@@ -3840,13 +4172,13 @@ EOF
eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
fi
@@ -7126,7 +7126,7 @@
done
$echo "creating a temporary reloadable object file: $output"
-@@ -3871,28 +4203,54 @@
+@@ -3871,28 +4203,54 @@ EOF
# value of $libobjs for piecewise linking.
# Do each of the archive commands.
@@ -7186,7 +7186,7 @@
fi
# Create links to the real library.
-@@ -3912,9 +4270,10 @@
+@@ -3912,9 +4270,10 @@ EOF
;;
obj)
@@ -7200,7 +7200,7 @@
if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
-@@ -3940,7 +4299,7 @@
+@@ -3940,7 +4299,7 @@ EOF
*.lo)
if test -n "$objs$old_deplibs"; then
$echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
@@ -7209,7 +7209,7 @@
fi
libobj="$output"
obj=`$echo "X$output" | $Xsed -e "$lo2o"`
-@@ -3961,72 +4320,20 @@
+@@ -3961,72 +4320,20 @@ EOF
reload_conv_objs=
gentop=
# reload_cmds runs $LD directly, so let us get rid of
@@ -7288,7 +7288,7 @@
fi
fi
-@@ -4034,10 +4341,11 @@
+@@ -4034,10 +4341,11 @@ EOF
reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
output="$obj"
@@ -7301,7 +7301,7 @@
$show "$cmd"
$run eval "$cmd" || exit $?
done
-@@ -4050,7 +4358,7 @@
+@@ -4050,7 +4358,7 @@ EOF
$run ${rm}r $gentop
fi
@@ -7310,7 +7310,7 @@
fi
if test "$build_libtool_libs" != yes; then
-@@ -4063,17 +4371,18 @@
+@@ -4063,17 +4371,18 @@ EOF
# accidentally link it into a program.
# $show "echo timestamp > $libobj"
# $run eval "echo timestamp > $libobj" || exit $?
@@ -7331,7 +7331,7 @@
$show "$cmd"
$run eval "$cmd" || exit $?
done
-@@ -4085,7 +4394,7 @@
+@@ -4085,7 +4394,7 @@ EOF
$run ${rm}r $gentop
fi
@@ -7340,7 +7340,7 @@
;;
prog)
-@@ -4110,24 +4419,50 @@
+@@ -4110,24 +4419,50 @@ EOF
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library is the System framework
@@ -7397,7 +7397,7 @@
compile_command="$compile_command $compile_deplibs"
finalize_command="$finalize_command $finalize_deplibs"
-@@ -4172,10 +4507,15 @@
+@@ -4172,10 +4507,15 @@ EOF
fi
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
@@ -7413,7 +7413,7 @@
;;
esac
done
-@@ -4289,13 +4629,25 @@
+@@ -4289,13 +4629,25 @@ extern \"C\" {
# Prepare the list of exported symbols
if test -z "$export_symbols"; then
@@ -7443,7 +7443,7 @@
fi
fi
-@@ -4346,7 +4698,26 @@
+@@ -4346,7 +4698,26 @@ extern \"C\" {
#endif
/* The mapping between symbol names and symbols. */
@@ -7470,7 +7470,7 @@
const char *name;
lt_ptr address;
}
-@@ -4393,20 +4764,33 @@
+@@ -4393,20 +4764,33 @@ static const void *lt_preloaded_setup()
esac
# Now compile the dynamic symbol file.
@@ -7509,7 +7509,7 @@
;;
esac
else
-@@ -4415,30 +4799,19 @@
+@@ -4415,30 +4799,19 @@ static const void *lt_preloaded_setup()
# really was required.
# Nullify the symbol file.
@@ -7544,7 +7544,7 @@
# Delete the generated files.
if test -n "$dlsyms"; then
-@@ -4446,7 +4819,7 @@
+@@ -4446,7 +4819,7 @@ static const void *lt_preloaded_setup()
$run $rm "$output_objdir/${outputname}S.${objext}"
fi
@@ -7553,7 +7553,7 @@
fi
if test -n "$shlibpath_var"; then
-@@ -4505,7 +4878,7 @@
+@@ -4505,7 +4878,7 @@ static const void *lt_preloaded_setup()
# Link the executable and exit
$show "$link_command"
$run eval "$link_command" || exit $?
@@ -7562,7 +7562,7 @@
fi
if test "$hardcode_action" = relink; then
-@@ -4519,7 +4892,7 @@
+@@ -4519,7 +4892,7 @@ static const void *lt_preloaded_setup()
if test "$fast_install" != no; then
link_command="$finalize_var$compile_command$finalize_rpath"
if test "$fast_install" = yes; then
@@ -7571,7 +7571,7 @@
else
# fast_install is set to needless
relink_command=
-@@ -4556,14 +4929,14 @@
+@@ -4556,14 +4929,14 @@ static const void *lt_preloaded_setup()
fi
done
relink_command="(cd `pwd`; $relink_command)"
@@ -7591,7 +7591,7 @@
esac
qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
else
-@@ -4586,10 +4959,12 @@
+@@ -4586,10 +4959,12 @@ static const void *lt_preloaded_setup()
esac
case $host in
*cygwin* | *mingw* )
@@ -7608,7 +7608,7 @@
cat > $cwrappersource <<EOF
-@@ -4598,7 +4973,7 @@
+@@ -4598,7 +4973,7 @@ static const void *lt_preloaded_setup()
The $output program cannot be directly executed until all the libtool
libraries that it depends on are installed.
@@ -7617,7 +7617,7 @@
This wrapper executable should never be moved out of the build directory.
If it is, it will not operate correctly.
-@@ -4614,6 +4989,9 @@
+@@ -4614,6 +4989,9 @@ EOF
#include <malloc.h>
#include <stdarg.h>
#include <assert.h>
@@ -7627,7 +7627,7 @@
#if defined(PATH_MAX)
# define LT_PATHMAX PATH_MAX
-@@ -4624,15 +5002,19 @@
+@@ -4624,15 +5002,19 @@ EOF
#endif
#ifndef DIR_SEPARATOR
@@ -7652,7 +7652,7 @@
#endif
#ifndef DIR_SEPARATOR_2
-@@ -4642,17 +5024,32 @@
+@@ -4642,17 +5024,32 @@ EOF
(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
#endif /* DIR_SEPARATOR_2 */
@@ -7687,7 +7687,7 @@
char * strendzap(char *str, const char *pat);
void lt_fatal (const char *message, ...);
-@@ -4661,30 +5058,52 @@
+@@ -4661,30 +5058,52 @@ main (int argc, char *argv[])
{
char **newargz;
int i;
@@ -7749,7 +7749,7 @@
}
void *
-@@ -4697,59 +5116,159 @@
+@@ -4697,59 +5116,159 @@ xmalloc (size_t num)
return p;
}
@@ -7931,7 +7931,7 @@
{
size_t len, patlen;
-@@ -4769,7 +5288,7 @@
+@@ -4769,7 +5288,7 @@ strendzap(char *str, const char *pat)
}
static void
@@ -7940,7 +7940,7 @@
const char * message, va_list ap)
{
fprintf (stderr, "%s: %s: ", program_name, mode);
-@@ -4789,16 +5308,16 @@
+@@ -4789,16 +5308,16 @@ lt_fatal (const char *message, ...)
va_end (ap);
}
EOF
@@ -7967,7 +7967,7 @@
$echo > $output "\
#! $SHELL
-@@ -4817,9 +5336,23 @@
+@@ -4817,9 +5336,23 @@ EOF
Xsed='${SED} -e 1s/^X//'
sed_quote_subst='$sed_quote_subst'
@@ -7992,7 +7992,7 @@
relink_command=\"$relink_command\"
-@@ -4898,7 +5431,7 @@
+@@ -4898,7 +5431,7 @@ else
else
$echo \"\$relink_command_output\" >&2
$rm \"\$progdir/\$file\"
@@ -8001,7 +8001,7 @@
fi
fi
-@@ -4948,34 +5481,32 @@
+@@ -4948,34 +5481,32 @@ else
# Backslashes separate directories on plain windows
*-*-mingw | *-*-os2*)
$echo >> $output "\
@@ -8043,7 +8043,7 @@
;;
esac
-@@ -4998,78 +5529,78 @@
+@@ -4998,78 +5529,78 @@ fi\
if test -n "$addlibs"; then
gentop="$output_objdir/${outputname}x"
@@ -8183,7 +8183,7 @@
else
# the command line is too long to link in one step, link in parts
$echo "using piecewise archive linking..."
-@@ -5078,31 +5609,18 @@
+@@ -5078,31 +5609,18 @@ fi\
objlist=
concat_cmds=
save_oldobjs=$oldobjs
@@ -8218,7 +8218,7 @@
test "$len" -le "$max_cmd_len"; then
:
else
-@@ -5110,7 +5628,7 @@
+@@ -5110,7 +5628,7 @@ fi\
oldobjs=$objlist
if test "$obj" = "$last_oldobj" ; then
RANLIB=$save_RANLIB
@@ -8227,7 +8227,7 @@
test -z "$concat_cmds" || concat_cmds=$concat_cmds~
eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
objlist=
-@@ -5121,12 +5639,13 @@
+@@ -5121,12 +5639,13 @@ fi\
if test "X$oldobjs" = "X" ; then
eval cmds=\"\$concat_cmds\"
else
@@ -8242,7 +8242,7 @@
IFS="$save_ifs"
$show "$cmd"
$run eval "$cmd" || exit $?
-@@ -5158,11 +5677,13 @@
+@@ -5158,11 +5677,13 @@ fi\
fi
done
# Quote the link command for shipping.
@@ -8260,7 +8260,7 @@
# Only create the output if not a dry run.
if test -z "$run"; then
for installed in no yes; do
-@@ -5180,7 +5701,7 @@
+@@ -5180,7 +5701,7 @@ fi\
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
if test -z "$libdir"; then
$echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
@@ -8269,7 +8269,7 @@
fi
newdependency_libs="$newdependency_libs $libdir/$name"
;;
-@@ -5194,7 +5715,7 @@
+@@ -5194,7 +5715,7 @@ fi\
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
if test -z "$libdir"; then
$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
@@ -8278,7 +8278,7 @@
fi
newdlfiles="$newdlfiles $libdir/$name"
done
-@@ -5205,11 +5726,30 @@
+@@ -5205,11 +5726,30 @@ fi\
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
if test -z "$libdir"; then
$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
@@ -8310,7 +8310,7 @@
fi
$rm $output
# place dlname in correct position for cygwin
-@@ -5253,7 +5793,7 @@
+@@ -5253,7 +5793,7 @@ dlpreopen='$dlprefiles'
# Directory that this library needs to be installed in:
libdir='$install_libdir'"
@@ -8319,7 +8319,7 @@
$echo >> $output "\
relink_command=\"$relink_command\""
fi
-@@ -5266,7 +5806,7 @@
+@@ -5266,7 +5806,7 @@ relink_command=\"$relink_command\""
$run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
;;
esac
@@ -8328,7 +8328,7 @@
;;
# libtool install mode
-@@ -5277,11 +5817,11 @@
+@@ -5277,11 +5817,11 @@ relink_command=\"$relink_command\""
# install_prog (especially on Windows NT).
if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
# Allow the use of GNU shtool's install command.
@@ -8342,7 +8342,7 @@
arg="\"$arg\""
;;
esac
-@@ -5290,14 +5830,14 @@
+@@ -5290,14 +5830,14 @@ relink_command=\"$relink_command\""
shift
else
install_prog=
@@ -8359,7 +8359,7 @@
arg="\"$arg\""
;;
esac
-@@ -5315,28 +5855,31 @@
+@@ -5315,28 +5855,31 @@ relink_command=\"$relink_command\""
do
if test -n "$dest"; then
files="$files $dest"
@@ -8399,7 +8399,7 @@
continue
fi
;;
-@@ -5345,7 +5888,7 @@
+@@ -5345,7 +5888,7 @@ relink_command=\"$relink_command\""
# Aesthetically quote the argument.
arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
case $arg in
@@ -8408,7 +8408,7 @@
arg="\"$arg\""
;;
esac
-@@ -5355,13 +5898,13 @@
+@@ -5355,13 +5898,13 @@ relink_command=\"$relink_command\""
if test -z "$install_prog"; then
$echo "$modename: you must specify an install program" 1>&2
$echo "$help" 1>&2
@@ -8424,7 +8424,7 @@
fi
if test -z "$files"; then
-@@ -5371,7 +5914,7 @@
+@@ -5371,7 +5914,7 @@ relink_command=\"$relink_command\""
$echo "$modename: you must specify a destination" 1>&2
fi
$echo "$help" 1>&2
@@ -8433,7 +8433,7 @@
fi
# Strip any trailing slash from the destination.
-@@ -5392,7 +5935,7 @@
+@@ -5392,7 +5935,7 @@ relink_command=\"$relink_command\""
if test "$#" -gt 2; then
$echo "$modename: \`$dest' is not a directory" 1>&2
$echo "$help" 1>&2
@@ -8442,7 +8442,7 @@
fi
fi
case $destdir in
-@@ -5404,7 +5947,7 @@
+@@ -5404,7 +5947,7 @@ relink_command=\"$relink_command\""
*)
$echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
$echo "$help" 1>&2
@@ -8451,7 +8451,7 @@
;;
esac
done
-@@ -5433,7 +5976,7 @@
+@@ -5433,7 +5976,7 @@ relink_command=\"$relink_command\""
else
$echo "$modename: \`$file' is not a valid libtool archive" 1>&2
$echo "$help" 1>&2
@@ -8460,7 +8460,7 @@
fi
library_names=
-@@ -5475,14 +6018,14 @@
+@@ -5475,14 +6018,14 @@ relink_command=\"$relink_command\""
# but it's something to keep an eye on.
if test "$inst_prefix_dir" = "$destdir"; then
$echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
@@ -8478,7 +8478,7 @@
fi
$echo "$modename: warning: relinking \`$file'" 1>&2
-@@ -5490,7 +6033,7 @@
+@@ -5490,7 +6033,7 @@ relink_command=\"$relink_command\""
if $run eval "$relink_command"; then :
else
$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
@@ -8487,7 +8487,7 @@
fi
fi
-@@ -5514,23 +6057,36 @@
+@@ -5514,23 +6057,36 @@ relink_command=\"$relink_command\""
if test "$#" -gt 0; then
# Delete the old symlinks, and create new ones.
@@ -8528,7 +8528,7 @@
done
IFS="$save_ifs"
fi
-@@ -5568,7 +6124,7 @@
+@@ -5568,7 +6124,7 @@ relink_command=\"$relink_command\""
*)
$echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
$echo "$help" 1>&2
@@ -8537,7 +8537,7 @@
;;
esac
-@@ -5586,7 +6142,7 @@
+@@ -5586,7 +6142,7 @@ relink_command=\"$relink_command\""
$show "$install_prog $staticobj $staticdest"
$run eval "$install_prog \$staticobj \$staticdest" || exit $?
fi
@@ -8546,7 +8546,7 @@
;;
*)
-@@ -5624,23 +6180,21 @@
+@@ -5624,23 +6180,21 @@ relink_command=\"$relink_command\""
notinst_deplibs=
relink_command=
@@ -8579,7 +8579,7 @@
fi
finalize=yes
-@@ -5662,34 +6216,25 @@
+@@ -5662,34 +6216,25 @@ relink_command=\"$relink_command\""
done
relink_command=
@@ -8624,7 +8624,7 @@
$show "$relink_command"
if $run eval "$relink_command"; then :
-@@ -5709,7 +6254,7 @@
+@@ -5709,7 +6254,7 @@ relink_command=\"$relink_command\""
fi
# remove .exe since cygwin /usr/bin/install will append another
@@ -8633,7 +8633,7 @@
case $install_prog,$host in
*/usr/bin/install*,*cygwin*)
case $file:$destfile in
-@@ -5741,16 +6286,17 @@
+@@ -5741,16 +6286,17 @@ relink_command=\"$relink_command\""
$show "$install_prog $file $oldlib"
$run eval "$install_prog \$file \$oldlib" || exit $?
@@ -8653,7 +8653,7 @@
$show "$cmd"
$run eval "$cmd" || exit $?
done
-@@ -5764,9 +6310,9 @@
+@@ -5764,9 +6310,9 @@ relink_command=\"$relink_command\""
if test -n "$current_libdirs"; then
# Maybe just do a dry run.
test -n "$run" && current_libdirs=" -n$current_libdirs"
@@ -8665,7 +8665,7 @@
fi
;;
-@@ -5785,10 +6331,11 @@
+@@ -5785,10 +6331,11 @@ relink_command=\"$relink_command\""
for libdir in $libdirs; do
if test -n "$finish_cmds"; then
# Do each command in the finish commands.
@@ -8678,7 +8678,7 @@
$show "$cmd"
$run eval "$cmd" || admincmds="$admincmds
$cmd"
-@@ -5805,9 +6352,9 @@
+@@ -5805,9 +6352,9 @@ relink_command=\"$relink_command\""
fi
# Exit here if they wanted silent mode.
@@ -8690,7 +8690,7 @@
$echo "Libraries have been installed in:"
for libdir in $libdirs; do
$echo " $libdir"
-@@ -5840,8 +6387,8 @@
+@@ -5840,8 +6387,8 @@ relink_command=\"$relink_command\""
$echo
$echo "See any operating system documentation about shared libraries for"
$echo "more information, such as the ld(1) and ld.so(8) manual pages."
@@ -8701,7 +8701,7 @@
;;
# libtool execute mode
-@@ -5853,7 +6400,7 @@
+@@ -5853,7 +6400,7 @@ relink_command=\"$relink_command\""
if test -z "$cmd"; then
$echo "$modename: you must specify a COMMAND" 1>&2
$echo "$help"
@@ -8710,7 +8710,7 @@
fi
# Handle -dlopen flags immediately.
-@@ -5861,7 +6408,7 @@
+@@ -5861,7 +6408,7 @@ relink_command=\"$relink_command\""
if test ! -f "$file"; then
$echo "$modename: \`$file' is not a file" 1>&2
$echo "$help" 1>&2
@@ -8719,7 +8719,7 @@
fi
dir=
-@@ -5872,7 +6419,7 @@
+@@ -5872,7 +6419,7 @@ relink_command=\"$relink_command\""
else
$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
$echo "$help" 1>&2
@@ -8728,7 +8728,7 @@
fi
# Read the libtool library.
-@@ -5898,8 +6445,10 @@
+@@ -5898,8 +6445,10 @@ relink_command=\"$relink_command\""
if test -f "$dir/$objdir/$dlname"; then
dir="$dir/$objdir"
else
@@ -8741,7 +8741,7 @@
fi
;;
-@@ -5963,12 +6512,12 @@
+@@ -5963,12 +6512,12 @@ relink_command=\"$relink_command\""
fi
# Restore saved environment variables
@@ -8760,7 +8760,7 @@
# Now prepare to actually exec the command.
exec_cmd="\$cmd$args"
-@@ -5979,7 +6528,7 @@
+@@ -5979,7 +6528,7 @@ relink_command=\"$relink_command\""
$echo "export $shlibpath_var"
fi
$echo "$cmd$args"
@@ -8769,7 +8769,7 @@
fi
;;
-@@ -6007,7 +6556,7 @@
+@@ -6007,7 +6556,7 @@ relink_command=\"$relink_command\""
if test -z "$rm"; then
$echo "$modename: you must specify an RM program" 1>&2
$echo "$help" 1>&2
@@ -8778,7 +8778,7 @@
fi
rmdirs=
-@@ -6057,15 +6606,24 @@
+@@ -6057,15 +6606,24 @@ relink_command=\"$relink_command\""
rmfiles="$rmfiles $objdir/$n"
done
test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
@@ -8806,7 +8806,7 @@
$show "$cmd"
$run eval "$cmd"
if test "$?" -ne 0 && test "$rmforce" != yes; then
-@@ -6077,10 +6635,11 @@
+@@ -6077,10 +6635,11 @@ relink_command=\"$relink_command\""
if test -n "$old_library"; then
# Do each command in the old_postuninstall commands.
@@ -8819,7 +8819,7 @@
$show "$cmd"
$run eval "$cmd"
if test "$?" -ne 0 && test "$rmforce" != yes; then
-@@ -6090,7 +6649,8 @@
+@@ -6090,7 +6649,8 @@ relink_command=\"$relink_command\""
IFS="$save_ifs"
fi
# FIXME: should reinstall the best remaining shared library.
@@ -8829,7 +8829,7 @@
fi
;;
-@@ -6119,7 +6679,7 @@
+@@ -6119,7 +6679,7 @@ relink_command=\"$relink_command\""
if test "$mode" = clean ; then
noexename=$name
case $file in
@@ -8838,7 +8838,7 @@
file=`$echo $file|${SED} 's,.exe$,,'`
noexename=`$echo $name|${SED} 's,.exe$,,'`
# $file with .exe has already been added to rmfiles,
-@@ -6164,20 +6724,20 @@
+@@ -6164,20 +6724,20 @@ relink_command=\"$relink_command\""
"")
$echo "$modename: you must specify a MODE" 1>&2
$echo "$generic_help" 1>&2
@@ -8862,7 +8862,7 @@
fi
# We need to display help for each of the modes.
-@@ -6213,7 +6773,7 @@
+@@ -6213,7 +6773,7 @@ MODE-ARGS vary depending on the MODE. T
a more detailed description of MODE.
Report bugs to <bug-libtool at gnu.org>."
@@ -8871,7 +8871,7 @@
;;
clean)
-@@ -6314,9 +6874,9 @@
+@@ -6314,9 +6874,9 @@ The following components of LINK-COMMAND
-dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-export-symbols SYMFILE
@@ -8883,7 +8883,7 @@
-LLIBDIR search LIBDIR for required installed libraries
-lNAME OUTPUT-FILE requires the installed library libNAME
-module build a library that can dlopened
-@@ -6325,12 +6885,16 @@
+@@ -6325,12 +6885,16 @@ The following components of LINK-COMMAND
-no-undefined declare that a library does not refer to external symbols
-o OUTPUT-FILE create OUTPUT-FILE from the specified objects
-objectlist FILE Use a list of object files found in FILE to specify objects
@@ -8902,7 +8902,7 @@
All other options (arguments beginning with \`-') are ignored.
-@@ -6366,14 +6930,14 @@
+@@ -6366,14 +6930,14 @@ Otherwise, only FILE itself is deleted u
*)
$echo "$modename: invalid operation mode \`$mode'" 1>&2
$echo "$help" 1>&2
@@ -8919,7 +8919,7 @@
# The TAGs below are defined such that we never get into a situation
# in which we disable both kinds of libraries. Given conflicting
-@@ -6387,12 +6951,11 @@
+@@ -6387,12 +6951,11 @@ exit 0
# configuration. But we'll never go from static-only to shared-only.
# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
Modified: kde-extras/taskjuggler/trunk/debian/patches/04_am_maintainer_mode.diff
===================================================================
--- kde-extras/taskjuggler/trunk/debian/patches/04_am_maintainer_mode.diff 2009-07-15 23:00:45 UTC (rev 15295)
+++ kde-extras/taskjuggler/trunk/debian/patches/04_am_maintainer_mode.diff 2009-07-16 08:07:32 UTC (rev 15296)
@@ -1,6 +1,6 @@
--- a/admin/configure.in.min
+++ b/admin/configure.in.min
-@@ -38,6 +38,8 @@
+@@ -38,6 +38,8 @@ AC_ARG_PROGRAM
dnl Automake doc recommends to do this only here. (Janos)
AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
Modified: kde-extras/taskjuggler/trunk/debian/patches/05_pedantic-errors.diff
===================================================================
--- kde-extras/taskjuggler/trunk/debian/patches/05_pedantic-errors.diff 2009-07-15 23:00:45 UTC (rev 15295)
+++ kde-extras/taskjuggler/trunk/debian/patches/05_pedantic-errors.diff 2009-07-16 08:07:32 UTC (rev 15296)
@@ -1,6 +1,6 @@
--- a/admin/acinclude.m4.in
+++ b/admin/acinclude.m4.in
-@@ -2135,9 +2135,6 @@
+@@ -2135,9 +2135,6 @@ AC_LANG_CPLUSPLUS
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
Modified: kde-extras/taskjuggler/trunk/debian/patches/06_disable_no_undefined.diff
===================================================================
--- kde-extras/taskjuggler/trunk/debian/patches/06_disable_no_undefined.diff 2009-07-15 23:00:45 UTC (rev 15295)
+++ kde-extras/taskjuggler/trunk/debian/patches/06_disable_no_undefined.diff 2009-07-16 08:07:32 UTC (rev 15296)
@@ -1,6 +1,6 @@
--- a/admin/acinclude.m4.in
+++ b/admin/acinclude.m4.in
-@@ -1682,15 +1682,6 @@
+@@ -1682,15 +1682,6 @@ AC_DEFUN([KDE_CHECK_CLOSURE],
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
Modified: kde-extras/taskjuggler/trunk/debian/patches/11_fix_manpages_build.diff
===================================================================
--- kde-extras/taskjuggler/trunk/debian/patches/11_fix_manpages_build.diff 2009-07-15 23:00:45 UTC (rev 15295)
+++ kde-extras/taskjuggler/trunk/debian/patches/11_fix_manpages_build.diff 2009-07-16 08:07:32 UTC (rev 15296)
@@ -1,6 +1,6 @@
--- a/man/en/Makefile.am
+++ b/man/en/Makefile.am
-@@ -2,9 +2,7 @@
+@@ -2,9 +2,7 @@ man_MANS = taskjuggler.1 TaskJugglerUI.1
EXTRA_DIST = $(man_MANS)
.xml.1:
Modified: kde-extras/taskjuggler/trunk/debian/patches/series
===================================================================
--- kde-extras/taskjuggler/trunk/debian/patches/series 2009-07-15 23:00:45 UTC (rev 15295)
+++ kde-extras/taskjuggler/trunk/debian/patches/series 2009-07-16 08:07:32 UTC (rev 15296)
@@ -5,4 +5,3 @@
06_disable_no_undefined.diff
11_fix_manpages_build.diff
12_update_manpages.diff
-98_buildprep.diff
Modified: kde-extras/taskjuggler/trunk/debian/rules
===================================================================
--- kde-extras/taskjuggler/trunk/debian/rules 2009-07-15 23:00:45 UTC (rev 15295)
+++ kde-extras/taskjuggler/trunk/debian/rules 2009-07-16 08:07:32 UTC (rev 15296)
@@ -10,7 +10,8 @@
include /usr/share/cdbs/1/rules/utils.mk
DEB_BUILDDIR = .
-DEB_CONFIGURE_EXTRA_FLAGS := --with-docdir=/usr/share/doc/kde/HTML/en/taskjuggler/ --with-kde-support=no
+DEB_CONFIGURE_EXTRA_FLAGS := --with-docdir=/usr/share/doc/kde/HTML/en/taskjuggler/ \
+ --with-ical-support=no
DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--no-undefined -Wl,--as-needed"
install/taskjuggler::
More information about the pkg-kde-commits
mailing list