rev 9046 - in kde-extras/taskjuggler/trunk/debian: . patches
Fathi Boudra
fabo at alioth.debian.org
Sat Jan 19 18:00:19 UTC 2008
Author: fabo
Date: 2008-01-19 18:00:18 +0000 (Sat, 19 Jan 2008)
New Revision: 9046
Added:
kde-extras/taskjuggler/trunk/debian/patches/01_update_admin_dir.diff
kde-extras/taskjuggler/trunk/debian/patches/98_buildprep.diff
kde-extras/taskjuggler/trunk/debian/patches/series
Modified:
kde-extras/taskjuggler/trunk/debian/changelog
kde-extras/taskjuggler/trunk/debian/compat
kde-extras/taskjuggler/trunk/debian/control
kde-extras/taskjuggler/trunk/debian/menu
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/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/12_update_manpages.diff
kde-extras/taskjuggler/trunk/debian/rules
Log:
* New upstream release.
* Refresh patches. (Closes: #442742)
* Add patch to update admin directory.
* Add buildprep patch.
* Bump compat to 6.
* Update my e-mail address.
* Bump debhelper build dependency to 6.
* Add docbook-to-man build dependency.
* Use Homepage field.
* Add Vcs-Browser and Vcs-Svn fields.
* Update menu file to latest Debian menu policy.
* Build with --no-undefined and --as-needed linker flags.
* Add update-config target in rules file to workaround permission after
applying patches.
* Switch to quilt patch system.
Modified: kde-extras/taskjuggler/trunk/debian/changelog
===================================================================
--- kde-extras/taskjuggler/trunk/debian/changelog 2008-01-19 14:00:16 UTC (rev 9045)
+++ kde-extras/taskjuggler/trunk/debian/changelog 2008-01-19 18:00:18 UTC (rev 9046)
@@ -1,12 +1,26 @@
-taskjuggler (2.4.0-2) UNRELEASED; urgency=low
+taskjuggler (2.4.1~beta1-1) unstable; urgency=low
- * NOT RELEASED YET
+ * New upstream release.
+ * Refresh patches. (Closes: #442742)
+ * Add patch to update admin directory.
+ * Add buildprep patch.
+ * Bump compat to 6.
+ * Update my e-mail address.
+ * Bump debhelper build dependency to 6.
+ * Add docbook-to-man build dependency.
+ * Use Homepage field.
+ * Add Vcs-Browser and Vcs-Svn fields.
+ * Update menu file to latest Debian menu policy.
+ * Build with --no-undefined and --as-needed linker flags.
+ * Add update-config target in rules file to workaround permission after
+ applying patches.
+ * Switch to quilt patch system.
- -- Mark Purcell <msp at debian.org> Tue, 03 Jul 2007 19:09:25 +0100
+ -- Fathi Boudra <fabo at debian.org> Sat, 19 Jan 2008 10:54:03 +0100
taskjuggler (2.4.0-1) unstable; urgency=low
- * New upstream release
+ * New upstream release.
-- Mark Purcell <msp at debian.org> Tue, 03 Jul 2007 18:37:21 +0100
Modified: kde-extras/taskjuggler/trunk/debian/compat
===================================================================
--- kde-extras/taskjuggler/trunk/debian/compat 2008-01-19 14:00:16 UTC (rev 9045)
+++ kde-extras/taskjuggler/trunk/debian/compat 2008-01-19 18:00:18 UTC (rev 9046)
@@ -1 +1 @@
-5
+6
Modified: kde-extras/taskjuggler/trunk/debian/control
===================================================================
--- kde-extras/taskjuggler/trunk/debian/control 2008-01-19 14:00:16 UTC (rev 9045)
+++ kde-extras/taskjuggler/trunk/debian/control 2008-01-19 18:00:18 UTC (rev 9046)
@@ -3,10 +3,13 @@
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 (>= 5), automake1.9, kdelibs4-dev,
- libkcal2-dev | kdepim-dev, poster, docbook2x, docbook-utils, docbook-xml,
- openjade, xsltproc
-Standards-Version: 3.7.2
+Build-Depends: cdbs, debhelper (>= 6), quilt, automake1.9, kdelibs4-dev,
+ libkcal2-dev | kdepim-dev, poster, docbook2x, docbook-to-man, docbook-utils,
+ docbook-xml, openjade, xsltproc
+Standards-Version: 3.7.3
+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
Package: taskjuggler
Architecture: any
@@ -28,5 +31,3 @@
filtering and reporting algorithms you can create task lists, resource
usage tables, status reports, project calendars, and project accounting
statements.
- .
- Homepage: http://www.taskjuggler.org
Modified: kde-extras/taskjuggler/trunk/debian/menu
===================================================================
--- kde-extras/taskjuggler/trunk/debian/menu 2008-01-19 14:00:16 UTC (rev 9045)
+++ kde-extras/taskjuggler/trunk/debian/menu 2008-01-19 18:00:18 UTC (rev 9046)
@@ -1,5 +1,5 @@
?package(taskjuggler):\
needs="X11"\
- section="Apps/Tools"\
+ section="Applications/Project Management"\
title="TaskJuggler"\
command="/usr/bin/TaskJugglerUI"
Added: kde-extras/taskjuggler/trunk/debian/patches/01_update_admin_dir.diff
===================================================================
--- kde-extras/taskjuggler/trunk/debian/patches/01_update_admin_dir.diff (rev 0)
+++ kde-extras/taskjuggler/trunk/debian/patches/01_update_admin_dir.diff 2008-01-19 18:00:18 UTC (rev 9046)
@@ -0,0 +1,14173 @@
+--- a/admin/acinclude.m4.in
++++ b/admin/acinclude.m4.in
+@@ -593,6 +593,11 @@
+ if test "$kde_qtsubver" -le 2; then
+ kde33ornewer=
+ fi
++ if test "$KDECONFIG" != "compiled"; then
++ if test `$KDECONFIG --version | grep KDE | sed 's/KDE: \(...\).*/\1/'` = 3.2; then
++ kde33ornewer=
++ fi
++ fi
+ fi
+ fi
+
+@@ -606,7 +611,7 @@
+ fi
+ KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
+
+- if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then
++ if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
+ kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
+ test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
+ AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
+@@ -779,7 +784,7 @@
+ # CoreAudio framework
+ AC_CHECK_HEADER(CoreAudio/CoreAudio.h, [
+ AC_DEFINE(HAVE_COREAUDIO, 1, [Define if you have the CoreAudio API])
+- FRAMEWORK_COREAUDIO="-Xlinker -framework -Xlinker CoreAudio"
++ FRAMEWORK_COREAUDIO="-Wl,-framework,CoreAudio"
+ ])
+
+ AC_CHECK_RES_INIT
+@@ -803,6 +808,7 @@
+ KDE_CHECK_TYPES
+ KDE_CHECK_LIBDL
+ KDE_CHECK_STRLCPY
++ KDE_CHECK_PIE_SUPPORT
+
+ # darwin needs this to initialize the environment
+ AC_CHECK_HEADERS(crt_externs.h)
+@@ -977,7 +983,7 @@
+ X_INCLUDES="-I$x_includes"
+ fi
+
+-if test -z "$kde_x_libraries" || test "x$kde_x_libraries" = xNONE; then
++if test -z "$kde_x_libraries" || test "x$kde_x_libraries" = xNONE || test "$kde_x_libraries" = "/usr/lib"; then
+ X_LDFLAGS=""
+ x_libraries="/usr/lib"; dnl better than nothing :-
+ else
+@@ -1174,15 +1180,15 @@
+ if test $kde_qtsubver -gt 0; then
+ if test $kde_qtsubver -gt 1; then
+ if test $kde_qtsubver -gt 2; then
+- kde_qt_minversion=">= Qt 3.3"
++ kde_qt_minversion=">= Qt 3.3 and < 4.0"
+ else
+- kde_qt_minversion=">= Qt 3.2"
++ kde_qt_minversion=">= Qt 3.2 and < 4.0"
+ fi
+ else
+- kde_qt_minversion=">= Qt 3.1 (20021021)"
++ kde_qt_minversion=">= Qt 3.1 (20021021) and < 4.0"
+ fi
+ else
+- kde_qt_minversion=">= Qt 3.0"
++ kde_qt_minversion=">= Qt 3.0 and < 4.0"
+ fi
+ fi
+ if test "$kde_qtver" = "1"; then
+@@ -1195,11 +1201,11 @@
+ if test -z "$3"; then
+ if test $kde_qtver = 3; then
+ if test $kde_qtsubver -gt 0; then
+- kde_qt_verstring="QT_VERSION >= 0x03 at VER@00"
++ kde_qt_verstring="QT_VERSION >= 0x03 at VER@00 && QT_VERSION < 0x040000"
+ qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'`
+ kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s, at VER@,$qtsubver,"`
+ else
+- kde_qt_verstring="QT_VERSION >= 300"
++ kde_qt_verstring="QT_VERSION >= 300 && QT_VERSION < 0x040000"
+ fi
+ fi
+ if test $kde_qtver = 2; then
+@@ -1216,8 +1222,19 @@
+ kde_qt_verstring="$3"
+ fi
+
++if test $kde_qtver = 4; then
++ kde_qt_dirs="$QTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4"
++fi
+ if test $kde_qtver = 3; then
+- kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3"
++ kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3 /usr/lib${kdelibsuff}/qt-3.3"
++ if test -z "$PKG_CONFIG"; then
++ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
++ fi
++ if test "$PKG_CONFIG" != "no" ; then
++ if $PKG_CONFIG --exists qt-mt ; then
++ kde_qt_dirs="$kde_qt_dirs `$PKG_CONFIG --variable=prefix qt-mt`"
++ fi
++ fi
+ fi
+ if test $kde_qtver = 2; then
+ kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt"
+@@ -1347,22 +1364,17 @@
+ fi
+ fi
+
+-if test -z "$LIBQT"; then
+ dnl ------------------------------------------------------------
+ dnl If we got --enable-embedded then adjust the Qt library name.
+ dnl ------------------------------------------------------------
+- if test "x$kde_use_qt_emb" = "xyes"; then
+- qtlib="qte"
+- else
+- qtlib="qt"
+- fi
+-
+- kde_int_qt="-l$qtlib"
++if test "x$kde_use_qt_emb" = "xyes"; then
++ qtlib="qte"
+ else
+- kde_int_qt="$LIBQT"
+- kde_lib_qt_set=yes
++ qtlib="qt"
+ fi
+
++kde_int_qt="-l$qtlib"
++
+ if test -z "$LIBQPE"; then
+ dnl ------------------------------------------------------------
+ dnl If we got --enable-palmtop then add -lqpe to the link line
+@@ -1383,13 +1395,8 @@
+ dnl ------------------------------------------------------------------------
+
+ if test "x$kde_use_qt_mt" = "xyes"; then
+- if test -z "$LIBQT"; then
+- LIBQT="-l$qtlib-mt"
+- kde_int_qt="-l$qtlib-mt"
+- else
+- LIBQT="$qtlib-mt"
+- kde_int_qt="$qtlib-mt"
+- fi
++ LIBQT="-l$qtlib-mt"
++ kde_int_qt="-l$qtlib-mt"
+ LIBQT_GLOB="lib$qtlib-mt.*"
+ USING_QT_MT="using -mt"
+ else
+@@ -1444,6 +1451,14 @@
+ for dir in $kde_qt_dirs; do
+ qt_incdirs="$qt_incdirs $dir/include $dir"
+ done
++if test -z "$PKG_CONFIG"; then
++ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
++fi
++if test "$PKG_CONFIG" != "no" ; then
++ if $PKG_CONFIG --exists qt-mt ; then
++ qt_incdirs="$qt_incdirs `$PKG_CONFIG --variable=includedir qt-mt`"
++ fi
++fi
+ qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 /usr/include/qt3 $x_includes"
+ if test ! "$ac_qt_includes" = "NO"; then
+ qt_incdirs="$ac_qt_includes $qt_incdirs"
+@@ -1460,8 +1475,16 @@
+
+ qt_libdirs=""
+ for dir in $kde_qt_dirs; do
+- qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir"
++ qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir/lib $dir"
+ done
++if test -z "$PKG_CONFIG"; then
++ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
++fi
++if test "$PKG_CONFIG" != "no" ; then
++ if $PKG_CONFIG --exists qt-mt ; then
++ qt_libdirs="$qt_incdirs `$PKG_CONFIG --variable=libdir qt-mt`"
++ fi
++fi
+ qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
+ if test ! "$ac_qt_libraries" = "NO"; then
+ qt_libdir=$ac_qt_libraries
+@@ -1644,7 +1667,15 @@
+
+ AC_MSG_RESULT([$kde_cv_uic_plugins])
+ if test "$kde_cv_uic_plugins" != yes; then
+- AC_MSG_ERROR([you need to install kdelibs first.])
++ AC_MSG_ERROR([
++you need to install kdelibs first.
++
++If you did install kdelibs, then the Qt version that is picked up by
++this configure is not the same version you used to compile kdelibs.
++The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the
++_same Qt version_, compiled with the _same compiler_ and the same Qt
++configuration settings.
++])
+ fi
+ fi
+ ])
+@@ -1697,31 +1728,27 @@
+ AC_SUBST(KDE_NO_UNDEFINED)
+ ])
+
+-dnl Check if the linker supports --enable-new-dtags
+-AC_DEFUN([KDE_CHECK_NEW_DTAGS],
+-[
+- LDFLAGS_NEW_DTAGS=""
+- KDE_CHECK_COMPILER_FLAG([Wl,--enable-new-dtags],
+- [LDFLAGS_NEW_DTAGS="-Wl,--enable-new-dtags"],)
+- AC_SUBST(LDFLAGS_NEW_DTAGS)
+-])
+-
+-dnl Check for the linker if it supports --as-needed
+-AC_DEFUN([KDE_CHECK_AS_NEEDED],
++dnl Check if the linker supports --enable-new-dtags and --as-needed
++AC_DEFUN([KDE_CHECK_NEW_LDFLAGS],
+ [
+- KDE_CHECK_NEW_DTAGS
+-
+- AC_ARG_ENABLE(as_needed,
+- AC_HELP_STRING([--disable-as-needed],[disable the --as-needed flag for the linker]),
+- kde_use_as_needed=$enableval, kde_use_as_needed=$kde_cv_prog_cxx_Wl___enable_new_dtags)
++ AC_ARG_ENABLE(new_ldflags,
++ AC_HELP_STRING([--enable-new-ldflags],
++ [enable the new linker flags]),
++ kde_use_new_ldflags=$enableval,
++ kde_use_new_ldflags=no)
+
+ LDFLAGS_AS_NEEDED=""
+- if test "x$kde_use_as_needed" = "xyes"; then
++ LDFLAGS_NEW_DTAGS=""
++ if test "x$kde_use_new_ldflags" = "xyes"; then
++ LDFLAGS_NEW_DTAGS=""
++ KDE_CHECK_COMPILER_FLAG([Wl,--enable-new-dtags],
++ [LDFLAGS_NEW_DTAGS="-Wl,--enable-new-dtags"],)
++
+ KDE_CHECK_COMPILER_FLAG([Wl,--as-needed],
+- [LDFLAGS_AS_NEEDED="-Wl,--as-needed"],)
++ [LDFLAGS_AS_NEEDED="-Wl,--as-needed"],)
+ fi
+ AC_SUBST(LDFLAGS_AS_NEEDED)
+-
++ AC_SUBST(LDFLAGS_NEW_DTAGS)
+ ])
+
+ AC_DEFUN([KDE_CHECK_NMCHECK],
+@@ -2060,6 +2087,11 @@
+ AC_REQUIRE([K_PATH_X])
+
+ if test $kde_qtver = 3; then
++ case $host in
++ *cygwin*) lib_kded="-lkdeinit_kded" ;;
++ *) lib_kded="" ;;
++ esac
++ AC_SUBST(LIB_KDED, $lib_kded)
+ AC_SUBST(LIB_KDECORE, "-lkdecore")
+ AC_SUBST(LIB_KDEUI, "-lkdeui")
+ AC_SUBST(LIB_KIO, "-lkio")
+@@ -2076,6 +2108,7 @@
+ AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+ AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
+ AC_SUBST(LIB_KDNSSD, "-lkdnssd")
++ AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+ # these are for backward compatibility
+ AC_SUBST(LIB_KSYCOCA, "-lkio")
+ AC_SUBST(LIB_KFILE, "-lkio")
+@@ -2494,22 +2527,16 @@
+ ac_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
+ AC_TRY_LINK(
+-[/* Override any gcc2 internal prototype to avoid an error. */
+-struct jpeg_decompress_struct;
+-typedef struct jpeg_decompress_struct * j_decompress_ptr;
+-typedef int size_t;
++[
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+- void jpeg_CreateDecompress(j_decompress_ptr cinfo,
+- int version, size_t structsize);
++void jpeg_CreateDecompress();
+ #ifdef __cplusplus
+ }
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ ],
+- [jpeg_CreateDecompress(0L, 0, 0);],
++[jpeg_CreateDecompress();],
+ eval "ac_cv_lib_jpeg_$1=-ljpeg$2",
+ eval "ac_cv_lib_jpeg_$1=no")
+ LIBS="$ac_save_LIBS"
+@@ -2628,6 +2655,7 @@
+ AC_TRY_LINK(dnl
+ [
+ #include<zlib.h>
++#include<string.h>
+ ],
+ [
+ char buf[42];
+@@ -2635,7 +2663,7 @@
+ /* this would segfault.. but we only link, don't run */
+ (void) gzgets(f, buf, sizeof(buf));
+
+- return (zlibVersion() == ZLIB_VERSION);
++ return (strcmp(zlibVersion(), ZLIB_VERSION) == 0);
+ ],
+ eval "ac_cv_lib_z='-lz'",
+ eval "ac_cv_lib_z=no")
+@@ -2716,6 +2744,73 @@
+ AC_SUBST(LIBTIFF)
+ ])
+
++AC_DEFUN([KDE_FIND_LIBEXR],
++[
++AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
++AC_REQUIRE([AC_FIND_ZLIB])
++AC_CACHE_VAL(ac_cv_libexr,
++[
++ if test -z "$PKG_CONFIG"; then
++ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
++ fi
++
++ AC_MSG_CHECKING([for OpenEXR libraries])
++
++ if test "$PKG_CONFIG" = "no" ; then
++ AC_MSG_RESULT(no)
++ echo "*** The pkg-config script could not be found. Make sure it is"
++ echo "*** in your path, or set the PKG_CONFIG environment variable"
++ echo "*** to the full path to pkg-config."
++ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
++ else
++ if ! $PKG_CONFIG --exists OpenEXR ; then
++ AC_MSG_RESULT(no)
++ EXRSTATUS=no
++ else
++ if ! $PKG_CONFIG --atleast-version="1.1.1" OpenEXR ; then
++ AC_MSG_RESULT(no)
++ EXRSTATUS=old
++ else
++ kde_save_LIBS="$LIBS"
++ LIBS="$LIBS $all_libraries $USER_LDFLAGS `pkg-config --libs OpenEXR` $LIBZ"
++ AC_LANG_SAVE
++ AC_LANG_CPLUSPLUS
++ kde_save_CXXFLAGS="$CXXFLAGS"
++ EXR_FLAGS=`$PKG_CONFIG --cflags OpenEXR`
++ CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES $EXR_FLAGS"
++
++ AC_TRY_LINK(dnl
++ [
++ #include <ImfRgbaFile.h>
++ ],
++ [
++ using namespace Imf;
++ RgbaInputFile file ("dummy");
++ return 0;
++ ],
++ eval "ac_cv_libexr='`pkg-config --libs OpenEXR`'",
++ eval "ac_cv_libexr=no"
++ )
++ LIBS="$kde_save_LIBS"
++ CXXFLAGS="$kde_save_CXXFLAGS"
++ AC_LANG_RESTORE
++ ])dnl
++ if eval "test ! \"`echo $ac_cv_libexr`\" = no"; then
++ AC_DEFINE_UNQUOTED(HAVE_EXR, 1, [Define if you have OpenEXR])
++ LIB_EXR="$ac_cv_libexr"
++ AC_MSG_RESULT($ac_cv_libexr)
++ else
++ AC_MSG_RESULT(no)
++ LIB_EXR=""
++ fi
++ fi
++ fi
++ fi
++ AC_SUBST(LIB_EXR)
++ AC_SUBST(EXR_FLAGS)
++])
++
++
+
+ AC_DEFUN([AC_FIND_PNG],
+ [
+@@ -2904,6 +2999,76 @@
+ fi
+ ])
+
++
++AC_DEFUN([KDE_CHECK_FOR_BAD_COMPILER],
++[
++ AC_MSG_CHECKING([whether $CC is blacklisted])
++
++ dnl In theory we have tu run this test against $CC and $CXX
++ dnl in C and in C++ mode, because its perfectly legal for
++ dnl the user to mix compiler versions, since C has a defined
++ dnl ABI.
++ dnl
++ dnl For now, we assume the user is not on crack.
++
++ AC_TRY_COMPILE([
++#ifdef __GNUC__
++#if __GNUC__ == 4 && __GNUC_MINOR__ == 0 && __GNUC_PATCHLEVEL__ == 0
++choke me
++#endif
++#endif
++], ,
++ kde_bad_compiler=no,
++ kde_bad_compiler=yes
++)
++
++ AC_MSG_RESULT($kde_bad_compiler)
++
++if test "$kde_bad_compiler" = "yes"; then
++ AC_MSG_ERROR([
++
++This particular compiler version is blacklisted because it
++is known to miscompile KDE. Please use a newer version, or
++if that is not yet available, choose an older version.
++
++Please do not report a bug or bother us reporting this
++configure error. We know about it, and we introduced
++it by intention to avoid untraceable bugs or crashes in KDE.
++
++])
++fi
++
++])
++
++
++AC_DEFUN([KDE_CHECK_FOR_OPT_NOINLINE_MATCH],
++[
++ AC_CACHE_CHECK([whether system headers can cope with -O2 -fno-inline],
++ kde_cv_opt_noinline_match,
++ [
++ kde_cv_opt_noinline_match=irrelevant
++ dnl if we don't use both -O2 and -fno-inline, this check is moot
++ if echo "$CFLAGS" | grep -e -O2 >/dev/null 2>/dev/null \
++ && echo "$CFLAGS" | grep -e -fno-inline >/dev/null 2>/dev/null ; then
++
++ ac_cflags_save="$CFLAGS"
++ CFLAGS="$CFLAGS -D_USE_GNU"
++
++ AC_TRY_LINK([
++ #include <string.h>
++], [ const char *pt, *et;
++ et = __extension__ ({ char __a0, __a1, __a2; (__builtin_constant_p ( ";," ) && ((size_t)(const void *)(( ";," )+ 1) - (size_t)(const void *)( ";," ) == 1) ? ((__a0 =((__const char *) ( ";," ))[0], __a0 == '\0') ? ((void) ( pt ),((void *)0) ) : ((__a1 = ((__const char *) ( ";," ))[1], __a1== '\0') ? (__extension__ (__builtin_constant_p ( __a0 ) && ( __a0 ) == '\0' ? (char *) __rawmemchr ( pt , __a0) : strchr( pt , __a0 ))) : ((__a2 = ((__const char *) ( ";," ))[2], __a2 == '\0') ? __strpbrk_c2 ( pt , __a0, __a1) :(((__const char *) ( ";," ))[3] == '\0' ? __strpbrk_c3 ( pt ,__a0, __a1, __a2): strpbrk ( pt , ";," ))))) : strpbrk ( pt , ";," )); }) ;
++],
++ kde_cv_opt_noinline_match=yes,
++ kde_cv_opt_noinline_match=no
++ )
++
++ CFLAGS="$ac_cflags_save"
++ fi
++ ])
++])
++
++
+ dnl AC_VALIDIFY_CXXFLAGS checks for forbidden flags the user may have given
+ AC_DEFUN([AC_VALIDIFY_CXXFLAGS],
+ [dnl
+@@ -2988,7 +3153,7 @@
+ if test $kde_use_debug_code = "full"; then
+ CFLAGS="-g3 -fno-inline $CFLAGS"
+ else
+- CFLAGS="-g -O2 $CFLAGS"
++ CFLAGS="-g -O2 -fno-schedule-insns -fno-inline $CFLAGS"
+ fi
+ else
+ CFLAGS="-O2 $CFLAGS"
+@@ -3013,6 +3178,8 @@
+
+ AC_PROG_CXX
+
++ KDE_CHECK_FOR_BAD_COMPILER
++
+ if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
+ if test "$kde_use_debug_code" != "no"; then
+ if test "$CXX" = "KCC"; then
+@@ -3021,7 +3188,7 @@
+ if test "$kde_use_debug_code" = "full"; then
+ CXXFLAGS="-g3 -fno-inline $CXXFLAGS"
+ else
+- CXXFLAGS="-g -O2 $CXXFLAGS"
++ CXXFLAGS="-g -O2 -fno-schedule-insns -fno-inline $CXXFLAGS"
+ fi
+ fi
+ KDE_CHECK_COMPILER_FLAG(fno-builtin,[CXXFLAGS="-fno-builtin $CXXFLAGS"])
+@@ -3034,7 +3201,7 @@
+ CXXFLAGS="+K3 $CXXFLAGS"
+ else
+ CXXFLAGS="-O2 $CXXFLAGS"
+- fi
++ fi
+ fi
+ fi
+
+@@ -3052,17 +3219,19 @@
+
+ if test "$kde_use_warnings" = "yes"; then
+ if test "$GCC" = "yes"; then
+- CXXFLAGS="-Wall -W -Wpointer-arith -Wwrite-strings $CXXFLAGS"
++ CXXFLAGS="-Wall -W -Wpointer-arith $CXXFLAGS"
+ case $host in
+ *-*-linux-gnu)
+- CFLAGS="-ansi -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
+- CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS"
++ CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
++ CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wchar-subscripts $CXXFLAGS"
+ KDE_CHECK_COMPILER_FLAG(Wmissing-format-attribute, [CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"])
+ KDE_CHECK_C_COMPILER_FLAG(Wmissing-format-attribute, [CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"])
+ ;;
+ esac
+ KDE_CHECK_COMPILER_FLAG(Wundef,[CXXFLAGS="-Wundef $CXXFLAGS"])
+ KDE_CHECK_COMPILER_FLAG(Wno-long-long,[CXXFLAGS="-Wno-long-long $CXXFLAGS"])
++ dnl ### FIXME: revert for KDE 4
++ KDE_CHECK_COMPILER_FLAG(Wno-non-virtual-dtor,[CXXFLAGS="$CXXFLAGS -Wno-non-virtual-dtor"])
+ fi
+ fi
+
+@@ -3079,6 +3248,14 @@
+ AC_SUBST([HAVE_GCC_VISIBILITY])
+
+ if test "$GXX" = "yes"; then
++ gcc_no_reorder_blocks=NO
++ KDE_CHECK_COMPILER_FLAG(fno-reorder-blocks,[gcc_no_reorder_blocks=YES])
++ if test $kde_use_debug_code != "no" && \
++ test $kde_use_debug_code != "full" && \
++ test "YES" = "$gcc_no_reorder_blocks" ; then
++ CXXFLAGS="$CXXFLAGS -fno-reorder-blocks"
++ CFLAGS="$CFLAGS -fno-reorder-blocks"
++ fi
+ KDE_CHECK_COMPILER_FLAG(fno-exceptions,[CXXFLAGS="$CXXFLAGS -fno-exceptions"])
+ KDE_CHECK_COMPILER_FLAG(fno-check-new, [CXXFLAGS="$CXXFLAGS -fno-check-new"])
+ KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"])
+@@ -3107,6 +3284,11 @@
+ fi
+ rm -f conftest.h conftest.h.gch
+ fi
++
++ KDE_CHECK_FOR_OPT_NOINLINE_MATCH
++ if test "x$kde_cv_opt_noinline_match" = "xno" ; then
++ CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`"
++ fi
+ fi
+ AM_CONDITIONAL(unsermake_enable_pch, test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes")
+ if test "$CXX" = "KCC"; then
+@@ -3189,7 +3371,7 @@
+ AC_SUBST(NOOPT_CFLAGS)
+ AC_SUBST(ENABLE_PERMISSIVE_FLAG)
+
+- KDE_CHECK_AS_NEEDED
++ KDE_CHECK_NEW_LDFLAGS
+ KDE_CHECK_FINAL
+ KDE_CHECK_CLOSURE
+ KDE_CHECK_NMCHECK
+@@ -3197,26 +3379,114 @@
+ ifdef([AM_DEPENDENCIES], AC_REQUIRE([KDE_ADD_DEPENDENCIES]), [])
+ ])
+
+-AC_DEFUN([KDE_CHECK_AND_ADD_HIDDEN_VISIBILITY],
++AC_DEFUN([KDE_CHECK_VISIBILITY_GCC_BUG],
++ [
++ AC_CACHE_CHECK([for gcc -fvisibility-inlines-hidden bug], kde_cv_val_gcc_visibility_bug,
++ [
++ AC_LANG_SAVE
++ AC_LANG_CPLUSPLUS
++
++ safe_CXXFLAGS=$CXXFLAGS
++ safe_LDFLAGS=$LDFLAGS
++ CXXFLAGS="$CXXFLAGS -fPIC -fvisibility-inlines-hidden -O0"
++ LDFLAGS="$LDFLAGS -shared -fPIC"
++
++ AC_TRY_LINK(
++ [
++ /* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19664 */
++ #include <string>
++ int some_function( void ) __attribute__ ((visibility("default")));
++ int some_function( void )
++ {
++ std::string s("blafasel");
++ return 0;
++ }
++ ], [/* elvis is alive */],
++ kde_cv_val_gcc_visibility_bug=no, kde_cv_val_gcc_visibility_bug=yes)
++
++ CXXFLAGS=$safe_CXXFLAGS
++ LDFLAGS=$safe_LDFLAGS
++ AC_LANG_RESTORE
++ ]
++ )
++
++ if test x$kde_cv_val_gcc_visibility_bug = xno; then
++ CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
++ fi
++ ]
++)
++
++AC_DEFUN([KDE_ENABLE_HIDDEN_VISIBILITY],
+ [
+- if test "$GXX" = "yes"; then
+- KDE_CHECK_COMPILER_FLAG(fno-exceptions,[CXXFLAGS="$CXXFLAGS -fno-exceptions"])
+- KDE_CHECK_COMPILER_FLAG(fno-check-new, [CXXFLAGS="$CXXFLAGS -fno-check-new"])
+- KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"])
++ AC_BEFORE([AC_PATH_QT_1_3], [KDE_ENABLE_HIDDEN_VISIBILITY])
++
++ AC_MSG_CHECKING([grepping for visibility push/pop in headers])
++
++ if test "x$GXX" = "xyes"; then
++ AC_LANG_SAVE
++ AC_LANG_CPLUSPLUS
++ AC_EGREP_CPP(
++ [GCC visibility push],
++ [ #include <exception>
++ ],
++ [
++ AC_MSG_RESULT(yes)
++ kde_stdc_visibility_patched=yes ],
++ [
++ AC_MSG_RESULT(no)
++ AC_MSG_WARN([Your libstdc++ doesn't appear to be patched for
++ visibility support. Disabling -fvisibility=hidden])
++
++ kde_stdc_visibility_patched=no ])
++
++ AC_LANG_RESTORE
++
++ kde_have_gcc_visibility=no
+ KDE_CHECK_COMPILER_FLAG(fvisibility=hidden,
+ [
+- CXXFLAGS="$CXXFLAGS -fvisibility=hidden -fvisibility-inlines-hidden"
++ kde_have_gcc_visibility=yes
++ dnl the whole toolchain is just a mess, gcc is just too buggy
++ dnl to handle STL with visibility enabled. Lets reconsider
++ dnl when gcc 4.2 is out or when things get fixed in the compiler.
++ dnl Contact mueller at kde.org for details.
++ AC_ARG_ENABLE(gcc-hidden-visibility,
++ AC_HELP_STRING([--enable-gcc-hidden-visibility],[toolchain hidden visibility [default=no]]),
++ [kde_have_gcc_visibility=$enableval],
++ [kde_have_gcc_visibility=no])
++
++ AC_CACHE_CHECK([if Qt is patched for -fvisibility], kde_cv_val_qt_gcc_visibility_patched,
++ [
++ AC_LANG_SAVE
++ AC_LANG_CPLUSPLUS
++
++ safe_CXXFLAGS=$CXXFLAGS
++ CXXFLAGS="$CXXFLAGS $all_includes"
++
++ AC_TRY_COMPILE(
++ [
++#include <qglobal.h>
++#if Q_EXPORT - 0 != 0
++/* if this compiles, then Q_EXPORT is undefined */
++/* if Q_EXPORT is nonempty, this will break compilation */
++#endif
++ ], [/* elvis is alive */],
++ kde_cv_val_qt_gcc_visibility_patched=no, kde_cv_val_qt_gcc_visibility_patched=yes)
++
++ CXXFLAGS=$safe_CXXFLAGS
++ AC_LANG_RESTORE
++ ]
++ )
++
++ if test x$kde_have_gcc_visibility = "xyes" && test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
++ CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
++ KDE_CHECK_VISIBILITY_GCC_BUG
+ HAVE_GCC_VISIBILITY=1
+ AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
++ fi
+ ])
+ fi
+ ])
+
+-AC_DEFUN([KDE_ENABLE_HIDDEN_VISIBILITY],
+-[
+- AC_REQUIRE([KDE_CHECK_AND_ADD_HIDDEN_VISIBILITY])
+-])
+-
+ AC_DEFUN([KDE_ADD_DEPENDENCIES],
+ [
+ [A]M_DEPENDENCIES(CC)
+@@ -3244,23 +3514,37 @@
+ KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
+ AC_SUBST(KDE_PLUGIN)
+
++# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
++KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
++AC_SUBST(KDE_CHECK_PLUGIN)
++
+ # we patch configure quite some so we better keep that consistent for incremental runs
+ AC_SUBST(AUTOCONF,'$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch configure')
+ ])
+
+ AC_DEFUN([KDE_CHECK_LIB64],
+ [
+- kdelibsuff="$kde_libs_suffix"
+- if test -z "$kdelibsuff"; then
+- kdelibsuff=no
+- fi
+ AC_ARG_ENABLE(libsuffix,
+ AC_HELP_STRING([--enable-libsuffix],
+- [/lib directory suffix (64,32,none[=default])]),
+- kdelibsuff=$enableval)
+- # TODO: add an auto case that compiles a little C app to check
+- # where the glibc is
+- if test "$kdelibsuff" = "no"; then
++ [/lib directory suffix (64,32,none,auto[=default])]),
++ kdelibsuff=$enableval, kdelibsuff="auto")
++
++ if test "$kdelibsuff" = "auto"; then
++
++cat > conftest.c << EOF
++#include <stdio.h>
++int main() {
++ return 0;
++}
++EOF
++ kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{
++ s,.*/lib\([[^\/]]*\)/.*,\1,
++ p
++}'`
++ rm -rf conftest.*
++ fi
++
++ if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then
+ kdelibsuff=
+ fi
+ if test -z "$kdelibsuff"; then
+@@ -3306,7 +3590,11 @@
+
+ if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
+
+- KDE_RPATH="-R \$(kde_libraries)"
++ KDE_RPATH="-R \$(libdir)"
++
++ if test "$kde_libraries" != "$libdir"; then
++ KDE_RPATH="$KDE_RPATH -R \$(kde_libraries)"
++ fi
+
+ if test -n "$qt_libraries"; then
+ KDE_RPATH="$KDE_RPATH -R \$(qt_libraries)"
+@@ -3668,7 +3956,8 @@
+ ac_save_ldflags="$LDFLAGS"
+ ac_save_cflags="$CFLAGS"
+ ac_save_libs="$LIBS"
+- LDFLAGS="$LDFLAGS $DPMS_LDFLAGS $all_libraries -lX11 -lXext $LIBSOCKET"
++ LDFLAGS="$LDFLAGS $DPMS_LDFLAGS $all_libraries"
++ LIBS="-lX11 -lXext $LIBSOCKET"
+ CFLAGS="$CFLAGS $X_INCLUDES"
+ test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS"
+ AC_TRY_LINK([
+@@ -3679,12 +3968,7 @@
+ int foo_test_dpms()
+ { return DPMSSetTimeouts( 0, 0, 0, 0 ); }],[],
+ ac_cv_have_dpms="yes", [
+- LDFLAGS="$ac_save_ldflags"
+- CFLAGS="$ac_save_cflags"
+- LDFLAGS="$LDFLAGS $DPMS_LDFLAGS $all_libraries -lX11 -lXext $LIBSOCKET"
+- LIBS="$LIBS -lXdpms"
+- CFLAGS="$CFLAGS $X_INCLUDES"
+- test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS"
++ LIBS="-lXdpms $LIBS"
+ AC_TRY_LINK([
+ #include <X11/Xproto.h>
+ #include <X11/X.h>
+@@ -3733,12 +4017,14 @@
+ [Define if you have the DPMSCapable prototype in <X11/extensions/dpms.h>])
+ AC_CHECK_DECL(DPMSCapable,
+ AC_DEFINE(HAVE_DPMSCAPABLE_PROTO),,
+- [#include <X11/extensions/dpms.h>])
++ [#include <X11/Xlib.h>
++ #include <X11/extensions/dpms.h>])
+ AH_TEMPLATE(HAVE_DPMSINFO_PROTO,
+ [Define if you have the DPMSInfo prototype in <X11/extensions/dpms.h>])
+ AC_CHECK_DECL(DPMSInfo,
+ AC_DEFINE(HAVE_DPMSINFO_PROTO),,
+- [#include <X11/extensions/dpms.h>])
++ [#include <X11/Xlib.h>
++ #include <X11/extensions/dpms.h>])
+ CFLAGS="$ac_save_cflags"
+ AC_SUBST(DPMSINC)
+ AC_SUBST(DPMSLIB)
+@@ -3764,31 +4050,23 @@
+ [
+ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+- ac_save_ldflags="$LDFLAGS"
+- ac_save_cxxflags="$CXXFLAGS"
+- LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries -lMesaGL -lMesaGLU"
+- test "x$kde_use_qt_mac" != xyes && test "x$kde_use_qt_emb" != xyes && LDFLAGS="$LDFLAGS -lX11"
+- LDFLAGS="$LDFLAGS $LIB_XEXT -lm $LIBSOCKET"
++ ac_save_ldflags=$LDFLAGS
++ ac_save_cxxflags=$CXXFLAGS
++ ac_save_libs=$LIBS
++ LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries"
++ LIBS="$LIBS -lGL -lGLU"
++ test "x$kde_use_qt_mac" != xyes && test "x$kde_use_qt_emb" != xyes && LIBS="$LIBS -lX11"
++ LIBS="$LIBS $LIB_XEXT -lm $LIBSOCKET"
+ CXXFLAGS="$CFLAGS $X_INCLUDES"
+ test -n "$GL_INCLUDE" && CFLAGS="-I$GL_INCLUDE $CFLAGS"
+ AC_TRY_LINK([#include <GL/gl.h>
+ #include <GL/glu.h>
+ ], [],
+- ac_cv_have_gl="mesa", ac_cv_have_gl="no")
+- if test "x$ac_cv_have_gl" = "xno"; then
+- LDFLAGS="$ac_save_ldflags $X_LDFLAGS $GL_LDFLAGS $all_libraries -lGLU -lGL"
+- test "x$kde_use_qt_mac" != xyes && test "x$kde_use_qt_emb" != xyes && LDFLAGS="$LDFLAGS -lX11"
+- LDFLAGS="$LDFLAGS $LIB_XEXT -lm $LIBSOCKET"
+- CXXFLAGS="$ac_save_cflags $X_INCLUDES"
+- test -n "$GL_INCLUDE" && CFLAGS="-I$GL_INCLUDE $CFLAGS"
+- AC_TRY_LINK([#include <GL/gl.h>
+-#include <GL/glu.h>
+-], [],
+- ac_cv_have_gl="yes", ac_cv_have_gl="no")
+- fi
++ ac_cv_have_gl="yes", ac_cv_have_gl="no")
+ AC_LANG_RESTORE
+- LDFLAGS="$ac_save_ldflags"
+- CXXFLAGS="$ac_save_cxxflags"
++ LDFLAGS=$ac_save_ldflags
++ CXXFLAGS=$ac_save_cxxflags
++ LIBS=$ac_save_libs
+ ])dnl
+
+ if test "$ac_cv_have_gl" = "no"; then
+@@ -3799,17 +4077,9 @@
+ else
+ AC_DEFINE(HAVE_GL, 1, [Defines if you have GL (Mesa, OpenGL, ...)])
+ if test "$GL_LDFLAGS" = ""; then
+- if test "$ac_cv_have_gl" = "mesa"; then
+- GLLIB='-lMesaGLU -lMesaGL $(LIB_X11)'
+- else
+- GLLIB='-lGLU -lGL $(LIB_X11)'
+- fi
++ GLLIB='-lGLU -lGL $(LIB_X11)'
+ else
+- if test "$ac_cv_have_gl" = "mesa"; then
+- GLLIB="$GL_LDFLAGS -lMesaGLU -lMesaGL "'$(LIB_X11)'
+- else
+- GLLIB="$GL_LDFLAGS -lGLU -lGL "'$(LIB_X11)'
+- fi
++ GLLIB="$GL_LDFLAGS -lGLU -lGL "'$(LIB_X11)'
+ fi
+ if test "$GL_INCLUDE" = ""; then
+ GLINC=""
+@@ -4379,12 +4649,14 @@
+
+ AC_DEFUN([KDE_CHECK_PYTHON],
+ [
+- KDE_CHECK_PYTHON_INTERN("2.4",
+- [KDE_CHECK_PYTHON_INTERN("2.3",
+- [KDE_CHECK_PYTHON_INTERN("2.2",
+- [KDE_CHECK_PYTHON_INTERN("2.1",
+- [KDE_CHECK_PYTHON_INTERN("2.0",
+- [KDE_CHECK_PYTHON_INTERN($1, $2) ])
++ KDE_CHECK_PYTHON_INTERN("2.5",
++ [KDE_CHECK_PYTHON_INTERN("2.4",
++ [KDE_CHECK_PYTHON_INTERN("2.3",
++ [KDE_CHECK_PYTHON_INTERN("2.2",
++ [KDE_CHECK_PYTHON_INTERN("2.1",
++ [KDE_CHECK_PYTHON_INTERN("2.0",
++ [KDE_CHECK_PYTHON_INTERN($1, $2) ])
++ ])
+ ])
+ ])
+ ])
+@@ -4656,13 +4928,13 @@
+
+ AC_DEFUN([KDE_CHECK_HEADER],
+ [
+- AC_LANG_SAVE
+ kde_safe_cppflags=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $all_includes"
++ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+ AC_CHECK_HEADER([$1], [$2], [$3], [$4])
+- CPPFLAGS=$kde_safe_cppflags
+ AC_LANG_RESTORE
++ CPPFLAGS=$kde_safe_cppflags
+ ])
+
+ AC_DEFUN([KDE_CHECK_HEADERS],
+@@ -4714,7 +4986,6 @@
+ fi
+ # And delete superfluous '/' to make compares easier
+ prefix=`echo "$prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
+- kde_libs_htmldir=$prefix/share/doc/HTML/
+ exec_prefix=`echo "$exec_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
+
+ kde_libs_prefix='$(prefix)'
+@@ -4753,7 +5024,6 @@
+ ])
+ fi
+ kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
+- kde_libs_suffix=`$KDECONFIG --libsuffix`
+
+ AC_MSG_CHECKING([where to install])
+ if test "x$prefix" = "xNONE"; then
+@@ -4970,9 +5240,10 @@
+ for dir in $javadirs; do
+ dnl Check for the java executable
+ if test -x "$dir/java"; then
++ sane_path=$(cd $dir; /bin/pwd)
+ dnl And also check for a libjvm.so somewhere under there
+ dnl Since we have to go to the parent dir, /usr/bin is excluded, /usr is too big.
+- if test "$dir" != "/usr/bin"; then
++ if test "$sane_path" != "/usr/bin"; then
+ libjvmdir=`find $dir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1`
+ if test ! -f $libjvmdir/libjvm.so; then continue; fi
+ jredirs="$jredirs $dir"
+@@ -5129,7 +5400,7 @@
+ JAVAC=$kde_java_bindir/javac
+ JAVAH=$kde_java_bindir/javah
+ JAR=$kde_java_bindir/jar
+- JVMLIBS="-Xlinker -framework -Xlinker JavaVM"
++ JVMLIBS="-Wl,-framework,JavaVM"
+
+ AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is])
+ AC_MSG_RESULT([Apple Java Framework])
+@@ -5663,3 +5934,64 @@
+ fi
+
+ ])
++
++dnl A small extension to PKG_CHECK_MODULES (defined in pkg.m4.in)
++dnl which allows to search for libs that get installed into the KDE prefix.
++dnl
++dnl Syntax: KDE_PKG_CHECK_MODULES(KSTUFF, libkexif >= 0.2 glib = 1.3.4, action-if, action-not)
++dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page
++dnl also defines KSTUFF_PKG_ERRORS on error
++AC_DEFUN([KDE_PKG_CHECK_MODULES], [
++
++ PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
++ if test "$prefix" != "$kde_libs_prefix"; then
++ PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
++ fi
++ export PKG_CONFIG_PATH
++ PKG_CHECK_MODULES([$1],[$2],[$3],[$4])
++])
++
++
++dnl Check for PIE support in the compiler and linker
++AC_DEFUN([KDE_CHECK_PIE_SUPPORT],
++[
++ AC_CACHE_CHECK([for PIE support], kde_cv_val_pie_support,
++ [
++ AC_LANG_SAVE
++ AC_LANG_CPLUSPLUS
++ safe_CXXFLAGS=$CXXFLAGS
++ safe_LDFLAGS=$LDFLAGS
++ CXXFLAGS="$CXXFLAGS -fPIE"
++ LDFLAGS="$LDFLAGS -pie"
++
++ AC_TRY_LINK([int foo;], [], [kde_cv_val_pie_support=yes], [kde_cv_val_pie_support=no])
++
++ CXXFLAGS=$safe_CXXFLAGS
++ LDFLAGS=$safe_LDFLAGS
++ AC_LANG_RESTORE
++ ])
++
++ AC_MSG_CHECKING(if enabling -pie/fPIE support)
++
++ AC_ARG_ENABLE(pie,
++ AC_HELP_STRING([--enable-pie],[platform supports PIE linking [default=detect]]),
++ [kde_has_pie_support=$enableval],
++ [kde_has_pie_support=detect])
++
++ if test "$kde_has_pie_support" = "detect"; then
++ kde_has_pie_support=$kde_cv_val_pie_support
++ fi
++
++ AC_MSG_RESULT([$kde_has_pie_support])
++
++ KDE_USE_FPIE=""
++ KDE_USE_PIE=""
++
++ AC_SUBST([KDE_USE_FPIE])
++ AC_SUBST([KDE_USE_PIE])
++
++ if test "$kde_has_pie_support" = "yes"; then
++ KDE_USE_FPIE="-fPIE"
++ KDE_USE_PIE="-pie"
++ fi
++])
+--- a/admin/am_edit
++++ b/admin/am_edit
+@@ -351,7 +351,7 @@
+ my $tmp = "force-reedit:\n";
+ $tmp .= "\t$automkCall\n\tcd \$(top_srcdir) && perl $thisProg $printname\n\n";
+ appendLines($tmp);
+-
++
+ make_bcheck_target();
+ make_meta_classes();
+ tag_COMPILE_FIRST();
+@@ -422,10 +422,6 @@
+ substituteLine($lookup, "RECURSIVE_TARGETS = $1 nmcheck-recursive bcheck-recursive");
+ }
+
+- my $cvs_lines = "cvs-clean:\n";
+- $cvs_lines .= "\t\$(MAKE) admindir=\$(top_srcdir)/admin -f \$(top_srcdir)/admin/Makefile.common cvs-clean\n";
+- appendLines($cvs_lines);
+-
+ $cvs_lines = "kde-rpo-clean:\n";
+ $cvs_lines .= "\t-rm -f *.rpo\n";
+ appendLines($cvs_lines);
+@@ -483,6 +479,7 @@
+ $MakefileData =~ s/$lookup/$replacement/;
+ $lookup =~ s/\\\$\\\(CXXFLAGS\\\)/\\\$\\\(KCXXFLAGS\\\)/;
+ $replacement = "$stuff_before\$(KCXXFLAGS) \$(KDE_CXXFLAGS)$stuff_after";
++ next if ($stuff_before =~ /\$\(KDE_CXXFLAGS\)/ or $stuff_after =~ /\$\(KDE_CXXFLAGS\)/);
+ substituteLine($lookup, $replacement);
+ } else {
+ $found = 0;
+@@ -634,7 +631,7 @@
+ if ($pre eq '' && exists($varcontent{$variable})) {
+ my @addlist = split(/[\034\s]+/, $varcontent{$variable});
+ push(@objlist, @addlist);
+- } elsif ($variable !~ 'OBJEXT') {
++ } elsif ($variable !~ 'OBJEXT' && $variable !~ /am__objects_\d+/ ) {
+ $ocv = 1;
+ }
+ }
+@@ -875,8 +872,9 @@
+ $lines .= "\techo 'int main(int argc, char* argv[]) { return kdemain(argc,argv); }' >> ${kdeinit}.la.$cxxsuffix\n";
+
+ $lines .= "\n${kdeinit}_dummy.$cxxsuffix:\n";
+- $lines .= "\techo 'extern \"C\" int kdemain(int argc, char* argv[]);' > ${kdeinit}_dummy.$cxxsuffix; \\\n";
+- $lines .= "\techo 'extern \"C\" int kdeinitmain(int argc, char* argv[]) { return kdemain(argc,argv); }' >> ${kdeinit}_dummy.$cxxsuffix\n";
++ $lines .= "\techo '#include <kdemacros.h>' > ${kdeinit}_dummy.$cxxsuffix; \\\n";
++ $lines .= "\techo 'extern \"C\" int kdemain(int argc, char* argv[]);' >> ${kdeinit}_dummy.$cxxsuffix; \\\n";
++ $lines .= "\techo 'extern \"C\" KDE_EXPORT int kdeinitmain(int argc, char* argv[]) { return kdemain(argc,argv); }' >> ${kdeinit}_dummy.$cxxsuffix\n";
+
+ push(@cleanfiles, "${kdeinit}.la.$cxxsuffix");
+ push(@cleanfiles, "${kdeinit}_dummy.$cxxsuffix");
+@@ -1376,8 +1374,11 @@
+ $dep_lines .= "\tif test \"\$\$ret\" = 0; then echo '#include \"$source.moc\"' >> $source.$cxxsuffix; else rm -f $source.$cxxsuffix ; exit \$\$ret ; fi\n\n";
+ $dep_lines .= "$source.h: $sourcedir$source.ui\n";
+ $dep_lines .= "\trm -rf $source.h;\n";
+- $dep_lines .= "\t\$(UIC) $sourcedir$source.ui | \$(PERL) -pi -e \"s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g\" >> $source.h ;\n";
+-
++ if (!$kdeopts{"qtonly"}) {
++ $dep_lines .= "\t\$(UIC) $sourcedir$source.ui | \$(PERL) -pi -e \"s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g\" >> $source.h ;\n";
++ } else {
++ $dep_lines .= "\t\$(UIC) -o $source.h $sourcedir$source.ui\n";
++ }
+ $dep_lines .= "$source.moc: $source.h\n";
+ $dep_lines .= "\t\$(MOC) $source.h -o $source.moc\n";
+
+@@ -2027,7 +2028,7 @@
+
+ $lines .= "\n";
+ $lines .= "uninstall-docs:\n";
+- $lines .= "\t-rm -rf \$(kde_htmldir)/$kdelang/$appname\n";
++ $lines .= "\t-rm -rf \$(DESTDIR)\$(kde_htmldir)/$kdelang/$appname\n";
+ $lines .= "\n";
+ $lines .= "clean-docs:\n";
+ $lines .= "\t-rm -f index.cache.bz2\n";
+@@ -2276,7 +2277,7 @@
+ "\t echo \"\$\$i\"; \\\n" .
+ "\t if ! ";
+ $t .= $cxxsuffix eq "KKK" ?
+- "\$(CXX) \$(DEFS) -I. -I\$(srcdir) -I\$(top_builddir) \$(INCLUDES) \$(AM_CPPFLAGS) \$(CPPFLAGS) \$(KDE_CXXFLAGS) " :
++ "\$(CXX) \$(DEFS) -I. -I\$(srcdir) -I\$(top_builddir) \$(INCLUDES) \$(AM_CPPFLAGS) \$(CPPFLAGS) \$(CXXFLAGS) \$(KDE_CXXFLAGS) " :
+ "\$(CXXCOMPILE) ";
+ $t .= " --dump-class-hierarchy -c \$\$i.bchecktest.cc; then \\\n" .
+ "\t rm -f \$\$i.bchecktest.cc; exit 1; \\\n" .
+@@ -2352,7 +2353,7 @@
+ $MakefileData =~ s/\034/\\\n/g; # Restore continuation lines
+ # Append our $progId line, _below_ the "generated by automake" line
+ # because automake-1.6 relies on the first line to be his own.
+- my $progIdLine = "\# $progId - " . '$Revision$ '."\n";
++ my $progIdLine = "\# $progId - " . '$Revision: 483858 $ '."\n";
+ if ( !( $MakefileData =~ s/^(.*generated .*by automake.*\n)/$1$progIdLine/ ) ) {
+ warn "automake line not found in $makefile\n";
+ # Fallback: first line
+--- a/admin/am_edit.py
++++ /dev/null
+@@ -1,330 +0,0 @@
+-import getopt, string, posixpath, sys, os, os.path, re
+-
+-# Some global globals...
+-verbose = 0
+-thisProg = posixpath.basename(sys.argv[0])
+-if not thisProg: # happy only when running in xemacs ;/
+- thisProg = 'am_edit.py'
+-cppsuffixes = ['cpp', 'cc', 'cxx', 'C', 'c++']
+-hExt = ['h', 'H', 'hh', 'hxx', 'h++']
+-progId = "KDE tags expanded automatically by " + thisProg
+-use_final = 1
+-dryrun = 0
+-pathoption = 0
+-topdir = os.path.abspath(os.curdir) + "/"
+-foreigndirs = []
+-
+-class Makefile:
+- def __init__(self, file):
+- # some useful globals for the subroutines called here
+- self.headerdirs = ['.']
+- self.haveAutomocTag = 0
+-
+- self.programs = []
+-
+- # lists the objects compiled into $program
+- self.realobjs = {}
+- # lists the sources used for $program
+- self.sources = {}
+- # lists the objects compiled when final
+- self.finalObjs = {}
+- # the binary name of program variable
+- self.realname = {}
+- # lists the idl files used for $program
+- self.idlfiles = {}
+- # lists all idl generated files for cleantarget
+- self.idl_output = ""
+-
+- self.depedmocs = {}
+-
+- self.dep_files = ""
+- self.dep_finals = ""
+- # the targets to add
+- self.target_adds = {}
+- self.kdelang = ""
+- self.makefile = file
+- self.makefileDir = os.path.dirname(self.makefile)
+- self.options = {}
+-
+-
+- NoMakefileAmFound = "found Makefile.in without Makefile.am"
+-
+- def findLine(self, line):
+- import types
+- if type(line) is types.StringType:
+- regexp = re.compile(line)
+- else:
+- regexp = line
+- for line in self.lines:
+- match = regexp.match(line)
+- if match:
+- return match
+-
+- def substituteLine(self, old, new):
+- import types
+- if type(old) is types.StringType:
+- regexp = re.compile(old)
+- else:
+- regexp = old
+-
+- for index in range(len(self.lines)):
+- line = self.lines[index]
+- match = regexp.match(line)
+- if match:
+- line = '#>- ' + line
+- newlines = string.split(new, '\n')
+- self.lines[index:index+1] = [line, '#>+ %d' % len(newlines)] + newlines
+- return
+-
+- def addTarget(self, target, dependson):
+- if not self.target_adds.has_key(target):
+- self.target_adds[target] = [dependson]
+- else:
+- self.target_adds[target].append(dependson)
+-
+- def appendLines(self, newlines):
+- lines = string.split(newlines, '\n') + ['\n']
+- self.lines.extend(['#>+ %d' % len(lines)] + lines)
+-
+- def restore(self):
+- index = 0
+- while index < len(self.lines):
+- line = self.lines[index]
+- if line[0:3] == '#>+':
+- # the +1 is the comment itself
+- linec = string.atoi(line[3:]) + 1
+- del self.lines[index:index+linec]
+- continue
+- if line[0:3] == '#>-':
+- self.lines[index] = self.lines[index][4:]
+- index = index + 1
+-
+- def initialize(self):
+- global foreigndirs
+-
+- os.chdir(self.makefileDir)
+- self.printname = string.replace(self.makefile, topdir, "")
+- self.makefile = os.path.basename(self.makefile)
+-
+- if not posixpath.exists("Makefile.am"):
+- raise self.NoMakefileAmFound, self.makefileDir
+-
+- for dir in foreigndirs:
+- if dir.match(self.makefileDir):
+- print 'leaving ' + self.makefileDir
+- return 0
+-
+- f = open(self.makefile)
+- self.lines = []
+-
+- while 1:
+- line = f.readline()
+- if not line: break
+- self.lines.append(string.rstrip(line))
+-
+- f.close()
+-
+- # take out the
+- self.restore()
+-
+- optionline = re.compile('^\s*(\w+)\s*=\s*([^\n]*)$')
+- linecontinued = re.compile('\\\s*\n')
+- lastline = ''
+-
+- index = 0
+- while index < len(self.lines):
+- line = self.lines[index]
+- if linecontinued.search(line):
+- self.lines[index] = linecontinued.sub(' ', line) + self.lines[index+1]
+- continue
+- else:
+- index = index + 1
+-
+- match = optionline.search(line)
+- if match:
+- self.options[match.group(1)] = match.group(2)
+-
+- if self.options.has_key('KDE_OPTIONS'):
+- options = string.split(self.options['KDE_OPTIONS'])
+- if 'foreign' in options:
+- foreigndirs.append(re.compile(self.makefileDir + "/.*"))
+- return 0
+-
+- self.cxxsuffix = ""
+- suffixes = re.compile('^\.SUFFIXES:(.*)$')
+-
+- for line in self.lines:
+- match = suffixes.match(line)
+- if match:
+- existing_suffixes = string.split(match.group(1))
+- for suffix in existing_suffixes:
+- # leave out the .
+- if suffix[1:] in cppsuffixes:
+- self.cxxsuffix = suffix[1:]
+- break
+- if self.cxxsuffix:
+- break
+-
+- search_real_programs = {}
+-
+- for option in self.options.keys():
+- if string.rfind(option, '_OBJECTS') > 0:
+-
+- program = option[0:string.find(option, '_OBJECTS')]
+- objs = self.options[option]
+-
+- variable_in_objects = 0
+-
+- objlist = string.split(objs)
+- variable = re.compile('\$\((\w+)\)')
+- for obj in objlist:
+- match = variable.match(obj)
+- if match and not match.group(1) == 'OBJEXT':
+- variable_in_objects = 1
+- break
+-
+- if variable_in_objects:
+- continue
+-
+- if len(program) > 3 and program[3] == 'am_':
+- program = program[3:]
+-
+- if verbose:
+- print "found program " + program
+-
+- self.programs.append(program)
+- self.realobjs[program] = objs
+-
+- if self.options.has_key(program + "_SOURCES"):
+- self.sources[program] = self.options[program + "_SOURCES"]
+- else:
+- self.sources[program] = ""
+- sys.stderr.write("found program with no _SOURCES: " + program + '\n')
+-
+- # unmask to regexp
+- realprogram = string.replace(program, '_', '.')
+- search_real_programs[program] = re.compile('.*(' + realprogram +
+- ')(\$\(EXEEXT\)?)?:.*\$\(' +
+- program + '_OBJECTS\).*')
+-
+- self.realname[program] = "";
+-
+- for line in self.lines:
+- if string.find(line, '_OBJECTS') > 0: # just a random piece to not use at _every_ line
+- for program in self.programs:
+- match = search_real_programs[program].match(line)
+- if match:
+- self.realname[program] = match.group(1)
+-
+- def finalTouch(self):
+- if self.options.has_key('DEPDIR'):
+- sys.stderr.write(self.printname + " defines DEPDIR. This means you're using automake > 1.4 - this is not supported!")
+- else:
+- # taken out a random variable
+- self.substituteLine('bindir\s*=.*', 'DEPDIR = .deps\nbindir = ' + self.options['bindir'])
+-
+- self.appendLines('cvs-clean:\n' +
+- '\t$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean')
+-
+- self.appendLines('kde-rpo-clean:\n'+
+- '\t-rm -f *.rpo')
+-
+- self.addTarget('clean', 'kde-rpo-clean')
+- self.addAllTargets()
+-
+- def addAllTargets(self):
+- for target in self.target_adds.keys():
+- match = self.findLine(target + ':\s*(.*)')
+- if match:
+- self.substituteLine(match.re, target + ': ' +
+- string.join(self.target_adds[target]) +
+- ' ' + match.group(1))
+-
+- def writeback(self):
+- f = open(self.makefile, 'w')
+- for line in self.lines:
+- f.write(line)
+- f.write('\n')
+- f.close()
+-
+- def tag_automake(self):
+- match = self.findLine('^(.*cd \$\(top_srcdir\)\s+&&\s+\$\(AUTOMAKE\).*)$')
+- if not match: return 1
+- self.substituteLine(match.re, match.group(1) + '\n' +
+- '\tcd $(top_srcdir) && python ' +
+- thisProg + ' ' + self.printname)
+-
+-def main():
+- global use_final, dryrun, pathoption, thisProg, verbose
+-
+- optlist, makefiles = getopt.getopt(sys.argv[1:], 'vhp:n', [
+- 'version', 'verbose', 'path=', 'help', 'no-final'])
+-
+- for option, param in optlist:
+- if option == '--version':
+- print "\n"
+- print thisProg + "$Revision$"
+- print "This is really free software, unencumbered by the GPL."
+- print "You can do anything you like with it except sueing me."
+- print "Copyright 1998 Kalle Dalheimer <kalle\@kde.org>"
+- print "Concept, design and unnecessary questions about perl"
+- print " by Matthias Ettrich <ettrich\@kde.org>"
+- print ""
+- print "Making it useful by Stephan Kulow <coolo\@kde.org> and"
+- print "Harri Porten <porten\@kde.org>"
+- print "Updated (Feb-1999), John Birch <jb.nz\@writeme.com>"
+- print "Current Maintainer Stephan Kulow"
+- sys.exit(0)
+- if option == '--verbose' or option == '-v':
+- verbose = 1
+- if option == '-p' or option == '--path':
+- thisProg = param + "/" + thisProg
+- if (not posixpath.exists(thisProg)):
+- sys.stderr.write(thisProg + " doesn't exist\n")
+- pathoption=1
+- if option == '--help' or option == '-h':
+- print "Usage " + thisProg + " [OPTION] ... [dir/Makefile.in]..."
+- print "Patches dir/Makefile.in generated from automake"
+- print "(where dir can be a full or relative directory name)"
+- print " -v, --verbose verbosely list files processed"
+- print " -h, --help print this help, then exit"
+- print " --version print version number, then exit"
+- print " -p, --path= use the path to am_edit if the path"
+- print " --no-final don't patch for --enable-final"
+- print " called from is not the one to be used"
+- sys.exit(0)
+- if option == '--no-final':
+- use_final = 0
+- if option == '-n':
+- dryrun = 1
+-
+- if not use_final:
+- thisProg = thisProg + " --no-final"
+-
+- if thisProg[0] == '/' and not pathoption:
+- sys.stderr.write( "Illegal full pathname call performed...\n"
+- "The call to \"" + thisProg + "\"\n"
+- "would be inserted in some Makefile.in.\n"
+- "Please use option --path.\n")
+- sys.exit(1)
+-
+- if len(makefiles) == 0:
+- import find
+- makefiles = find.find('Makefile.in')
+-
+- for index in range(len(makefiles)):
+- if not makefiles[index][0] == '/':
+- makefiles[index] = os.path.normcase(os.path.abspath(makefiles[index]))
+-
+- makefiles.sort()
+- for file in makefiles:
+- makefile = Makefile(file)
+- try:
+- makefile.initialize()
+- makefile.tag_automake()
+- makefile.finalTouch()
+- makefile.writeback()
+- except Makefile.NoMakefileAmFound, param:
+- if verbose: print Makefile.NoMakefileAmFound + ' in ' + param
+-
+-main()
+--- a/admin/bcheck.pl
++++ b/admin/bcheck.pl
+@@ -118,6 +118,7 @@
+
+ s/0x[0-9a-fA-F]+/0x......../g;
+ s/base size=/size=/g;
++ s/\(\)\s*$//g;
+ s/base align=/align=/g;
+
+ $chunk .= $_ . "\n";
+--- a/admin/ChangeLog
++++ /dev/null
+@@ -1,757 +0,0 @@
+-2002-04-26 Stephan Kulow <coolo at kde.org>
+-
+- * acinclude.m4.in removed bogus message
+-
+-2001-11-07 Walter Tasin <tasin at kdevelop.org>
+-
+- * now #MIN_CONFIG tag takes parameters for KDE_USE_QT, too.
+- e.g. #MIN_CONFIG(2.2) for qt 2.2 usage
+-
+-2000-11-30 David Faure <faure at kde.org>
+-
+- * acinclude.m4.in: Added kde_moduledir which points to $prefix/lib/kde2/
+-
+-2000-07-24 Alex Zepeda <jazepeda at pacbell.net>
+-
+- * acinclude.m4.in: Remove the test for malloc.h
+-
+-2000-04-05 Michael Matz <matz at ifh.de>
+-
+- * config.pl : added kludge for compiling regexp's even if
+- perl < 5.005 is installed
+- * conf.change.pl : added support for autoconf 2.14.1
+-
+-2000-03-27 David Faure <faure at kde.org>
+-
+- * acinclude.m4.in, Makefile.common: changed inst-apps semantics
+- If present, only the subdirs it lists will be configured and compiled.
+- If absent, then subdirs is used (and inst-apps isn't generated anymore)
+-
+-2000-03-22 David Faure <faure at kde.org>
+-
+- * am_edit: Added support for KDE_ICON = AUTO
+-
+-2000-03-18 David Faure <faure at kde.org>
+-
+- * Makefile.common: Rewrote the list-of-Makefiles generation to make it
+- simpler and nicer, using create_makefiles' way of doing it.
+- Added support for COMPILE_LAST and COMPILE_FIRST in toplevel Makefile.am
+-
+-2000-01-05 David Faure <faure at kde.org>
+-
+- * Makefile.common: hacked around autoconf bug (setting INSTALL to ".."
+- when calling a subconfigure and INSTALL is already set).
+-
+-1999-12-15 Waldo Bastian <bastian at kde.org>
+-
+- * acinclude.m4.in: Test whether Qt compiles AND LINKS without flags.
+-
+-1999-06-24 Stephan Kulow <coolo at kde.org>
+-
+- * am_edit: generate correct Makefile entries for kde-i18n toplevel directories
+- * am_edit:
+-
+-1999-06-14 Stephan Kulow <coolo at kde.org>
+-
+- * am_edit: remove idl generated files on make clean
+-
+-1999-06-09 Stephan Kulow <coolo at kde.org>
+-
+- * am_edit: skipping programs with variables in sources for final
+-
+-1999-06-07 Stephan Kulow <coolo at kde.org>
+-
+- * am_edit: added support for idl files
+-
+-1999-06-02 Stephan Kulow <coolo at kde.org>
+-
+- * Makefile.common: preserve comments in .pot files to make it
+- possible for programmers and translators to comment them
+-
+-1999-06-02 Simon Hausmann <hausmann at kde.org>
+-
+- * acinclude.m4.in: added kde_servicetypesdir
+-
+-1999-06-02 David Faure <faure at kde.org>
+-
+- * acinclude.m4.in: removed LIB_KFM and LIB_KDEUTIL aliases
+-
+-1999-05-28 Simon Hausmann <hausmann at kde.org>
+-
+- * acinclude.m4.in: added kde_servicesdir
+-
+-1999-05-27 Stephan Kulow <coolo at kde.org>
+-
+- * am_edit: lots of changes for better support of --enable-final
+-
+-1999-05-22 Stephan Kulow <coolo at kde.org>
+-
+- * acinclude.m4.in: added support for --with-dmalloc
+-
+-1999-05-19 Stephan Kulow <coolo at kde.org>
+-
+- * acinclude.m4.in: added support for --enable-final
+-
+- * am_edit: added support for --enable-final
+-
+-1999-05-06 Stephan Kulow <coolo at kde.org>
+-
+- * acinclude.m4.in: change the meaning of --disable-debug
+-
+-1999-05-04 Helge Deller <deller at gmx.de>
+-
+- * acinclude.m4.in: the test for the X-includes/directories failed,
+- when compile & link work without special directories (as on HP-UX).
+-
+-1999-04-20 Stephan Kulow <coolo at kde.org>
+-
+- * am_edit: adding DESTDIR replacement for rm and uninstall-local
+- too. Seems very useless, but makes testing for uninstall easier
+-
+-1999-04-01 David Faure <faure at kde.org>
+-
+- * acinclude.m4.in: Added -lkfile to $(LIB_KIO)
+-
+-1999-03-30 David Faure <faure at kde.org>
+-
+- * acinclude.m4.in: Added AC_CHECK_KDEMAXPATHLEN, which defines KDEMAXPATHLEN.
+-
+-1999-03-29 David Faure <faure at kde.org>
+-
+- * acinclude.m4.in: added LIB_X11 to XPMLIB and GLLIB, because
+- on SCO, they need it _after_ themselves.
+-
+-1999-03-28 David Faure <faure at kde.org>
+-
+- * acinclude.m4.in: added LIB_KFM to LIB_KAB alias
+-
+-1999-03-26 David Faure <faure at kde.org>
+-
+- * acinclude.m4.in: made LIB_KFILE use LIB_KIO instead of LIB_KFM
+- added LIB_KFORMULA
+-
+-1999-03-20 Stephan Kulow <coolo at kde.org>
+-
+- * acinclude.m4.in: check for libXext - for Russel :)
+-
+-1999-03-16 Stephan Kulow <coolo at kde.org>
+-
+- * acinclud3.m4.in: extend the MICO test with a list of possible
+- places where to find CORBA.h
+-
+-1999-03-15 Stephan Kulow <coolo at kde.org>
+-
+- * acinclude.m4.in: move $QTINC and $QTLIB in search path
+-
+-1999-03-14 Stephan Kulow <coolo at kde.org>
+-
+- * am_edit: install-root is obsolute. Use DESTDIR always
+-
+-1999-03-03 Stephan Kulow <coolo at kde.org>
+-
+- * acinclude.m4.in: fixing a bug, that $QTDIR was taken before --with-qt*
+- * acinclude.m4.in: added KDE_USE_QT, that you can choose if to
+- use QT 2.0 or KDE 1.0
+-
+- * Makefile.common: added target package-merge
+-
+- * am_edit: many fixes to the POFILES handeling of am_edit
+-
+-1999-03-02 Stephan Kulow <coolo at kde.org>
+-
+- * acinclude.m4.in: first look at libjpeg6b (from kdesupport) then
+- for libjpeg
+-
+- * config.*, libtool.*: update to the latest FSF tools
+-
+-1999-02-23 Stephan Kulow <coolo at kde.org>
+-
+- * acinclude.m4.in: error when Sparc CC is used. Better use it in
+- configure and tell him the story then letting him find it while
+- compiling
+-
+- * acinclude.m4.in: adding KDE_CHECK_EXTRA_LIBS to all possible tests,
+- so that --with-extra-includes is used when needed.
+-
+- * acinclude.m4.in: configure looks for giflib30, so it should say so
+-
+- * acinclude.m4.in: don't overwrite x include parameters. Patch by
+- Ari Lemmke <ari.lemmke at regex.fi> (bug report 741)
+-
+-1999-02-20 Stephan Kulow <coolo at kde.org>
+-
+- * acinclude.m4.in: fixing KDE_CHECK_PATHS for rechecking. In case
+- of defaults (kdelibs) configure didn't cache the results
+-
+-1999-02-18 David Faure <faure at kde.org>
+-
+- * acinclude.m4.in: added AC_CHECK_S_ISSOCK, to fix #706.
+-
+-1999-02-17 David Faure <faure at kde.org>
+-
+- * acinclude.m4.in: added AC_CHECK_RANDOM, just like
+- AC_CHECK_USLEEP, to enable the fake if necessary.
+-
+-1999-02-13 Kurt Granroth <granroth at kde.org>
+-
+- * acinclude.m4.in: look for QT-2.0
+-
+-1999-02-05 Stephan Kulow <coolo at kde.org>
+-
+- * acinclude.m4.in: in macro KDE_FIND_PATH treat user given dirs
+- and $PATH dirs the same. Added seperate test for to find binary
+- ($5) to replace findperl
+-
+-1999-01-28 Stephan Kulow <coolo at kde.org>
+-
+- * automoc: added patch by jbb to be a little bit more precise about
+- the number of sourcefiles that include the moc file if it's != 1.
+- Besides that automoc will fail with exit code, so the Makefile.cvs
+- process does stop in case a problem accoured.
+-
+- * automoc: don't hardcode header suffix, but allow *.h, *.hh and *.H
+-
+-1999-01-27 Stephan Kulow <coolo at kde.org>
+-
+- * acinclude.m4.in: try qobjcoll.h and qapplication.h before saying
+- OK to qt headers. (I could kill SuSE for splitting into qt-dev
+- and qt-compat)
+-
+-1991-01-23 Stephan Kulow <coolo at kde.org>
+-
+- * automoc: added fixes by JB <jb.nz at writeme.com>
+-
+-1999-01-21 Stephan Kulow <coolo at kde.org>
+-
+- * automoc: added --help and --path (for use in dist-hook)
+-
+-1999-01-20 Alex Zepeda <garbanzo at hooked.net>
+-
+- * ltconfig: added entries for FreeBSD 4.x
+-
+-1999-01-19 Stephan Kulow <coolo at kde.org>
+-
+- * automoc: added a distclean-metasources target which deletes all
+- moc files and let distclean depend on it
+-
+-1999-01-18 Stephan Kulow <coolo at kde.org>
+-
+- * automoc: several fixes (ignore comment lines + join lines
+- with \ )
+-
+- * automoc: support META_INCLUDES in case the header files are
+- not in the same dir as the sources.
+-
+-1999-01-17 Stephan Kulow <coolo at kde.org>
+-
+- * automoc: several fixes.
+-
+-1999-01-16 Stephan Kulow <coolo at kde.org>
+-
+- * automoc: added support for included MOC files.
+-
+- * acinclude.m4.in: use srcdir for the subdirs stuff as well
+-
+- * automoc: added better command line parsing and some preparation
+- for handling "normal" moc files
+-
+- * acinclude.m4.in: added aliases for libkio and libkdeutil
+-
+-1999-01-15 Harri Porten <porten at kde.org>
+-
+- * automoc: Carved in stone syntax for Makefile.in:
+- {program}_METASOURCES = USE_AUTOMOC [{suffix}]
+-
+-1999-01-15 Stephan Kulow <coolo at kde.org>
+-
+- * Makefile.common: set top_srcdir to .
+-
+-1999-01-14 Stephan Kulow <coolo at kde.org>
+-
+- * acinclude.m4.in: don't use config.h.bot any longer
+-
+-1999-01-08 Stephan Kulow <coolo at kde.org>
+-
+- * acinclude.m4.in: added KDE_CHECK_NEWLIBS
+-
+- * acinclude.m4.in: test for Qt even if both --with-qt-headers and
+- --with-qt-libraries are given. They may be wrong.
+-
+-1999-01-06 Stephan Kulow <coolo at kde.org>
+-
+- * acinclude.m4.in: change the MOC test so it can be used for other
+- tools as well
+-
+-1998-12-28 Stephan Kulow <coolo at kde.org>
+-
+- * acinclude.m4.in: look for QT-1.42 since kpanel needs it
+-
+-1998-12-27 Stephan Kulow <coolo at kde.org>
+-
+- * acinclude.m4.in: added /usr/lib for libpython test
+-
+- * acinclude.m4.in: take my email address out of it and added a
+- reference to www.kde.org/faq
+-
+- * acinclude.m4.in: use Qt >= 1.4
+-
+- * acinclude.m4.in: added KDE_CHECK_NAMESPACES
+-
+-1998-12-18 Stephan Kulow <coolo at kde.org>
+-
+- * acinclude.m4.in: test for directories to exist before saying yes
+- to compilation :)
+-
+-1998-12-14 Stephan Kulow <coolo at kde.org>
+-
+- * acinclude.m4.in: added CPLUSPLUS for the kimgio test. It's
+- only important for shaman right now, but at least there it is :)
+-
+-1998-12-12 Stephan Kulow <coolo at kde.org>
+-
+- * Makefile.cvs: added common Makefile.cvs
+-
+- * acinclude.m4.in: Thomas.Schwarz at pro-sieben.de reported a very ugly
+- bug in AC_PROG_CXXCPP, so I added my own version
+-
+- * acinclude.m4.in: added KDE_CREATE_SUBDIRS_LIST to simplify
+- most toplevel configures
+-
+-1998-12-11 Stephan Kulow <coolo at kde.org>
+-
+- * acinclude.m4.in: added call to AC_PROG_CXXCPP. Not really sure why
+- it never caused problems
+-
+- * acinclude.m4.in: moved LIBTIFF alias
+-
+- * acinclude.m4.in: only test for the existance of libkimgio if the
+- user wants to. For 99% of the applications it doesn't matter if
+- configure can find libkimgio :)
+-
+-1998-12-10 Stephan Kulow <coolo at kde.org>
+-
+- * acinclude.m4.in: some changes to the python check to handle $LIBDL
+-
+-1998-12-09 Stephan Kulow <coolo at kde.org>
+-
+- * acinclude.m4.in: make Alex's tiff test a real one
+-
+- * acinclude.m4.in: fix the LIB_TIFF alias to really expand
+-
+-1998-12-08 Alex Zepeda <garbanzo at hooked.net>
+-
+- * acinclude.m4.in: Fix tiff test to use libtiff34 if it exists.
+- This is what the FreeBSD port installs to for whatever reason.
+-
+- * acinclude.m4.in: s/kde/KDE/ (at least in some of the
+- descriptions, obviously no variable names were touched.
+-
+-1998-12-08 Stephan Kulow <coolo at kde.org>
+-
+- * acinclude.m4.in: moved the LIB_QT alias to the Qt check
+-
+- * acinclude.m4.in: unset KDEDIR before running conftest
+-
+- * acinclude.m4.in: fixed mean typo
+-
+- * acinclude.m4.in: added the copyright header for the gettext
+- tests, so that people know we're legal ;)
+-
+- * acinclude.m4.in: set language to C++ before testing QIMGIO
+-
+-1998-12-07 Alex Zepeda <garbanzo at hooked.net>
+-
+- * acinclude.m4.in: Fix PNG test to use correct ANSI C code, and
+- not trip up gcc.
+-
+-1998-12-07 Stephan Kulow <coolo at kde.org>
+-
+- * acinclude.m4.in: don't hardcode -ldl
+-
+- * acinclude.m4.in: move the LIB_X11 alias to the X test to make it
+- useful for kdesupport as well
+-
+- * acinclude.m4.in: give the word CHECK_KIMGIO a meaning in really
+- checking for it
+-
+- * acinclude.m4.in: simple fix to prevent kimgio test from compiling
+- KDE application in kdelibs
+-
+-1998-12-05 Stephan Kulow <coolo at kde.org>
+-
+- * acinclude.m4.in: let KDE_CHECK_KIMGIO depend on AC_PATH_KDE,
+- otherwise most tests fail. It didn't mean anything to 90% of the
+- packages since they test for KDE before kimgio, but for shaman
+- it does
+-
+- * ltconfig: the real fix for the Solaris && gcc problem.
+- Thanks Kurt for reporting it and Alexandre for fixing it :)
+-
+-1998-12-04 Stephan Kulow <coolo at kde.org>
+-
+- * libtool.*: update again
+-
+- * acinclude.m4.in: changed the function to test for libnsl to
+- inet_ntoa since UnixWare 7's version did not have gethostbyname,
+- but needs libnsl
+-
+-1998-12-02 Stephan Kulow <coolo at kde.org>
+-
+- * acinclude.m4.in: fixed the MOC test (again) to use the PATH variable
+- correctly (with the correct seperator)
+-
+- * config.guess: update from the soon to be released autoconf-2.13
+-
+-1998-12-01 Stephan Kulow <coolo at kde.org>
+-
+- * acinclude.m4.in: fixes for the MOC test. Use PATH now when found
+-
+-1998-11-30 Stephan Kulow <coolo at kde.org>
+-
+- * acinclude.m4.in: extended the MOC test. It checks now for the
+- first line of the output of "moc --help" and looks for Qt in it.
+-
+-1998-11-27 Stephan Kulow <coolo at kde.org>
+-
+- * ltconfig: another libtool update. Fixes an ugly bug on Solaris,
+- when GNU ld is in path before Solaris ld, but gcc uses the later
+-
+-1998-11-26 Stephan Kulow <coolo at kde.org>
+-
+- * acinclude.m4.in: made the Qt test more advance to check for qt
+- 1.41 - I still need to make it better, but there shouldn't be too
+- many qt releases in a row, would there? ;)
+-
+- * ltconfig: libtool update with better BSD/OS support
+-
+-1998-11-22 Stephan Kulow <coolo at kde.org>
+-
+- * ltconfig: cool - libtool uses g++ now to link libraries on Solaris.
+- This means, static objects become usuable on that plattforms (some
+- others as well).
+-
+-1998-11-20 Stephan Kulow <coolo at kde.org>
+-
+- * ltmain.sh: updated libtool from their CVS - fixes bugs we haven't
+- found and adds some more features, that we do not need ;-)
+-
+-1998-11-19 David Faure <faure at kde.org>
+-
+- * acinclude.m4.in: added AC_CHECK_UTMP_FILE, taken from kdebase
+-
+-1998-11-16 Harri Porten <porten at kde.org>
+-
+- * automoc: take care of "ar" object files, too.
+-
+-1998-11-16 Stephan Kulow <coolo at kde.org>
+-
+- * libtool.m4.in: revised my --silent patch. The solution
+- Alexandre suggested is much better.
+-
+-1998-11-15 Stephan Kulow <coolo at kde.org>
+-
+- * ltconfig.in: done some tweakings to support -export-dynamic
+- with egcs
+-
+- * config.sub: wow - BeOS support :)
+-
+-1998-11-14 Stephan Kulow <coolo at kde.org>
+-
+- * acinclude.m4.in: don't use rpath for test program, if rpath is
+- disabled for applications
+-
+- * ltconfig: patched libtool to make it silent without making
+- ltconfig silent
+-
+- * acinclude.m4.in: make libtool silent again
+-
+- * libtool.m4.in: update to libtool-981114 (untested stuff, but
+- we have to test it to make it tested - sounds that logical? :-)
+-
+- * libtool.m4.in: moved the self stricked libtool tests to "our"
+- file.
+-
+- * acinclude.m4.in: moved ChangeLog of kdebase which I used to
+- maintain acinclude.m4.in logs to kde-common/admin. Hopefully I
+- will maintain it more often from now on :)
+-
+-1998-07-27 Stephan Kulow <coolo at kde.org>
+-
+- * acinclude.m4.in: fixed some things in the MOC test
+-
+- * acinclude.m4.in: fixed this damn msgfmt test
+-
+-1998-06-02 Stephan Kulow <coolo at kde.org>
+-
+- * acinclude.m4.in: ignore msgfmt, if not GNU gettext
+-
+-1998-05-28 Stephan Kulow <coolo at kde.org>
+-
+- * acinclude.m4.in: fixed KDE_CHECK_STL. Checks for HP and SGI type
+-
+- * acinclude.m4.in: embraced every variable with "" to make
+- it consistent
+-
+- * acinclude.m4.in: various fixes for the koffice checks
+- (mico, ministl and python)
+-
+-1998-05-16 Stephan Kulow <coolo at kde.org>
+-
+- * acinclude.m4.in: don't use KDE_CHECK_QT_DIRECT, when
+- --with-qt-libs are given
+-
+-1998-04-21 Stephan Kulow <coolo at kde.org>
+-
+- * acinclude.m4.in: cool, I found the trick to suppress the ls
+- errors
+-
+-1998-04-20 Stephan Kulow <coolo at kde.org>
+-
+- * acinclude.m4.in: rewrote the qt checking test, since it
+- didn't work under FreeBSD, since it relied on the .so link.
+- The new version is a little bit buggy, but I need some testing
+- to make it perfect
+-
+- * acinclude.m4.in: fixed the side effects of the PAM test
+-
+-1998-04-18 Stephan Kulow <coolo at kde.org>
+-
+- * acinclude.m4.in: hopefully fixed the PAM test (I rewrote it)
+-
+-1998-04-16 Stephan Kulow <coolo at kde.org>
+-
+- * acinclude.m4.in: extended the getsockname test inspired
+- by a patch by Martin Baulig
+-
+- * configure.in: added test for utmp file
+-
+- * acinclude.m4.in: made --without-pam default
+-
+-
+-1998-04-06 Stephan Kulow <coolo at kde.org>
+-
+- * acinclude.m4.in: don't test compiling, linking, running in
+- one step. This proved to be too dangerous for my mail box.
+-
+-1998-03-21 Stephan Kulow <coolo at kde.org>
+-
+- * libtool.m4.in: created some new macros to work around this
+- ugly (because long) help of configure --enable-shared/static
+-
+-1998-03-05 Stephan Kulow <coolo at kde.org>
+-
+- * acinclude.m4.in: set language to C++ before trying the ksize_t
+- test
+-
+- * configure.in: sorted the Makefile entries alphabeticly (and all
+- together: we love xemacs! we love xemacs! ;)
+-
+- * configure.in: added sk
+-
+- * acinclude.m4.in: substitute x_libraries to fix the empty -rpath
+-
+-1998-03-03 Stephan Kulow <coolo at kde.org>
+-
+- * acinclude.m4.in: add a rpath for every shared library, that is
+- linked too (especially X11 libraries)
+-
+-Tue Feb 24 22:04:59 1998 Stephan Kulow <coolo at kde.org>
+-
+- * acinclude.m4.in: added kde_sounddir and set kde_minidir to
+- kde_icondir/mini to break not too much
+-
+-Sun Feb 15 18:25:50 1998 Stephan Kulow <coolo at kde.org>
+-
+- * configure.in: added bugfix by Bob Miller <kbob at engr.sgi.com>
+- (correct reset of IFS)
+-
+-Wed Feb 11 00:53:11 1998 Stephan Kulow <coolo at kde.org>
+-
+- * configure.in: made shadow under Linux default, since the
+- binaries will work also under non-shadow systems. The only problem
+- left is PAM, so I disabled shadow in case, PAM is present
+-
+-Tue Feb 10 16:46:32 1998 Stephan Kulow <coolo at kde.org>
+-
+- * configure.in: added test for nice to find out, if the option
+- -nice works for the screensavers
+-
+- * acinclude.m4.in: port to LynxOS. For this I moved all library
+- search routines in KDE_MISC_TESTS, so I don't need to write this
+- in every package
+-
+- * README: some grammar fixes
+-
+- * acinclude.m4.in: search for the libs in the exec_prefix, when
+- it's present
+-
+-Sun Feb 8 14:07:23 1998 Stephan Kulow <coolo at kde.org>
+-
+- * acinclude.m4.in: updated all packages
+-
+- * libtool.m4.in: applied patch for libtool.m4.in to show the
+- correct default for shared and static
+-
+-
+-Sat Feb 7 10:56:00 1998 Stephan Kulow <coolo at kde.org>
+-
+- * configure.in: good news - KDE is relocatable again.
+-
+- * libtool.m4.in: updated to latest libtool 1.0i
+-
+-Fri Feb 6 21:26:51 1998 Stephan Kulow <coolo at kde.org>
+-
+- * acinclude.m4.in: added a AC_PROVIDE for AC_PROG_CC and
+- AC_PROG_CPP to KDE_CHECK_COMPILERS
+-
+-Thu Feb 5 16:27:47 1998 Stephan Kulow <coolo at kde.org>
+-
+- * acinclude.m4.in: put $QTDIR/bin before /usr/bin in the path to
+- look for moc. I don't know why, but I got a report, that configure
+- found /usr/bin/moc under Solaris
+-
+-Fri Jan 30 15:47:50 1998 Stephan Kulow <coolo at kde.org>
+-
+- * acinclude.m4.in: export LIBRARY_PATH after reset to the saved
+- value
+-
+- * acinclude.m4.in: unset the LIBRARY_PATH to get a relieable
+- result when trying to find, if Qt compiles without -L
+-
+-Sat Jan 24 00:45:52 1998 Stephan Kulow <coolo at kde.org>
+-
+- * acinclude.m4.in: fixed another bug in AC_PATH_KDE
+-
+-Thu Jan 22 14:46:15 1998 Stephan Kulow <coolo at kde.org>
+-
+- * configure.in: fixed an ugly bug in AC_BASE_PATH_KDE
+-
+- * kappfinder/kappfinder.in: let kappfinder create by configure to
+- allow the use of the kde_ paths
+-
+-Wed Jan 21 22:19:35 1998 Stephan Kulow <coolo at kde.org>
+-
+- * acinclude.m4.in: - added a install_root prefix to all paths, if
+- set, to enable package managers to move the whole installation at once
+- - added --with-install-root to set the install_root prefix
+-
+-Tue Jan 20 22:41:04 1998 Stephan Kulow <coolo at kde.org>
+-
+- * configure.in: added NOOPT_CXXFLAGS to allow kioslave to be
+- compiled without -O2
+-
+-Mon Jan 19 21:55:21 1998 Stephan Kulow <coolo at kde.org>
+-
+- * configure.in: some little fixes for the Makefiles
+-
+- * acinclude.m4.in: --prefix will no longer override the search for
+- libraries. If they are present somewhere, they are used (through
+- the methodes in KApplication)
+-
+-Mon Jan 12 00:30:36 1998 Stephan Kulow <coolo at kde.org>
+-
+- * acinclude.m4.in fixed an ugly bug, that accoured, when
+- qt_libraries is not set (empty/equals X11/not necessary)
+-
+- * acinclude.m4.in moved the remove of the files after the error
+- detection
+-
+-
+-Sun Jan 11 17:27:53 1998 Stephan Kulow <coolo at kde.org>
+-
+- * acinclude.m4.in added a new macro KDE_CHECK_QT_DIRECT to unset
+- the Qt library path, if a Qt program compiles without them
+-
+- * acinclude.m4.in added a return value in the CREATE_KFSSTND
+- macro. Perhaps this has caused the problems
+-
+-Sat Jan 10 17:40:44 1998 Stephan Kulow <coolo at kde.org>
+-
+- * ChangeLog started to maintain a ChangeLog file again
+- * acinclude.m4.in the AC_CREATE_KFSSTND to get better debug output
+- to find the problem
+-
+-
+-Old logs, Stephan Kulow made:
+-
+-0.1 : first steps with libkde
+-0.2 : first release with libkde, khtmlw, kdehelp, acli, kwm, kpanel
+-0.3 : added kfm and bugfixes
+-0.4 : updated khtmlw, kdehelp, kwm, changed install in all subdirs
+-0.5 : support libtool (chooseable shared libs)
+-0.6 : split libkde in kdecore and kdeui
+-0.6.1 : Bugfixes
+-0.7 : added code from Janos Farkas (configure)
+- : added @{kde,qt}_{includes,libraries}@
+-0.7.1: Bugfixes
+-0.7.2: Bugfixes
+-0.7.3: added @all_includes@ and @all_libraries@
+- replaced all incompatible flags like $(CC) and -DHAVE_UNISTD_H
+-0.7.4: changed support for libkde (back in it's own)
+- added kpat
+- updated kpanel, kwm, kghostview
+-0.8: removed a bug in kghostview
+- lifted installation process of several apps
+- splitt kdebase into kdelibs and kdeapps
+- updated khtmlw, kfm and kdehelp
+- added kcalc and kpaint
+- updated kdisplay
+- added kscreensaver
+- added --enable-kscreensaver
+- added --enable-debug (and @CXXFLAGS@ to all Makefile.ins)
+- updated kwm to 0.4.7
+- added make uninstall to every app
+- added kvt
+- added khexdit
+- added .kdelnk for kmines, kedit, ktetris
+- put kwm, kfind's .kdelnk in the right directories
+- replaced --enable-kscreensaver by --disable-kscreensaver
+- updated kpanel to 0.15
+- some bugfixes (thanks Marco)
+- some bugfixes (thanks Martin)
+- changed acinclude.m4, because aclocal won't
+- updated kwm to 0.4.8 (patched it again for Qt-1.2)
+- updated kvt to 0.13 (patch from Matthias)
+- patched kvt and kwm
+- updated kwm to 0.5.0
+- updated kvt for 0.14 (again and again :-)
+- updated kview to 0.10
+- updated kfm to 0.6.3
+- patched kscreensaver for FreeBSD (thanks Marc)
+-0.9: updated kdisplay to 0.5.3
+- added klogout
+- patches from Matthias
+- updated kfm to 0.6.4
+- updated kghostview to 0.4
+- added QTINC and QTLIB
+- updated kdehelp to 0.4.11
+- patched kfm to support ktoolbar
+- updated kedit to kedit+
+- added kfontmanager 0.2.1
+-0.9.1: changed kpaint's make style
+- bugfixing
+- updated kmines to 0.6.5
+- updated ktetris to 0.2.4
+- changed to Makefiles to depend on Makefile.in
+- changed the Makefiles to let install depend on all
+- added kjots-0.2.2
+- updated kjots-0.2.3
+- updated kfm to 0.6.6
+- updated kjots-0.2.4
+- updated kpaint-0.2
+- updated kedit to 0.5
+- updated kfontmanager to 0.2.2
+- updated kfm to 0.6.7
+- updated ktetris to 0.2.5
+- updated kjots to 0.2.5
+-0.10: added HAVE_SQRTL
+- added HAVE_CRYPT_H
+- updated kfind
+- updated kfm to kfm-0.8.1
+- re-introduced automake to kdebase
+- bugfixes for the configure.in
+- added XPM, GL and PAM tests to configure
+- added morph3d to kscreensavers
+- updated kfind to 0.3.2
+- added some patches for SGI
+-... lost the time to maintain a Changelog ;)
+--- a/admin/compile
++++ b/admin/compile
+@@ -1,8 +1,9 @@
+ #! /bin/sh
+-
+ # Wrapper for compilers which do not understand `-c -o'.
+
+-# Copyright 1999, 2000 Free Software Foundation, Inc.
++scriptversion=2005-05-14.22
++
++# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+ # Written by Tom Tromey <tromey at cygnus.com>.
+ #
+ # This program is free software; you can redistribute it and/or modify
+@@ -24,76 +25,118 @@
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
+
+-# Usage:
+-# compile PROGRAM [ARGS]...
+-# `-o FOO.o' is removed from the args passed to the actual compile.
+-
+-prog=$1
+-shift
++# This file is maintained in Automake, please report
++# bugs to <bug-automake at gnu.org> or send patches to
++# <automake-patches at gnu.org>.
++
++case $1 in
++ '')
++ echo "$0: No command. Try \`$0 --help' for more information." 1>&2
++ exit 1;
++ ;;
++ -h | --h*)
++ cat <<\EOF
++Usage: compile [--help] [--version] PROGRAM [ARGS]
++
++Wrapper for compilers which do not understand `-c -o'.
++Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
++arguments, and rename the output as expected.
++
++If you are trying to build a whole package this is not the
++right script to run: please start by reading the file `INSTALL'.
++
++Report bugs to <bug-automake at gnu.org>.
++EOF
++ exit $?
++ ;;
++ -v | --v*)
++ echo "compile $scriptversion"
++ exit $?
++ ;;
++esac
+
+ ofile=
+ cfile=
+-args=
+-while test $# -gt 0; do
+- case "$1" in
+- -o)
+- # configure might choose to run compile as `compile cc -o foo foo.c'.
+- # So we do something ugly here.
+- ofile=$2
+- shift
+- case "$ofile" in
+- *.o | *.obj)
+- ;;
+- *)
+- args="$args -o $ofile"
+- ofile=
+- ;;
+- esac
+- ;;
+- *.c)
+- cfile=$1
+- args="$args $1"
+- ;;
+- *)
+- args="$args $1"
+- ;;
+- esac
+- shift
++eat=
++
++for arg
++do
++ if test -n "$eat"; then
++ eat=
++ else
++ case $1 in
++ -o)
++ # configure might choose to run compile as `compile cc -o foo foo.c'.
++ # So we strip `-o arg' only if arg is an object.
++ eat=1
++ case $2 in
++ *.o | *.obj)
++ ofile=$2
++ ;;
++ *)
++ set x "$@" -o "$2"
++ shift
++ ;;
++ esac
++ ;;
++ *.c)
++ cfile=$1
++ set x "$@" "$1"
++ shift
++ ;;
++ *)
++ set x "$@" "$1"
++ shift
++ ;;
++ esac
++ fi
++ shift
+ done
+
+ if test -z "$ofile" || test -z "$cfile"; then
+- # If no `-o' option was seen then we might have been invoked from a
+- # pattern rule where we don't need one. That is ok -- this is a
+- # normal compilation that the losing compiler can handle. If no
+- # `.c' file was seen then we are probably linking. That is also
+- # ok.
+- exec "$prog" $args
++ # If no `-o' option was seen then we might have been invoked from a
++ # pattern rule where we don't need one. That is ok -- this is a
++ # normal compilation that the losing compiler can handle. If no
++ # `.c' file was seen then we are probably linking. That is also
++ # ok.
++ exec "$@"
+ fi
+
+ # Name of file we expect compiler to create.
+-cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
++cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
+
+ # Create the lock directory.
+ # Note: use `[/.-]' here to ensure that we don't use the same name
+ # that we are using for the .o file. Also, base the name on the expected
+ # object file name, since that is what matters with a parallel build.
+-lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d
++lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
+ while true; do
+- if mkdir $lockdir > /dev/null 2>&1; then
+- break
+- fi
+- sleep 1
++ if mkdir "$lockdir" >/dev/null 2>&1; then
++ break
++ fi
++ sleep 1
+ done
+ # FIXME: race condition here if user kills between mkdir and trap.
+-trap "rmdir $lockdir; exit 1" 1 2 15
++trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+ # Run the compile.
+-"$prog" $args
+-status=$?
++"$@"
++ret=$?
+
+ if test -f "$cofile"; then
+- mv "$cofile" "$ofile"
++ mv "$cofile" "$ofile"
++elif test -f "${cofile}bj"; then
++ mv "${cofile}bj" "$ofile"
+ fi
+
+-rmdir $lockdir
+-exit $status
++rmdir "$lockdir"
++exit $ret
++
++# Local Variables:
++# mode: shell-script
++# sh-indentation: 2
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-end: "$"
++# End:
+--- a/admin/config.guess
++++ b/admin/config.guess
+@@ -1,9 +1,9 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
++# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+
+-timestamp='2004-06-24'
++timestamp='2005-06-30'
+
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -17,13 +17,15 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
++# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
+
++
+ # Originally written by Per Bothner <per at bothner.com>.
+ # Please send patches to <config-patches at gnu.org>. Submit a context
+ # diff and a properly formatted ChangeLog entry.
+@@ -53,7 +55,7 @@
+ GNU config.guess ($timestamp)
+
+ Originally written by Per Bothner.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+ Free Software Foundation, Inc.
+
+ This is free software; see the source for copying conditions. There is NO
+@@ -66,11 +68,11 @@
+ while test $# -gt 0 ; do
+ case $1 in
+ --time-stamp | --time* | -t )
+- echo "$timestamp" ; exit 0 ;;
++ echo "$timestamp" ; exit ;;
+ --version | -v )
+- echo "$version" ; exit 0 ;;
++ echo "$version" ; exit ;;
+ --help | --h* | -h )
+- echo "$usage"; exit 0 ;;
++ echo "$usage"; exit ;;
+ -- ) # Stop option processing
+ shift; break ;;
+ - ) # Use stdin as input.
+@@ -196,64 +198,20 @@
+ # contains redundant information, the shorter form:
+ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+ echo "${machine}-${os}${release}"
+- exit 0 ;;
+- amd64:OpenBSD:*:*)
+- echo x86_64-unknown-openbsd${UNAME_RELEASE}
+- exit 0 ;;
+- amiga:OpenBSD:*:*)
+- echo m68k-unknown-openbsd${UNAME_RELEASE}
+- exit 0 ;;
+- arc:OpenBSD:*:*)
+- echo mipsel-unknown-openbsd${UNAME_RELEASE}
+- exit 0 ;;
+- cats:OpenBSD:*:*)
+- echo arm-unknown-openbsd${UNAME_RELEASE}
+- exit 0 ;;
+- hp300:OpenBSD:*:*)
+- echo m68k-unknown-openbsd${UNAME_RELEASE}
+- exit 0 ;;
+- luna88k:OpenBSD:*:*)
+- echo m88k-unknown-openbsd${UNAME_RELEASE}
+- exit 0 ;;
+- mac68k:OpenBSD:*:*)
+- echo m68k-unknown-openbsd${UNAME_RELEASE}
+- exit 0 ;;
+- macppc:OpenBSD:*:*)
+- echo powerpc-unknown-openbsd${UNAME_RELEASE}
+- exit 0 ;;
+- mvme68k:OpenBSD:*:*)
+- echo m68k-unknown-openbsd${UNAME_RELEASE}
+- exit 0 ;;
+- mvme88k:OpenBSD:*:*)
+- echo m88k-unknown-openbsd${UNAME_RELEASE}
+- exit 0 ;;
+- mvmeppc:OpenBSD:*:*)
+- echo powerpc-unknown-openbsd${UNAME_RELEASE}
+- exit 0 ;;
+- pmax:OpenBSD:*:*)
+- echo mipsel-unknown-openbsd${UNAME_RELEASE}
+- exit 0 ;;
+- sgi:OpenBSD:*:*)
+- echo mipseb-unknown-openbsd${UNAME_RELEASE}
+- exit 0 ;;
+- sun3:OpenBSD:*:*)
+- echo m68k-unknown-openbsd${UNAME_RELEASE}
+- exit 0 ;;
+- wgrisc:OpenBSD:*:*)
+- echo mipsel-unknown-openbsd${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ *:OpenBSD:*:*)
+- echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+- exit 0 ;;
++ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
++ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
++ exit ;;
+ *:ekkoBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ macppc:MirBSD:*:*)
+ echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ *:MirBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ alpha:OSF1:*:*)
+ case $UNAME_RELEASE in
+ *4.0)
+@@ -306,37 +264,43 @@
+ # A Xn.n version is an unreleased experimental baselevel.
+ # 1.2 uses "1.2" for uname -r.
+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+- exit 0 ;;
++ exit ;;
+ Alpha\ *:Windows_NT*:*)
+ # How do we know it's Interix rather than the generic POSIX subsystem?
+ # Should we change UNAME_MACHINE based on the output of uname instead
+ # of the specific Alpha model?
+ echo alpha-pc-interix
+- exit 0 ;;
++ exit ;;
+ 21064:Windows_NT:50:3)
+ echo alpha-dec-winnt3.5
+- exit 0 ;;
++ exit ;;
+ Amiga*:UNIX_System_V:4.0:*)
+ echo m68k-unknown-sysv4
+- exit 0;;
++ exit ;;
+ *:[Aa]miga[Oo][Ss]:*:*)
+ echo ${UNAME_MACHINE}-unknown-amigaos
+- exit 0 ;;
++ exit ;;
+ *:[Mm]orph[Oo][Ss]:*:*)
+ echo ${UNAME_MACHINE}-unknown-morphos
+- exit 0 ;;
++ exit ;;
+ *:OS/390:*:*)
+ echo i370-ibm-openedition
+- exit 0 ;;
++ exit ;;
++ *:z/VM:*:*)
++ echo s390-ibm-zvmoe
++ exit ;;
+ *:OS400:*:*)
+ echo powerpc-ibm-os400
+- exit 0 ;;
++ exit ;;
+ arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+ echo arm-acorn-riscix${UNAME_RELEASE}
+- exit 0;;
++ exit ;;
++ arm:riscos:*:*|arm:RISCOS:*:*)
++ echo arm-unknown-riscos
++ exit ;;
+ SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+ echo hppa1.1-hitachi-hiuxmpp
+- exit 0;;
++ exit ;;
+ Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+ # akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+ if test "`(/bin/universe) 2>/dev/null`" = att ; then
+@@ -344,32 +308,32 @@
+ else
+ echo pyramid-pyramid-bsd
+ fi
+- exit 0 ;;
++ exit ;;
+ NILE*:*:*:dcosx)
+ echo pyramid-pyramid-svr4
+- exit 0 ;;
++ exit ;;
+ DRS?6000:unix:4.0:6*)
+ echo sparc-icl-nx6
+- exit 0 ;;
+- DRS?6000:UNIX_SV:4.2*:7*)
++ exit ;;
++ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+ case `/usr/bin/uname -p` in
+- sparc) echo sparc-icl-nx7 && exit 0 ;;
++ sparc) echo sparc-icl-nx7; exit ;;
+ esac ;;
+ sun4H:SunOS:5.*:*)
+ echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+- exit 0 ;;
++ exit ;;
+ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+- exit 0 ;;
++ exit ;;
+ i86pc:SunOS:5.*:*)
+ echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+- exit 0 ;;
++ exit ;;
+ sun4*:SunOS:6*:*)
+ # According to config.sub, this is the proper way to canonicalize
+ # SunOS6. Hard to guess exactly what SunOS6 will be like, but
+ # it's likely to be more like Solaris than SunOS4.
+ echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+- exit 0 ;;
++ exit ;;
+ sun4*:SunOS:*:*)
+ case "`/usr/bin/arch -k`" in
+ Series*|S4*)
+@@ -378,10 +342,10 @@
+ esac
+ # Japanese Language versions have a version number like `4.1.3-JL'.
+ echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+- exit 0 ;;
++ exit ;;
+ sun3*:SunOS:*:*)
+ echo m68k-sun-sunos${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ sun*:*:4.2BSD:*)
+ UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+ test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+@@ -393,10 +357,10 @@
+ echo sparc-sun-sunos${UNAME_RELEASE}
+ ;;
+ esac
+- exit 0 ;;
++ exit ;;
+ aushp:SunOS:*:*)
+ echo sparc-auspex-sunos${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ # The situation for MiNT is a little confusing. The machine name
+ # can be virtually everything (everything which is not
+ # "atarist" or "atariste" at least should have a processor
+@@ -407,40 +371,40 @@
+ # be no problem.
+ atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+ echo m68k-atari-mint${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+ echo m68k-atari-mint${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+ echo m68k-atari-mint${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+ echo m68k-milan-mint${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+ echo m68k-hades-mint${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+ echo m68k-unknown-mint${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ m68k:machten:*:*)
+ echo m68k-apple-machten${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ powerpc:machten:*:*)
+ echo powerpc-apple-machten${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ RISC*:Mach:*:*)
+ echo mips-dec-mach_bsd4.3
+- exit 0 ;;
++ exit ;;
+ RISC*:ULTRIX:*:*)
+ echo mips-dec-ultrix${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ VAX*:ULTRIX*:*:*)
+ echo vax-dec-ultrix${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ 2020:CLIX:*:* | 2430:CLIX:*:*)
+ echo clipper-intergraph-clix${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ mips:*:*:UMIPS | mips:*:*:RISCos)
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+@@ -464,32 +428,33 @@
+ exit (-1);
+ }
+ EOF
+- $CC_FOR_BUILD -o $dummy $dummy.c \
+- && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+- && exit 0
++ $CC_FOR_BUILD -o $dummy $dummy.c &&
++ dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
++ SYSTEM_NAME=`$dummy $dummyarg` &&
++ { echo "$SYSTEM_NAME"; exit; }
+ echo mips-mips-riscos${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ Motorola:PowerMAX_OS:*:*)
+ echo powerpc-motorola-powermax
+- exit 0 ;;
++ exit ;;
+ Motorola:*:4.3:PL8-*)
+ echo powerpc-harris-powermax
+- exit 0 ;;
++ exit ;;
+ Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+ echo powerpc-harris-powermax
+- exit 0 ;;
++ exit ;;
+ Night_Hawk:Power_UNIX:*:*)
+ echo powerpc-harris-powerunix
+- exit 0 ;;
++ exit ;;
+ m88k:CX/UX:7*:*)
+ echo m88k-harris-cxux7
+- exit 0 ;;
++ exit ;;
+ m88k:*:4*:R4*)
+ echo m88k-motorola-sysv4
+- exit 0 ;;
++ exit ;;
+ m88k:*:3*:R3*)
+ echo m88k-motorola-sysv3
+- exit 0 ;;
++ exit ;;
+ AViiON:dgux:*:*)
+ # DG/UX returns AViiON for all architectures
+ UNAME_PROCESSOR=`/usr/bin/uname -p`
+@@ -505,29 +470,29 @@
+ else
+ echo i586-dg-dgux${UNAME_RELEASE}
+ fi
+- exit 0 ;;
++ exit ;;
+ M88*:DolphinOS:*:*) # DolphinOS (SVR3)
+ echo m88k-dolphin-sysv3
+- exit 0 ;;
++ exit ;;
+ M88*:*:R3*:*)
+ # Delta 88k system running SVR3
+ echo m88k-motorola-sysv3
+- exit 0 ;;
++ exit ;;
+ XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+ echo m88k-tektronix-sysv3
+- exit 0 ;;
++ exit ;;
+ Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+ echo m68k-tektronix-bsd
+- exit 0 ;;
++ exit ;;
+ *:IRIX*:*:*)
+ echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+- exit 0 ;;
++ exit ;;
+ ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
+- exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX '
++ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
++ exit ;; # Note that: echo "'`uname -s`'" gives 'AIX '
+ i*86:AIX:*:*)
+ echo i386-ibm-aix
+- exit 0 ;;
++ exit ;;
+ ia64:AIX:*:*)
+ if [ -x /usr/bin/oslevel ] ; then
+ IBM_REV=`/usr/bin/oslevel`
+@@ -535,7 +500,7 @@
+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ fi
+ echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+- exit 0 ;;
++ exit ;;
+ *:AIX:2:3)
+ if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+ eval $set_cc_for_build
+@@ -550,14 +515,18 @@
+ exit(0);
+ }
+ EOF
+- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+- echo rs6000-ibm-aix3.2.5
++ if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
++ then
++ echo "$SYSTEM_NAME"
++ else
++ echo rs6000-ibm-aix3.2.5
++ fi
+ elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+ echo rs6000-ibm-aix3.2.4
+ else
+ echo rs6000-ibm-aix3.2
+ fi
+- exit 0 ;;
++ exit ;;
+ *:AIX:*:[45])
+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+ if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+@@ -571,28 +540,28 @@
+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ fi
+ echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+- exit 0 ;;
++ exit ;;
+ *:AIX:*:*)
+ echo rs6000-ibm-aix
+- exit 0 ;;
++ exit ;;
+ ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+ echo romp-ibm-bsd4.4
+- exit 0 ;;
++ exit ;;
+ ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
+ echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
+- exit 0 ;; # report: romp-ibm BSD 4.3
++ exit ;; # report: romp-ibm BSD 4.3
+ *:BOSX:*:*)
+ echo rs6000-bull-bosx
+- exit 0 ;;
++ exit ;;
+ DPX/2?00:B.O.S.:*:*)
+ echo m68k-bull-sysv3
+- exit 0 ;;
++ exit ;;
+ 9000/[34]??:4.3bsd:1.*:*)
+ echo m68k-hp-bsd
+- exit 0 ;;
++ exit ;;
+ hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+ echo m68k-hp-bsd4.4
+- exit 0 ;;
++ exit ;;
+ 9000/[34678]??:HP-UX:*:*)
+ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+ case "${UNAME_MACHINE}" in
+@@ -656,7 +625,18 @@
+ then
+ # avoid double evaluation of $set_cc_for_build
+ test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
+- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
++
++ # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
++ # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
++ # generating 64-bit code. GNU and HP use different nomenclature:
++ #
++ # $ CC_FOR_BUILD=cc ./config.guess
++ # => hppa2.0w-hp-hpux11.23
++ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
++ # => hppa64-hp-hpux11.23
++
++ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
++ grep __LP64__ >/dev/null
+ then
+ HP_ARCH="hppa2.0w"
+ else
+@@ -664,11 +644,11 @@
+ fi
+ fi
+ echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+- exit 0 ;;
++ exit ;;
+ ia64:HP-UX:*:*)
+ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+ echo ia64-hp-hpux${HPUX_REV}
+- exit 0 ;;
++ exit ;;
+ 3050*:HI-UX:*:*)
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+@@ -696,152 +676,166 @@
+ exit (0);
+ }
+ EOF
+- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
++ $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
++ { echo "$SYSTEM_NAME"; exit; }
+ echo unknown-hitachi-hiuxwe2
+- exit 0 ;;
++ exit ;;
+ 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+ echo hppa1.1-hp-bsd
+- exit 0 ;;
++ exit ;;
+ 9000/8??:4.3bsd:*:*)
+ echo hppa1.0-hp-bsd
+- exit 0 ;;
++ exit ;;
+ *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+ echo hppa1.0-hp-mpeix
+- exit 0 ;;
++ exit ;;
+ hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+ echo hppa1.1-hp-osf
+- exit 0 ;;
++ exit ;;
+ hp8??:OSF1:*:*)
+ echo hppa1.0-hp-osf
+- exit 0 ;;
++ exit ;;
+ i*86:OSF1:*:*)
+ if [ -x /usr/sbin/sysversion ] ; then
+ echo ${UNAME_MACHINE}-unknown-osf1mk
+ else
+ echo ${UNAME_MACHINE}-unknown-osf1
+ fi
+- exit 0 ;;
++ exit ;;
+ parisc*:Lites*:*:*)
+ echo hppa1.1-hp-lites
+- exit 0 ;;
++ exit ;;
+ C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+ echo c1-convex-bsd
+- exit 0 ;;
++ exit ;;
+ C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+ if getsysinfo -f scalar_acc
+ then echo c32-convex-bsd
+ else echo c2-convex-bsd
+ fi
+- exit 0 ;;
++ exit ;;
+ C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+ echo c34-convex-bsd
+- exit 0 ;;
++ exit ;;
+ C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+ echo c38-convex-bsd
+- exit 0 ;;
++ exit ;;
+ C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+ echo c4-convex-bsd
+- exit 0 ;;
++ exit ;;
+ CRAY*Y-MP:*:*:*)
+ echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+- exit 0 ;;
++ exit ;;
+ CRAY*[A-Z]90:*:*:*)
+ echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+ -e 's/\.[^.]*$/.X/'
+- exit 0 ;;
++ exit ;;
+ CRAY*TS:*:*:*)
+ echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+- exit 0 ;;
++ exit ;;
+ CRAY*T3E:*:*:*)
+ echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+- exit 0 ;;
++ exit ;;
+ CRAY*SV1:*:*:*)
+ echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+- exit 0 ;;
++ exit ;;
+ *:UNICOS/mp:*:*)
+ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+- exit 0 ;;
++ exit ;;
+ F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+ FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+- exit 0 ;;
++ exit ;;
+ 5000:UNIX_System_V:4.*:*)
+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+- exit 0 ;;
++ exit ;;
+ i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+ echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ sparc*:BSD/OS:*:*)
+ echo sparc-unknown-bsdi${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ *:BSD/OS:*:*)
+ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ *:FreeBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+- exit 0 ;;
++ exit ;;
+ i*:CYGWIN*:*)
+ echo ${UNAME_MACHINE}-pc-cygwin
+- exit 0 ;;
++ exit ;;
+ i*:MINGW*:*)
+ echo ${UNAME_MACHINE}-pc-mingw32
+- exit 0 ;;
++ exit ;;
++ i*:windows32*:*)
++ # uname -m includes "-pc" on this system.
++ echo ${UNAME_MACHINE}-mingw32
++ exit ;;
+ i*:PW*:*)
+ echo ${UNAME_MACHINE}-pc-pw32
+- exit 0 ;;
++ exit ;;
+ x86:Interix*:[34]*)
+ echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
+- exit 0 ;;
++ exit ;;
+ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+ echo i${UNAME_MACHINE}-pc-mks
+- exit 0 ;;
++ exit ;;
+ i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+ # How do we know it's Interix rather than the generic POSIX subsystem?
+ # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+ # UNAME_MACHINE based on the output of uname instead of i386?
+ echo i586-pc-interix
+- exit 0 ;;
++ exit ;;
+ i*:UWIN*:*)
+ echo ${UNAME_MACHINE}-pc-uwin
+- exit 0 ;;
++ exit ;;
++ amd64:CYGWIN*:*:*)
++ echo x86_64-unknown-cygwin
++ exit ;;
+ p*:CYGWIN*:*)
+ echo powerpcle-unknown-cygwin
+- exit 0 ;;
++ exit ;;
+ prep*:SunOS:5.*:*)
+ echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+- exit 0 ;;
++ exit ;;
+ *:GNU:*:*)
+ # the GNU system
+ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+- exit 0 ;;
++ exit ;;
+ *:GNU/*:*:*)
+ # other systems with GNU libc and userland
+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+- exit 0 ;;
++ exit ;;
+ i*86:Minix:*:*)
+ echo ${UNAME_MACHINE}-pc-minix
+- exit 0 ;;
++ exit ;;
+ arm*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+- exit 0 ;;
++ exit ;;
+ cris:Linux:*:*)
+ echo cris-axis-linux-gnu
+- exit 0 ;;
++ exit ;;
++ crisv32:Linux:*:*)
++ echo crisv32-axis-linux-gnu
++ exit ;;
++ frv:Linux:*:*)
++ echo frv-unknown-linux-gnu
++ exit ;;
+ ia64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+- exit 0 ;;
++ exit ;;
+ m32r*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+- exit 0 ;;
++ exit ;;
+ m68*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+- exit 0 ;;
++ exit ;;
+ mips:Linux:*:*)
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+@@ -859,7 +853,7 @@
+ #endif
+ EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
++ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ ;;
+ mips64:Linux:*:*)
+ eval $set_cc_for_build
+@@ -878,14 +872,14 @@
+ #endif
+ EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
++ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ ;;
+ ppc:Linux:*:*)
+ echo powerpc-unknown-linux-gnu
+- exit 0 ;;
++ exit ;;
+ ppc64:Linux:*:*)
+ echo powerpc64-unknown-linux-gnu
+- exit 0 ;;
++ exit ;;
+ alpha:Linux:*:*)
+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+ EV5) UNAME_MACHINE=alphaev5 ;;
+@@ -899,7 +893,7 @@
+ objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+- exit 0 ;;
++ exit ;;
+ parisc:Linux:*:* | hppa:Linux:*:*)
+ # Look for CPU level
+ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+@@ -907,25 +901,25 @@
+ PA8*) echo hppa2.0-unknown-linux-gnu ;;
+ *) echo hppa-unknown-linux-gnu ;;
+ esac
+- exit 0 ;;
++ exit ;;
+ parisc64:Linux:*:* | hppa64:Linux:*:*)
+ echo hppa64-unknown-linux-gnu
+- exit 0 ;;
++ exit ;;
+ s390:Linux:*:* | s390x:Linux:*:*)
+ echo ${UNAME_MACHINE}-ibm-linux
+- exit 0 ;;
++ exit ;;
+ sh64*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+- exit 0 ;;
++ exit ;;
+ sh*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+- exit 0 ;;
++ exit ;;
+ sparc:Linux:*:* | sparc64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+- exit 0 ;;
++ exit ;;
+ x86_64:Linux:*:*)
+ echo x86_64-unknown-linux-gnu
+- exit 0 ;;
++ exit ;;
+ i*86:Linux:*:*)
+ # The BFD linker knows what the default object file format is, so
+ # first see if it will tell us. cd to the root directory to prevent
+@@ -943,15 +937,15 @@
+ ;;
+ a.out-i386-linux)
+ echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+- exit 0 ;;
++ exit ;;
+ coff-i386)
+ echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+- exit 0 ;;
++ exit ;;
+ "")
+ # Either a pre-BFD a.out linker (linux-gnuoldld) or
+ # one that does not give us useful --help.
+ echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+- exit 0 ;;
++ exit ;;
+ esac
+ # Determine whether the default compiler is a.out or elf
+ eval $set_cc_for_build
+@@ -979,15 +973,18 @@
+ #endif
+ EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+- test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
+- test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
++ test x"${LIBC}" != x && {
++ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
++ exit
++ }
++ test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
+ ;;
+ i*86:DYNIX/ptx:4*:*)
+ # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+ # earlier versions are messed up and put the nodename in both
+ # sysname and nodename.
+ echo i386-sequent-sysv4
+- exit 0 ;;
++ exit ;;
+ i*86:UNIX_SV:4.2MP:2.*)
+ # Unixware is an offshoot of SVR4, but it has its own version
+ # number series starting with 2...
+@@ -995,27 +992,27 @@
+ # I just have to hope. -- rms.
+ # Use sysv4.2uw... so that sysv4* matches it.
+ echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+- exit 0 ;;
++ exit ;;
+ i*86:OS/2:*:*)
+ # If we were able to find `uname', then EMX Unix compatibility
+ # is probably installed.
+ echo ${UNAME_MACHINE}-pc-os2-emx
+- exit 0 ;;
++ exit ;;
+ i*86:XTS-300:*:STOP)
+ echo ${UNAME_MACHINE}-unknown-stop
+- exit 0 ;;
++ exit ;;
+ i*86:atheos:*:*)
+ echo ${UNAME_MACHINE}-unknown-atheos
+- exit 0 ;;
+- i*86:syllable:*:*)
++ exit ;;
++ i*86:syllable:*:*)
+ echo ${UNAME_MACHINE}-pc-syllable
+- exit 0 ;;
++ exit ;;
+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+ echo i386-unknown-lynxos${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ i*86:*DOS:*:*)
+ echo ${UNAME_MACHINE}-pc-msdosdjgpp
+- exit 0 ;;
++ exit ;;
+ i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+ UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+ if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+@@ -1023,15 +1020,16 @@
+ else
+ echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+ fi
+- exit 0 ;;
+- i*86:*:5:[78]*)
++ exit ;;
++ i*86:*:5:[678]*)
++ # UnixWare 7.x, OpenUNIX and OpenServer 6.
+ case `/bin/uname -X | grep "^Machine"` in
+ *486*) UNAME_MACHINE=i486 ;;
+ *Pentium) UNAME_MACHINE=i586 ;;
+ *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+ esac
+ echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+- exit 0 ;;
++ exit ;;
+ i*86:*:3.2:*)
+ if test -f /usr/options/cb.name; then
+ UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+@@ -1049,73 +1047,73 @@
+ else
+ echo ${UNAME_MACHINE}-pc-sysv32
+ fi
+- exit 0 ;;
++ exit ;;
+ pc:*:*:*)
+ # Left here for compatibility:
+ # uname -m prints for DJGPP always 'pc', but it prints nothing about
+ # the processor, so we play safe by assuming i386.
+ echo i386-pc-msdosdjgpp
+- exit 0 ;;
++ exit ;;
+ Intel:Mach:3*:*)
+ echo i386-pc-mach3
+- exit 0 ;;
++ exit ;;
+ paragon:*:*:*)
+ echo i860-intel-osf1
+- exit 0 ;;
++ exit ;;
+ i860:*:4.*:*) # i860-SVR4
+ if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+ echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+ else # Add other i860-SVR4 vendors below as they are discovered.
+ echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
+ fi
+- exit 0 ;;
++ exit ;;
+ mini*:CTIX:SYS*5:*)
+ # "miniframe"
+ echo m68010-convergent-sysv
+- exit 0 ;;
++ exit ;;
+ mc68k:UNIX:SYSTEM5:3.51m)
+ echo m68k-convergent-sysv
+- exit 0 ;;
++ exit ;;
+ M680?0:D-NIX:5.3:*)
+ echo m68k-diab-dnix
+- exit 0 ;;
++ exit ;;
+ M68*:*:R3V[5678]*:*)
+- test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+- 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
++ test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
++ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
+ OS_REL=''
+ test -r /etc/.relid \
+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+- && echo i486-ncr-sysv4.3${OS_REL} && exit 0
++ && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+- && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+ 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+- && echo i486-ncr-sysv4 && exit 0 ;;
++ && { echo i486-ncr-sysv4; exit; } ;;
+ m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+ echo m68k-unknown-lynxos${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ mc68030:UNIX_System_V:4.*:*)
+ echo m68k-atari-sysv4
+- exit 0 ;;
++ exit ;;
+ TSUNAMI:LynxOS:2.*:*)
+ echo sparc-unknown-lynxos${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ rs6000:LynxOS:2.*:*)
+ echo rs6000-unknown-lynxos${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+ echo powerpc-unknown-lynxos${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ SM[BE]S:UNIX_SV:*:*)
+ echo mips-dde-sysv${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ RM*:ReliantUNIX-*:*:*)
+ echo mips-sni-sysv4
+- exit 0 ;;
++ exit ;;
+ RM*:SINIX-*:*:*)
+ echo mips-sni-sysv4
+- exit 0 ;;
++ exit ;;
+ *:SINIX-*:*:*)
+ if uname -p 2>/dev/null >/dev/null ; then
+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
+@@ -1123,68 +1121,73 @@
+ else
+ echo ns32k-sni-sysv
+ fi
+- exit 0 ;;
++ exit ;;
+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+ # says <Richard.M.Bartel at ccMail.Census.GOV>
+ echo i586-unisys-sysv4
+- exit 0 ;;
++ exit ;;
+ *:UNIX_System_V:4*:FTX*)
+ # From Gerald Hewes <hewes at openmarket.com>.
+ # How about differentiating between stratus architectures? -djm
+ echo hppa1.1-stratus-sysv4
+- exit 0 ;;
++ exit ;;
+ *:*:*:FTX*)
+ # From seanf at swdc.stratus.com.
+ echo i860-stratus-sysv4
+- exit 0 ;;
++ exit ;;
++ i*86:VOS:*:*)
++ # From Paul.Green at stratus.com.
++ echo ${UNAME_MACHINE}-stratus-vos
++ exit ;;
+ *:VOS:*:*)
+ # From Paul.Green at stratus.com.
+ echo hppa1.1-stratus-vos
+- exit 0 ;;
++ exit ;;
+ mc68*:A/UX:*:*)
+ echo m68k-apple-aux${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ news*:NEWS-OS:6*:*)
+ echo mips-sony-newsos6
+- exit 0 ;;
++ exit ;;
+ R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+ if [ -d /usr/nec ]; then
+ echo mips-nec-sysv${UNAME_RELEASE}
+ else
+ echo mips-unknown-sysv${UNAME_RELEASE}
+ fi
+- exit 0 ;;
++ exit ;;
+ BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
+ echo powerpc-be-beos
+- exit 0 ;;
++ exit ;;
+ BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only.
+ echo powerpc-apple-beos
+- exit 0 ;;
++ exit ;;
+ BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
+ echo i586-pc-beos
+- exit 0 ;;
++ exit ;;
+ SX-4:SUPER-UX:*:*)
+ echo sx4-nec-superux${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ SX-5:SUPER-UX:*:*)
+ echo sx5-nec-superux${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ SX-6:SUPER-UX:*:*)
+ echo sx6-nec-superux${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ Power*:Rhapsody:*:*)
+ echo powerpc-apple-rhapsody${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ *:Rhapsody:*:*)
+ echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ *:Darwin:*:*)
+- case `uname -p` in
++ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
++ case $UNAME_PROCESSOR in
+ *86) UNAME_PROCESSOR=i686 ;;
+- powerpc) UNAME_PROCESSOR=powerpc ;;
++ unknown) UNAME_PROCESSOR=powerpc ;;
+ esac
+ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ *:procnto*:*:* | *:QNX:[0123456789]*:*)
+ UNAME_PROCESSOR=`uname -p`
+ if test "$UNAME_PROCESSOR" = "x86"; then
+@@ -1192,22 +1195,25 @@
+ UNAME_MACHINE=pc
+ fi
+ echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ *:QNX:*:4*)
+ echo i386-pc-qnx
+- exit 0 ;;
++ exit ;;
++ NSE-?:NONSTOP_KERNEL:*:*)
++ echo nse-tandem-nsk${UNAME_RELEASE}
++ exit ;;
+ NSR-?:NONSTOP_KERNEL:*:*)
+ echo nsr-tandem-nsk${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ *:NonStop-UX:*:*)
+ echo mips-compaq-nonstopux
+- exit 0 ;;
++ exit ;;
+ BS2000:POSIX*:*:*)
+ echo bs2000-siemens-sysv
+- exit 0 ;;
++ exit ;;
+ DS/*:UNIX_System_V:*:*)
+ echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ *:Plan9:*:*)
+ # "uname -m" is not consistent, so use $cputype instead. 386
+ # is converted to i386 for consistency with other x86
+@@ -1218,38 +1224,44 @@
+ UNAME_MACHINE="$cputype"
+ fi
+ echo ${UNAME_MACHINE}-unknown-plan9
+- exit 0 ;;
++ exit ;;
+ *:TOPS-10:*:*)
+ echo pdp10-unknown-tops10
+- exit 0 ;;
++ exit ;;
+ *:TENEX:*:*)
+ echo pdp10-unknown-tenex
+- exit 0 ;;
++ exit ;;
+ KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+ echo pdp10-dec-tops20
+- exit 0 ;;
++ exit ;;
+ XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+ echo pdp10-xkl-tops20
+- exit 0 ;;
++ exit ;;
+ *:TOPS-20:*:*)
+ echo pdp10-unknown-tops20
+- exit 0 ;;
++ exit ;;
+ *:ITS:*:*)
+ echo pdp10-unknown-its
+- exit 0 ;;
++ exit ;;
+ SEI:*:*:SEIUX)
+ echo mips-sei-seiux${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ *:DragonFly:*:*)
+ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+- exit 0 ;;
++ exit ;;
+ *:*VMS:*:*)
+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
+ case "${UNAME_MACHINE}" in
+- A*) echo alpha-dec-vms && exit 0 ;;
+- I*) echo ia64-dec-vms && exit 0 ;;
+- V*) echo vax-dec-vms && exit 0 ;;
+- esac
++ A*) echo alpha-dec-vms ; exit ;;
++ I*) echo ia64-dec-vms ; exit ;;
++ V*) echo vax-dec-vms ; exit ;;
++ esac ;;
++ *:XENIX:*:SysV)
++ echo i386-pc-xenix
++ exit ;;
++ i*86:skyos:*:*)
++ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
++ exit ;;
+ esac
+
+ #echo '(No uname command or uname output not recognized.)' 1>&2
+@@ -1281,7 +1293,7 @@
+ #endif
+
+ #if defined (__arm) && defined (__acorn) && defined (__unix)
+- printf ("arm-acorn-riscix"); exit (0);
++ printf ("arm-acorn-riscix\n"); exit (0);
+ #endif
+
+ #if defined (hp300) && !defined (hpux)
+@@ -1370,11 +1382,12 @@
+ }
+ EOF
+
+-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
++$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
++ { echo "$SYSTEM_NAME"; exit; }
+
+ # Apollos put the system type in the environment.
+
+-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
++test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
+
+ # Convex versions that predate uname can use getsysinfo(1)
+
+@@ -1383,22 +1396,22 @@
+ case `getsysinfo -f cpu_type` in
+ c1*)
+ echo c1-convex-bsd
+- exit 0 ;;
++ exit ;;
+ c2*)
+ if getsysinfo -f scalar_acc
+ then echo c32-convex-bsd
+ else echo c2-convex-bsd
+ fi
+- exit 0 ;;
++ exit ;;
+ c34*)
+ echo c34-convex-bsd
+- exit 0 ;;
++ exit ;;
+ c38*)
+ echo c38-convex-bsd
+- exit 0 ;;
++ exit ;;
+ c4*)
+ echo c4-convex-bsd
+- exit 0 ;;
++ exit ;;
+ esac
+ fi
+
+@@ -1409,7 +1422,9 @@
+ the operating system you are using. It is advised that you
+ download the most up to date version of the config scripts from
+
+- ftp://ftp.gnu.org/pub/gnu/config/
++ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
++and
++ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
+
+ If the version you run ($0) is already up to date, please
+ send the following data and any information you think might be
+--- a/admin/config.pl
++++ b/admin/config.pl
+@@ -53,6 +53,7 @@
+
+ open(CF, "< $ac_subs") || die "can't open $ac_subs: $!";
+ my @subs = <CF>;
++my $pat;
+ close(CF);
+ chomp @subs;
+ @comp_match=();
+@@ -60,7 +61,7 @@
+
+ if ($bad_perl) {
+ print "Using perl older than version 5.005\n";
+- foreach my $pat (@subs) {
++ foreach $pat (@subs) {
+ if ( ($pat =~ m/s%([^%]*)%([^%]*)%g/ )
+ || ($pat =~ m/s%([^%]*)%([^%]*)%;t/ )
+ || ($pat =~ m/s,([^,]*),(.*),;t/)
+@@ -85,7 +86,7 @@
+ }
+ }
+ } else {
+- foreach my $pat (@subs) {
++ foreach $pat (@subs) {
+ if ( ($pat =~ /s%([^%]*)%([^%]*)%g/ ) ||
+ ($pat =~ /s%([^%]*)%([^%]*)%;t/ ) ||
+ ($pat =~ /s,([^,]*),(.*),;t/) ) {
+@@ -192,8 +193,9 @@
+ my $filedata;
+ my @infiles=split(' ', $infiles);
+ my $i=0;
++ my $name;
+
+- foreach my $name (@infiles) {
++ foreach $name (@infiles) {
+ if (open(CF, "< $name")) {
+ while (<CF>) {
+ $filedata .= $_;
+--- a/admin/config.sub
++++ b/admin/config.sub
+@@ -1,9 +1,9 @@
+ #! /bin/sh
+ # Configuration validation subroutine script.
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
++# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+
+-timestamp='2004-06-24'
++timestamp='2005-07-01'
+
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -21,14 +21,15 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 51 Franklin Street, Fifth Floor,
+-# Boston, MA 02110-1301, USA.
+-
++# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
++# 02110-1301, USA.
++#
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
+
++
+ # Please send patches to <config-patches at gnu.org>. Submit a context
+ # diff and a properly formatted ChangeLog entry.
+ #
+@@ -70,7 +71,7 @@
+ version="\
+ GNU config.sub ($timestamp)
+
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+ Free Software Foundation, Inc.
+
+ This is free software; see the source for copying conditions. There is NO
+@@ -83,11 +84,11 @@
+ while test $# -gt 0 ; do
+ case $1 in
+ --time-stamp | --time* | -t )
+- echo "$timestamp" ; exit 0 ;;
++ echo "$timestamp" ; exit ;;
+ --version | -v )
+- echo "$version" ; exit 0 ;;
++ echo "$version" ; exit ;;
+ --help | --h* | -h )
+- echo "$usage"; exit 0 ;;
++ echo "$usage"; exit ;;
+ -- ) # Stop option processing
+ shift; break ;;
+ - ) # Use stdin as input.
+@@ -99,7 +100,7 @@
+ *local*)
+ # First pass through any local machine types.
+ echo $1
+- exit 0;;
++ exit ;;
+
+ * )
+ break ;;
+@@ -231,13 +232,14 @@
+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ | am33_2.0 \
+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
++ | bfin \
+ | c4x | clipper \
+ | d10v | d30v | dlx | dsp16xx \
+ | fr30 | frv \
+ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ | i370 | i860 | i960 | ia64 \
+ | ip2k | iq2000 \
+- | m32r | m32rle | m68000 | m68k | m88k | mcore \
++ | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
+ | mips | mipsbe | mipseb | mipsel | mipsle \
+ | mips16 \
+ | mips64 | mips64el \
+@@ -246,6 +248,7 @@
+ | mips64vr4100 | mips64vr4100el \
+ | mips64vr4300 | mips64vr4300el \
+ | mips64vr5000 | mips64vr5000el \
++ | mips64vr5900 | mips64vr5900el \
+ | mipsisa32 | mipsisa32el \
+ | mipsisa32r2 | mipsisa32r2el \
+ | mipsisa64 | mipsisa64el \
+@@ -254,23 +257,28 @@
+ | mipsisa64sr71k | mipsisa64sr71kel \
+ | mipstx39 | mipstx39el \
+ | mn10200 | mn10300 \
++ | ms1 \
+ | msp430 \
+ | ns16k | ns32k \
+- | openrisc | or32 \
++ | or32 \
+ | pdp10 | pdp11 | pj | pjl \
+ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+ | pyramid \
+ | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+ | sh64 | sh64le \
+- | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
++ | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
++ | sparcv8 | sparcv9 | sparcv9b \
+ | strongarm \
+ | tahoe | thumb | tic4x | tic80 | tron \
+ | v850 | v850e \
+ | we32k \
+- | x86 | xscale | xstormy16 | xtensa \
++ | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+ | z8k)
+ basic_machine=$basic_machine-unknown
+ ;;
++ m32c)
++ basic_machine=$basic_machine-unknown
++ ;;
+ m6811 | m68hc11 | m6812 | m68hc12)
+ # Motorola 68HC11/12.
+ basic_machine=$basic_machine-unknown
+@@ -298,7 +306,7 @@
+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
+ | avr-* \
+- | bs2000-* \
++ | bfin-* | bs2000-* \
+ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+ | clipper-* | craynv-* | cydra-* \
+ | d10v-* | d30v-* | dlx-* \
+@@ -310,7 +318,7 @@
+ | ip2k-* | iq2000-* \
+ | m32r-* | m32rle-* \
+ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+- | m88110-* | m88k-* | mcore-* \
++ | m88110-* | m88k-* | maxq-* | mcore-* \
+ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+ | mips16-* \
+ | mips64-* | mips64el-* \
+@@ -319,6 +327,7 @@
+ | mips64vr4100-* | mips64vr4100el-* \
+ | mips64vr4300-* | mips64vr4300el-* \
+ | mips64vr5000-* | mips64vr5000el-* \
++ | mips64vr5900-* | mips64vr5900el-* \
+ | mipsisa32-* | mipsisa32el-* \
+ | mipsisa32r2-* | mipsisa32r2el-* \
+ | mipsisa64-* | mipsisa64el-* \
+@@ -327,6 +336,7 @@
+ | mipsisa64sr71k-* | mipsisa64sr71kel-* \
+ | mipstx39-* | mipstx39el-* \
+ | mmix-* \
++ | ms1-* \
+ | msp430-* \
+ | none-* | np1-* | ns16k-* | ns32k-* \
+ | orion-* \
+@@ -336,18 +346,21 @@
+ | romp-* | rs6000-* \
+ | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+- | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
++ | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
++ | sparclite-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+ | tahoe-* | thumb-* \
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+ | tron-* \
+ | v850-* | v850e-* | vax-* \
+ | we32k-* \
+- | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
+- | xtensa-* \
++ | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
++ | xstormy16-* | xtensa-* \
+ | ymp-* \
+ | z8k-*)
+ ;;
++ m32c-*)
++ ;;
+ # Recognize the various machine names and aliases which stand
+ # for a CPU type and a company and sometimes even an OS.
+ 386bsd)
+@@ -457,6 +470,9 @@
+ crds | unos)
+ basic_machine=m68k-crds
+ ;;
++ crisv32 | crisv32-* | etraxfs*)
++ basic_machine=crisv32-axis
++ ;;
+ cris | cris-* | etrax*)
+ basic_machine=cris-axis
+ ;;
+@@ -486,6 +502,10 @@
+ basic_machine=m88k-motorola
+ os=-sysv3
+ ;;
++ djgpp)
++ basic_machine=i586-pc
++ os=-msdosdjgpp
++ ;;
+ dpx20 | dpx20-*)
+ basic_machine=rs6000-bull
+ os=-bosx
+@@ -751,9 +771,8 @@
+ basic_machine=hppa1.1-oki
+ os=-proelf
+ ;;
+- or32 | or32-*)
++ openrisc | openrisc-*)
+ basic_machine=or32-unknown
+- os=-coff
+ ;;
+ os400)
+ basic_machine=powerpc-ibm
+@@ -1026,6 +1045,10 @@
+ basic_machine=hppa1.1-winbond
+ os=-proelf
+ ;;
++ xbox)
++ basic_machine=i686-pc
++ os=-mingw32
++ ;;
+ xps | xps100)
+ basic_machine=xps100-honeywell
+ ;;
+@@ -1078,9 +1101,6 @@
+ sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
+ basic_machine=sh-unknown
+ ;;
+- sh64)
+- basic_machine=sh64-unknown
+- ;;
+ sparc | sparcv8 | sparcv9 | sparcv9b)
+ basic_machine=sparc-sun
+ ;;
+@@ -1167,7 +1187,7 @@
+ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+- | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
++ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* | -skyos*)
+ # Remember, each alternative MUST END IN *, to match a version number.
+ ;;
+ -qnx*)
+@@ -1294,6 +1314,9 @@
+ -kaos*)
+ os=-kaos
+ ;;
++ -zvmoe)
++ os=-zvmoe
++ ;;
+ -none)
+ ;;
+ *)
+@@ -1542,7 +1565,7 @@
+ esac
+
+ echo $basic_machine$os
+-exit 0
++exit
+
+ # Local variables:
+ # eval: (add-hook 'write-file-hooks 'time-stamp)
+--- a/admin/configure.in.bot.end
++++ b/admin/configure.in.bot.end
+@@ -16,6 +16,21 @@
+ fi
+ fi
+
++if test x$GXX = "xyes" -a x$kde_have_gcc_visibility = "xyes" -a x$kde_cv_val_qt_gcc_visibility_patched = "xno"; then
++ echo ""
++ echo "Your GCC supports symbol visibility, but the patch for Qt supporting visibility"
++ echo "was not included. Therefore, GCC symbol visibility support remains disabled."
++ echo ""
++ echo "For better performance, consider including the Qt visibility supporting patch"
++ echo "located at:"
++ echo ""
++ echo "http://bugs.kde.org/show_bug.cgi?id=109386"
++ echo ""
++ echo "and recompile all of Qt and KDE. Note, this is entirely optional and"
++ echo "everything will continue to work just fine without it."
++ echo ""
++fi
++
+ if test "$all_tests" = "bad"; then
+ if test ! "$cache_file" = "/dev/null"; then
+ echo ""
+--- a/admin/createtarball
++++ /dev/null
+@@ -1,74 +0,0 @@
+-#!/bin/bash
+-#
+-# Create a taskjuggler tarball in the current directory
+-#
+-# Copyright 2003 Klaas Freitag <freitag at suse.de>
+-#
+-# Parameter: The required version (defaults to svn)
+-#
+-tmpdir=/tmp/tjball
+-v=svn
+-ver=${1:-$v}
+-
+-release=HEAD
+-rel=${2:-$release}
+-
+-tj=taskjuggler-$ver
+-dir=`pwd`
+-wantdocs=1
+-
+-echo "Building version" $tj tarball
+-
+-rm -rf $tmpdir
+-mkdir $tmpdir
+-cd $tmpdir
+-
+-cd $tmpdir
+-svn export -r $rel http://einstein.suse.de/svn/taskjuggler/trunk/
+-# cvs export -r $rel taskjuggler 1>/dev/null
+-
+-mv trunk $tj
+-rm `find $tj -name .cvsignore`
+-
+-export UNSERMAKE=no
+-(cd $tj && make -f Makefile.cvs 1>/dev/null )
+-
+-archive=$tj.tar.bz2
+-
+-tar cjf $archive $tj
+-
+-# Archvive is created now, start to produce documentation
+-if [ -n $wantdocs ] ; then
+- cd $tj
+- ./configure &> /dev/null
+- cd docs
+-
+- doctarball=manual-$ver.tar.bz2
+-
+- if make ; then
+-
+- cd en
+- rm -rf manual-$ver
+- cp -r taskjuggler manual-$ver
+- chmod 755 manual-$ver
+- tar cjf $dir/$doctarball manual-$ver
+-
+- # check for postscript and pdf
+- if [ -e taskjuggler.ps ] ; then
+- cp taskjuggler.ps $dir/manual-$ver.ps
+- fi
+-
+- if [ -e taskjuggler.pdf ] ; then
+- cp taskjuggler.pdf $dir/manual-$ver.pdf
+- fi
+-
+- cd ..
+- fi
+- cd ../..
+-fi
+-# Copy stuff home
+-cp $archive $dir
+-cd $dir
+-
+-# rm -rf $tmpdir
+-
+--- a/admin/cvs-clean.pl
++++ /dev/null
+@@ -1,87 +0,0 @@
+-#! /usr/bin/perl
+-
+-#
+-# This script recursively (beginning with the current directory)
+-# wipes out everything not registered in CVS.
+-#
+-# written by Oswald Buddenhagen <ossi at kde.org>
+-# inspired by the "old" cvs-clean target from Makefile.common
+-#
+-# This file is free software in terms of the BSD license. That means
+-# that you can do anything with it except removing this license or
+-# the above copyright notice. There is NO WARRANTY of any kind.
+-#
+-
+-sub rmrf()
+-{
+- my $fn = shift;
+- lstat ($fn);
+- if (-d _) {
+- if (opendir (DIR, $fn)) {
+- for my $efn (grep (!/^\.\.?$/, readdir (DIR))) {
+- &rmrf ($fn."/".$efn);
+- }
+- closedir (DIR);
+- rmdir ($fn);
+- }
+- } else {
+- unlink ($fn);
+- }
+-}
+-
+-sub newfiles()
+-{
+- my ($indir, $incvs) = @_;
+- for my $n (keys (%$incvs)) { delete $$indir{$n} }
+- return sort (keys (%$indir));
+-}
+-
+-sub cvsclean()
+-{
+- my $dir = shift;
+- my (%dirsdir, %filesdir, %dirscvs, %filescvs);
+- my $dnam = $dir ? $dir : ".";
+- if (!opendir (DIR, $dnam)) {
+- print STDERR "Cannot enter \"".$dnam."\".\n";
+- return;
+- }
+- for my $fn (grep (!/^\.\.?$/, readdir (DIR))) {
+- if (-d $dir.$fn) {
+- $fn eq "CVS" or $dirsdir{$fn} = 1;
+- } else {
+- $filesdir{$fn} = 1;
+- }
+- }
+- closedir (DIR);
+- if (!open (FILE, "<".$dir."CVS/Entries")) {
+- print STDERR "No CVS information in \"".$dnam."\".\n";
+- return;
+- }
+- while (<FILE>) {
+- m%^D/([^/]+)/.*$% and $dirscvs{$1} = 1;
+- m%^/([^/]+)/.*$% and $filescvs{$1} = 1;
+- }
+- close (FILE);
+- if (open (FILE, "<".$dir."CVS/Entries.Log")) {
+- while (<FILE>) {
+- m%^A D/([^/]+)/.*$% and $dirscvs{$1} = 1;
+- m%^A /([^/]+)/.*$% and $filescvs{$1} = 1;
+- m%^R D/([^/]+)/.*$% and delete $dirscvs{$1};
+- m%^R /([^/]+)/.*$% and delete $filescvs{$1};
+- }
+- close (FILE);
+- }
+- for my $fn (&newfiles (\%filesdir, \%filescvs)) {
+- print ("F ".$dir.$fn."\n");
+- &rmrf ($dir.$fn);
+- }
+- for my $fn (&newfiles (\%dirsdir, \%dirscvs)) {
+- print ("D ".$dir.$fn."\n");
+- &rmrf ($dir.$fn);
+- }
+- for my $fn (sort (keys (%dirscvs))) {
+- &cvsclean ($dir.$fn."/");
+- }
+-}
+-
+-&cvsclean ("");
+--- a/admin/cvs.sh
++++ b/admin/cvs.sh
+@@ -6,6 +6,8 @@
+ # It defines a shell function for each known target
+ # and then does a case to call the correct function.
+
++unset MAKEFLAGS
++
+ call_and_fix_autoconf()
+ {
+ $AUTOCONF || exit 1
+@@ -30,7 +32,7 @@
+ required_autoconf_version="2.53 or newer"
+ AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
+ case $AUTOCONF_VERSION in
+- Autoconf*2.5* | autoconf*2.5* | Autoconf*2.6* | autoconf*2.6*) : ;;
++ Autoconf*2.5* | autoconf*2.5* | autoconf*2.6* ) : ;;
+ "" )
+ echo "*** AUTOCONF NOT FOUND!."
+ echo "*** KDE requires autoconf $required_autoconf_version"
+@@ -42,10 +44,10 @@
+ exit 1
+ ;;
+ esac
+-
++
+ AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
+ case $AUTOHEADER_VERSION in
+- Autoheader*2.5* | autoheader*2.5* | *Autoheader*2.6* | autoheader*2.6*) : ;;
++ Autoconf*2.5* | autoheader*2.5* | autoheader*2.6* ) : ;;
+ "" )
+ echo "*** AUTOHEADER NOT FOUND!."
+ echo "*** KDE requires autoheader $required_autoconf_version"
+@@ -58,8 +60,6 @@
+ ;;
+ esac
+
+-unset UNSERMAKE || :
+-
+ AUTOMAKE_STRING=`$AUTOMAKE --version | head -n 1`
+ required_automake_version="1.6.1 or newer"
+ case $AUTOMAKE_STRING in
+@@ -68,7 +68,10 @@
+ echo "*** KDE requires automake $required_automake_version"
+ exit 1
+ ;;
+- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*) : ;;
++ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
++ echo "*** $AUTOMAKE_STRING found."
++ UNSERMAKE=no
++ ;;
+ "" )
+ echo "*** AUTOMAKE NOT FOUND!."
+ echo "*** KDE requires automake $required_automake_version"
+@@ -77,8 +80,6 @@
+ *unsermake* ) :
+ echo "*** YOU'RE USING UNSERMAKE."
+ echo "*** GOOD LUCK!! :)"
+- echo "*** Set the environment variable UNSERMAKE to 'no' to"
+- echo "*** disable UNSERMAKE in case you have problems with it."
+ UNSERMAKE=unsermake
+ ;;
+ * )
+@@ -130,12 +131,13 @@
+ if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
+ echo "*** Creating config.h template"
+ $AUTOHEADER || exit 1
++ touch config.h.in
+ fi
+
+ echo "*** Creating Makefile templates"
+ $AUTOMAKE || exit 1
+
+-if test -z "$UNSERMAKE"; then
++if test "$UNSERMAKE" = no; then
+ echo "*** Postprocessing Makefile templates"
+ perl -w admin/am_edit || exit 1
+ fi
+@@ -185,9 +187,10 @@
+ if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
+ echo "*** Creating config.h template"
+ $AUTOHEADER || exit 1
++ touch config.h.in
+ fi
+-$AUTOMAKE --foreign
+-if test -z "$UNSERMAKE"; then
++$AUTOMAKE --foreign || exit 1
++if test "$UNSERMAKE" = no; then
+ echo "*** Postprocessing Makefile templates"
+ perl -w admin/am_edit || exit 1
+ fi
+@@ -218,6 +221,7 @@
+ {
+ $ACLOCAL $ACLOCALFLAGS
+ $AUTOHEADER
++touch config.h.in
+ $AUTOMAKE
+ AUTOMAKE_STRING=`$AUTOMAKE --version | head -n 1`
+ case $AUTOMAKE_STRING in
+@@ -312,7 +316,7 @@
+ fi
+ fi
+ if test -z "$VERSION" || test "$VERSION" = "@VERSION@"; then
+- VERSION="\"3.3.91\""
++ VERSION="\"3.5.8\""
+ fi
+ if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then
+ modulename=`pwd`;
+@@ -505,17 +509,6 @@
+ fi
+ }
+
+-cvs_clean()
+-{
+-if test -d CVS; then :; else
+- echo "You don't have a toplevel CVS directory."
+- echo "You most certainly didn't use cvs to get these sources."
+- echo "But this function depends on cvs's information."
+- exit 1
+-fi
+-perl $admindir/cvs-clean.pl
+-}
+-
+ package_merge()
+ {
+ catalogs=$POFILES
+@@ -555,13 +548,16 @@
+ echo "$subdir has *.rc, *.ui or *.kcfg files, but not correct messages line"
+ fi
+ fi
+- if find . -name \*.c\* -o -name \*.h\* | xargs fgrep -s -q KAboutData ; then
++ if find . -name \*.c\* -o -name \*.h\* | fgrep -v ".svn" | xargs fgrep -s -q KAboutData ; then
+ echo -e 'i18n("_: NAME OF TRANSLATORS\\n"\n"Your names")\ni18n("_: EMAIL OF TRANSLATORS\\n"\n"Your emails")' > _translatorinfo.cpp
+ else echo " " > _translatorinfo.cpp
+ fi
+ perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
+
+- kdepotpath=${includedir:-${KDEDIR:-`kde-config --prefix`}/include}/kde.pot
++ kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
++ if ! test -f $kdepotpath; then
++ kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
++ fi
+
+ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
+ XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages
+@@ -584,7 +580,7 @@
+ mkdir po.backup
+
+ for i in `ls -1 po/*.pot 2>/dev/null | sed -e "s#po/##"`; do
+- egrep -v '^#([^:]|$)' po/$i | egrep '^.*[^ ]+.*$' | grep -v "\"POT-Creation" > po.backup/$i
++ egrep -v '^#[^,]' po/$i | egrep '^.*[^ ]+.*$' | grep -v "\"POT-Creation" > po.backup/$i
+ cat po/$i > po.backup/backup_$i
+ touch -r po/$i po.backup/backup_$i
+ rm po/$i
+@@ -596,11 +592,11 @@
+ test -f po/$i || echo "disappeared: $i"
+ done
+ for i in `ls -1 po/*.pot 2>/dev/null | sed -e "s#po/##"`; do
+- sed -e 's,^"Content-Type: text/plain; charset=CHARSET\\n"$,"Content-Type: text/plain; charset=UTF-8\\n",' po/$i > po/$i.new && mv po/$i.new po/$i
+- #msgmerge -q -o po/$i po/$i po/$i
+- egrep -v '^#([^:]|$)' po/$i | egrep '^.*[^ ]+.*$' | grep -v "\"POT-Creation" > temp.pot
++ sed -e 's,^"Content-Type: text/plain; charset=CHARSET\\n"$,"Content-Type: text/plain; charset=UTF-8\\n",' po/$i > po/$i.new && mv po/$i.new po/$i
++ #msgmerge -q -o po/$i po/$i po/$i
++ egrep -v '^#[^,]' po/$i | egrep '^.*[^ ]+.*$' | grep -v "\"POT-Creation" > temp.pot
+ if test -f po.backup/$i && ! cmp -s temp.pot po.backup/$i; then
+- echo "will update $i"
++ echo "will update $i"
+ else
+ if test -f po.backup/backup_$i; then
+ test -z "$VERBOSE" || echo "I'm restoring $i"
+@@ -615,7 +611,9 @@
+ rm -rf po.backup
+ }
+
+-unset LC_ALL || :
++# Make sure that sorting is always done the same way
++LC_ALL=C
++export LC_ALL
+ unset LANG || :
+ unset LC_CTYPE || :
+ unset LANGUAGE || :
+@@ -633,8 +631,9 @@
+ rm -f $makefile_wo
+ fi
+
+-# Suck in the AUTOCONF detection code
+-. $admindir/detect-autoconf.sh
++# Call script to find autoconf and friends. Uses eval since the script outputs
++# sh-compatible code.
++eval `$admindir/detect-autoconf.pl`
+
+ ###
+ ### Main
+@@ -647,7 +646,7 @@
+ configure ) call_and_fix_autoconf ;;
+ * ) echo "Usage: cvs.sh <target>"
+ echo "Target can be one of:"
+- echo " cvs cvs-clean dist"
++ echo " cvs svn dist"
+ echo " configure.in configure.files"
+ echo " package-merge package-messages"
+ echo ""
+--- a/admin/depcomp
++++ b/admin/depcomp
+@@ -1,7 +1,9 @@
+ #! /bin/sh
+-
+ # depcomp - compile a program generating dependencies as side-effects
+-# Copyright 1999, 2000 Free Software Foundation, Inc.
++
++scriptversion=2005-07-09.11
++
++# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -25,13 +27,45 @@
+
+ # Originally written by Alexandre Oliva <oliva at dcc.unicamp.br>.
+
++case $1 in
++ '')
++ echo "$0: No command. Try \`$0 --help' for more information." 1>&2
++ exit 1;
++ ;;
++ -h | --h*)
++ cat <<\EOF
++Usage: depcomp [--help] [--version] PROGRAM [ARGS]
++
++Run PROGRAMS ARGS to compile a file, generating dependencies
++as side-effects.
++
++Environment variables:
++ depmode Dependency tracking mode.
++ source Source file read by `PROGRAMS ARGS'.
++ object Object file output by `PROGRAMS ARGS'.
++ DEPDIR directory where to store dependencies.
++ depfile Dependency file to output.
++ tmpdepfile Temporary file to use when outputing dependencies.
++ libtool Whether libtool is used (yes/no).
++
++Report bugs to <bug-automake at gnu.org>.
++EOF
++ exit $?
++ ;;
++ -v | --v*)
++ echo "depcomp $scriptversion"
++ exit $?
++ ;;
++esac
++
+ if test -z "$depmode" || test -z "$source" || test -z "$object"; then
+ echo "depcomp: Variables source, object and depmode must be set" 1>&2
+ exit 1
+ fi
+-# `libtool' can also be set to `yes' or `no'.
+
+-depfile=${depfile-`echo "$object" | sed 's,\([^/]*\)$,.deps/\1,;s/\.\([^.]*\)$/.P\1/'`}
++# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
++depfile=${depfile-`echo "$object" |
++ sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
+ tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
+
+ rm -f "$tmpdepfile"
+@@ -163,19 +197,25 @@
+
+ aix)
+ # The C for AIX Compiler uses -M and outputs the dependencies
+- # in a .u file. This file always lives in the current directory.
+- # Also, the AIX compiler puts `$object:' at the start of each line;
+- # $object doesn't have directory information.
+- stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
++ # in a .u file. In older versions, this file always lives in the
++ # current directory. Also, the AIX compiler puts `$object:' at the
++ # start of each line; $object doesn't have directory information.
++ # Version 6 uses the directory in both cases.
++ stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
+ tmpdepfile="$stripped.u"
+- outname="$stripped.o"
+ if test "$libtool" = yes; then
+ "$@" -Wc,-M
+ else
+ "$@" -M
+ fi
+-
+ stat=$?
++
++ if test -f "$tmpdepfile"; then :
++ else
++ stripped=`echo "$stripped" | sed 's,^.*/,,'`
++ tmpdepfile="$stripped.u"
++ fi
++
+ if test $stat -eq 0; then :
+ else
+ rm -f "$tmpdepfile"
+@@ -183,6 +223,7 @@
+ fi
+
+ if test -f "$tmpdepfile"; then
++ outname="$stripped.o"
+ # Each line is of the form `foo.o: dependent.h'.
+ # Do two passes, one to just change these to
+ # `$object: dependent.h' and one to simply `dependent.h:'.
+@@ -198,11 +239,9 @@
+ ;;
+
+ icc)
+- # Must come before tru64.
+-
+- # Intel's C compiler understands `-MD -MF file'. However
++ # Intel's C compiler understands `-MD -MF file'. However on
+ # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
+- # will fill foo.d with something like
++ # ICC 7.0 will fill foo.d with something like
+ # foo.o: sub/foo.c
+ # foo.o: sub/foo.h
+ # which is wrong. We want:
+@@ -210,6 +249,12 @@
+ # sub/foo.o: sub/foo.h
+ # sub/foo.c:
+ # sub/foo.h:
++ # ICC 7.1 will output
++ # foo.o: sub/foo.c sub/foo.h
++ # and will wrap long lines using \ :
++ # foo.o: sub/foo.c ... \
++ # sub/foo.h ... \
++ # ...
+
+ "$@" -MD -MF "$tmpdepfile"
+ stat=$?
+@@ -219,45 +264,70 @@
+ exit $stat
+ fi
+ rm -f "$depfile"
+- # Each line is of the form `foo.o: dependent.h'.
++ # Each line is of the form `foo.o: dependent.h',
++ # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+ # Do two passes, one to just change these to
+ # `$object: dependent.h' and one to simply `dependent.h:'.
+- sed -e "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+- sed -e "s,^[^:]*: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
++ sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
++ # Some versions of the HPUX 10.20 sed can't process this invocation
++ # correctly. Breaking it into two sed invocations is a workaround.
++ sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
++ sed -e 's/$/ :/' >> "$depfile"
+ rm -f "$tmpdepfile"
+ ;;
+
+ tru64)
+- # The Tru64 AIX compiler uses -MD to generate dependencies as a side
++ # The Tru64 compiler uses -MD to generate dependencies as a side
+ # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
+- # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
++ # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+ # dependencies in `foo.d' instead, so we check for that too.
+ # Subdirectories are respected.
++ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
++ test "x$dir" = "x$object" && dir=
++ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+
+- tmpdepfile1="$object.d"
+- tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'`
+ if test "$libtool" = yes; then
++ # With Tru64 cc, shared objects can also be used to make a
++ # static library. This mecanism is used in libtool 1.4 series to
++ # handle both shared and static libraries in a single compilation.
++ # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
++ #
++ # With libtool 1.5 this exception was removed, and libtool now
++ # generates 2 separate objects for the 2 libraries. These two
++ # compilations output dependencies in in $dir.libs/$base.o.d and
++ # in $dir$base.o.d. We have to check for both files, because
++ # one of the two compilations can be disabled. We should prefer
++ # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
++ # automatically cleaned when .libs/ is deleted, while ignoring
++ # the former would cause a distcleancheck panic.
++ tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4
++ tmpdepfile2=$dir$base.o.d # libtool 1.5
++ tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5
++ tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504
+ "$@" -Wc,-MD
+ else
++ tmpdepfile1=$dir$base.o.d
++ tmpdepfile2=$dir$base.d
++ tmpdepfile3=$dir$base.d
++ tmpdepfile4=$dir$base.d
+ "$@" -MD
+ fi
+
+ stat=$?
+ if test $stat -eq 0; then :
+ else
+- rm -f "$tmpdepfile1" "$tmpdepfile2"
++ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
+ exit $stat
+ fi
+
+- if test -f "$tmpdepfile1"; then
+- tmpdepfile="$tmpdepfile1"
+- else
+- tmpdepfile="$tmpdepfile2"
+- fi
++ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
++ do
++ test -f "$tmpdepfile" && break
++ done
+ if test -f "$tmpdepfile"; then
+ sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+- # That's a space and a tab in the [].
+- sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
++ # That's a tab and a space in the [].
++ sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+ else
+ echo "#dummy" > "$depfile"
+ fi
+@@ -270,34 +340,42 @@
+
+ dashmstdout)
+ # Important note: in order to support this mode, a compiler *must*
+- # always write the proprocessed file to stdout, regardless of -o,
+- # because we must use -o when running libtool.
+- test -z "$dashmflag" && dashmflag=-M
+- ( IFS=" "
+- case " $* " in
+- *" --mode=compile "*) # this is libtool, let us make it quiet
+- for arg
+- do # cycle over the arguments
+- case "$arg" in
+- "--mode=compile")
+- # insert --quiet before "--mode=compile"
+- set fnord "$@" --quiet
+- shift # fnord
+- ;;
+- esac
+- set fnord "$@" "$arg"
+- shift # fnord
+- shift # "$arg"
+- done
++ # always write the preprocessed file to stdout, regardless of -o.
++ "$@" || exit $?
++
++ # Remove the call to Libtool.
++ if test "$libtool" = yes; then
++ while test $1 != '--mode=compile'; do
++ shift
++ done
++ shift
++ fi
++
++ # Remove `-o $object'.
++ IFS=" "
++ for arg
++ do
++ case $arg in
++ -o)
++ shift
++ ;;
++ $object)
++ shift
++ ;;
++ *)
++ set fnord "$@" "$arg"
++ shift # fnord
++ shift # $arg
+ ;;
+ esac
+- "$@" $dashmflag | sed 's:^[^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
+- ) &
+- proc=$!
+- "$@"
+- stat=$?
+- wait "$proc"
+- if test "$stat" != 0; then exit $stat; fi
++ done
++
++ test -z "$dashmflag" && dashmflag=-M
++ # Require at least two characters before searching for `:'
++ # in the target name. This is to cope with DOS-style filenames:
++ # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
++ "$@" $dashmflag |
++ sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
+ rm -f "$depfile"
+ cat < "$tmpdepfile" > "$depfile"
+ tr ' ' '
+@@ -315,36 +393,40 @@
+ ;;
+
+ makedepend)
+- # X makedepend
+- (
+- shift
+- cleared=no
+- for arg in "$@"; do
+- case $cleared in no)
+- set ""; shift
+- cleared=yes
+- esac
+- case "$arg" in
+- -D*|-I*)
+- set fnord "$@" "$arg"; shift;;
+- -*)
+- ;;
+- *)
+- set fnord "$@" "$arg"; shift;;
+- esac
++ "$@" || exit $?
++ # Remove any Libtool call
++ if test "$libtool" = yes; then
++ while test $1 != '--mode=compile'; do
++ shift
+ done
+- obj_suffix="`echo $object | sed 's/^.*\././'`"
+- touch "$tmpdepfile"
+- ${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@"
+- ) &
+- proc=$!
+- "$@"
+- stat=$?
+- wait "$proc"
+- if test "$stat" != 0; then exit $stat; fi
++ shift
++ fi
++ # X makedepend
++ shift
++ cleared=no
++ for arg in "$@"; do
++ case $cleared in
++ no)
++ set ""; shift
++ cleared=yes ;;
++ esac
++ case "$arg" in
++ -D*|-I*)
++ set fnord "$@" "$arg"; shift ;;
++ # Strip any option that makedepend may not understand. Remove
++ # the object too, otherwise makedepend will parse it as a source file.
++ -*|$object)
++ ;;
++ *)
++ set fnord "$@" "$arg"; shift ;;
++ esac
++ done
++ obj_suffix="`echo $object | sed 's/^.*\././'`"
++ touch "$tmpdepfile"
++ ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
+ rm -f "$depfile"
+ cat < "$tmpdepfile" > "$depfile"
+- tail +3 "$tmpdepfile" | tr ' ' '
++ sed '1,2d' "$tmpdepfile" | tr ' ' '
+ ' | \
+ ## 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 +436,40 @@
+
+ cpp)
+ # Important note: in order to support this mode, a compiler *must*
+- # always write the proprocessed file to stdout, regardless of -o,
+- # because we must use -o when running libtool.
+- ( IFS=" "
+- case " $* " in
+- *" --mode=compile "*)
+- for arg
+- do # cycle over the arguments
+- case $arg in
+- "--mode=compile")
+- # insert --quiet before "--mode=compile"
+- set fnord "$@" --quiet
+- shift # fnord
+- ;;
+- esac
+- set fnord "$@" "$arg"
+- shift # fnord
+- shift # "$arg"
+- done
++ # always write the preprocessed file to stdout.
++ "$@" || exit $?
++
++ # Remove the call to Libtool.
++ if test "$libtool" = yes; then
++ while test $1 != '--mode=compile'; do
++ shift
++ done
++ shift
++ fi
++
++ # Remove `-o $object'.
++ IFS=" "
++ for arg
++ do
++ case $arg in
++ -o)
++ shift
++ ;;
++ $object)
++ shift
++ ;;
++ *)
++ set fnord "$@" "$arg"
++ shift # fnord
++ shift # $arg
+ ;;
+ esac
+- "$@" -E |
+- sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
++ done
++
++ "$@" -E |
++ sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
++ -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+ sed '$ s: \\$::' > "$tmpdepfile"
+- ) &
+- proc=$!
+- "$@"
+- stat=$?
+- wait "$proc"
+- if test "$stat" != 0; then exit $stat; fi
+ rm -f "$depfile"
+ echo "$object : \\" > "$depfile"
+ cat < "$tmpdepfile" >> "$depfile"
+@@ -392,34 +479,27 @@
+
+ msvisualcpp)
+ # Important note: in order to support this mode, a compiler *must*
+- # always write the proprocessed file to stdout, regardless of -o,
++ # always write the preprocessed file to stdout, regardless of -o,
+ # because we must use -o when running libtool.
+- ( IFS=" "
+- case " $* " in
+- *" --mode=compile "*)
+- for arg
+- do # cycle over the arguments
+- case $arg in
+- "--mode=compile")
+- # insert --quiet before "--mode=compile"
+- set fnord "$@" --quiet
+- shift # fnord
+- ;;
+- esac
++ "$@" || exit $?
++ IFS=" "
++ for arg
++ do
++ case "$arg" in
++ "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
++ set fnord "$@"
++ shift
++ shift
++ ;;
++ *)
+ set fnord "$@" "$arg"
+- shift # fnord
+- shift # "$arg"
+- done
+- ;;
++ shift
++ shift
++ ;;
+ esac
+- "$@" -E |
+- sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
+- ) &
+- proc=$!
+- "$@"
+- stat=$?
+- wait "$proc"
+- if test "$stat" != 0; then exit $stat; fi
++ done
++ "$@" -E |
++ sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
+ rm -f "$depfile"
+ echo "$object : \\" > "$depfile"
+ . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
+@@ -439,3 +519,12 @@
+ esac
+
+ exit 0
++
++# Local Variables:
++# mode: shell-script
++# sh-indentation: 2
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-end: "$"
++# End:
+--- /dev/null
++++ b/admin/detect-autoconf.pl
+@@ -0,0 +1,257 @@
++#!/usr/bin/env perl
++
++# Try to locate best version of auto*
++# By Michael Pyne <michael.pyne at kdemail.net>
++#
++# Copyright (c) 2005.
++# This code is public domain. You may use it however you like (including
++# relicensing).
++
++# Emulate the 'which' program.
++sub which
++{
++ my $prog = shift;
++ my @paths = split(/:/, $ENV{'PATH'});
++
++ for $path (@paths)
++ {
++ return "$path/$prog" if -x "$path/$prog";
++ }
++
++ return "";
++}
++
++# Subroutine to lexicographically compare two version strings, a and b.
++# If a > b, 1 is returned.
++# If a == b, 0 is returned.
++# If a < b, -1 is returned.
++#
++# If the strings are of uneven number length then the shorter string is
++# prepended by enough zeroes to make the two string lengths equal in order to
++# allow an accurate comparison. Note that the zero-padding only occurs in
++# between version separators (i.e. 1.6 and 1.10, results in 1.06 vs. 1.10).
++# Parts of the version ending in -foo (or any other text) are not considered
++# when doing the compare. (i.e. 2.53a vs 2.53 doesn't end up in 2.53a vs.
++# 2.053)
++sub compareVersions
++{
++ my ($a, $b) = @_;
++
++ # Split the strings up by '.' (version separator) and start comparing digit
++ # length.
++
++ my @aParts = split(/\./, $a);
++ my @bParts = split(/\./, $b);
++
++ # Make the arrays equal in length by adding missing zeroes to the end of the
++ # version.
++ push @aParts, '0' while scalar @aParts < scalar @bParts;
++ push @bParts, '0' while scalar @bParts < scalar @aParts;
++
++ # Now compare each individual portion.
++ for (my $i = 0; $i < scalar @aParts; ++$i)
++ {
++ # Make sure that any portion that has numbers is contiguous. I'm sure
++ # there's a technique for saving stuff like 2.52a2 but I don't feel
++ # like implementing it.
++ if ($aParts[$i] !~ /^[^\d]*\d+[^\d]*$/ or
++ $bParts[$i] !~ /^[^\d]*\d+[^\d]*$/)
++ {
++ die "Not able to compare $a to $b!\n";
++ }
++
++ my ($aDigits) = ($aParts[$i] =~ /(\d+)/);
++ my ($bDigits) = ($bParts[$i] =~ /(\d+)/);
++
++ # Perl is $MODERATELY_INSULTING_TERM, don't remove the parentheses in
++ # the delta calculation below.
++ my $delta = (length $aDigits) - (length $bDigits);
++ if ($delta < 0) # b is longer
++ {
++ my $replacement = ('0' x (-$delta)) . $aDigits;
++ $aParts[$i] =~ s/$aDigits/$replacement/;
++ }
++ elsif ($delta > 0) # a is longer
++ {
++ my $replacement = ('0' x $delta) . $bDigits;
++ $bParts[$i] =~ s/$bDigits/$replacement/;
++ }
++ }
++
++ # Arrays now have standardized version components, let's re-merge them
++ # to strings to do the compare.
++ my $newA = join('.', @aParts);
++ my $newB = join('.', @bParts);
++
++ return 1 if ($newA gt $newB);
++ return -1 if ($newA lt $newB);
++ return 0;
++}
++
++# Subroutine to determine the highest installed version of the given program,
++# searching from the given paths.
++sub findBest
++{
++ my ($program, @paths) = @_;
++ my $best_version_found = '0'; # Deliberately a string.
++ my %versions;
++ my %minimumVersions = (
++ 'autoconf' => '2.5',
++ 'automake' => '1.6',
++ );
++ my $sgn; # Used for compareVersions results.
++
++ # Allow user to use environment variable to override search.
++ return $ENV{uc $program} if $ENV{uc $program};
++
++ for $prefix (@paths)
++ {
++ @files = glob "$prefix/$program*";
++ for $file (@files)
++ {
++ # Don't check non-executable scripts.
++ next unless -x $file;
++
++ ($version) = $file =~ /$prefix\/$program-?(.*)$/;
++
++ # Don't check the -wrapper ones (or any other non program one).
++ # The real deal should start with a version number, or have no
++ # suffix at all.
++ next if $version =~ /^[^\d]/;
++
++ # Special case some programs to make sure it has a minimum version.
++ if (not $version and exists $minimumVersions{$program})
++ {
++ my $min_version = $minimumVersions{$program};
++ my $versionOutput = `$program --version 2>/dev/null | head -n 1`;
++
++ # If we can't run the script to get the version it likely won't work later.
++ next unless $versionOutput;
++
++ # Use number.number for version (we don't need the excess in general).
++ ($versionOutput) = ($versionOutput =~ /(\d+\.\d+)/);
++
++ # compareVersions returns -1 if the left argument is less than
++ # the right argument. It can also die for invalid input so
++ # wrap with eval.
++ eval {
++ $sgn = compareVersions($versionOutput, $min_version);
++ };
++
++ # $@ would be set if an error was encountered.
++ if ($@ or not $versionOutput or $sgn == -1) {
++ next;
++ }
++ }
++
++ # If no version suffix then use it in favor of a versioned autotool
++ # since the ever-popular WANT_AUTOFOO should then work (in theory).
++ return $file unless $version;
++
++ # Emulate 'which', and abort if we've already seen this version.
++ next if exists $versions{$version};
++
++ # Save filename of program.
++ $versions{$version} = $file;
++
++ # Use string comparison so that e.g. 253a will be > 253 but < 254.
++ # See above about the need for eval.
++ eval {
++ $sgn = compareVersions($version, $best_version_found);
++ };
++
++ if (not $@ and $sgn == 1)
++ {
++ $best_version_found = $version;
++ }
++ }
++ }
++
++ return $versions{$best_version_found};
++}
++
++# Find an appropriate "which" program for later use by the shell script calling
++# us.
++sub findWhich
++{
++ for $candidate ('type -p', 'which', 'type')
++ {
++ $test = `$candidate sh 2>/dev/null`;
++ chomp $test;
++
++ return $candidate if -x $test;
++ }
++}
++
++# Uses which() to find a program unless the user provided its path in the
++# environment (the upper case program name is searched).
++sub findProgram
++{
++ $suffix = ""; # For use if @_ has only one param.
++ my ($program, $suffix) = @_;
++
++ return $ENV{uc $program} if $ENV{uc $program};
++ return which("$program$suffix");
++}
++
++# SCRIPT STARTS.
++
++# Search in path.
++ at paths = split(/:/, $ENV{'PATH'});
++
++# Make sure at least /usr/bin and /usr/local/bin are in this search.
++unshift @paths, '/usr/local/bin' unless grep $_ eq '/usr/local/bin', @paths;
++unshift @paths, '/usr/bin' unless grep $_ eq '/usr/bin', @paths;
++
++$autoconf = findBest('autoconf', @paths);
++($autoconf_suffix) = $autoconf =~ /.*autoconf(.*)$/;
++
++# Find matching autoconf companions.
++$autoheader = findProgram('autoheader', $autoconf_suffix);
++$autom4te = findProgram('autom4te', $autoconf_suffix);
++
++# Get best automake, and look for unsermake to possibly override it.
++$automake = findBest('automake', @paths);
++$unsermake = "";
++# backward compatible: if $UNSERMAKE points to a path, use it
++$unsermake = findProgram('unsermake') if (defined($ENV{'UNSERMAKE'}) and $ENV{'UNSERMAKE'} =~ /\//);
++# new compatible: if it says 'yes', use the one from path
++$unsermake = which('unsermake') if ($ENV{'UNSERMAKE'} ne 'no');
++
++($automake_suffix) = $automake =~ /.*automake(.*)$/;
++
++# Use unsermake if we found it.
++$automake = "$unsermake -c" if $unsermake;
++
++# Find matching automake companions.
++$aclocal = findProgram('aclocal', $automake_suffix);
++
++$which = findWhich();
++
++# Make sure we have all of the needed programs.
++for $i (qw'autoconf autoheader autom4te automake aclocal')
++{
++ unless(${$i})
++ {
++ print "# Unable to find $i!!\n";
++ exit 1;
++ }
++}
++
++# Print results in eval-able form.
++print <<EOF;
++AUTOCONF="$autoconf"
++AUTOHEADER="$autoheader"
++AUTOM4TE="$autom4te"
++
++AUTOMAKE="$automake"
++ACLOCAL="$aclocal"
++
++WHICH="$which"
++
++export AUTOCONF AUTOHEADER AUTOM4TE AUTOMAKE ACLOCAL WHICH
++EOF
++
++exit 0;
++
++# vim: set noet ts=8 sw=4:
+--- a/admin/detect-autoconf.sh
++++ /dev/null
+@@ -1,59 +0,0 @@
+-#! /bin/sh
+-
+-# Global variables...
+-AUTOCONF="autoconf"
+-AUTOHEADER="autoheader"
+-AUTOM4TE="autom4te"
+-AUTOMAKE="automake"
+-ACLOCAL="aclocal"
+-
+-# Please add higher versions first. The last version number is the minimum
+-# needed to compile KDE. Do not forget to include the name/version #
+-# separator if one is present, e.g. -1.2 where - is the separator.
+-KDE_AUTOCONF_VERS="-2.60 260 -2.59 259 -2.58 258 -2.57 257 -2.54 -2.53a -2.53 -2.52 -2.5x"
+-KDE_AUTOMAKE_VERS="-1.9 19 -1.8 18 -1.7 17 -1.6"
+-
+-# We don't use variable here for remembering the type ... strings. Local
+-# variables are not that portable, but we fear namespace issues with our
+-# includer.
+-checkAutoconf()
+-{
+- for kde_autoconf_version in $KDE_AUTOCONF_VERS; do
+- if test -x "`$WHICH $AUTOCONF$kde_autoconf_version 2>/dev/null`"; then
+- AUTOCONF="`$WHICH $AUTOCONF$kde_autoconf_version`"
+- AUTOHEADER="`$WHICH $AUTOHEADER$kde_autoconf_version`"
+- AUTOM4TE="`$WHICH $AUTOM4TE$kde_autoconf_version`"
+- break
+- fi
+- done
+-}
+-
+-checkAutomake ()
+-{
+- for kde_automake_version in $KDE_AUTOMAKE_VERS; do
+- if test -x "`$WHICH $AUTOMAKE$kde_automake_version 2>/dev/null`"; then
+- AUTOMAKE="`$WHICH $AUTOMAKE$kde_automake_version`"
+- ACLOCAL="`$WHICH $ACLOCAL$kde_automake_version`"
+- break
+- fi
+- done
+-
+- if test "$UNSERMAKE" != no && test -x "`$WHICH unsermake 2>/dev/null`"; then
+- AUTOMAKE="`$WHICH unsermake` -c"
+- fi
+-}
+-
+-checkWhich ()
+-{
+- WHICH=""
+- for i in "type -p" "which" "type" ; do
+- T=`$i sh 2> /dev/null`
+- test -x "$T" && WHICH="$i" && break
+- done
+-}
+-
+-checkWhich
+-checkAutoconf
+-checkAutomake
+-
+-export WHICH AUTOHEADER AUTOCONF AUTOM4TE AUTOMAKE ACLOCAL
+--- a/admin/Doxyfile.am
++++ b/admin/Doxyfile.am
+@@ -1,70 +1,40 @@
+ ## generate API documentation with doxygen
+ apidox-am-yes:
++ @if test \! -d "$(top_srcdir)/doc/common/" && test -z "$$DOXDATA" ; then \
++ export DOXDATA=$(kde_libs_htmldir)/en/common ; \
++ fi ; \
++ abs_top_srcdir=`cd $(top_srcdir) && pwd` ;\
++ test -d $(top_builddir)/apidocs || \
++ ( cd $(top_builddir) && sh $$abs_top_srcdir/admin/doxygen.sh \
++ --no-modulename --installdir=$(kde_libs_htmldir)/en \
++ --no-recurse $(abs_top_srcdir) . ) ; \
++ cd $(top_builddir) && sh $$abs_top_srcdir/admin/doxygen.sh \
++ --recurse --no-modulename --installdir=$(kde_libs_htmldir)/en \
++ $$abs_top_srcdir $(subdir)
++
++apidox-am-toplevel-yes:
++ @if test \! -d "$(top_srcdir)/doc/common/" && test -z "$$ADMIN" ; then \
++ export DOXDATA=$(kde_libs_htmldir)/en/common ; \
++ fi ; \
++ abs_top_srcdir=`cd $(top_srcdir) && pwd` ;\
++ cd $(top_builddir) && sh $$abs_top_srcdir/admin/doxygen.sh \
++ --no-modulename --installdir=$(kde_libs_htmldir)/en \
++ $$abs_top_srcdir
++
++## Don't generate API documentation without doxygen
++apidox-am-no:
++
++apidox-am-toplevel-no:
++
++
++apidox:
+ @if test "$(subdir)" != "."; then \
+- $(mkinstalldirs) $(top_builddir)/apidocs/$(subdir) ;\
+- if test ! -x $(top_builddir)/apidocs/common; then \
+- if test -d $(top_srcdir)/doc/common; then \
+- common_dir=`cd $(top_srcdir)/doc/common && pwd` ;\
+- else \
+- common_dir=$(kde_libs_htmldir)/en/common ;\
+- fi ;\
+- $(LN_S) $$common_dir $(top_builddir)/apidocs/common; \
+- fi ;\
+- cp $(top_srcdir)/admin/Doxyfile.global Doxyfile; \
+- echo "PROJECT_NAME = \"$(subdir) Library\"" >> Doxyfile; \
+- echo "PROJECT_NUMBER = \"Version $(VERSION)\"" >> Doxyfile; \
+- echo "INPUT = $(srcdir)" >> Doxyfile; \
+- echo "IMAGE_PATH = $(top_srcdir)/doc/api" >> Doxyfile ;\
+- echo "OUTPUT_DIRECTORY = $(top_builddir)/apidocs" >> Doxyfile; \
+- echo "HTML_OUTPUT = $(subdir)/html" >> Doxyfile; \
+- echo "HTML_HEADER = $(top_builddir)/apidocs/common/header.html" >> Doxyfile;\
+- echo "HTML_FOOTER = $(top_builddir)/apidocs/common/footer.html" >> Doxyfile;\
+- echo "HTML_STYLESHEET = $(top_builddir)/apidocs/common/doxygen.css" >> Doxyfile;\
+- echo "LATEX_OUTPUT = $(subdir)/latex" >> Doxyfile; \
+- echo "RTF_OUTPUT = $(subdir)/rtf" >> Doxyfile; \
+- echo "MAN_OUTPUT = $(subdir)/man" >> Doxyfile; \
+- echo "GENERATE_HTML = $(GENERATE_FLAG)" >> Doxyfile ;\
+- echo "GENERATE_MAN = $(GENERATE_FLAG)" >> Doxyfile ;\
+- echo "GENERATE_LATEX = $(GENERATE_FLAG)" >> Doxyfile ;\
+- if test -n "$(DOXYGEN_EXCLUDE)"; then \
+- patterns= ;\
+- dirs= ;\
+- for item in `echo "$(DOXYGEN_EXCLUDE)"`; do \
+- if test -d "$(srcdir)/$$item"; then \
+- dirs="$$dirs $(srcdir)/$$item/" ;\
+- else \
+- patterns="$$patterns $$item" ;\
+- fi ;\
+- done ;\
+- echo "EXCLUDE_PATTERNS += $$patterns" >> Doxyfile; \
+- echo "EXCLUDE += $$dirs" >> Doxyfile ;\
+- fi ;\
+- echo "TAGFILES = \\" >> Doxyfile; \
+- tags='$(DOXYGEN_REFERENCES) qt'; for tag in $$tags; do \
+- tagpath= ;\
+- path="../../$$tag" ;\
+- if test -f $(top_builddir)/apidocs/$$tag/$$tag.tag; then \
+- tagpath="$(top_builddir)/apidocs/$$tag/$$tag.tag" ;\
+- else \
+- tagpath=`ls -1 $(kde_htmldir)/en/*-apidocs/$$tag/$$tag.tag 2> /dev/null` ;\
+- if test -n "$$tagpath"; then \
+- path=`echo $$tagpath | sed -e "s,.*/\([^/]*-apidocs\)/$$tag/$$tag.tag,../../../\1/$$tag,"` ;\
+- fi ;\
+- fi ;\
+- if test "$$tag" = qt; then \
+- echo $$tagpath=$(QTDOCDIR) >> Doxyfile ;\
+- else if test -n "$$tagpath"; then \
+- echo "$$tagpath=$$path/html \\" >> Doxyfile ;\
+- fi ;\
+- fi ;\
+- done ;\
+- echo "GENERATE_TAGFILE = $(top_builddir)/apidocs/$(subdir)/`basename $(subdir)`.tag" >> Doxyfile ;\
+- echo "IGNORE_PREFIX = K" >> Doxyfile ;\
+- echo "HAVE_DOT = $(KDE_HAVE_DOT)" >> Doxyfile ;\
+- $(DOXYGEN) Doxyfile ;\
++ $(MAKE) apidox-am- at KDE_HAS_DOXYGEN@ ;\
++ else \
++ $(MAKE) apidox-am-toplevel- at KDE_HAS_DOXYGEN@ ;\
+ fi
+
+-apidox-am-no:
++
+
+ install-data-local: install-apidox
+
+@@ -83,13 +53,12 @@
+ $(INSTALL_DATA) $(top_builddir)/apidocs/$(subdir)/html/$$file $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir)/html; \
+ done; \
+ fi; \
+- rm -f $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/common; \
+- $(LN_S) $(kde_libs_htmldir)/en/common $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/common; \
+ else\
+ if test -d $(top_builddir)/apidocs; then \
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs ;\
+ list=`cd $(top_builddir)/apidocs && ls -1`; \
+ echo "installing $(top_builddir)/apidocs/$$file" ;\
++ echo "target directory $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs" ; \
+ for file in $$list; do \
+ if test -f $(top_builddir)/apidocs/$$file; then \
+ $(INSTALL_DATA) $(top_builddir)/apidocs/$$file $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; \
+@@ -104,72 +73,26 @@
+ @if test "$(subdir)" != "."; then \
+ if test -d $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); then \
+ rm -rfv $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); \
+- fi\
+- else\
++ fi \
++ else \
+ if test -d $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; then \
+ rm -rfv $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; \
+- fi\
++ fi \
+ fi
+
+-apidox:
+- @if test "$(subdir)" != "."; then \
+- $(MAKE) apidox-am- at KDE_HAS_DOXYGEN@ ;\
+- else \
+- $(MAKE) apidox-am-toplevel- at KDE_HAS_DOXYGEN@ ;\
+- fi
++install-apidox-recurse: install-apidox
+ @set fnord $(MAKEFLAGS); amf=$$2; if test -n '$(SUBDIRS)'; then \
+ list='$(SUBDIRS)'; \
+ for subdir in $$list; do \
+- if grep '^include .*Doxyfile.am' $(srcdir)/$$subdir/Makefile.am; then \
+- echo "Making apidox in $$subdir"; \
++ if grep '^include .*Doxyfile.am' $(srcdir)/$$subdir/Makefile.am > /dev/null ; then \
++ echo "Installing apidox from $$subdir"; \
+ if test "$$subdir" != "."; then \
+- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) GENERATE_FLAG=no apidox) || exit 1; \
+- fi ; fi ;\
+- done; \
+- for subdir in $$list; do \
+- if grep '^include .*Doxyfile.am' $(srcdir)/$$subdir/Makefile.am; then \
+- echo "Making apidox in $$subdir"; \
+- if test "$$subdir" != "."; then \
+- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) GENERATE_FLAG=yes apidox) || exit 1; \
++ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) GENERATE_FLAG=no install-apidox-recurse) || exit 1; \
+ fi ; fi ;\
+ done; \
+ fi
+
+-apidox-am-toplevel-no:
+-apidox-am-toplevel-yes:
+- @echo "*** Creating API documentation main page"; \
+- cp $(top_srcdir)/admin/Doxyfile.global Doxyfile; \
+- echo "PROJECT_NAME = \"$(DOXYGEN_PROJECT_NAME)\"" >> Doxyfile ; \
+- echo "PROJECT_NUMBER = \"$(DOXYGEN_PROJECT_NUMBER)\"" >> Doxyfile ; \
+- echo "INPUT = $(top_srcdir)" >> Doxyfile ; \
+- echo "OUTPUT_DIRECTORY = $(top_builddir)/apidocs" >> Doxyfile ; \
+- echo "FILE_PATTERNS = *.dox" >> Doxyfile ; \
+- echo "RECURSIVE = NO" >> Doxyfile ; \
+- echo "SOURCE_BROWSER = NO" >> Doxyfile ; \
+- echo "ALPHABETICAL_INDEX = NO" >> Doxyfile ; \
+- echo "HTML_OUTPUT = ." >> Doxyfile ; \
+- echo "HTML_HEADER = apidocs/common/mainheader.html" >> Doxyfile ; \
+- echo "HTML_FOOTER = apidocs/common/mainfooter.html" >> Doxyfile ; \
+- echo "HTML_STYLESHEET = apidocs/common/doxygen.css" >> Doxyfile ; \
+- echo "GENERATE_LATEX = NO" >> Doxyfile ; \
+- echo "GENERATE_RTF = NO" >> Doxyfile ; \
+- echo "GENERATE_MAN = NO" >> Doxyfile ; \
+- echo "GENERATE_XML = NO" >> Doxyfile ; \
+- echo "GENERATE_AUTOGEN_DEF = NO" >> Doxyfile ; \
+- echo "ENABLE_PREPROCESSING = NO" >> Doxyfile ; \
+- echo "CLASS_DIAGRAMS = NO" >> Doxyfile ; \
+- echo "HAVE_DOT = NO" >> Doxyfile ; \
+- echo "GENERATE_HTML = YES" >> Doxyfile ;\
+- $(mkinstalldirs) $(top_builddir)/apidocs ; \
+- rm -f $(top_builddir)/apidocs/common ; \
+- if test -d $(top_srcdir)/doc/common; then \
+- common_dir=`cd $(top_srcdir)/doc/common && pwd` ;\
+- else \
+- common_dir=$(kde_libs_htmldir)/en/common ;\
+- fi ;\
+- $(LN_S) $$common_dir $(top_builddir)/apidocs/common ;\
+- doxygen Doxyfile; \
+- rm -f Doxyfile
++
+
+ .PHONY: apidox-am-yes apidox-am-no install-data-local install-apidox install-apidox uninstall-local uninstall-apidox uninstall-apidox apidox apidox-am-toplevel-no apidox-am-toplevel-yes
+
+--- a/admin/Doxyfile.global
++++ b/admin/Doxyfile.global
+@@ -1,405 +1,49 @@
+-# Doxyfile 1.3.6
+-
+-# This file describes the settings to be used by the documentation system
+-# doxygen (www.doxygen.org) for a project
+-#
+-# All text after a hash (#) is considered a comment and will be ignored
+-# The format is:
+-# TAG = value [value, ...]
+-# For lists items can also be appended using:
+-# TAG += value [value, ...]
+-# Values that contain spaces should be placed between quotes (" ")
+-
+-#---------------------------------------------------------------------------
+-# Project related configuration options
+-#---------------------------------------------------------------------------
+-
+-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
+-# by quotes) that should identify the project.
+-
+-PROJECT_NAME =
+-
+-# The PROJECT_NUMBER tag can be used to enter a project or revision number.
+-# This could be handy for archiving the generated documentation or
+-# if some version control system is used.
+-
+-PROJECT_NUMBER =
+-
+-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
+-# base path where the generated documentation will be put.
+-# If a relative path is entered, it will be relative to the location
+-# where doxygen was started. If left blank the current directory will be used.
+-
+-OUTPUT_DIRECTORY = ../apidocs/
+-
+-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+-# documentation generated by doxygen is written. Doxygen will use this
+-# information to generate all constant output in the proper language.
+-# The default language is English, other supported languages are:
+-# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch,
+-# Finnish, French, German, Greek, Hungarian, Italian, Japanese, Japanese-en
+-# (Japanese with English messages), Korean, Korean-en, Norwegian, Polish, Portuguese,
+-# Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian.
+-
+ OUTPUT_LANGUAGE = English
+-
+-# This tag can be used to specify the encoding used in the generated output.
+-# The encoding is not always determined by the language that is chosen,
+-# but also whether or not the output is meant for Windows or non-Windows users.
+-# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES
+-# forces the Windows encoding (this is the default for the Windows binary),
+-# whereas setting the tag to NO uses a Unix-style encoding (the default for
+-# all platforms other than Windows).
+-
+ USE_WINDOWS_ENCODING = NO
+-
+-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
+-# include brief member descriptions after the members that are listed in
+-# the file and class documentation (similar to JavaDoc).
+-# Set to NO to disable this.
+-
+ BRIEF_MEMBER_DESC = NO
+-
+-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
+-# the brief description of a member or function before the detailed description.
+-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+-# brief descriptions will be completely suppressed.
+-
+ REPEAT_BRIEF = YES
+-
+-# This tag implements a quasi-intelligent brief description abbreviator
+-# that is used to form the text in various listings. Each string
+-# in this list, if found as the leading text of the brief description, will be
+-# stripped from the text and the result after processing the whole list, is used
+-# as the annotated text. Otherwise, the brief description is used as-is. If left
+-# blank, the following values are used ("$name" is automatically replaced with the
+-# name of the entity): "The $name class" "The $name widget" "The $name file"
+-# "is" "provides" "specifies" "contains" "represents" "a" "an" "the"
+-
+ ABBREVIATE_BRIEF =
+-
+-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+-# Doxygen will generate a detailed section even if there is only a brief
+-# description.
+-
+ ALWAYS_DETAILED_SEC = YES
+-
+-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all inherited
+-# members of a class in the documentation of that class as if those members were
+-# ordinary class members. Constructors, destructors and assignment operators of
+-# the base classes will not be shown.
+-
+ INLINE_INHERITED_MEMB = NO
+-
+-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
+-# path before files name in the file list and in the header files. If set
+-# to NO the shortest path that makes the file name unique will be used.
+-
+ FULL_PATH_NAMES = NO
+-
+-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
+-# can be used to strip a user-defined part of the path. Stripping is
+-# only done if one of the specified strings matches the left-hand part of
+-# the path. It is allowed to use relative paths in the argument list.
+-# If left blank the directory from which doxygen is run is used as the
+-# path to strip.
+-
+ STRIP_FROM_PATH =
+-
+-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
+-# (but less readable) file names. This can be useful is your file systems
+-# doesn't support long names like on DOS, Mac, or CD-ROM.
+-
+ SHORT_NAMES = NO
+-
+-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
+-# will interpret the first line (until the first dot) of a JavaDoc-style
+-# comment as the brief description. If set to NO, the JavaDoc
+-# comments will behave just like the Qt-style comments (thus requiring an
+-# explicit @brief command for a brief description.
+-
+ JAVADOC_AUTOBRIEF = YES
+-
+-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
+-# treat a multi-line C++ special comment block (i.e. a block of //! or ///
+-# comments) as a brief description. This used to be the default behaviour.
+-# The new default is to treat a multi-line C++ comment block as a detailed
+-# description. Set this tag to YES if you prefer the old behaviour instead.
+-
+ MULTILINE_CPP_IS_BRIEF = NO
+-
+-# If the DETAILS_AT_TOP tag is set to YES then Doxygen
+-# will output the detailed description near the top, like JavaDoc.
+-# If set to NO, the detailed description appears after the member
+-# documentation.
+-
+-DETAILS_AT_TOP = NO
+-
+-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
+-# member inherits the documentation from any documented member that it
+-# re-implements.
+-
+ INHERIT_DOCS = YES
+-
+-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+-# tag is set to YES, then doxygen will reuse the documentation of the first
+-# member in the group (if any) for the other members of the group. By default
+-# all members of a group must be documented explicitly.
+-
+ DISTRIBUTE_GROUP_DOC = NO
+-
+-# The TAB_SIZE tag can be used to set the number of spaces in a tab.
+-# Doxygen uses this value to replace tabs by spaces in code fragments.
+-
+ TAB_SIZE = 4
+-
+-# This tag can be used to specify a number of aliases that acts
+-# as commands in the documentation. An alias has the form "name=value".
+-# For example adding "sideeffect=\par Side Effects:\n" will allow you to
+-# put the command \sideeffect (or @sideeffect) in the documentation, which
+-# will result in a user-defined paragraph with heading "Side Effects:".
+-# You can put \n's in the value part of an alias to insert newlines.
+-
+-ALIASES = obsolete=@deprecated
+-
+-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+-# only. Doxygen will then generate output that is more tailored for C.
+-# For instance, some of the names that are used will be different. The list
+-# of all members will be omitted, etc.
+-
+ OPTIMIZE_OUTPUT_FOR_C = NO
+-
+-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources
+-# only. Doxygen will then generate output that is more tailored for Java.
+-# For instance, namespaces will be presented as packages, qualified scopes
+-# will look different, etc.
+-
+ OPTIMIZE_OUTPUT_JAVA = NO
+-
+-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
+-# the same type (for instance a group of public functions) to be put as a
+-# subgroup of that type (e.g. under the Public Functions section). Set it to
+-# NO to prevent subgrouping. Alternatively, this can be done per class using
+-# the \nosubgrouping command.
+-
+ SUBGROUPING = YES
+-
+-#---------------------------------------------------------------------------
+-# Build related configuration options
+-#---------------------------------------------------------------------------
+-
+-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
+-# documentation are documented, even if no documentation was available.
+-# Private class members and static file members will be hidden unless
+-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+-
+ EXTRACT_ALL = NO
+-
+-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
+-# will be included in the documentation.
+-
+ EXTRACT_PRIVATE = NO
+-
+-# If the EXTRACT_STATIC tag is set to YES all static members of a file
+-# will be included in the documentation.
+-
+ EXTRACT_STATIC = YES
+-
+-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
+-# defined locally in source files will be included in the documentation.
+-# If set to NO only classes defined in header files are included.
+-
+ EXTRACT_LOCAL_CLASSES = NO
+-
+-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
+-# undocumented members of documented classes, files or namespaces.
+-# If set to NO (the default) these members will be included in the
+-# various overviews, but no documentation section is generated.
+-# This option has no effect if EXTRACT_ALL is enabled.
+-
+ HIDE_UNDOC_MEMBERS = NO
+-
+-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
+-# undocumented classes that are normally visible in the class hierarchy.
+-# If set to NO (the default) these classes will be included in the various
+-# overviews. This option has no effect if EXTRACT_ALL is enabled.
+-
+ HIDE_UNDOC_CLASSES = YES
+-
+-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
+-# friend (class|struct|union) declarations.
+-# If set to NO (the default) these declarations will be included in the
+-# documentation.
+-
+ HIDE_FRIEND_COMPOUNDS = NO
+-
+-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
+-# documentation blocks found inside the body of a function.
+-# If set to NO (the default) these blocks will be appended to the
+-# function's detailed documentation block.
+-
+ HIDE_IN_BODY_DOCS = NO
+-
+-# The INTERNAL_DOCS tag determines if documentation
+-# that is typed after a \internal command is included. If the tag is set
+-# to NO (the default) then the documentation will be excluded.
+-# Set it to YES to include the internal documentation.
+-
+ INTERNAL_DOCS = NO
+-
+-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
+-# file names in lower-case letters. If set to YES upper-case letters are also
+-# allowed. This is useful if you have classes or files whose names only differ
+-# in case and if your file system supports case sensitive file names. Windows
+-# users are advised to set this option to NO.
+-
+ CASE_SENSE_NAMES = YES
+-
+-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
+-# will show members with their full class and namespace scopes in the
+-# documentation. If set to YES the scope will be hidden.
+-
+ HIDE_SCOPE_NAMES = NO
+-
+-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
+-# will put a list of the files that are included by a file in the documentation
+-# of that file.
+-
+ SHOW_INCLUDE_FILES = YES
+-
+-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
+-# is inserted in the documentation for inline members.
+-
+ INLINE_INFO = YES
+-
+-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
+-# will sort the (detailed) documentation of file and class members
+-# alphabetically by member name. If set to NO the members will appear in
+-# declaration order.
+-
+-SORT_MEMBER_DOCS = NO
+-
+-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
+-# brief documentation of file, namespace and class members alphabetically
+-# by member name. If set to NO (the default) the members will appear in
+-# declaration order.
+-
+ SORT_BRIEF_DOCS = NO
+-
+-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
+-# sorted by fully-qualified names, including namespaces. If set to
+-# NO (the default), the class list will be sorted only by class name,
+-# not including the namespace part.
+-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+-# Note: This option applies only to the class list, not to the
+-# alphabetical list.
+-
+ SORT_BY_SCOPE_NAME = NO
+-
+-# The GENERATE_TODOLIST tag can be used to enable (YES) or
+-# disable (NO) the todo list. This list is created by putting \todo
+-# commands in the documentation.
+-
+-GENERATE_TODOLIST = NO
+-
+-# The GENERATE_TESTLIST tag can be used to enable (YES) or
+-# disable (NO) the test list. This list is created by putting \test
+-# commands in the documentation.
+-
+ GENERATE_TESTLIST = NO
+-
+-# The GENERATE_BUGLIST tag can be used to enable (YES) or
+-# disable (NO) the bug list. This list is created by putting \bug
+-# commands in the documentation.
+-
+ GENERATE_BUGLIST = YES
+-
+-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
+-# disable (NO) the deprecated list. This list is created by putting
+-# \deprecated commands in the documentation.
+-
+ GENERATE_DEPRECATEDLIST= YES
+-
+-# The ENABLED_SECTIONS tag can be used to enable conditional
+-# documentation sections, marked by \if sectionname ... \endif.
+-
+ ENABLED_SECTIONS =
+-
+-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
+-# the initial value of a variable or define consists of for it to appear in
+-# the documentation. If the initializer consists of more lines than specified
+-# here it will be hidden. Use a value of 0 to hide initializers completely.
+-# The appearance of the initializer of individual variables and defines in the
+-# documentation can be controlled using \showinitializer or \hideinitializer
+-# command in the documentation regardless of this setting.
+-
+ MAX_INITIALIZER_LINES = 30
+-
+-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
+-# at the bottom of the documentation of classes and structs. If set to YES the
+-# list will mention the files that were used to generate the documentation.
+-
+ SHOW_USED_FILES = YES
+-
+-#---------------------------------------------------------------------------
+-# configuration options related to warning and progress messages
+-#---------------------------------------------------------------------------
+-
+-# The QUIET tag can be used to turn on/off the messages that are generated
+-# by doxygen. Possible values are YES and NO. If left blank NO is used.
+-
+ QUIET = YES
+-
+-# The WARNINGS tag can be used to turn on/off the warning messages that are
+-# generated by doxygen. Possible values are YES and NO. If left blank
+-# NO is used.
+-
+ WARNINGS = NO
+-
+-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
+-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
+-# automatically be disabled.
+-
+ WARN_IF_UNDOCUMENTED = NO
+-
+-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
+-# potential errors in the documentation, such as not documenting some
+-# parameters in a documented function, or documenting parameters that
+-# don't exist or using markup commands wrongly.
+-
+ WARN_IF_DOC_ERROR = YES
+-
+-# The WARN_FORMAT tag determines the format of the warning messages that
+-# doxygen can produce. The string should contain the $file, $line, and $text
+-# tags, which will be replaced by the file and line number from which the
+-# warning originated and the warning text.
+-
+ WARN_FORMAT =
+-
+-# The WARN_LOGFILE tag can be used to specify a file to which warning
+-# and error messages should be written. If left blank the output is written
+-# to stderr.
+-
+ WARN_LOGFILE =
+-
+-#---------------------------------------------------------------------------
+-# configuration options related to the input files
+-#---------------------------------------------------------------------------
+-
+-# The INPUT tag can be used to specify the files and/or directories that contain
+-# documented source files. You may enter file names like "myfile.cpp" or
+-# directories like "/usr/src/myproject". Separate the files or directories
+-# with spaces.
+-
+ INPUT =
+-
+-# If the value of the INPUT tag contains directories, you can use the
+-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+-# and *.h) to filter out the source-files in the directories. If left
+-# blank the following patterns are tested:
+-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp
+-# *.h++ *.idl *.odl *.cs *.php *.php3 *.inc
+-
+ FILE_PATTERNS = *.h \
+ *.cpp \
+ *.cc \
+@@ -409,724 +53,140 @@
+ *.cxx \
+ *.h++ \
+ *.hh
+-
+-# The RECURSIVE tag can be used to turn specify whether or not subdirectories
+-# should be searched for input files as well. Possible values are YES and NO.
+-# If left blank NO is used.
+-
+ RECURSIVE = YES
+-
+-# The EXCLUDE tag can be used to specify files and/or directories that should
+-# excluded from the INPUT source files. This way you can easily exclude a
+-# subdirectory from a directory tree whose root is specified with the INPUT tag.
+-
+ EXCLUDE =
+-
+-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories
+-# that are symbolic links (a Unix filesystem feature) are excluded from the input.
+-
+ EXCLUDE_SYMLINKS = NO
+-
+-# If the value of the INPUT tag contains directories, you can use the
+-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+-# certain files from those directories.
+-
+ EXCLUDE_PATTERNS = *.moc.* \
+ moc* \
+ *.all_cpp.* \
+ *unload.* \
+ */test/* \
+- */tests/*
+-
+-# The EXAMPLE_PATH tag can be used to specify one or more files or
+-# directories that contain example code fragments that are included (see
+-# the \include command).
+-
++ */tests/* \
++ *_p.h
+ EXAMPLE_PATH =
+-
+-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+-# and *.h) to filter out the source-files in the directories. If left
+-# blank all files are included.
+-
+ EXAMPLE_PATTERNS =
+-
+-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+-# searched for input files to be used with the \include or \dontinclude
+-# commands irrespective of the value of the RECURSIVE tag.
+-# Possible values are YES and NO. If left blank NO is used.
+-
+ EXAMPLE_RECURSIVE = NO
+-
+-# The IMAGE_PATH tag can be used to specify one or more files or
+-# directories that contain image that are included in the documentation (see
+-# the \image command).
+-
+ IMAGE_PATH =
+-
+-# The INPUT_FILTER tag can be used to specify a program that doxygen should
+-# invoke to filter for each input file. Doxygen will invoke the filter program
+-# by executing (via popen()) the command <filter> <input-file>, where <filter>
+-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
+-# input file. Doxygen will then use the output that the filter program writes
+-# to standard output.
+-
+ INPUT_FILTER =
+-
+-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+-# INPUT_FILTER) will be used to filter the input files when producing source
+-# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+-
+ FILTER_SOURCE_FILES = NO
+-
+-#---------------------------------------------------------------------------
+-# configuration options related to source browsing
+-#---------------------------------------------------------------------------
+-
+-# If the SOURCE_BROWSER tag is set to YES then a list of source files will
+-# be generated. Documented entities will be cross-referenced with these sources.
+-# Note: To get rid of all source code in the generated output, make sure also
+-# VERBATIM_HEADERS is set to NO.
+-
+ SOURCE_BROWSER = YES
+-
+-# Setting the INLINE_SOURCES tag to YES will include the body
+-# of functions and classes directly in the documentation.
+-
+ INLINE_SOURCES = NO
+-
+-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
+-# doxygen to hide any special comment blocks from generated source code
+-# fragments. Normal C and C++ comments will always remain visible.
+-
+ STRIP_CODE_COMMENTS = YES
+-
+-# If the REFERENCED_BY_RELATION tag is set to YES (the default)
+-# then for each documented function all documented
+-# functions referencing it will be listed.
+-
+ REFERENCED_BY_RELATION = YES
+-
+-# If the REFERENCES_RELATION tag is set to YES (the default)
+-# then for each documented function all documented entities
+-# called/used by that function will be listed.
+-
+ REFERENCES_RELATION = YES
+-
+-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
+-# will generate a verbatim copy of the header file for each class for
+-# which an include is specified. Set to NO to disable this.
+-
+ VERBATIM_HEADERS = YES
+-
+-#---------------------------------------------------------------------------
+-# configuration options related to the alphabetical class index
+-#---------------------------------------------------------------------------
+-
+-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
+-# of all compounds will be generated. Enable this if the project
+-# contains a lot of classes, structs, unions or interfaces.
+-
+ ALPHABETICAL_INDEX = YES
+-
+-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
+-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
+-# in which this list will be split (can be a number in the range [1..20])
+-
+ COLS_IN_ALPHA_INDEX = 3
+-
+-# In case all classes in a project start with a common prefix, all
+-# classes will be put under the same header in the alphabetical index.
+-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
+-# should be ignored while generating the index headers.
+-
+-IGNORE_PREFIX = K
+-
+-#---------------------------------------------------------------------------
+-# configuration options related to the HTML output
+-#---------------------------------------------------------------------------
+-
+-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
+-# generate HTML output.
+-
+-GENERATE_HTML = NO
+-
+-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
+-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+-# put in front of it. If left blank `html' will be used as the default path.
+-
+ HTML_OUTPUT =
+-
+-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
+-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
+-# doxygen will generate files with .html extension.
+-
+ HTML_FILE_EXTENSION = .html
+-
+-# The HTML_HEADER tag can be used to specify a personal HTML header for
+-# each generated HTML page. If it is left blank doxygen will generate a
+-# standard header.
+-
+ HTML_HEADER = ../apidocs/common/header.html
+-
+-# The HTML_FOOTER tag can be used to specify a personal HTML footer for
+-# each generated HTML page. If it is left blank doxygen will generate a
+-# standard footer.
+-
+ HTML_FOOTER = ../apidocs/common/footer.html
+-
+-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
+-# style sheet that is used by each HTML page. It can be used to
+-# fine-tune the look of the HTML output. If the tag is left blank doxygen
+-# will generate a default style sheet. Note that doxygen will try to copy
+-# the style sheet file to the HTML output directory, so don't put your own
+-# stylesheet in the HTML output directory as well, or it will be erased!
+-
+ HTML_STYLESHEET = ../apidocs/common/doxygen.css
+-
+-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
+-# files or namespaces will be aligned in HTML using tables. If set to
+-# NO a bullet list will be used.
+-
+ HTML_ALIGN_MEMBERS = YES
+-
+-# If the GENERATE_HTMLHELP tag is set to YES, additional index files
+-# will be generated that can be used as input for tools like the
+-# Microsoft HTML help workshop to generate a compressed HTML help file (.chm)
+-# of the generated HTML documentation.
+-
+ GENERATE_HTMLHELP = NO
+-
+-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
+-# be used to specify the file name of the resulting .chm file. You
+-# can add a path in front of the file if the result should not be
+-# written to the html output directory.
+-
+ CHM_FILE =
+-
+-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
+-# be used to specify the location (absolute path including file name) of
+-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
+-# the HTML help compiler on the generated index.hhp.
+-
+ HHC_LOCATION =
+-
+-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
+-# controls if a separate .chi index file is generated (YES) or that
+-# it should be included in the master .chm file (NO).
+-
+ GENERATE_CHI = NO
+-
+-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
+-# controls whether a binary table of contents is generated (YES) or a
+-# normal table of contents (NO) in the .chm file.
+-
+ BINARY_TOC = NO
+-
+-# The TOC_EXPAND flag can be set to YES to add extra items for group members
+-# to the contents of the HTML help documentation and to the tree view.
+-
+ TOC_EXPAND = NO
+-
+-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
+-# top of each HTML page. The value NO (the default) enables the index and
+-# the value YES disables it.
+-
+ DISABLE_INDEX = YES
+-
+-# This tag can be used to set the number of enum values (range [1..20])
+-# that doxygen will group on one line in the generated HTML documentation.
+-
+ ENUM_VALUES_PER_LINE = 4
+-
+-# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
+-# generated containing a tree-like index structure (just like the one that
+-# is generated for HTML Help). For this to work a browser that supports
+-# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+,
+-# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are
+-# probably better off using the HTML help feature.
+-
+ GENERATE_TREEVIEW = NO
+-
+-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
+-# used to set the initial width (in pixels) of the frame in which the tree
+-# is shown.
+-
+ TREEVIEW_WIDTH = 250
+-
+-#---------------------------------------------------------------------------
+-# configuration options related to the LaTeX output
+-#---------------------------------------------------------------------------
+-
+-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
+-# generate Latex output.
+-
+ GENERATE_LATEX = NO
+-
+-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
+-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+-# put in front of it. If left blank `latex' will be used as the default path.
+-
+ LATEX_OUTPUT =
+-
+-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+-# invoked. If left blank `latex' will be used as the default command name.
+-
+ LATEX_CMD_NAME = latex
+-
+-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
+-# generate index for LaTeX. If left blank `makeindex' will be used as the
+-# default command name.
+-
+ MAKEINDEX_CMD_NAME = makeindex
+-
+-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
+-# LaTeX documents. This may be useful for small projects and may help to
+-# save some trees in general.
+-
+ COMPACT_LATEX = NO
+-
+-# The PAPER_TYPE tag can be used to set the paper type that is used
+-# by the printer. Possible values are: a4, a4wide, letter, legal and
+-# executive. If left blank a4wide will be used.
+-
+ PAPER_TYPE = a4wide
+-
+-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
+-# packages that should be included in the LaTeX output.
+-
+ EXTRA_PACKAGES =
+-
+-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
+-# the generated latex document. The header should contain everything until
+-# the first chapter. If it is left blank doxygen will generate a
+-# standard header. Notice: only use this tag if you know what you are doing!
+-
+ LATEX_HEADER =
+-
+-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
+-# is prepared for conversion to pdf (using ps2pdf). The pdf file will
+-# contain links (just like the HTML output) instead of page references
+-# This makes the output suitable for online browsing using a pdf viewer.
+-
+ PDF_HYPERLINKS = NO
+-
+-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
+-# plain latex in the generated Makefile. Set this option to YES to get a
+-# higher quality PDF documentation.
+-
+ USE_PDFLATEX = NO
+-
+-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
+-# command to the generated LaTeX files. This will instruct LaTeX to keep
+-# running if errors occur, instead of asking the user for help.
+-# This option is also used when generating formulas in HTML.
+-
+ LATEX_BATCHMODE = NO
+-
+-# If LATEX_HIDE_INDICES is set to YES then doxygen will not
+-# include the index chapters (such as File Index, Compound Index, etc.)
+-# in the output.
+-
+ LATEX_HIDE_INDICES = NO
+-
+-#---------------------------------------------------------------------------
+-# configuration options related to the RTF output
+-#---------------------------------------------------------------------------
+-
+-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
+-# The RTF output is optimized for Word 97 and may not look very pretty with
+-# other RTF readers or editors.
+-
+ GENERATE_RTF = NO
+-
+-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
+-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+-# put in front of it. If left blank `rtf' will be used as the default path.
+-
+ RTF_OUTPUT =
+-
+-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
+-# RTF documents. This may be useful for small projects and may help to
+-# save some trees in general.
+-
+ COMPACT_RTF = NO
+-
+-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
+-# will contain hyperlink fields. The RTF file will
+-# contain links (just like the HTML output) instead of page references.
+-# This makes the output suitable for online browsing using WORD or other
+-# programs which support those fields.
+-# Note: wordpad (write) and others do not support links.
+-
+ RTF_HYPERLINKS = NO
+-
+-# Load stylesheet definitions from file. Syntax is similar to doxygen's
+-# config file, i.e. a series of assignments. You only have to provide
+-# replacements, missing definitions are set to their default value.
+-
+ RTF_STYLESHEET_FILE =
+-
+-# Set optional variables used in the generation of an rtf document.
+-# Syntax is similar to doxygen's config file.
+-
+ RTF_EXTENSIONS_FILE =
+-
+-#---------------------------------------------------------------------------
+-# configuration options related to the man page output
+-#---------------------------------------------------------------------------
+-
+-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
+-# generate man pages
+-
+ GENERATE_MAN = NO
+-
+-# The MAN_OUTPUT tag is used to specify where the man pages will be put.
+-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+-# put in front of it. If left blank `man' will be used as the default path.
+-
+ MAN_OUTPUT =
+-
+-# The MAN_EXTENSION tag determines the extension that is added to
+-# the generated man pages (default is the subroutine's section .3)
+-
+ MAN_EXTENSION = .kde3
+-
+-# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
+-# then it will generate one additional man file for each entity
+-# documented in the real man page(s). These additional files
+-# only source the real man page, but without them the man command
+-# would be unable to find the correct page. The default is NO.
+-
+ MAN_LINKS = YES
+-
+-#---------------------------------------------------------------------------
+-# configuration options related to the XML output
+-#---------------------------------------------------------------------------
+-
+-# If the GENERATE_XML tag is set to YES Doxygen will
+-# generate an XML file that captures the structure of
+-# the code including all documentation.
+-
+ GENERATE_XML = NO
+-
+-# The XML_OUTPUT tag is used to specify where the XML pages will be put.
+-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+-# put in front of it. If left blank `xml' will be used as the default path.
+-
+ XML_OUTPUT = xml
+-
+-# The XML_SCHEMA tag can be used to specify an XML schema,
+-# which can be used by a validating XML parser to check the
+-# syntax of the XML files.
+-
+ XML_SCHEMA =
+-
+-# The XML_DTD tag can be used to specify an XML DTD,
+-# which can be used by a validating XML parser to check the
+-# syntax of the XML files.
+-
+ XML_DTD =
+-
+-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
+-# dump the program listings (including syntax highlighting
+-# and cross-referencing information) to the XML output. Note that
+-# enabling this will significantly increase the size of the XML output.
+-
+ XML_PROGRAMLISTING = NO
+-
+-#---------------------------------------------------------------------------
+-# configuration options for the AutoGen Definitions output
+-#---------------------------------------------------------------------------
+-
+-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
+-# generate an AutoGen Definitions (see autogen.sf.net) file
+-# that captures the structure of the code including all
+-# documentation. Note that this feature is still experimental
+-# and incomplete at the moment.
+-
+ GENERATE_AUTOGEN_DEF = NO
+-
+-#---------------------------------------------------------------------------
+-# configuration options related to the Perl module output
+-#---------------------------------------------------------------------------
+-
+-# If the GENERATE_PERLMOD tag is set to YES Doxygen will
+-# generate a Perl module file that captures the structure of
+-# the code including all documentation. Note that this
+-# feature is still experimental and incomplete at the
+-# moment.
+-
+ GENERATE_PERLMOD = NO
+-
+-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
+-# the necessary Makefile rules, Perl scripts and LaTeX code to be able
+-# to generate PDF and DVI output from the Perl module output.
+-
+ PERLMOD_LATEX = NO
+-
+-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
+-# nicely formatted so it can be parsed by a human reader. This is useful
+-# if you want to understand what is going on. On the other hand, if this
+-# tag is set to NO the size of the Perl module output will be much smaller
+-# and Perl will parse it just the same.
+-
+ PERLMOD_PRETTY = YES
+-
+-# The names of the make variables in the generated doxyrules.make file
+-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
+-# This is useful so different doxyrules.make files included by the same
+-# Makefile don't overwrite each other's variables.
+-
+ PERLMOD_MAKEVAR_PREFIX =
+-
+-#---------------------------------------------------------------------------
+-# Configuration options related to the preprocessor
+-#---------------------------------------------------------------------------
+-
+-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
+-# evaluate all C-preprocessor directives found in the sources and include
+-# files.
+-
+ ENABLE_PREPROCESSING = YES
+-
+-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
+-# names in the source code. If set to NO (the default) only conditional
+-# compilation will be performed. Macro expansion can be done in a controlled
+-# way by setting EXPAND_ONLY_PREDEF to YES.
+-
+-MACRO_EXPANSION = NO
+-
+-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
+-# then the macro expansion is limited to the macros specified with the
+-# PREDEFINED and EXPAND_AS_PREDEFINED tags.
+-
+-EXPAND_ONLY_PREDEF = NO
+-
+-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
+-# in the INCLUDE_PATH (see below) will be search if a #include is found.
+-
+ SEARCH_INCLUDES = YES
+-
+-# The INCLUDE_PATH tag can be used to specify one or more directories that
+-# contain include files that are not input files but should be processed by
+-# the preprocessor.
+-
+ INCLUDE_PATH =
+-
+-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+-# patterns (like *.h and *.hpp) to filter out the header-files in the
+-# directories. If left blank, the patterns specified with FILE_PATTERNS will
+-# be used.
+-
+ INCLUDE_FILE_PATTERNS =
+-
+-# The PREDEFINED tag can be used to specify one or more macro names that
+-# are defined before the preprocessor is started (similar to the -D option of
+-# gcc). The argument of the tag is a list of macros of the form: name
+-# or name=definition (no spaces). If the definition and the = are
+-# omitted =1 is assumed.
+-
+ PREDEFINED = QT_VERSION=320 \
+ __cplusplus \
+ Q_WS_X11
+-
+-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
+-# this tag can be used to specify a list of macro names that should be expanded.
+-# The macro definition that is found in the sources will be used.
+-# Use the PREDEFINED tag if you want to use a different macro definition.
+-
+ EXPAND_AS_DEFINED =
+-
+-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
+-# doxygen's preprocessor will remove all function-like macros that are alone
+-# on a line, have an all uppercase name, and do not end with a semicolon. Such
+-# function macros are typically used for boiler-plate code, and will confuse the
+-# parser if not removed.
+-
+ SKIP_FUNCTION_MACROS = YES
+-
+-#---------------------------------------------------------------------------
+-# Configuration::additions related to external references
+-#---------------------------------------------------------------------------
+-
+-# The TAGFILES option can be used to specify one or more tagfiles.
+-# Optionally an initial location of the external documentation
+-# can be added for each tagfile. The format of a tag file without
+-# this location is as follows:
+-# TAGFILES = file1 file2 ...
+-# Adding location for the tag files is done as follows:
+-# TAGFILES = file1=loc1 "file2 = loc2" ...
+-# where "loc1" and "loc2" can be relative or absolute paths or
+-# URLs. If a location is present for each tag, the installdox tool
+-# does not have to be run to correct the links.
+-# Note that each tag file must have a unique name
+-# (where the name does NOT include the path)
+-# If a tag file is not located in the directory in which doxygen
+-# is run, you must also specify the path to the tagfile here.
+-
+ TAGFILES =
+-
+-# When a file name is specified after GENERATE_TAGFILE, doxygen will create
+-# a tag file that is based on the input files it reads.
+-
+ GENERATE_TAGFILE =
+-
+-# If the ALLEXTERNALS tag is set to YES all external classes will be listed
+-# in the class index. If set to NO only the inherited external classes
+-# will be listed.
+-
+ ALLEXTERNALS = NO
+-
+-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
+-# in the modules index. If set to NO, only the current project's groups will
+-# be listed.
+-
+ EXTERNAL_GROUPS = NO
+-
+-# The PERL_PATH should be the absolute path and name of the perl script
+-# interpreter (i.e. the result of `which perl').
+-
+ PERL_PATH =
+-
+-#---------------------------------------------------------------------------
+-# Configuration options related to the dot tool
+-#---------------------------------------------------------------------------
+-
+-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
+-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base or
+-# super classes. Setting the tag to NO turns the diagrams off. Note that this
+-# option is superseded by the HAVE_DOT option below. This is only a fallback. It is
+-# recommended to install and use dot, since it yields more powerful graphs.
+-
+ CLASS_DIAGRAMS = YES
+-
+-# If set to YES, the inheritance and collaboration graphs will hide
+-# inheritance and usage relations if the target is undocumented
+-# or is not a class.
+-
+ HIDE_UNDOC_RELATIONS = NO
+-
+-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+-# available from the path. This tool is part of Graphviz, a graph visualization
+-# toolkit from AT&T and Lucent Bell Labs. The other options in this section
+-# have no effect if this option is set to NO (the default)
+-
+ HAVE_DOT = NO
+-
+-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
+-# will generate a graph for each documented class showing the direct and
+-# indirect inheritance relations. Setting this tag to YES will force the
+-# the CLASS_DIAGRAMS tag to NO.
+-
+-CLASS_GRAPH = YES
+-
+-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
+-# will generate a graph for each documented class showing the direct and
+-# indirect implementation dependencies (inheritance, containment, and
+-# class references variables) of the class with other documented classes.
+-
+-COLLABORATION_GRAPH = YES
+-
+-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
+-# collaboration diagrams in a style similar to the OMG's Unified Modeling
+-# Language.
+-
+ UML_LOOK = NO
+-
+-# If set to YES, the inheritance and collaboration graphs will show the
+-# relations between templates and their instances.
+-
+ TEMPLATE_RELATIONS = YES
+-
+-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
+-# tags are set to YES then doxygen will generate a graph for each documented
+-# file showing the direct and indirect include dependencies of the file with
+-# other documented files.
+-
+ INCLUDE_GRAPH = YES
+-
+-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
+-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
+-# documented header file showing the documented files that directly or
+-# indirectly include this file.
+-
+ INCLUDED_BY_GRAPH = YES
+-
+-# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will
+-# generate a call dependency graph for every global function or class method.
+-# Note that enabling this option will significantly increase the time of a run.
+-# So in most cases it will be better to enable call graphs for selected
+-# functions only using the \callgraph command.
+-
+ CALL_GRAPH = NO
+-
+-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
+-# will graphical hierarchy of all classes instead of a textual one.
+-
+ GRAPHICAL_HIERARCHY = YES
+-
+-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+-# generated by dot. Possible values are png, jpg, or gif
+-# If left blank png will be used.
+-
+ DOT_IMAGE_FORMAT = png
+-
+-# The tag DOT_PATH can be used to specify the path where the dot tool can be
+-# found. If left blank, it is assumed the dot tool can be found on the path.
+-
+ DOT_PATH =
+-
+-# The DOTFILE_DIRS tag can be used to specify one or more directories that
+-# contain dot files that are included in the documentation (see the
+-# \dotfile command).
+-
+ DOTFILE_DIRS =
+-
+-# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width
+-# (in pixels) of the graphs generated by dot. If a graph becomes larger than
+-# this value, doxygen will try to truncate the graph, so that it fits within
+-# the specified constraint. Beware that most browsers cannot cope with very
+-# large images.
+-
+ MAX_DOT_GRAPH_WIDTH = 800
+-
+-# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height
+-# (in pixels) of the graphs generated by dot. If a graph becomes larger than
+-# this value, doxygen will try to truncate the graph, so that it fits within
+-# the specified constraint. Beware that most browsers cannot cope with very
+-# large images.
+-
+ MAX_DOT_GRAPH_HEIGHT = 1024
+-
+-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
+-# graphs generated by dot. A depth value of 3 means that only nodes reachable
+-# from the root by following a path via at most 3 edges will be shown. Nodes that
+-# lay further from the root node will be omitted. Note that setting this option to
+-# 1 or 2 may greatly reduce the computation time needed for large code bases. Also
+-# note that a graph may be further truncated if the graph's image dimensions are
+-# not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH and MAX_DOT_GRAPH_HEIGHT).
+-# If 0 is used for the depth value (the default), the graph is not depth-constrained.
+-
+ MAX_DOT_GRAPH_DEPTH = 0
+-
+-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
+-# generate a legend page explaining the meaning of the various boxes and
+-# arrows in the dot generated graphs.
+-
+ GENERATE_LEGEND = YES
++DOT_CLEANUP = YES
++SEARCHENGINE = NO
+
+-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
+-# remove the intermediate dot files that are used to generate
+-# the various graphs.
++### KDE Settings
++ALIASES = \
++ "intern=\par<b>Internal use only.</b>" \
++ "reimp=\par<b>Reimplemented from superclass.</b>" \
++ "obsolete=@deprecated" \
++ "feature=\xrefitem features \"Feature(s)\" \"Features\"" \
++ "maintainer=\xrefitem maintainers \"Maintainer(s)\" \"Maintainers\"" \
++ "unmaintained=\xrefitem unmaintained \"Unmaintained\" \"Unmaintained\"" \
++ "requirement=\xrefitem requirements \"Requirement(s)\" \"Requirements\"" \
++ "faq=\xrefitem FAQ \"F.A.Q.\" \"F.A.Q.\"" \
++ "authors=\xrefitem authors \"Author(s)\" \"Authors\"" \
++ "FIXME=\xrefitem fixme \"Fixme\" \"Fixme\""
+
+-DOT_CLEANUP = YES
++HTML_ALIGN_MEMBERS = YES
++REFERENCED_BY_RELATION = NO
++REFERENCES_RELATION = NO
++VERBATIM_HEADERS = NO
++GENERATE_HTML = YES
++SOURCE_BROWSER = YES
++GENERATE_AUTOGEN_DEF = NO
++DETAILS_AT_TOP = YES
++SORT_MEMBER_DOCS = YES
++GENERATE_TODOLIST = YES
++IGNORE_PREFIX = K
++GENERATE_HTML = YES
++CLASS_GRAPH = YES
++COLLABORATION_GRAPH = NO
+
+-#---------------------------------------------------------------------------
+-# Configuration::additions related to the search engine
+-#---------------------------------------------------------------------------
+
+-# The SEARCHENGINE tag specifies whether or not a search engine should be
+-# used. If set to NO the values of all tags below this one will be ignored.
++MACRO_EXPANSION = YES
++EXPAND_ONLY_PREDEF = YES
+
+-SEARCHENGINE = NO
+--- /dev/null
++++ b/admin/doxygen.sh
+@@ -0,0 +1,883 @@
++#! /bin/sh
++#
++# doxygen.sh Copyright (C) 2005 by Adriaan de Groot
++# Based on some code from Doxyfile.am, among other things.
++# License: GPL version 2.
++# See file COPYING in kdelibs for details.
++
++echo "*** doxygen.sh"
++
++# Recurse handling is a little complicated, since normally
++# subdir (given on the command-line) processing doesn't recurse
++# but you can force it to do so.
++recurse=1
++recurse_given=NO
++use_modulename=1
++cleanup=YES
++
++while test -n "$1" ; do
++case "x$1" in
++"x--no-cleanup" )
++ cleanup=NO
++ ;;
++"x--no-recurse" )
++ recurse=0
++ recurse_given=YES
++ ;;
++"x--recurse" )
++ recurse=1
++ recurse_given=YES
++ ;;
++"x--no-modulename" )
++ use_modulename=0
++ ;;
++"x--modulename" )
++ use_modulename=1
++ ;;
++"x--help" )
++ echo "doxygen.sh usage:"
++ echo "doxygen.sh [--no-recurse] [--no-modulename] <srcdir> [<subdir>]"
++ exit 2
++ ;;
++x--doxdatadir=* )
++ DOXDATA=`echo $1 | sed -e 's+--doxdatadir=++'`
++ ;;
++x--installdir=*)
++ PREFIX=`echo $1 | sed -e 's+--installdir=++'`
++ ;;
++x--* )
++ echo "Unknown option: $1"
++ exit 1
++ ;;
++* )
++ top_srcdir="$1"
++ break
++ ;;
++esac
++shift
++done
++
++
++### Sanity check the mandatory "top srcdir" argument.
++if test -z "$top_srcdir" ; then
++ echo "Usage: doxygen.sh <top_srcdir>"
++ exit 1
++fi
++if test ! -d "$top_srcdir" ; then
++ echo "top_srcdir ($top_srcdir) is not a directory."
++ exit 1
++fi
++
++### Normalize top_srcdir so it is an absolute path.
++if expr "x$top_srcdir" : "x/" > /dev/null ; then
++ # top_srcdir is absolute already
++ :
++else
++ top_srcdir=`cd "$top_srcdir" 2> /dev/null && pwd`
++ if test ! -d "$top_srcdir" ; then
++ echo "top_srcdir ($top_srcdir) is not a directory."
++ exit 1
++ fi
++fi
++
++
++
++### Sanity check and guess QTDOCDIR.
++if test -z "$QTDOCDIR" ; then
++ if test -z "$QTDIR" ; then
++ for i in /usr/X11R6/share/doc/qt/html
++ do
++ QTDOCDIR="$i"
++ test -d "$QTDOCDIR" && break
++ done
++ else
++ for i in share/doc/qt/html doc/html
++ do
++ QTDOCDIR="$QTDIR/$i"
++ test -d "$QTDOCDIR" && break
++ done
++ fi
++fi
++if test -z "$QTDOCDIR" || test ! -d "$QTDOCDIR" ; then
++ if test -z "$QTDOCDIR" ; then
++ echo "* QTDOCDIR could not be guessed."
++ else
++ echo "* QTDOCDIR does not name a directory."
++ fi
++ if test -z "$QTDOCTAG" ; then
++ echo "* QTDOCDIR set to \"\""
++ QTDOCDIR=""
++ else
++ echo "* But I'll use $QTDOCDIR anyway because of QTDOCTAG."
++ fi
++fi
++
++### Get the "top srcdir", also its name, and handle the case that subdir "."
++### is given (which would be top_srcdir then, so it's equal to none-given
++### but no recursion either).
++###
++# top_srcdir="$1" # Already set by options processing
++module_name=`basename "$top_srcdir"`
++subdir="$2"
++if test "x." = "x$subdir" ; then
++ subdir=""
++ if test "x$recurse_given" = "xNO" ; then
++ recurse=0
++ fi
++fi
++if test "x" != "x$subdir" ; then
++ # If no recurse option given explicitly, default to
++ # no recurse when processing subdirs given on the command-line.
++ if test "x$recurse_given" = "xNO" ; then
++ recurse=0
++ fi
++fi
++
++if test -z "$DOXDATA" || test ! -d "$DOXDATA" ; then
++ if test -n "$DOXDATA" ; then
++ echo "* \$DOXDATA is '$DOXDATA' which does not name a directory"
++ fi
++ DOXDATA="$top_srcdir/doc/common"
++fi
++
++if test ! -d "$DOXDATA" ; then
++ echo "* \$DOXDATA does not name a directory ( or is unset ), tried \"$DOXDATA\""
++ exit 1
++fi
++
++if test -n "$PREFIX" && test ! -d "$PREFIX" ; then
++ echo "* \$PREFIX does not name a directory, tried \"$PREFIX\""
++ echo "* \$PREFIX is disabled."
++ PREFIX=""
++fi
++
++### We need some values from top-level files, which
++### are not preserved between invocations of this
++### script, so factor it out for easy use.
++create_doxyfile_in()
++{
++ eval `grep 'VERSION="' "$top_srcdir/admin/cvs.sh"`
++ echo "PROJECT_NUMBER = $VERSION" > Doxyfile.in
++ grep '^KDE_INIT_DOXYGEN' "$top_srcdir/configure.in.in" | \
++ sed -e 's+[^[]*\[\([^]]*\)+PROJECT_NAME = "\1"+' \
++ -e 's+].*++' >> Doxyfile.in
++}
++
++apidoxdir="$module_name"-apidocs
++test "x$use_modulename" = "x0" && apidoxdir="apidocs"
++
++### If we're making the top subdir, create the structure
++### for the apidox and initialize it. Otherwise, just use the
++### structure assumed to be there.
++if test -z "$subdir" ; then
++ if test ! -d "$apidoxdir" ; then
++ mkdir "$apidoxdir" > /dev/null 2>&1
++ fi
++ cd "$apidoxdir" > /dev/null 2>&1 || {
++ echo "Cannot create and cd into $apidoxdir"
++ exit 1
++ }
++
++ test -f "Doxyfile.in" || create_doxyfile_in
++
++ # Copy in logos and the like
++ for i in "favicon.ico" "kde_gear_64.png"
++ do
++ cp "$DOXDATA/$i" . > /dev/null 2> /dev/null
++ done
++ for i in "$top_srcdir/doc/api/Dox-"*.png
++ do
++ T=`basename "$i" | sed -e 's+Dox-++'`
++ test -f "$i" && cp "$i" "./$T" > /dev/null 2> /dev/null
++ done
++
++ top_builddir="."
++ srcdir="$1"
++ subdir="."
++else
++ cd "$apidoxdir" > /dev/null 2>&1 || {
++ echo "Cannot cd into $apidoxdir -- maybe you need to"
++ echo "build the top-level dox first."
++ exit 1
++ }
++
++ if test "x1" = "x$recurse" ; then
++ # OK, so --recurse was requested
++ if test ! -f "subdirs.top" ; then
++ echo "* No subdirs.top available in the $apidoxdir."
++ echo "* The --recurse option will be ignored."
++ recurse=0
++ fi
++ fi
++fi
++
++### Read a single line (TODO: support \ continuations) from the Makefile.am.
++### Used to extract variable assignments from it.
++extract_line()
++{
++ file="$2" ; test -z "$file" && file="$srcdir/Makefile.am"
++ pattern=`echo "$1" | tr + .`
++ grep "^$1" "$file" | \
++ sed -e "s+$pattern.*=\s*++"
++}
++
++### Handle the COMPILE_{FIRST,LAST,BEFORE,AFTER} part of Makefile.am
++### in the toplevel. Copied from admin/cvs.sh. Licence presumed LGPL).
++create_subdirs()
++{
++echo "* Sorting top-level subdirs"
++dirs=
++idirs=
++if test -f "$top_srcdir/inst-apps"; then
++ idirs=`cat "$top_srcdir/"inst-apps`
++else
++ idirs=`cd "$top_srcdir" && ls -1 | sort`
++fi
++
++compilefirst=""
++compilelast=""
++if test -f "$top_srcdir/"Makefile.am.in ; then
++ compilefirst=`sed -ne 's#^COMPILE_FIRST[ ]*=[ ]*##p' "$top_srcdir/"Makefile.am.in | head -n 1`
++ compilelast=`sed -ne 's#^COMPILE_LAST[ ]*=[ ]*##p' "$top_srcdir/"Makefile.am.in | head -n 1`
++fi
++for i in $idirs; do
++ if test -f "$top_srcdir/$i"/Makefile.am; then
++ case " $compilefirst $compilelast " in
++ *" $i "*) ;;
++ *) dirs="$dirs $i"
++ esac
++ fi
++done
++
++: > ./_SUBDIRS
++
++for d in $compilefirst; do
++ echo $d >> ./_SUBDIRS
++done
++
++(for d in $dirs; do
++ list=""
++ if test -f "$top_srcdir/"Makefile.am.in ; then
++ list=`sed -ne "s#^COMPILE_BEFORE_$d""[ ]*=[ ]*##p" "$top_srcdir/"Makefile.am.in | head -n 1`
++ fi
++ for s in $list; do
++ echo $s $d
++ done
++ list=""
++ if test -f "$top_srcdir/"Makefile.am.in ; then
++ list=`sed -ne "s#^COMPILE_AFTER_$d""[ ]*=[ ]*##p" "$top_srcdir/"Makefile.am.in | head -n 1`
++ fi
++ for s in $list; do
++ echo $d $s
++ done
++ echo $d $d
++done ) | tsort >> ./_SUBDIRS
++
++for d in $compilelast; do
++ echo $d >> ./_SUBDIRS
++done
++
++test -r _SUBDIRS && mv _SUBDIRS subdirs.top || true
++}
++
++
++### Add HTML header, footer, CSS tags to Doxyfile.
++### Assumes $subdir is set. Argument is a string
++### to stick in front of the file if needed.
++apidox_htmlfiles()
++{
++ dox_header="$top_srcdir/doc/api/$1header.html"
++ dox_footer="$top_srcdir/doc/api/$1footer.html"
++ dox_css="$top_srcdir/doc/api/doxygen.css"
++ test -f "$dox_header" || dox_header="$DOXDATA/$1header.html"
++ test -f "$dox_footer" || dox_footer="$DOXDATA/$1footer.html"
++ test -f "$dox_css" || dox_css="$DOXDATA/doxygen.css"
++
++ echo "HTML_HEADER = $dox_header" >> "$subdir/Doxyfile" ; \
++ echo "HTML_FOOTER = $dox_footer" >> "$subdir/Doxyfile" ; \
++ echo "HTML_STYLESHEET = $dox_css" >> "$subdir/Doxyfile"
++}
++
++apidox_specials()
++{
++ line=`extract_line DOXYGEN_PROJECTNAME "$1"`
++ test -n "$line" && echo "PROJECT_NAME = \"$line\"" >> "$2"
++}
++
++apidox_local()
++{
++ for i in "$top_srcdir/doc/api/Doxyfile.local"
++ do
++ if test -f "$i" ; then
++ cat "$i" >> "$subdir/Doxyfile"
++ break
++ fi
++ done
++}
++
++### Post-process HTML files by substituting in the menu files
++#
++# In non-top directories, both <!-- menu --> and <!-- gmenu -->
++# are calculated and replaced. Top directories get an empty <!-- menu -->
++# if any.
++doxyndex()
++{
++ # Special case top-level to have an empty MENU.
++ if test "x$subdir" = "x." ; then
++ MENU=""
++ htmldir="."
++ htmltop="$top_builddir" # Just ., presumably
++ echo "* Post-processing top-level files"
++ else
++ MENU="<ul>"
++ htmldir="$subdir/html"
++ htmltop="$top_builddir.." # top_builddir ends with /
++ echo "* Post-processing files in $htmldir"
++
++ # Build a little PHP file that maps class names to file
++ # names, for the quick-class-picker functionality.
++ # (The quick-class-picker is disabled due to styling
++ # problems in IE & FF).
++ (
++ echo "<?php \$map = array("; \
++ for htmlfile in `find $htmldir/ -type f -name "class[A-Z]*.html" | grep -v "\-members.html$"`; do
++ classname=`echo $htmlfile | sed -e "s,.*/class\\(.*\\).html,\1," -e "s,_1_1,::,g" -e "s,_01, ,g" -e "s,_4,>,g" -e "s+_00+,+g" -e "s+_3+<+g" | tr "[A-Z]" "[a-z]"`
++ echo " \"$classname\" => \"$htmlfile\","
++ done | sort ; \
++ echo ") ?>"
++ ) > "$subdir/classmap.inc"
++
++ # This is a list of pairs, with / separators so we can use
++ # basename and dirname (a crude shell hack) to split them
++ # into parts. For each, if the file part exists (as a html
++ # file) tack it onto the MENU variable as a <li> with link.
++ for i in "Main Page/index" \
++ "Modules/modules" \
++ "Namespace List/namespaces" \
++ "Class Hierarchy/hierarchy" \
++ "Alphabetical List/classes" \
++ "Class List/annotated" \
++ "File List/files" \
++ "Directories/dirs" \
++ "Namespace Members/namespacemembers" \
++ "Class Members/functions" \
++ "Related Pages/pages"
++ do
++ NAME=`dirname "$i"`
++ FILE=`basename "$i"`
++ test -f "$htmldir/$FILE.html" && MENU="$MENU<li><a href=\"$FILE.html\">$NAME</a></li>"
++ done
++
++ MENU="$MENU</ul>"
++ fi
++
++
++ # Get the list of global Menu entries.
++ GMENU=`cat subdirs | tr -d '\n'`
++
++ PMENU=`grep '<!-- pmenu' "$htmldir/index.html" | sed -e 's+.*pmenu *++' -e 's+ *-->++' | awk '{ c=split($0,a,"/"); for (j=1; j<=c; j++) { printf " / <a href=\""; if (j==c) { printf("."); } for (k=j; k<c; k++) { printf "../"; } if (j<c) { printf("../html/index.html"); } printf "\">%s</a>\n" , a[j]; } }' | tr -d '\n'`
++
++ # Map the PHP file into HTML options so that
++ # it can be substituted in for the quick-class-picker.
++ CMENU=""
++ # For now, leave the CMENU disabled
++ CMENUBEGIN="<!--"
++ CMENUEND="-->"
++
++ if test "x$subdir" = "x." ; then
++ # Disable CMENU on toplevel anyway
++ CMENUBEGIN="<!--"
++ CMENUEND="-->"
++ else
++ test -f "$subdir/classmap.inc" && \
++ CMENU=`grep '=>' "$subdir/classmap.inc" | sed -e 's+"\([^"]*\)" => "'"$subdir/html/"'\([^"]*\)"+<option value="\2">\1<\/option>+' | tr -d '\n'`
++
++ if test -f "$subdir/classmap.inc" && grep "=>" "$subdir/classmap.inc" > /dev/null 2>&1 ; then
++ # Keep the menu, it's useful
++ :
++ else
++ CMENUBEGIN="<!--"
++ CMENUEND="-->"
++ fi
++ fi
++
++ # Now substitute in the MENU in every file. This depends
++ # on HTML_HEADER (ie. header.html) containing the
++ # <!-- menu --> comment.
++ for i in "$htmldir"/*.html
++ do
++ if test -f "$i" ; then
++ sed -e "s+<!-- menu -->+$MENU+" \
++ -e "s+<!-- gmenu -->+$GMENU+" \
++ -e "s+<!-- pmenu.*-->+$PMENU+" \
++ -e "s+<!-- cmenu.begin -->+$CMENUBEGIN+" \
++ -e "s+<!-- cmenu.end -->+$CMENUEND+" \
++ < "$i" | sed -e "s+ at topdir@+$htmltop+g" > "$i.new" && mv "$i.new" "$i"
++ sed -e "s+<!-- cmenu -->+$CMENU+" < "$i" > "$i.new"
++ test -s "$i.new" && mv "$i.new" "$i"
++ fi
++ done
++}
++
++
++
++
++
++
++### Handle the Doxygen processing of a toplevel directory.
++apidox_toplevel()
++{
++ echo ""
++ echo "*** Creating API documentation main page for $module_name"
++ echo "*"
++ rm -f "Doxyfile"
++ for i in "$top_srcdir/doc/api/Doxyfile.global" \
++ "$top_srcdir/admin/Doxyfile.global" \
++ "$DOXDATA/Doxyfile.global"
++ do
++ if test -f "$i" ; then
++ cp "$i" Doxyfile
++ break
++ fi
++ done
++
++ if test ! -f "Doxyfile" ; then
++ echo "* Cannot create Doxyfile."
++ exit 1
++ fi
++
++ cat "$top_builddir/Doxyfile.in" >> Doxyfile
++
++
++ echo "INPUT = $top_srcdir" >> Doxyfile
++ echo "OUTPUT_DIRECTORY = $top_builddir" >> Doxyfile ; \
++ echo "FILE_PATTERNS = *.dox" >> Doxyfile ; \
++ echo "RECURSIVE = NO" >> Doxyfile ; \
++ echo "ALPHABETICAL_INDEX = NO" >> Doxyfile ; \
++ echo "HTML_OUTPUT = ." >> Doxyfile ; \
++ apidox_htmlfiles "main"
++
++ # KDevelop has a top-level Makefile.am with settings.
++ for i in "$top_srcdir/Makefile.am.in" "$top_srcdir/Makefile.am"
++ do
++ if test -f "$i" ; then
++ grep '^DOXYGEN_SET_' "$i" | \
++ sed -e 's+DOXYGEN_SET_++' -e "s+ at topdir@+$top_srcdir+" >> Doxyfile
++ apidox_specials "$srcdir/Makefile.am" "$subdir/Doxyfile"
++
++ break
++ fi
++ done
++
++ apidox_local
++
++ doxygen Doxyfile
++
++ ( cd "$top_srcdir" && grep -l '^include.*Doxyfile.am' `find . -name Makefile.am` ) | sed -e 's+/Makefile.am$++' -e 's+^\./++' | sort > subdirs.in
++ for i in `cat subdirs.in`
++ do
++ test "x." = "x$i" && continue;
++
++ dir=`dirname "$i"`
++ file=`basename "$i"`
++ if test "x." = "x$dir" ; then
++ dir=""
++ else
++ dir="$dir/"
++ fi
++ indent=`echo "$dir" | sed -e 's+[^/]*/+\ \ +g' | sed -e 's+&+\\\&+g'`
++ entryname=`extract_line DOXYGEN_SET_PROJECT_NAME "$top_srcdir/$dir/$file/Makefile.am"`
++ test -z "$entryname" && entryname="$file"
++
++ if grep DOXYGEN_EMPTY "$top_srcdir/$dir/$file/Makefile.am" > /dev/null 2>&1 ; then
++ echo "<li>$indent$file</li>"
++ else
++ echo "<li>$indent<a href=\"@topdir@/$dir$file/html/index.html\">$entryname</a></li>"
++ fi
++ done > subdirs
++
++ doxyndex
++}
++
++### Handle the Doxygen processing of a non-toplevel directory.
++apidox_subdir()
++{
++ echo ""
++ echo "*** Creating apidox in $subdir"
++ echo "*"
++ rm -f "$subdir/Doxyfile"
++ if test ! -d "$top_srcdir/$subdir" ; then
++ echo "* No source (sub)directory $subdir"
++ return
++ fi
++ for i in "$top_srcdir/doc/api/Doxyfile.global" \
++ "$top_srcdir/admin/Doxyfile.global" \
++ "$DOXDATA/Doxyfile.global"
++ do
++ if test -f "$i" ; then
++ cp "$i" "$subdir/Doxyfile"
++ break
++ fi
++ done
++
++
++ test -f "Doxyfile.in" || create_doxyfile_in
++ cat "Doxyfile.in" >> "$subdir/Doxyfile"
++
++ echo "PROJECT_NAME = \"$subdir\"" >> "$subdir/Doxyfile"
++ echo "INPUT = $srcdir" >> "$subdir/Doxyfile"
++ echo "OUTPUT_DIRECTORY = ." >> "$subdir/Doxyfile"
++ if grep -l "$subdir/" subdirs.in > /dev/null 2>&1 ; then
++ echo "RECURSIVE = NO" >> "$subdir/Doxyfile"
++ fi
++ echo "HTML_OUTPUT = $subdir/html" >> "$subdir/Doxyfile"
++ echo "GENERATE_TAGFILE = $subdir/$subdirname.tag" >> "$subdir/Doxyfile"
++ test -d "$top_srcdir/doc/api" && \
++ echo "IMAGE_PATH = $top_srcdir/doc/api" >> "$subdir/Doxyfile"
++
++ apidox_htmlfiles ""
++
++ # Makefile.ams may contain overrides to our settings,
++ # so copy them in.
++ grep '^DOXYGEN_SET_' "$srcdir/Makefile.am" | \
++ sed -e 's+DOXYGEN_SET_++' >> "$subdir/Doxyfile"
++ apidox_specials "$srcdir/Makefile.am" "$subdir/Doxyfile"
++
++ excludes=`extract_line DOXYGEN_EXCLUDE`
++ if test -n "$excludes"; then
++ patterns=""
++ dirs=""
++ for item in `echo "$excludes"`; do
++ if test -d "$top_srcdir/$subdir/$item"; then
++ dirs="$dirs $top_srcdir/$subdir/$item/"
++ else
++ patterns="$patterns $item"
++ fi
++ done
++ echo "EXCLUDE_PATTERNS += $patterns" >> "$subdir/Doxyfile"
++ echo "EXCLUDE += $dirs" >> "$subdir/Doxyfile"
++ fi
++
++ echo "TAGFILES = \\" >> "$subdir/Doxyfile"
++ ## For now, don't support \ continued references lines
++ tags=`extract_line DOXYGEN_REFERENCES`
++ for i in $tags qt ; do
++ tagsubdir=`dirname $i` ; tag=`basename $i`
++ tagpath=""
++ not_found=""
++
++ if test "x$tagsubdir" = "x." ; then
++ tagsubdir=""
++ else
++ tagsubdir="$tagsubdir/"
++ fi
++
++ # Find location of tag file
++ if test -f "$tagsubdir$tag/$tag.tag" ; then
++ file="$tagsubdir$tag/$tag.tag"
++ loc="$tagsubdir$tag/html"
++ else
++ # This checks for dox built with_out_ --no-modulename
++ # in the same build dir as this dox run was started in.
++ file=`ls -1 ../*-apidocs/"$tagsubdir$tag/$tag.tag" 2> /dev/null`
++
++ if test -n "$file" ; then
++ loc=`echo "$file" | sed -e "s/$tag.tag\$/html/"`
++ else
++ # If the tag file doesn't exist yet, but should
++ # because we have the right dirs here, queue
++ # this directory for re-processing later.
++ if test -d "$top_srcdir/$tagsubdir$tag" ; then
++ echo "* Need to re-process $subdir for tag $i"
++ echo "$subdir" >> "subdirs.later"
++ else
++ # Re-check in $PREFIX if needed.
++ test -n "$PREFIX" && \
++ file=`cd "$PREFIX" && \
++ ls -1 *-apidocs/"$tagsubdir$tag/$tag.tag" 2> /dev/null`
++
++ # If something is found, patch it up. The location must be
++ # relative to the installed location of the dox and the
++ # file must be absolute.
++ if test -n "$file" ; then
++ loc=`echo "../$file" | sed -e "s/$tag.tag\$/html/"`
++ file="$PREFIX/$file"
++ echo "* Tags for $tagsubdir$tag will only work when installed."
++ not_found="YES"
++ fi
++ fi
++ fi
++ fi
++ if test "$tag" = "qt" ; then
++ if test -z "$QTDOCDIR" ; then
++ echo " $file" >> "$subdir/Doxyfile"
++ else
++ if test -z "$file" ; then
++ # Really no Qt tags
++ echo "" >> "$subdir/Doxyfile"
++ else
++ echo " $file=$QTDOCDIR" >> "$subdir/Doxyfile"
++ fi
++ fi
++ else
++ if test -n "$file" ; then
++ test -z "$not_found" && echo "* Found tag $file"
++ echo " $file=../$top_builddir$loc \\" >> "$subdir/Doxyfile"
++ fi
++ fi
++ done
++
++ apidox_local
++
++ if grep '^DOXYGEN_EMPTY' "$srcdir/Makefile.am" > /dev/null 2>&1 ; then
++ # This directory is empty, so don't process it, but
++ # *do* handle subdirs that might have dox.
++ :
++ else
++ # Regular processing
++ doxygen "$subdir/Doxyfile"
++ doxyndex
++ fi
++}
++
++### Run a given subdir by setting up global variables first.
++do_subdir()
++{
++ subdir=`echo "$1" | sed -e 's+/$++'`
++ srcdir="$top_srcdir/$subdir"
++ subdirname=`basename "$subdir"`
++ mkdir -p "$subdir" 2> /dev/null
++ if test ! -d "$subdir" ; then
++ echo "Can't create dox subdirectory $subdir"
++ return
++ fi
++ top_builddir=`echo "/$subdir" | sed -e 's+/[^/]*+../+g'`
++ apidox_subdir
++}
++
++
++### Create installdox-slow in the toplevel
++create_installdox()
++{
++# Fix up the installdox script so it accepts empty args
++#
++# This code is copied from the installdox generated by Doxygen,
++# copyright by Dimitri van Heesch and released under the GPL.
++# This does a _slow_ update of the dox, because it loops
++# over the given substitutions instead of assuming all the
++# needed ones are given.
++#
++cat <<\EOF
++#! /usr/bin/env perl
++
++%subst = () ;
++$quiet = 0;
++
++if (open(F,"search.cfg"))
++{
++ $_=<F> ; s/[ \t\n]*$//g ; $subst{"_doc"} = $_;
++ $_=<F> ; s/[ \t\n]*$//g ; $subst{"_cgi"} = $_;
++}
++
++while ( @ARGV ) {
++ $_ = shift @ARGV;
++ if ( s/^-// ) {
++ if ( /^l(.*)/ ) {
++ $v = ($1 eq "") ? shift @ARGV : $1;
++ ($v =~ /\/$/) || ($v .= "/");
++ $_ = $v;
++ if ( /(.+)\@(.+)/ ) {
++ $subst{$1} = $2;
++ } else {
++ print STDERR "Argument $_ is invalid for option -l\n";
++ &usage();
++ }
++ }
++ elsif ( /^q/ ) {
++ $quiet = 1;
++ }
++ elsif ( /^\?|^h/ ) {
++ &usage();
++ }
++ else {
++ print STDERR "Illegal option -$_\n";
++ &usage();
++ }
++ }
++ else {
++ push (@files, $_ );
++ }
++}
++
++
++if ( ! @files ) {
++ if (opendir(D,".")) {
++ foreach $file ( readdir(D) ) {
++ $match = ".html";
++ next if ( $file =~ /^\.\.?$/ );
++ ($file =~ /$match/) && (push @files, $file);
++ ($file =~ "tree.js") && (push @files, $file);
++ }
++ closedir(D);
++ }
++}
++
++if ( ! @files ) {
++ print STDERR "Warning: No input files given and none found!\n";
++}
++
++foreach $f (@files)
++{
++ if ( ! $quiet ) {
++ print "Editing: $f...\n";
++ }
++ $oldf = $f;
++ $f .= ".bak";
++ unless (rename $oldf,$f) {
++ print STDERR "Error: cannot rename file $oldf\n";
++ exit 1;
++ }
++ if (open(F,"<$f")) {
++ unless (open(G,">$oldf")) {
++ print STDERR "Error: opening file $oldf for writing\n";
++ exit 1;
++ }
++ if ($oldf ne "tree.js") {
++ while (<F>) {
++ foreach $sub (keys %subst) {
++ s/doxygen\=\"$sub\:([^ \"\t\>\<]*)\" (href|src)=\"\1/doxygen\=\"$sub:$subst{$sub}\" \2=\"$subst{$sub}/g;
++ print G "$_";
++ }
++ }
++ }
++ else {
++ while (<F>) {
++ foreach $sub (keys %subst) {
++ s/\"$sub\:([^ \"\t\>\<]*)\", \"\1/\"$sub:$subst{$sub}\" ,\"$subst{$sub}/g;
++ print G "$_";
++ }
++ }
++ }
++ }
++ else {
++ print STDERR "Warning file $f does not exist\n";
++ }
++ unlink $f;
++}
++
++sub usage {
++ print STDERR "Usage: installdox [options] [html-file [html-file ...]]\n";
++ print STDERR "Options:\n";
++ print STDERR " -l tagfile\@linkName tag file + URL or directory \n";
++ print STDERR " -q Quiet mode\n\n";
++ exit 1;
++}
++EOF
++}
++
++# Do only the subdirs that match the RE passed in as $1
++do_subdirs_re()
++{
++ RE=`echo "$1" | sed -e 's+/$++'`
++
++ # Here's a queue of dirs to re-process later when
++ # all the rest have been done already.
++ > subdirs.later
++
++ # subdirs.top lists _all_ subdirs of top in the order they
++ # should be handled; subdirs.in lists those dirs that contain
++ # dox. So the intersection of the two is the ordered list
++ # of top-level subdirs that contain dox.
++ #
++ # subdirs.top also doesn't contain ".", so that special
++ # case can be ignored in the loop.
++
++
++ (
++ for i in `grep "^$RE" subdirs.top`
++ do
++ if test "x$i" = "x." ; then
++ continue
++ fi
++ # Calculate intersection of this element and the
++ # set of dox dirs.
++ if grep "^$i\$" subdirs.in > /dev/null 2>&1 ; then
++ echo "$i"
++ mkdir -p "$i" 2> /dev/null
++
++ # Handle the subdirs of this one
++ for j in `grep "$i/" subdirs.in`
++ do
++ echo "$j"
++ mkdir -p "$j" 2> /dev/null
++ done
++ fi
++ done
++
++ # Now we still need to handle whatever is left
++ for i in `cat subdirs.in`
++ do
++ test -d "$i" || echo "$i"
++ mkdir -p "$i" 2> /dev/null
++ done
++ ) > subdirs.sort
++ for i in `cat subdirs.sort`
++ do
++ do_subdir "$i"
++ done
++
++ if test -s "subdirs.later" ; then
++ sort subdirs.later | uniq > subdirs.sort
++ for i in `cat subdirs.sort`
++ do
++ : > subdirs.later
++ echo "*** Reprocessing $i"
++ do_subdir "$i"
++ test -s "subdirs.later" && echo "* Some tag files were still not found."
++ done
++ fi
++}
++
++if test "x." = "x$top_builddir" ; then
++ apidox_toplevel
++ create_subdirs
++ create_installdox > installdox-slow
++ if test "x$recurse" = "x1" ; then
++ if test "x$module_name" = "xkdelibs" ; then
++ if test -z "$QTDOCTAG" && test -d "$QTDOCDIR" && \
++ test ! -f "qt/qt.tag" ; then
++ # Special case: create a qt tag file.
++ echo "*** Creating a tag file for the Qt library:"
++ mkdir qt
++ doxytag -t qt/qt.tag "$QTDOCDIR" > /dev/null 2>&1
++ fi
++ fi
++ if test -n "$QTDOCTAG" && test -r "$QTDOCTAG" ; then
++ echo "*** Copying tag file for the Qt library:"
++ mkdir qt
++ cp "$QTDOCTAG" qt/qt.tag
++ fi
++
++ do_subdirs_re "."
++
++ fi
++else
++ if test "x$recurse" = "x1" ; then
++ do_subdirs_re "$subdir"
++ else
++ do_subdir "$subdir"
++ fi
++fi
++
++
++# At the end of a run, clean up stuff.
++if test "YES" = "$cleanup" ; then
++ rm -f subdirs.in subdirs.later subdirs.sort subdirs.top Doxyfile.in
++ rm -f `find . -name Doxyfile`
++ rm -f qt/qt.tag
++ rmdir qt > /dev/null 2>&1
++fi
++
++
++exit 0
++
+--- a/admin/install-sh
++++ b/admin/install-sh
+@@ -1,19 +1,38 @@
+ #!/bin/sh
+-#
+ # install - install a program, script, or datafile
+-# This comes from X11R5 (mit/util/scripts/install.sh).
++
++scriptversion=2005-11-07.23
++
++# This originates from X11R5 (mit/util/scripts/install.sh), which was
++# later released in X11R6 (xc/config/util/install.sh) with the
++# following copyright and license.
++#
++# Copyright (C) 1994 X Consortium
++#
++# Permission is hereby granted, free of charge, to any person obtaining a copy
++# of this software and associated documentation files (the "Software"), to
++# deal in the Software without restriction, including without limitation the
++# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
++# sell copies of the Software, and to permit persons to whom the Software is
++# furnished to do so, subject to the following conditions:
++#
++# The above copyright notice and this permission notice shall be included in
++# all copies or substantial portions of the Software.
++#
++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
++# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++#
++# Except as contained in this notice, the name of the X Consortium shall not
++# be used in advertising or otherwise to promote the sale, use or other deal-
++# ings in this Software without prior written authorization from the X Consor-
++# tium.
+ #
+-# Copyright 1991 by the Massachusetts Institute of Technology
+ #
+-# Permission to use, copy, modify, distribute, and sell this software and its
+-# documentation for any purpose is hereby granted without fee, provided that
+-# the above copyright notice appear in all copies and that both that
+-# copyright notice and this permission notice appear in supporting
+-# documentation, and that the name of M.I.T. not be used in advertising or
+-# publicity pertaining to distribution of the software without specific,
+-# written prior permission. M.I.T. makes no representations about the
+-# suitability of this software for any purpose. It is provided "as is"
+-# without express or implied warranty.
++# FSF changes to this file are in the public domain.
+ #
+ # Calling this script install-sh is preferred over install.sh, to prevent
+ # `make' implicit rules from creating a file called install from it
+@@ -23,13 +42,11 @@
+ # from scratch. It can only install one file at a time, a restriction
+ # shared with many OS's install programs.
+
+-
+ # set DOITPROG to echo to test this script
+
+ # Don't use :- since 4.3BSD and earlier shells don't like it.
+ doit="${DOITPROG-}"
+
+-
+ # put in absolute paths if you don't have them in your path; or use env. vars.
+
+ mvprog="${MVPROG-mv}"
+@@ -41,236 +58,344 @@
+ rmprog="${RMPROG-rm}"
+ mkdirprog="${MKDIRPROG-mkdir}"
+
+-transformbasename=""
+-transform_arg=""
+-instcmd="$mvprog"
+-chmodcmd="$chmodprog 0755"
+-chowncmd=""
+-chgrpcmd=""
+-stripcmd=""
++posix_glob=
++posix_mkdir=
++
++# Symbolic mode for testing mkdir with directories.
++# It is the same as 755, but also tests that "u+" works.
++test_mode=u=rwx,g=rx,o=rx,u+wx
++
++# Desired mode of installed file.
++mode=0755
++
++# Desired mode of newly created intermediate directories.
++# It is empty if not known yet.
++intermediate_mode=
++
++chmodcmd=$chmodprog
++chowncmd=
++chgrpcmd=
++stripcmd=
+ rmcmd="$rmprog -f"
+ mvcmd="$mvprog"
+-src=""
+-dst=""
+-dir_arg=""
+-
+-while [ x"$1" != x ]; do
+- case $1 in
+- -c) instcmd=$cpprog
+- shift
+- continue;;
+-
+- -d) dir_arg=true
+- shift
+- continue;;
+-
+- -m) chmodcmd="$chmodprog $2"
+- shift
+- shift
+- continue;;
+-
+- -o) chowncmd="$chownprog $2"
+- shift
+- shift
+- continue;;
+-
+- -g) chgrpcmd="$chgrpprog $2"
+- shift
+- shift
+- continue;;
+-
+- -s) stripcmd=$stripprog
+- shift
+- continue;;
+-
+- -t=*) transformarg=`echo $1 | sed 's/-t=//'`
+- shift
+- continue;;
+-
+- -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
+- shift
+- continue;;
+-
+- *) if [ x"$src" = x ]
+- then
+- src=$1
+- else
+- # this colon is to work around a 386BSD /bin/sh bug
+- :
+- dst=$1
+- fi
+- shift
+- continue;;
+- esac
+-done
+-
+-if [ x"$src" = x ]
+-then
+- echo "$0: no input file specified" >&2
+- exit 1
+-else
+- :
+-fi
+-
+-if [ x"$dir_arg" != x ]; then
+- dst=$src
+- src=""
+-
+- if [ -d "$dst" ]; then
+- instcmd=:
+- chmodcmd=""
+- else
+- instcmd=$mkdirprog
+- fi
+-else
+-
+-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
+-# might cause directories to be created, which would be especially bad
+-# if $src (and thus $dsttmp) contains '*'.
+-
+- if [ -f "$src" ] || [ -d "$src" ]
+- then
+- :
+- else
+- echo "$0: $src does not exist" >&2
+- exit 1
+- fi
+-
+- if [ x"$dst" = x ]
+- then
+- echo "$0: no destination specified" >&2
+- exit 1
+- else
+- :
+- fi
+-
+-# If destination is a directory, append the input filename; if your system
+-# does not like double slashes in filenames, you may need to add some logic
+-
+- if [ -d "$dst" ]
+- then
+- dst=$dst/`basename "$src"`
+- else
+- :
+- fi
+-fi
+-
+-## this sed command emulates the dirname command
+-dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+-
+-# Make sure that the destination directory exists.
+-# this part is taken from Noah Friedman's mkinstalldirs script
+-
+-# Skip lots of stat calls in the usual case.
+-if [ ! -d "$dstdir" ]; then
+-defaultIFS='
+- '
+-IFS="${IFS-$defaultIFS}"
+-
+-oIFS=$IFS
+-# Some sh's can't handle IFS=/ for some reason.
+-IFS='%'
+-set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+-IFS=$oIFS
++src=
++dst=
++dir_arg=
++dstarg=
++no_target_directory=
++
++usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
++ or: $0 [OPTION]... SRCFILES... DIRECTORY
++ or: $0 [OPTION]... -t DIRECTORY SRCFILES...
++ or: $0 [OPTION]... -d DIRECTORIES...
++
++In the 1st form, copy SRCFILE to DSTFILE.
++In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
++In the 4th, create DIRECTORIES.
++
++Options:
++-c (ignored)
++-d create directories instead of installing files.
++-g GROUP $chgrpprog installed files to GROUP.
++-m MODE $chmodprog installed files to MODE.
++-o USER $chownprog installed files to USER.
++-s $stripprog installed files.
++-t DIRECTORY install into DIRECTORY.
++-T report an error if DSTFILE is a directory.
++--help display this help and exit.
++--version display version info and exit.
++
++Environment variables override the default commands:
++ CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
++"
++
++while test -n "$1"; do
++ case $1 in
++ -c) shift
++ continue;;
++
++ -d) dir_arg=true
++ shift
++ continue;;
++
++ -g) chgrpcmd="$chgrpprog $2"
++ shift
++ shift
++ continue;;
++
++ --help) echo "$usage"; exit $?;;
++
++ -m) mode=$2
++ shift
++ shift
++ continue;;
++
++ -o) chowncmd="$chownprog $2"
++ shift
++ shift
++ continue;;
++
++ -s) stripcmd=$stripprog
++ shift
++ continue;;
+
+-pathcomp=''
++ -t) dstarg=$2
++ shift
++ shift
++ continue;;
+
+-while [ $# -ne 0 ] ; do
+- pathcomp=$pathcomp$1
++ -T) no_target_directory=true
+ shift
++ continue;;
+
+- if [ ! -d "$pathcomp" ] ;
+- then
+- $mkdirprog "$pathcomp"
+- else
+- :
+- fi
++ --version) echo "$0 $scriptversion"; exit $?;;
+
+- pathcomp=$pathcomp/
++ *) # When -d is used, all remaining arguments are directories to create.
++ # When -t is used, the destination is already specified.
++ test -n "$dir_arg$dstarg" && break
++ # Otherwise, the last argument is the destination. Remove it from $@.
++ for arg
++ do
++ if test -n "$dstarg"; then
++ # $@ is not empty: it contains at least $arg.
++ set fnord "$@" "$dstarg"
++ shift # fnord
++ fi
++ shift # arg
++ dstarg=$arg
++ done
++ break;;
++ esac
+ done
++
++if test -z "$1"; then
++ if test -z "$dir_arg"; then
++ echo "$0: no input file specified." >&2
++ exit 1
++ fi
++ # It's OK to call `install-sh -d' without argument.
++ # This can happen when creating conditional directories.
++ exit 0
+ fi
+
+-if [ x"$dir_arg" != x ]
+-then
+- $doit $instcmd "$dst" &&
+-
+- if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi &&
+- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi &&
+- if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi &&
+- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi
+-else
+-
+-# If we're going to rename the final executable, determine the name now.
+-
+- if [ x"$transformarg" = x ]
+- then
+- dstfile=`basename "$dst"`
+- else
+- dstfile=`basename "$dst" $transformbasename |
+- sed $transformarg`$transformbasename
+- fi
++test -n "$dir_arg" || trap '(exit $?); exit' 1 2 13 15
+
+-# don't allow the sed command to completely eliminate the filename
++for src
++do
++ # Protect names starting with `-'.
++ case $src in
++ -*) src=./$src ;;
++ esac
++
++ if test -n "$dir_arg"; then
++ dst=$src
++ dstdir=$dst
++ test -d "$dstdir"
++ dstdir_status=$?
++ else
++
++ # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
++ # might cause directories to be created, which would be especially bad
++ # if $src (and thus $dsttmp) contains '*'.
++ if test ! -f "$src" && test ! -d "$src"; then
++ echo "$0: $src does not exist." >&2
++ exit 1
++ fi
++
++ if test -z "$dstarg"; then
++ echo "$0: no destination specified." >&2
++ exit 1
++ fi
++
++ dst=$dstarg
++ # Protect names starting with `-'.
++ case $dst in
++ -*) dst=./$dst ;;
++ esac
+
+- if [ x"$dstfile" = x ]
+- then
+- dstfile=`basename "$dst"`
++ # If destination is a directory, append the input filename; won't work
++ # if double slashes aren't ignored.
++ if test -d "$dst"; then
++ if test -n "$no_target_directory"; then
++ echo "$0: $dstarg: Is a directory" >&2
++ exit 1
++ fi
++ dstdir=$dst
++ dst=$dstdir/`basename "$src"`
++ dstdir_status=0
++ else
++ # Prefer dirname, but fall back on a substitute if dirname fails.
++ dstdir=`
++ (dirname "$dst") 2>/dev/null ||
++ expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++ X"$dst" : 'X\(//\)[^/]' \| \
++ X"$dst" : 'X\(//\)$' \| \
++ X"$dst" : 'X\(/\)' \| \
++ . : '\(.\)' 2>/dev/null ||
++ echo X"$dst" |
++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
++ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
++ /^X\(\/\/\)$/{ s//\1/; q; }
++ /^X\(\/\).*/{ s//\1/; q; }
++ s/.*/./; q'
++ `
++
++ test -d "$dstdir"
++ dstdir_status=$?
++ fi
++ fi
++
++ obsolete_mkdir_used=false
++
++ if test $dstdir_status != 0; then
++ case $posix_mkdir in
++ '')
++ posix_mkdir=false
++ if $mkdirprog -m $test_mode -p -- / >/dev/null 2>&1; then
++ posix_mkdir=true
+ else
+- :
+- fi
+-
+-# Make a couple of temp file names in the proper directory.
+-
+- dsttmp=$dstdir/#inst.$$#
+- rmtmp=$dstdir/#rm.$$#
+-
+-# Trap to clean up temp files at exit.
+-
+- trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
+- trap '(exit $?); exit' 1 2 13 15
+-
+-# Move or copy the file name to the temp name
+-
+- $doit $instcmd "$src" "$dsttmp" &&
+-
+-# and set any options; do chmod last to preserve setuid bits
+-
+-# If any of these fail, we abort the whole thing. If we want to
+-# ignore errors from any of these, just make sure not to ignore
+-# errors from the above "$doit $instcmd $src $dsttmp" command.
++ # Remove any dirs left behind by ancient mkdir implementations.
++ rmdir ./-m "$test_mode" ./-p ./-- 2>/dev/null
++ fi ;;
++ esac
+
+- if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi &&
+- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi &&
+- if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi &&
+- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi &&
++ if
++ $posix_mkdir && {
+
+-# Now remove or move aside any old file at destination location. We try this
+-# two ways since rm can't unlink itself on some systems and the destination
+-# file might be busy for other reasons. In this case, the final cleanup
+-# might fail but the new file should still install successfully.
++ # With -d, create the new directory with the user-specified mode.
++ # Otherwise, create it using the same intermediate mode that
++ # mkdir -p would use when creating intermediate directories.
++ # POSIX says that this mode is "$(umask -S),u+wx", so use that
++ # if umask -S works.
+
+-{
+- if [ -f "$dstdir/$dstfile" ]
+- then
+- $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null ||
+- $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null ||
+- {
+- echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+- (exit 1); exit
+- }
++ if test -n "$dir_arg"; then
++ mkdir_mode=$mode
+ else
+- :
++ case $intermediate_mode in
++ '')
++ if umask_S=`(umask -S) 2>/dev/null`; then
++ intermediate_mode=$umask_S,u+wx
++ else
++ intermediate_mode=$test_mode
++ fi ;;
++ esac
++ mkdir_mode=$intermediate_mode
+ fi
+-} &&
+-
+-# Now rename the file to the real destination.
+-
+- $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+
+-fi &&
++ $mkdirprog -m "$mkdir_mode" -p -- "$dstdir"
++ }
++ then :
++ else
++
++ # mkdir does not conform to POSIX, or it failed possibly due to
++ # a race condition. Create the directory the slow way, step by
++ # step, checking for races as we go.
++
++ case $dstdir in
++ /*) pathcomp=/ ;;
++ -*) pathcomp=./ ;;
++ *) pathcomp= ;;
++ esac
++
++ case $posix_glob in
++ '')
++ if (set -f) 2>/dev/null; then
++ posix_glob=true
++ else
++ posix_glob=false
++ fi ;;
++ esac
++
++ oIFS=$IFS
++ IFS=/
++ $posix_glob && set -f
++ set fnord $dstdir
++ shift
++ $posix_glob && set +f
++ IFS=$oIFS
++
++ for d
++ do
++ test "x$d" = x && continue
++
++ pathcomp=$pathcomp$d
++ if test ! -d "$pathcomp"; then
++ $mkdirprog "$pathcomp"
++ # Don't fail if two instances are running concurrently.
++ test -d "$pathcomp" || exit 1
++ fi
++ pathcomp=$pathcomp/
++ done
++ obsolete_mkdir_used=true
++ fi
++ fi
++
++ if test -n "$dir_arg"; then
++ { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
++ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
++ { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
++ test -z "$chmodcmd" || $doit $chmodcmd "$mode" "$dst"; } || exit 1
++ else
++
++ # Make a couple of temp file names in the proper directory.
++ dsttmp=$dstdir/_inst.$$_
++ rmtmp=$dstdir/_rm.$$_
++
++ # Trap to clean up those temp files at exit.
++ trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
++
++ # Copy the file name to the temp name.
++ $doit $cpprog "$src" "$dsttmp" &&
++
++ # and set any options; do chmod last to preserve setuid bits.
++ #
++ # If any of these fail, we abort the whole thing. If we want to
++ # ignore errors from any of these, just make sure not to ignore
++ # errors from the above "$doit $cpprog $src $dsttmp" command.
++ #
++ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
++ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
++ && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
++ && { test -z "$chmodcmd" || $doit $chmodcmd "$mode" "$dsttmp"; } &&
++
++ # Now rename the file to the real destination.
++ { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
++ || {
++ # The rename failed, perhaps because mv can't rename something else
++ # to itself, or perhaps because mv is so ancient that it does not
++ # support -f.
++
++ # Now remove or move aside any old file at destination location.
++ # We try this two ways since rm can't unlink itself on some
++ # systems and the destination file might be busy for other
++ # reasons. In this case, the final cleanup might fail but the new
++ # file should still install successfully.
++ {
++ if test -f "$dst"; then
++ $doit $rmcmd -f "$dst" 2>/dev/null \
++ || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
++ && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
++ || {
++ echo "$0: cannot unlink or rename $dst" >&2
++ (exit 1); exit 1
++ }
++ else
++ :
++ fi
++ } &&
++
++ # Now rename the file to the real destination.
++ $doit $mvcmd "$dsttmp" "$dst"
++ }
++ } || exit 1
+
+-# The final little trick to "correctly" pass the exit status to the exit trap.
++ trap '' 0
++ fi
++done
+
+-{
+- (exit 0); exit
+-}
++# Local variables:
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-end: "$"
++# End:
+--- a/admin/libtool.m4.in
++++ b/admin/libtool.m4.in
+@@ -1273,7 +1273,7 @@
+ dynamic_linker=no
+ ;;
+
+-freebsd*-gnu*)
++kfreebsd*-gnu*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -1424,7 +1424,7 @@
+ libsuff=
+ if test "x$LINUX_64_MODE" = x64; then
+ # Some platforms are per default 64-bit, so there's no /lib64
+- if test -d /lib64; then
++ if test -d /lib64 -a ! -h /lib64; then
+ libsuff=64
+ fi
+ fi
+@@ -2119,7 +2119,7 @@
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-freebsd*)
++freebsd* | kfreebsd*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+ case $host_cpu in
+ i*86 )
+@@ -2560,10 +2560,21 @@
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ case "$host_os" in
+ rhapsody* | darwin1.[[012]])
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
+ ;;
+ *) # Darwin 1.3 on
+- test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
++ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
++ else
++ case ${MACOSX_DEPLOYMENT_TARGET} in
++ 10.[012])
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
++ ;;
++ 10.*)
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
++ ;;
++ esac
++ fi
+ ;;
+ esac
+ output_verbose_link_cmd='echo'
+@@ -2872,10 +2883,21 @@
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ case "$host_os" in
+ rhapsody* | darwin1.[[012]])
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
+ ;;
+ *) # Darwin 1.3 on
+- test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
++ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
++ else
++ case ${MACOSX_DEPLOYMENT_TARGET} in
++ 10.[012])
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
++ ;;
++ 10.*)
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
++ ;;
++ esac
++ fi
+ ;;
+ esac
+ lt_int_apple_cc_single_mod=no
+@@ -2931,7 +2953,7 @@
+ freebsd-elf*)
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ ;;
+- freebsd*)
++ freebsd* | kfreebsd*-gnu)
+ # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+ # conventions
+ _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+@@ -4577,7 +4599,7 @@
+ ;;
+ esac
+ ;;
+- freebsd*)
++ freebsd* | kfreebsd*-gnu)
+ # FreeBSD uses GNU C++
+ ;;
+ hpux9* | hpux10* | hpux11*)
+@@ -5312,10 +5334,21 @@
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ case "$host_os" in
+ rhapsody* | darwin1.[[012]])
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
+ ;;
+ *) # Darwin 1.3 on
+- test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
++ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
++ else
++ case ${MACOSX_DEPLOYMENT_TARGET} in
++ 10.[012])
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
++ ;;
++ 10.*)
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
++ ;;
++ esac
++ fi
+ ;;
+ esac
+ lt_int_apple_cc_single_mod=no
+@@ -5376,7 +5409,7 @@
+ ;;
+
+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+- freebsd*)
++ freebsd* | kfreebsd*-gnu)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+--- a/admin/ltcf-c.sh
++++ /dev/null
+@@ -1,815 +0,0 @@
+-#### This script is meant to be sourced by ltconfig.
+-
+-# ltcf-c.sh - Create a C compiler specific configuration
+-#
+-# Copyright (C) 1996-2000, 2001 Free Software Foundation, Inc.
+-# Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+-#
+-# This file is free software; you can redistribute it and/or modify it
+-# under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2 of the License, or
+-# (at your option) any later version.
+-#
+-# This program is distributed in the hope that it will be useful, but
+-# WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-# General Public License for more details.
+-#
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+-#
+-# As a special exception to the GNU General Public License, if you
+-# distribute this file as part of a program that contains a
+-# configuration script generated by Autoconf, you may include it under
+-# the same distribution terms that you use for the rest of that program.
+-
+-
+-# Source file extension for C test sources.
+-ac_ext=c
+-
+-# Object file extension for compiled C test sources.
+-objext=o
+-
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;"
+-
+-# Code to be used in simple link tests
+-lt_simple_link_test_code='main(){return(0);}'
+-
+-## Linker Characteristics
+-case $host_os in
+-cygwin* | mingw*)
+- # FIXME: the MSVC++ port hasn't been tested in a loooong time
+- # When not using gcc, we currently assume that we are using
+- # Microsoft Visual C++.
+- if test "$with_gcc" != yes; then
+- with_gnu_ld=no
+- fi
+- ;;
+-
+-esac
+-
+-ld_shlibs=yes
+-if test "$with_gnu_ld" = yes; then
+- # If archive_cmds runs LD, not CC, wlarc should be empty
+- wlarc='${wl}'
+-
+- # See if GNU ld supports shared libraries.
+- case $host_os in
+- aix3* | aix4* | aix5*)
+- # On AIX, the GNU linker is very broken
+- ld_shlibs=no
+- cat <<EOF 1>&2
+-
+-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+-*** to be unable to reliably create shared libraries on AIX.
+-*** Therefore, libtool is disabling shared libraries support. If you
+-*** really care for shared libraries, you may want to modify your PATH
+-*** so that a non-GNU linker is found, and then restart.
+-
+-EOF
+- ;;
+-
+- amigaos*)
+- archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+- hardcode_libdir_flag_spec='-L$libdir'
+- hardcode_minus_L=yes
+-
+- # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
+- # that the semantics of dynamic libraries on AmigaOS, at least up
+- # to version 4, is to share data among multiple programs linked
+- # with the same dynamic library. Since this doesn't match the
+- # behavior of shared libraries on other platforms, we can use
+- # them.
+- ld_shlibs=no
+- ;;
+-
+- beos*)
+- if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+- allow_undefined_flag=unsupported
+- # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
+- # support --undefined. This deserves some investigation. FIXME
+- archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+- else
+- ld_shlibs=no
+- fi
+- ;;
+-
+- cygwin* | mingw*)
+- # hardcode_libdir_flag_spec is actually meaningless, as there is
+- # no search path for DLLs.
+- hardcode_libdir_flag_spec='-L$libdir'
+- allow_undefined_flag=unsupported
+- always_export_symbols=yes
+-
+- extract_expsyms_cmds='test -f $output_objdir/impgen.c || \
+- sed -e "/^# \/\* impgen\.c starts here \*\//,/^# \/\* impgen.c ends here \*\// { s/^# //; p; }" -e d < $0 > $output_objdir/impgen.c~
+- test -f $output_objdir/impgen.exe || (cd $output_objdir && \
+- if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \
+- else $CC -o impgen impgen.c ; fi)~
+- $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def'
+-
+- old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib'
+-
+- # cygwin and mingw dlls have different entry points and sets of symbols
+- # to exclude.
+- # FIXME: what about values for MSVC?
+- dll_entry=__cygwin_dll_entry at 12
+- dll_exclude_symbols=DllMain at 12,_cygwin_dll_entry at 12,_cygwin_noncygwin_dll_entry at 12~
+- case $host_os in
+- mingw*)
+- # mingw values
+- dll_entry=_DllMainCRTStartup at 12
+- dll_exclude_symbols=DllMain at 12,DllMainCRTStartup at 12,DllEntryPoint at 12~
+- ;;
+- esac
+-
+- # mingw and cygwin differ, and it's simplest to just exclude the union
+- # of the two symbol sets.
+- dll_exclude_symbols=DllMain at 12,_cygwin_dll_entry at 12,_cygwin_noncygwin_dll_entry at 12,DllMainCRTStartup at 12,DllEntryPoint at 12
+-
+- # recent cygwin and mingw systems supply a stub DllMain which the user
+- # can override, but on older systems we have to supply one (in ltdll.c)
+- if test "x$lt_cv_need_dllmain" = "xyes"; then
+- ltdll_obj='$output_objdir/$soname-ltdll.'"$objext "
+- ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $output_objdir/$soname-ltdll.c~
+- test -f $output_objdir/$soname-ltdll.$objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~'
+- else
+- ltdll_obj=
+- ltdll_cmds=
+- fi
+-
+- # Extract the symbol export list from an `--export-all' def file,
+- # then regenerate the def file from the symbol export list, so that
+- # the compiled dll only exports the symbol export list.
+- # Be careful not to strip the DATA tag left be newer dlltools.
+- export_symbols_cmds="$ltdll_cmds"'
+- $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~
+- sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols'
+-
+- # If the export-symbols file already is a .def file (1st line
+- # is EXPORTS), use it as is.
+- # If DATA tags from a recent dlltool are present, honour them!
+- archive_expsym_cmds='if test "x`head -n 1 $export_symbols`" = xEXPORTS; then
+- cp $export_symbols $output_objdir/$soname-def;
+- else
+- echo EXPORTS > $output_objdir/$soname-def;
+- _lt_hint=1;
+- cat $export_symbols | while read symbol; do
+- set dummy \$symbol;
+- case \[$]# in
+- 2) echo " \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
+- *) echo " \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;;
+- esac;
+- _lt_hint=`expr 1 + \$_lt_hint`;
+- done;
+- fi~
+- '"$ltdll_cmds"'
+- $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
+- $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp~
+- $CC -Wl,--base-file,$output_objdir/$soname-base $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
+- $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp --output-lib $output_objdir/$libname.dll.a~
+- $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags'
+- ;;
+-
+- darwin* | rhapsody*)
+- allow_undefined_flag='-undefined suppress'
+- archive_cmds='$CC `test .$module = .yes && echo -bundle || echo -dynamiclib` $allow_undefined_flag -o $lib $libobjs $deplibs $linkopts -install_name $rpath/$soname `test -n "$verstring" -a x$verstring != x0.0 && echo $verstring`'
+- # We need to add '_' to the symbols in $export_symbols first
+- #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
+- hardcode_direct=yes
+- hardcode_shlibpath_var=no
+- whole_archive_flag_spec='-all_load $convenience'
+- ;;
+-
+- netbsd*)
+- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+- archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+- wlarc=
+- else
+- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+- fi
+- ;;
+-
+- solaris* | sysv5*)
+- if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
+- ld_shlibs=no
+- cat <<EOF 1>&2
+-
+-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+-*** create shared libraries on Solaris systems. Therefore, libtool
+-*** is disabling shared libraries support. We urge you to upgrade GNU
+-*** binutils to release 2.9.1 or newer. Another option is to modify
+-*** your PATH or compiler configuration so that the native linker is
+-*** used, and then restart.
+-
+-EOF
+- elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+- else
+- ld_shlibs=no
+- fi
+- ;;
+-
+- sunos4*)
+- archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+- wlarc=
+- hardcode_direct=yes
+- hardcode_shlibpath_var=no
+- ;;
+-
+- *)
+- if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+- else
+- ld_shlibs=no
+- fi
+- ;;
+- esac
+-
+- case "$host_os" in
+- freebsd*)
+- skip_need_lc_check=yes
+- ;;
+- esac
+-
+- if test "$ld_shlibs" = yes; then
+- runpath_var=LD_RUN_PATH
+- hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
+- export_dynamic_flag_spec='${wl}--export-dynamic'
+- case $host_os in
+- cygwin* | mingw*)
+- # dlltool doesn't understand --whole-archive et. al.
+- whole_archive_flag_spec=
+- ;;
+- *)
+- # ancient GNU ld didn't support --whole-archive et. al.
+- if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then
+- whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+- else
+- whole_archive_flag_spec=
+- fi
+- ;;
+- esac
+- fi
+-else
+- # PORTME fill in a description of your system's linker (not GNU ld)
+- case $host_os in
+- aix3*)
+- allow_undefined_flag=unsupported
+- always_export_symbols=yes
+- archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+- # Note: this linker hardcodes the directories in LIBPATH if there
+- # are no directories specified by -L.
+- hardcode_minus_L=yes
+- if test "$with_gcc" = yes && test -z "$link_static_flag"; then
+- # Neither direct hardcoding nor static linking is supported with a
+- # broken collect2.
+- hardcode_direct=unsupported
+- fi
+- ;;
+-
+- aix4* | aix5*)
+- hardcode_direct=yes
+- hardcode_libdir_separator=':'
+- link_all_deplibs=yes
+- # When large executables or shared objects are built, AIX ld can
+- # have problems creating the table of contents. If linking a library
+- # or program results in "error TOC overflow" add -mminimal-toc to
+- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
+- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+- if test "$with_gcc" = yes; then
+- case $host_os in aix4.[012]|aix4.[012].*)
+- # 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`
+- if test -f "$collect2name" && \
+- strings "$collect2name" | grep resolve_lib_name >/dev/null
+- then
+- # We have reworked collect2
+- hardcode_direct=yes
+- else
+- # We have old collect2
+- hardcode_direct=unsupported
+- # It fails to find uninstalled libraries when the uninstalled
+- # path is not listed in the libpath. Setting hardcode_minus_L
+- # to unsupported forces relinking
+- hardcode_minus_L=yes
+- hardcode_libdir_flag_spec='-L$libdir'
+- hardcode_libdir_separator=
+- fi
+- esac
+- shared_flag='-shared'
+- else
+- # not using gcc
+- if test "$host_cpu" = ia64; then
+- shared_flag='${wl}-G'
+- else
+- shared_flag='${wl}-bM:SRE'
+- fi
+- fi
+-
+- 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.
+- aix_use_runtimelinking=no
+- exp_sym_flag='-Bexport'
+- no_entry_flag=""
+- else
+- # KDE requires run time linking. Make it the default.
+- aix_use_runtimelinking=yes
+- exp_sym_flag='-bexport'
+- no_entry_flag='-bnoentry'
+- fi
+- # Let the compiler handle the export list.
+- always_export_symbols=no
+- if test "$aix_use_runtimelinking" = yes; then
+- # Warning - without using the other run time loading flags (-brtl), -berok will
+- # link without error, but may produce a broken library.
+- allow_undefined_flag=' ${wl}-berok'
+- # The following three lines along with hardcode_into_libs=yes put the correct path into libraries.
+- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir${libdir:+:}/usr/lib:/lib'
+- archive_cmds='$CC '"$shared_flag"' $libobjs $deplibs $compiler_flags ${wl}-G '"$hardcode_libdir_flag_spec"' -o $lib'
+- archive_expsym_cmds='$CC '"$shared_flag"' $libobjs $deplibs $compiler_flags ${wl}-G '"$hardcode_libdir_flag_spec"' ${wl}'"$exp_sym_flag"':$export_symbols -o $lib'
+- else
+- if test "$host_cpu" = ia64; then
+- hardcode_libdir_flag_spec='${wl}-R $libdir${libdir:+:}/usr/lib:/lib'
+- allow_undefined_flag="-z nodefs"
+- archive_cmds='$CC '"$shared_flag"' $libobjs $deplibs $compiler_flags '"$hardcode_libdir_flag_spec"' -o $lib'
+- archive_expsym_cmds='$CC '"$shared_flag"' $libobjs $deplibs $compiler_flags '"$hardcode_libdir_flag_spec"' ${wl}'"$exp_sym_flag"':$export_symbols -o $lib'
+- else
+- allow_undefined_flag=' ${wl}-berok'
+- # -bexpall does not export symbols beginning with underscore (_)
+- always_export_symbols=yes
+- # Exported symbols can be pulled into shared objects from archives
+- whole_archive_flag_spec=' '
+- build_libtool_need_lc=yes
+- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
+- # This is similar to how AIX traditionally builds it's shared libraries.
+- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+- fi
+- fi
+- ;;
+-
+- amigaos*)
+- archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+- hardcode_libdir_flag_spec='-L$libdir'
+- hardcode_minus_L=yes
+- # see comment about different semantics on the GNU ld section
+- ld_shlibs=no
+- ;;
+-
+- cygwin* | mingw*)
+- # When not using gcc, we currently assume that we are using
+- # Microsoft Visual C++.
+- # hardcode_libdir_flag_spec is actually meaningless, as there is
+- # no search path for DLLs.
+- hardcode_libdir_flag_spec=' '
+- allow_undefined_flag=unsupported
+- # Tell ltmain to make .lib files, not .a files.
+- libext=lib
+- # FIXME: Setting linknames here is a bad hack.
+- archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames='
+- # The linker will automatically build a .lib file if we build a DLL.
+- old_archive_from_new_cmds='true'
+- # FIXME: Should let the user specify the lib program.
+- old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
+- fix_srcfile_path='`cygpath -w "$srcfile"`'
+- ;;
+-
+- freebsd1*)
+- ld_shlibs=no
+- ;;
+-
+- # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+- # support. Future versions do this automatically, but an explicit c++rt0.o
+- # does not break anything, and helps significantly (at the cost of a little
+- # extra space).
+- freebsd2.2*)
+- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+- hardcode_libdir_flag_spec='-R$libdir'
+- hardcode_direct=yes
+- hardcode_shlibpath_var=no
+- ;;
+-
+- # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+- freebsd2*)
+- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+- hardcode_direct=yes
+- hardcode_minus_L=yes
+- hardcode_shlibpath_var=no
+- ;;
+-
+- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+- freebsd*)
+- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+- hardcode_libdir_flag_spec='-R$libdir'
+- hardcode_direct=yes
+- hardcode_shlibpath_var=no
+- skip_need_lc_check=yes
+- ;;
+-
+- hpux9* | hpux10* | hpux11*)
+- case $host_os in
+- hpux9*) archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;;
+- *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;;
+- esac
+- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+- hardcode_libdir_separator=:
+- hardcode_direct=yes
+- hardcode_minus_L=yes # Not in the search PATH, but as the default
+- # location of the library.
+- export_dynamic_flag_spec='${wl}-E'
+- ;;
+-
+- irix5* | irix6*)
+- if test "$with_gcc" = yes; then
+- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+- else
+- archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+- fi
+- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+- hardcode_libdir_separator=:
+- link_all_deplibs=yes
+- ;;
+-
+- netbsd*)
+- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+- else
+- archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
+- fi
+- hardcode_libdir_flag_spec='-R$libdir'
+- hardcode_direct=yes
+- hardcode_shlibpath_var=no
+- ;;
+-
+- newsos6)
+- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
+- hardcode_direct=yes
+- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+- hardcode_libdir_separator=:
+- hardcode_shlibpath_var=no
+- ;;
+-
+- openbsd*)
+- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+- hardcode_libdir_flag_spec='-R$libdir'
+- hardcode_direct=yes
+- hardcode_shlibpath_var=no
+- ;;
+-
+- os2*)
+- hardcode_libdir_flag_spec='-L$libdir'
+- hardcode_minus_L=yes
+- allow_undefined_flag=unsupported
+- archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+- old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+- ;;
+-
+- osf3*)
+- if test "$with_gcc" = yes; then
+- allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+- else
+- allow_undefined_flag=' -expect_unresolved \*'
+- archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+- fi
+- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+- hardcode_libdir_separator=:
+- ;;
+-
+- osf4* | osf5*) # as osf3* with the addition of -msym flag
+- if test "$with_gcc" = yes; then
+- allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+- else
+- allow_undefined_flag=' -expect_unresolved \*'
+- archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+- archive_expsym_cmds='for i in `cat $export_symbols`; do printf "-exported_symbol " >> $lib.exp; echo "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
+- fi
+- hardcode_libdir_flag_spec='-rpath $libdir'
+- hardcode_libdir_separator=:
+- ;;
+-
+- sco3.2v5*)
+- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+- hardcode_shlibpath_var=no
+- runpath_var=LD_RUN_PATH
+- hardcode_runpath_var=yes
+- ;;
+-
+- solaris*)
+- no_undefined_flag=' -z text'
+- # $CC -shared without GNU ld will not create a library from C++
+- # object files and a static libstdc++, better avoid it by now
+- archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+- archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+- hardcode_libdir_flag_spec='-R$libdir'
+- hardcode_shlibpath_var=no
+- case $host_os in
+- solaris2.[0-5] | solaris2.[0-5].*) ;;
+- *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+- whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
+- esac
+- link_all_deplibs=yes
+- ;;
+-
+- sunos4*)
+- archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+- hardcode_libdir_flag_spec='-L$libdir'
+- hardcode_direct=yes
+- hardcode_minus_L=yes
+- hardcode_shlibpath_var=no
+- ;;
+-
+- sysv4)
+- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+- runpath_var='LD_RUN_PATH'
+- hardcode_shlibpath_var=no
+- hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+- ;;
+-
+- sysv4.3*)
+- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+- hardcode_shlibpath_var=no
+- export_dynamic_flag_spec='-Bexport'
+- ;;
+-
+- sysv5*)
+- no_undefined_flag=' -z text'
+- # $CC -shared without GNU ld will not create a library from C++
+- # object files and a static libstdc++, better avoid it by now
+- archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+- archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+- hardcode_libdir_flag_spec=
+- hardcode_shlibpath_var=no
+- runpath_var='LD_RUN_PATH'
+- ;;
+-
+- uts4*)
+- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+- hardcode_libdir_flag_spec='-L$libdir'
+- hardcode_shlibpath_var=no
+- ;;
+-
+- dgux*)
+- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+- hardcode_libdir_flag_spec='-L$libdir'
+- hardcode_shlibpath_var=no
+- ;;
+-
+- sysv4*MP*)
+- if test -d /usr/nec; then
+- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+- hardcode_shlibpath_var=no
+- runpath_var=LD_RUN_PATH
+- hardcode_runpath_var=yes
+- ld_shlibs=yes
+- fi
+- ;;
+-
+- sysv4.2uw2*)
+- archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+- hardcode_direct=yes
+- hardcode_minus_L=no
+- hardcode_shlibpath_var=no
+- hardcode_runpath_var=yes
+- runpath_var=LD_RUN_PATH
+- ;;
+-
+- unixware7*)
+- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+- runpath_var='LD_RUN_PATH'
+- hardcode_shlibpath_var=no
+- ;;
+-
+- *)
+- ld_shlibs=no
+- ;;
+- esac
+-fi
+-
+-## Compiler Characteristics: PIC flags, static flags, etc
+-if test "X${ac_cv_prog_cc_pic+set}" = Xset; then
+- :
+-else
+- ac_cv_prog_cc_pic=
+- ac_cv_prog_cc_shlib=
+- ac_cv_prog_cc_wl=
+- ac_cv_prog_cc_static=
+- ac_cv_prog_cc_no_builtin=
+- ac_cv_prog_cc_can_build_shared=$can_build_shared
+-
+- if test "$with_gcc" = yes; then
+- ac_cv_prog_cc_wl='-Wl,'
+- ac_cv_prog_cc_static='-static'
+-
+- case $host_os in
+- aix*)
+- # All AIX code is PIC.
+- if test "$host_cpu" = ia64; then
+- # AIX 5 now supports IA64 processor
+- lt_cv_prog_cc_static='-Bstatic'
+- else
+- lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
+- fi
+- ;;
+- amigaos*)
+- # FIXME: we need at least 68020 code to build shared libraries, but
+- # adding the `-m68020' flag to GCC prevents building anything better,
+- # like `-m68040'.
+- ac_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
+- ;;
+- beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
+- # PIC is the default for these OSes.
+- ;;
+- cygwin* | mingw* | os2*)
+- # This hack is so that the source file can tell whether it is being
+- # built for inclusion in a dll (and should export symbols for example).
+- ac_cv_prog_cc_pic='-DDLL_EXPORT'
+- ;;
+- darwin* | rhapsody*)
+- # PIC is the default on this platform
+- # Common symbols not allowed in MH_DYLIB files
+- lt_cv_prog_cc_pic='-fno-common'
+- ;;
+- *djgpp*)
+- # DJGPP does not support shared libraries at all
+- ac_cv_prog_cc_pic=
+- ;;
+- sysv4*MP*)
+- if test -d /usr/nec; then
+- ac_cv_prog_cc_pic=-Kconform_pic
+- fi
+- ;;
+- *)
+- ac_cv_prog_cc_pic='-fPIC'
+- ;;
+- esac
+- else
+- # PORTME Check for PIC flags for the system compiler.
+- case $host_os in
+- aix*)
+- # All AIX code is PIC.
+- ac_cv_prog_cc_static="$ac_cv_prog_cc_static ${ac_cv_prog_cc_wl}-lC"
+- ;;
+-
+- hpux9* | hpux10* | hpux11*)
+- # Is there a better ac_cv_prog_cc_static that works with the bundled CC?
+- ac_cv_prog_cc_wl='-Wl,'
+- ac_cv_prog_cc_static="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+- ac_cv_prog_cc_pic='+Z'
+- ;;
+-
+- irix5* | irix6*)
+- ac_cv_prog_cc_wl='-Wl,'
+- ac_cv_prog_cc_static='-non_shared'
+- # PIC (with -KPIC) is the default.
+- ;;
+-
+- cygwin* | mingw* | os2*)
+- # This hack is so that the source file can tell whether it is being
+- # built for inclusion in a dll (and should export symbols for example).
+- ac_cv_prog_cc_pic='-DDLL_EXPORT'
+- ;;
+-
+- linux*)
+- case "$CC" in
+- ccc*)
+- # Compaq C
+- # It appears that all Alpha
+- # Linux and Compaq Tru64 Unix objects are PIC.
+- ac_cv_prog_cc_static='-non_shared'
+- ;;
+- KCC*)
+- # KAI C++
+- ac_cv_prog_cc_pic='-fPIC'
+- ac_cv_prog_cc_wl='--backend -Wl,'
+- ac_cv_prog_cc_static='-Bstatic'
+- ;;
+- *)
+- ;;
+- esac
+- ;;
+-
+- newsos6)
+- ac_cv_prog_cc_pic='-KPIC'
+- ac_cv_prog_cc_static='-Bstatic'
+- ;;
+-
+- osf3* | osf4* | osf5*)
+- # All OSF/1 code is PIC.
+- ac_cv_prog_cc_wl='-Wl,'
+- ac_cv_prog_cc_static='-non_shared'
+- ;;
+-
+- sco3.2v5*)
+- ac_cv_prog_cc_pic='-Kpic'
+- ac_cv_prog_cc_static='-dn'
+- ac_cv_prog_cc_shlib='-belf'
+- ;;
+-
+- solaris*)
+- ac_cv_prog_cc_pic='-KPIC'
+- ac_cv_prog_cc_static='-Bstatic'
+- ac_cv_prog_cc_wl='-Wl,'
+- ;;
+-
+- sunos4*)
+- ac_cv_prog_cc_pic='-PIC'
+- ac_cv_prog_cc_static='-Bstatic'
+- ac_cv_prog_cc_wl='-Qoption ld '
+- ;;
+-
+- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+- ac_cv_prog_cc_pic='-KPIC'
+- ac_cv_prog_cc_static='-Bstatic'
+- ac_cv_prog_cc_wl='-Wl,'
+- ;;
+-
+- uts4*)
+- ac_cv_prog_cc_pic='-pic'
+- ac_cv_prog_cc_static='-Bstatic'
+- ;;
+-
+- sysv4*MP*)
+- if test -d /usr/nec ;then
+- ac_cv_prog_cc_pic='-Kconform_pic'
+- ac_cv_prog_cc_static='-Bstatic'
+- fi
+- ;;
+-
+- *)
+- ac_cv_prog_cc_can_build_shared=no
+- ;;
+- esac
+- fi
+- case "$host_os" in
+- # Platforms which do not suport PIC and -DPIC is meaningless
+- # on them:
+- *djgpp*)
+- ac_cv_prog_cc_pic=
+- ;;
+- *)
+- ac_cv_prog_cc_pic="$ac_cv_prog_cc_pic -DPIC"
+- ;;
+- esac
+-fi
+-
+-need_lc=yes
+-if test "$enable_shared" = yes && test "$with_gcc" = yes; then
+- case $archive_cmds in
+- *'~'*)
+- # FIXME: we may have to deal with multi-command sequences.
+- ;;
+- '$CC '*)
+- # Test whether the compiler implicitly links with -lc since on some
+- # systems, -lgcc has to come before -lc. If gcc already passes -lc
+- # to ld, don't add -lc before -lgcc.
+- echo $ac_n "checking whether -lc should be explicitly linked in... $ac_c" 1>&6
+- if eval "test \"`echo '$''{'ac_cv_archive_cmds_needs_lc'+set}'`\" = set"; then
+- echo $ac_n "(cached) $ac_c" 1>&6
+- need_lc=$ac_cv_archive_cmds_needs_lc
+- elif test "x$skip_need_lc_check" = "xyes" ; then
+- echo $ac_n "(skipping, using no) $ac_c" 1>&6
+- need_lc=no
+- else
+- $rm conftest*
+- echo "static int dummy;" > conftest.$ac_ext
+- if { (eval echo ltcf-c.sh:need_lc: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; }; then
+- # Append any warnings to the config.log.
+- cat conftest.err 1>&5
+- soname=conftest
+- lib=conftest
+- libobjs=conftest.$ac_objext
+- deplibs=
+- wl=$ac_cv_prog_cc_wl
+- compiler_flags=-v
+- linker_flags=-v
+- verstring=
+- output_objdir=.
+- libname=conftest
+- save_allow_undefined_flag=$allow_undefined_flag
+- allow_undefined_flag=
+- if { (eval echo ltcf-c.sh:need_lc: \"$archive_cmds\") 1>&5; (eval $archive_cmds) 2>&1 | grep " -lc " 1>&5 ; }; then
+- need_lc=no
+- fi
+- allow_undefined_flag=$save_allow_undefined_flag
+- else
+- cat conftest.err 1>&5
+- fi
+- fi
+- $rm conftest*
+- echo "$ac_t$need_lc" 1>&6
+- ;;
+- esac
+-fi
+-ac_cv_archive_cmds_needs_lc=$need_lc
+--- a/admin/ltcf-cxx.sh
++++ /dev/null
+@@ -1,1045 +0,0 @@
+-#### This script is meant to be sourced by ltconfig.
+-
+-# ltcf-cxx.sh - Create a C++ compiler specific configuration
+-#
+-# Copyright (C) 1996-1999, 2000, 2001 Free Software Foundation, Inc.
+-# Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+-#
+-# Original C++ support by:Gary V. Vaughan <gvv at techie.com>
+-# Alexandre Oliva <oliva at lsd.ic.unicamp.br>
+-# Ossama Othman <ossama at debian.org>
+-# Thomas Thanner <tanner at gmx.de>
+-#
+-# This file is free software; you can redistribute it and/or modify it
+-# under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2 of the License, or
+-# (at your option) any later version.
+-#
+-# This program is distributed in the hope that it will be useful, but
+-# WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-# General Public License for more details.
+-#
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+-#
+-# As a special exception to the GNU General Public License, if you
+-# distribute this file as part of a program that contains a
+-# configuration script generated by Autoconf, you may include it under
+-# the same distribution terms that you use for the rest of that program.
+-
+-
+-# Source file extension for C++ test sources.
+-ac_ext=cc
+-
+-# Object file extension for compiled C++ test sources.
+-objext=o
+-
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;"
+-
+-# Code to be used in simple link tests
+-lt_simple_link_test_code='int main(int, char *[]) { return (0); }'
+-
+-# C++ compiler
+-CXX=${CXX-c++}
+-
+-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+-CC=${CC-"$CXX"}
+-CFLAGS=${CFLAGS-"$CXXFLAGS"}
+-
+-# Allow CC (or CXX) to be a program name with arguments.
+-set dummy $CC
+-compiler=$2
+-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
+-
+-# we are optimistic. (Too optimistic if you ask me, down there we switch it
+-# off again for most platforms ;) (MM)
+-ld_shlibs=yes
+-
+-# Check if we are using GNU gcc (taken/adapted from configure script)
+-# We need to check here since "--with-gcc" is set at configure time,
+-# not ltconfig time!
+-cat > conftest.$ac_ext <<EOF
+-#ifdef __GNUC__
+- yes;
+-#endif
+-EOF
+-if { ac_try='${CC-c++} -E conftest.$ac_ext'; { (eval echo \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+- with_gcc=yes
+-
+- # Set up default GNU C++ configuration
+-
+- # Check if GNU C++ uses GNU ld as the underlying linker, since the
+- # archiving commands below assume that GNU ld is being used.
+- if eval "`$CC -print-prog-name=ld` --version 2>&1" | \
+- egrep 'GNU ld' > /dev/null; then
+- with_gnu_ld=yes
+-
+- archive_cmds='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+- archive_expsym_cmds='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-
+- runpath_var=LD_RUN_PATH
+- hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
+- export_dynamic_flag_spec='${wl}--export-dynamic'
+-
+- # If archive_cmds runs LD, not CC, wlarc should be empty
+- # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+- # investigate it a little bit more. (MM)
+- wlarc='${wl}'
+-
+- # ancient GNU ld didn't support --whole-archive et. al.
+- if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
+- egrep 'no-whole-archive' > /dev/null; then
+- whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+- else
+- whole_archive_flag_spec=
+- fi
+- else
+- with_gnu_ld=no
+- wlarc=
+-
+- # A generic and very simple default shared library creation
+- # command for GNU C++ for the case where it uses the native
+- # 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.
+- archive_cmds='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+- fi
+-
+- # Commands to make compiler produce verbose output that lists
+- # what "hidden" libraries, object files and flags are used when
+- # linking a shared library.
+- output_verbose_link_cmds='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | egrep "\-L"'
+-
+-else
+- with_gcc=no
+- with_gnu_ld=no
+- wlarc=
+-fi
+-
+-echo "ltcf-cxx: with_gcc=$with_gcc ; with_gnu_ld=$with_gnu_ld"
+-
+-# PORTME: fill in a description of your system's C++ link characteristics
+-case $host_os in
+- aix3*)
+- # FIXME: insert proper C++ library support
+- ld_shlibs=no
+- ;;
+- aix4* | aix5*)
+- archive_cmds=''
+- hardcode_direct=yes
+- hardcode_libdir_separator=':'
+- link_all_deplibs=yes
+- # When large executables or shared objects are built, AIX ld can
+- # have problems creating the table of contents. If linking a library
+- # or program results in "error TOC overflow" add -mminimal-toc to
+- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
+- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+- if test "$with_gcc" = yes; then
+- case $host_os in aix4.[012]|aix4.[012].*)
+- # 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`
+- if test -f "$collect2name" && \
+- strings "$collect2name" | grep resolve_lib_name >/dev/null
+- then
+- # We have reworked collect2
+- hardcode_direct=yes
+- else
+- # We have old collect2
+- hardcode_direct=unsupported
+- # It fails to find uninstalled libraries when the uninstalled
+- # path is not listed in the libpath. Setting hardcode_minus_L
+- # to unsupported forces relinking
+- hardcode_minus_L=yes
+- hardcode_libdir_flag_spec='-L$libdir'
+- hardcode_libdir_separator=
+- fi
+- esac
+- shared_flag='-shared'
+- else
+- # not using gcc
+- if test "$host_cpu" = ia64; then
+- shared_flag='${wl}-G'
+- else
+- shared_flag='${wl}-bM:SRE'
+- fi
+- fi
+-
+- 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.
+- aix_use_runtimelinking=no
+- exp_sym_flag='-Bexport'
+- no_entry_flag=""
+- else
+- # KDE requires run time linking. Make it the default.
+- aix_use_runtimelinking=yes
+- exp_sym_flag='-bexport'
+- no_entry_flag='-bnoentry'
+- fi
+- # Let the compiler handle the export list.
+- always_export_symbols=no
+- if test "$aix_use_runtimelinking" = yes; then
+- allow_undefined_flag=' ${wl}-berok'
+- # The following three lines along with hardcode_into_libs=yes put the correct path into libraries.
+- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir${libdir:+:}/usr/lib:/lib'
+- archive_cmds='$CC '"$shared_flag"' $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-G '"$hardcode_libdir_flag_spec"' -o $lib'
+- archive_expsym_cmds='$CC '"$shared_flag"' $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-G '"$hardcode_libdir_flag_spec"' ${wl}'"$exp_sym_flag"':$export_symbols -o $lib'
+- else
+- if test "$host_cpu" = ia64; then
+- hardcode_libdir_flag_spec='${wl}-R $libdir${libdir:+:}/usr/lib:/lib'
+- allow_undefined_flag="-z nodefs"
+- archive_cmds='$CC '"$shared_flag"' $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags '"$hardcode_libdir_flag_spec"' -o $lib'
+- archive_expsym_cmds='$CC '"$shared_flag"' $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags '"$hardcode_libdir_flag_spec"' ${wl}'"$exp_sym_flag"':$export_symbols -o $lib'
+- else
+- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
+- # Warning - without using the other run time loading flags, -berok will
+- # link without error, but may produce a broken library.
+- no_undefined_flag='${wl}-bnoerok'
+- allow_undefined_flag='${wl}-berok"
+- # -bexpall does not export symbols beginning with underscore (_)
+- always_export_symbols=yes
+- # Exported symbols can be pulled into shared objects from archives
+- whole_archive_flag_spec=' '
+- build_libtool_need_lc=yes
+- # This is similar to how AIX traditionally builds it's shared libraries.
+- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+- fi
+- fi
+- ;;
+- chorus*)
+- case $cc_basename in
+- *)
+- # FIXME: insert proper C++ library support
+- ld_shlibs=no
+- ;;
+- esac
+- ;;
+- dgux*)
+- case $cc_basename in
+- ec++)
+- # FIXME: insert proper C++ library support
+- ld_shlibs=no
+- ;;
+- ghcx)
+- # Green Hills C++ Compiler
+- # FIXME: insert proper C++ library support
+- ld_shlibs=no
+- ;;
+- *)
+- # FIXME: insert proper C++ library support
+- ld_shlibs=no
+- ;;
+- esac
+- ;;
+- freebsd*)
+- # FreeBSD uses GNU C++ and GNU ld
+- skip_need_lc_check=yes
+- remove_lgcc=yes
+- ;;
+- hpux*)
+- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+- hardcode_libdir_separator=:
+- hardcode_direct=yes
+- hardcode_minus_L=yes # Not in the search PATH, but as the default
+- # location of the library.
+- export_dynamic_flag_spec='${wl}-E'
+-
+- case $cc_basename in
+- CC)
+- # FIXME: insert proper C++ library support
+- ld_shlibs=no
+- ;;
+- aCC)
+- case $host_os in
+- hpux9*) archive_cmds='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;;
+- *) archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;;
+- esac
+- # Commands to make compiler produce verbose output that lists
+- # what "hidden" libraries, object files and flags are used when
+- # linking a shared library.
+- #
+- # There doesn't appear to be a way to prevent this compiler from
+- # 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.
+- output_verbose_link_cmds='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+- ;;
+- *)
+- if test "$with_gcc" = yes && test "$with_gnu_ld" = no ; then
+- # MM: for HP-UX and g++ -fPIC is needed to link pic objects together
+- case $host_os in
+- hpux9*) archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;;
+- *) archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;;
+- esac
+- output_verbose_link_cmds='$CC -shared -fPIC $CFLAGS -v conftest.$objext 2>&1 | egrep "\-L"'
+- remove_lgcc=yes
+- fi
+- if test "$with_gcc" = no ; then
+- # FIXME: insert proper C++ library support
+- ld_shlibs=no
+- fi
+- ;;
+- esac
+- ;;
+- irix5* | irix6*)
+- case $cc_basename in
+- CC)
+- # SGI C++
+- archive_cmds='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+-
+- # Archives containing C++ object files must be created using
+- # "CC -ar", where "CC" is the IRIX C++ compiler. This is
+- # necessary to make sure instantiated templates are included
+- # in the archive.
+- old_archive_cmds='$CC -ar -WR,-u -o $oldlib $oldobjs'
+- ;;
+- *)
+- if test "$with_gcc" = yes; then
+- if test "$with_gnu_ld" = no; then
+- archive_cmds='$CC -D_LANGUAGE_C_CPLUS_PLUS -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+- else
+- archive_cmds='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -o $lib'
+- fi
+- fi
+- ;;
+- esac
+- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+- hardcode_libdir_separator=:
+- link_all_deplibs=yes
+- ;;
+- linux*)
+- case $cc_basename in
+- KCC)
+- # Kuck and Associates, Inc. (KAI) C++ Compiler
+-
+- # KCC will only create a shared library if the output file
+- # ends with ".so" (or ".sl" for HP-UX), so rename the library
+- # to its proper name (with version) after linking.
+- archive_cmds='templib=`echo $lib | sed -e "s/\.so\..*/\.so/"`; $CC $libobjs $deplibs $compiler_flags --soname $soname -o \$templib; test \$templib = $lib || mv \$templib $lib'
+- archive_expsym_cmds='templib=`echo $lib | sed -e "s/\.so\..*/\.so/"`; $CC $libobjs $deplibs $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; test \$templib = $lib || mv \$templib $lib'
+-
+- # Commands to make compiler produce verbose output that lists
+- # what "hidden" libraries, object files and flags are used when
+- # linking a shared library.
+- #
+- # There doesn't appear to be a way to prevent this compiler from
+- # 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.
+- output_verbose_link_cmds='echo "go to hell"'
+- skip_need_lc_check=yes
+-
+- hardcode_libdir_flag_spec='${wl}--rpath,$libdir'
+- export_dynamic_flag_spec='${wl}--export-dynamic'
+-
+- # Archives containing C++ object files must be created using
+- # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+- # We add also $compiler_flags, to evetually add any --thread_safe or
+- # --exceptions flags (which is also tested when building an .a
+- # archive.
+- old_archive_cmds='$CC -Bstatic $compiler_flags -o $oldlib $oldobjs'
+- ;;
+- cxx)
+- # Compaq C++
+- archive_cmds='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+- archive_expsym_cmds='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+-
+- runpath_var=LD_RUN_PATH
+- hardcode_libdir_flag_spec='-rpath $libdir'
+- hardcode_libdir_separator=:
+-
+- # Commands to make compiler produce verbose output that lists
+- # what "hidden" libraries, object files and flags are used when
+- # linking a shared library.
+- #
+- # There doesn't appear to be a way to prevent this compiler from
+- # 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.
+- output_verbose_link_cmds='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'
+- ;;
+- insure)
+- if test "$with_gcc" = yes; then
+- # Insure++ together with gcc probably means also GNU ld
+- # only -whole-archive isn't supported
+- whole_archive_flag_spec=""
+- # and we can't use -nostdlib, because bloody insure has no way to
+- # output the linkline (-Zvm isn't working as documented), so we don't
+- # know the depending libs. So we hope, insure gets it right anyway.
+- archive_cmds='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+- runpath_var=LD_RUN_PATH
+- hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
+- export_dynamic_flag_spec='${wl}--export-dynamic'
+- output_verbose_link_cmds=""
+- fi
+- esac
+- ;;
+- lynxos*)
+- # FIXME: insert proper C++ library support
+- ld_shlibs=no
+- ;;
+- m88k*)
+- # FIXME: insert proper C++ library support
+- ld_shlibs=no
+- ;;
+- mvs*)
+- case $cc_basename in
+- cxx)
+- # FIXME: insert proper C++ library support
+- ld_shlibs=no
+- ;;
+- *)
+- # FIXME: insert proper C++ library support
+- ld_shlibs=no
+- ;;
+- esac
+- ;;
+- netbsd*)
+- if test "$with_gcc" = no || test "$with_gnu_ld" = no; then
+- # This should only be triggered for NetBSD/a.out
+- # Add in C++ constructor/destructor support
+- if test -f /usr/pkg/lib/c++rt0/c++rt0.o.PIC; then
+- cppopts="/usr/pkg/lib/c++rt0/c++rt0.o.PIC"
+- elif test -f /usr/lib/c++rt0.o; then
+- cppopts="/usr/lib/c++rt0.o"
+- fi
+- archive_cmds='ld -Bshareable -o $lib '"$cppopts"' $libobjs $deplibs $linkopts'
+- fi
+- ;;
+- openbsd*)
+- if test "$with_gcc" = yes && test "$with_gnu_ld" = no; then
+- # MM: OpenBSD 2.7 uses G++, but not GNU ld
+- archive_cmds='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+- archive_expsym_cmds='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+- old_archive_cmds="$old_archive_cmds~"'$RANLIB $oldlib'
+- hardcode_libdir_flag_spec='${wl}-R$libdir'
+- hardcode_direct=yes
+- hardcode_shlibpath_var=no
+- whole_archive_flag_spec='${wl}-Bforcearchive'
+- remove_lgcc=yes
+- fi
+- ;;
+- osf3*)
+- if test "$with_gcc" = yes && test "$with_gnu_ld" = no; then
+- allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+- archive_cmds='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+-
+- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+- hardcode_libdir_separator=:
+-
+- # Commands to make compiler produce verbose output that lists
+- # what "hidden" libraries, object files and flags are used when
+- # linking a shared library.
+- output_verbose_link_cmds='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | egrep "\-L"'
+- else
+- case $cc_basename in
+- KCC)
+- # Kuck and Associates, Inc. (KAI) C++ Compiler
+-
+- # KCC will only create a shared library if the output file
+- # ends with ".so" (or ".sl" for HP-UX), so rename the library
+- # to its proper name (with version) after linking.
+- archive_cmds='templib=`echo $lib | sed -e "s/\.so\..*/\.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+-
+- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+- hardcode_libdir_separator=:
+-
+- # Archives containing C++ object files must be created using
+- # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+- old_archive_cmds='$CC -Bstatic -o $oldlib $oldobjs'
+-
+- ;;
+- RCC)
+- # Rational C++ 2.4.1
+- # FIXME: insert proper C++ library support
+- ld_shlibs=no
+- ;;
+- cxx)
+- allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+- archive_cmds='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+-
+- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+- hardcode_libdir_separator=:
+-
+- # Commands to make compiler produce verbose output that lists
+- # what "hidden" libraries, object files and flags are used when
+- # linking a shared library.
+- #
+- # There doesn't appear to be a way to prevent this compiler from
+- # 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.
+- output_verbose_link_cmds='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "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'
+- ;;
+- *)
+- # FIXME: insert proper C++ library support
+- ld_shlibs=no
+- ;;
+- esac
+- fi
+- ;;
+- osf4* | osf5*)
+- if test "$with_gcc" = yes && test "$with_gnu_ld" = no; then
+- allow_undefined_flag=' -Wl,-expect_unresolved -Wl,\*'
+- no_undefined_flag=' -Wl,-expect_unresolved -Wl,\*'
+- archive_cmds='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+-
+- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+- hardcode_libdir_separator=:
+-
+- # Commands to make compiler produce verbose output that lists
+- # what "hidden" libraries, object files and flags are used when
+- # linking a shared library.
+- output_verbose_link_cmds='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | egrep "\-L"'
+- else
+- case $cc_basename in
+- KCC)
+- # Kuck and Associates, Inc. (KAI) C++ Compiler
+-
+- # KCC will only create a shared library if the output file
+- # ends with ".so" (or ".sl" for HP-UX), so rename the library
+- # to its proper name (with version) after linking.
+- archive_cmds='templib=`echo $lib | sed -e "s/\.so\..*/\.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+-
+- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+- hardcode_libdir_separator=:
+-
+- # Archives containing C++ object files must be created using
+- # the KAI C++ compiler.
+- old_archive_cmds='$CC -o $oldlib $oldobjs'
+- ;;
+- RCC)
+- # Rational C++ 2.4.1
+- # FIXME: insert proper C++ library support
+- ld_shlibs=no
+- ;;
+- cxx)
+- allow_undefined_flag=' -Wl,-expect_unresolved -Wl,\*'
+- no_undefined_flag=' -Wl,-expect_unresolved -Wl,\*'
+- archive_cmds='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -update_registry ${objdir}/so_locations -o $lib'
+-
+- hardcode_libdir_flag_spec='-rpath $libdir'
+- hardcode_libdir_separator=:
+-
+- # Commands to make compiler produce verbose output that lists
+- # what "hidden" libraries, object files and flags are used when
+- # linking a shared library.
+- #
+- # There doesn't appear to be a way to prevent this compiler from
+- # 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.
+- output_verbose_link_cmds='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "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'
+- ;;
+- *)
+- # FIXME: insert proper C++ library support
+- ld_shlibs=no
+- ;;
+- esac
+- fi
+- ;;
+- psos*)
+- # FIXME: insert proper C++ library support
+- ld_shlibs=no
+- ;;
+- sco*)
+- case $cc_basename in
+- CC)
+- # FIXME: insert proper C++ library support
+- ld_shlibs=no
+- ;;
+- *)
+- # FIXME: insert proper C++ library support
+- ld_shlibs=no
+- ;;
+- esac
+- ;;
+- sunos4*)
+- case $cc_basename in
+- CC)
+- # Sun C++ 4.x
+- # FIXME: insert proper C++ library support
+- ld_shlibs=no
+- ;;
+- lcc)
+- # Lucid
+- # FIXME: insert proper C++ library support
+- ld_shlibs=no
+- ;;
+- *)
+- # FIXME: insert proper C++ library support
+- ld_shlibs=no
+- ;;
+- esac
+- ;;
+- solaris*)
+- case $cc_basename in
+- CC)
+- # Sun C++ 4.2, 5.x and Centerline C++
+- no_undefined_flag=' -ztext'
+- archive_cmds='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+- archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+- $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+-
+- hardcode_libdir_flag_spec='-R$libdir'
+- hardcode_shlibpath_var=no
+- case $host_os in
+- solaris2.[0-5] | solaris2.[0-5].*) ;;
+- *)
+- # The C++ compiler is used as linker so we must use $wl
+- # flag to pass the commands to the underlying system
+- # linker.
+- # Supported since Solaris 2.6 (maybe 2.5.1?)
+- whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+- ;;
+- esac
+- link_all_deplibs=yes
+-
+- # Commands to make compiler produce verbose output that lists
+- # what "hidden" libraries, object files and flags are used when
+- # linking a shared library.
+- #
+- # There doesn't appear to be a way to prevent this compiler from
+- # 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.
+- output_verbose_link_cmds='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | egrep "\-R|\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+-
+- # Archives containing C++ object files must be created using
+- # "CC -xar", where "CC" is the Sun C++ compiler. This is
+- # necessary to make sure instantiated templates are included
+- # in the archive.
+- old_archive_cmds='$CC -xar -o $oldlib $oldobjs'
+- ;;
+- gcx)
+- # Green Hills C++ Compiler
+- archive_cmds='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+-
+- # The C++ compiler must be used to create the archive.
+- old_archive_cmds='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+- ;;
+- *)
+- # GNU C++ compiler with Solaris linker
+- if test "$with_gcc" = yes && test "$with_gnu_ld" = no; then
+- if $CC --version | egrep -v '^2\.7' > /dev/null; then
+- archive_cmds='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+- archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+-
+- # Commands to make compiler produce verbose output that lists
+- # what "hidden" libraries, object files and flags are used when
+- # linking a shared library.
+- output_verbose_link_cmds="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | egrep \"\-L\""
+- else
+- # g++ 2.7 appears to require `-G' NOT `-shared' on this
+- # platform.
+- archive_cmds='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+- archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+- $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+-
+- # Commands to make compiler produce verbose output that lists
+- # what "hidden" libraries, object files and flags are used when
+- # linking a shared library.
+- output_verbose_link_cmds="$CC -G $CFLAGS -v conftest.$objext 2>&1 | egrep \"\-L\""
+- fi
+-
+- hardcode_libdir_flag_spec='${wl}-R $wl$libdir'
+- fi
+- ;;
+- esac
+- ;;
+- tandem*)
+- case $cc_basename in
+- NCC)
+- # NonStop-UX NCC 3.20
+- # FIXME: insert proper C++ library support
+- ld_shlibs=no
+- ;;
+- *)
+- # FIXME: insert proper C++ library support
+- ld_shlibs=no
+- ;;
+- esac
+- ;;
+- unixware*)
+- # FIXME: insert proper C++ library support
+- ld_shlibs=no
+- ;;
+- vxworks*)
+- # FIXME: insert proper C++ library support
+- ld_shlibs=no
+- ;;
+- *)
+- # FIXME: insert proper C++ library support
+- ld_shlibs=no
+- ;;
+-esac
+-
+-
+-## Compiler Characteristics: PIC flags, static flags, etc
+-
+-# We don't use cached values here since only the C compiler
+-# characteristics should be cached.
+-ac_cv_prog_cc_pic=
+-ac_cv_prog_cc_shlib=
+-ac_cv_prog_cc_wl=
+-ac_cv_prog_cc_static=
+-ac_cv_prog_cc_no_builtin=
+-ac_cv_prog_cc_can_build_shared=$can_build_shared
+-
+-ac_cv_prog_cc_pic_works=
+-ac_cv_prog_cc_static_works=
+-
+-if test "$with_gcc" = yes; then
+- ac_cv_prog_cc_wl='-Wl,'
+- ac_cv_prog_cc_static='-static'
+-
+- case $host_os in
+- aix*)
+- # All AIX code is PIC.
+- if test "$host_cpu" = ia64; then
+- # AIX 5 now supports IA64 processor
+- lt_cv_prog_cc_static='-Bstatic'
+- else
+- lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
+- fi
+- ;;
+- amigaos*)
+- # FIXME: we need at least 68020 code to build shared libraries, but
+- # adding the `-m68020' flag to GCC prevents building anything better,
+- # like `-m68040'.
+- ac_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
+- ;;
+- beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
+- # PIC is the default for these OSes.
+- ;;
+- cygwin* | mingw* | os2*)
+- # This hack is so that the source file can tell whether it is being
+- # built for inclusion in a dll (and should export symbols for example).
+- ac_cv_prog_cc_pic='-DDLL_EXPORT'
+- ;;
+- darwin* | rhapsody*)
+- # PIC is the default on this platform
+- # Common symbols not allowed in MH_DYLIB files
+- lt_cv_prog_cc_pic='-fno-common'
+- ;;
+- *djgpp*)
+- # DJGPP does not support shared libraries at all
+- ac_cv_prog_cc_pic=
+- ;;
+- sysv4*MP*)
+- if test -d /usr/nec; then
+- ac_cv_prog_cc_pic=-Kconform_pic
+- fi
+- ;;
+- *)
+- ac_cv_prog_cc_pic='-fPIC'
+- ;;
+- esac
+-else
+- case $host_os in
+- aix4* | aix5*)
+- # All AIX code is PIC.
+- if test "$host_cpu" = ia64; then
+- # AIX 5 now supports IA64 processor
+- lt_cv_prog_cc_static='-Bstatic'
+- else
+- lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
+- fi
+- ;;
+- chorus*)
+- case $cc_basename in
+- cxch68)
+- # Green Hills C++ Compiler
+- # ac_cv_prog_cc_static="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+- ;;
+- esac
+- ;;
+- dgux*)
+- case $cc_basename in
+- ec++)
+- ac_cv_prog_cc_pic='-KPIC'
+- ;;
+- ghcx)
+- # Green Hills C++ Compiler
+- ac_cv_prog_cc_pic='-pic'
+- ;;
+- *)
+- ;;
+- esac
+- ;;
+- freebsd*)
+- # FreeBSD uses GNU C++
+- ;;
+- hpux9* | hpux10* | hpux11*)
+- case $cc_basename in
+- CC)
+- ac_cv_prog_cc_wl='-Wl,'
+- ac_cv_prog_cc_static="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+- ac_cv_prog_cc_pic='+Z'
+- ;;
+- aCC)
+- ac_cv_prog_cc_wl='-Wl,'
+- ac_cv_prog_cc_static="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+- ac_cv_prog_cc_pic='+Z'
+- ;;
+- *)
+- ;;
+- esac
+- ;;
+- irix5* | irix6*)
+- case $cc_basename in
+- CC)
+- ac_cv_prog_cc_wl='-Wl,'
+- ac_cv_prog_cc_static='-non_shared'
+- ac_cv_prog_cc_pic='-KPIC'
+- ;;
+- *)
+- ;;
+- esac
+- ;;
+- linux*)
+- case $cc_basename in
+- KCC)
+- # KAI C++ Compiler
+- ac_cv_prog_cc_wl='--backend -Wl,'
+- ac_cv_prog_cc_pic='-fPIC'
+- ac_cv_prog_cc_static='-Bstatic'
+- ;;
+- cxx)
+- # Compaq C++
+- # Make sure the PIC flag is empty. It appears that all Alpha
+- # Linux and Compaq Tru64 Unix objects are PIC.
+- ac_cv_prog_cc_pic=
+- ac_cv_prog_cc_static='-non_shared'
+- ;;
+- *)
+- ;;
+- esac
+- ;;
+- lynxos*)
+- ;;
+- m88k*)
+- ;;
+- mvs*)
+- case $cc_basename in
+- cxx)
+- ac_cv_prog_cc_pic='-W c,exportall'
+- ;;
+- *)
+- ;;
+- esac
+- ;;
+- netbsd*)
+- ;;
+- osf3* | osf4* | osf5*)
+- case $cc_basename in
+- KCC)
+- ac_cv_prog_cc_wl='--backend -Wl,'
+- ;;
+- RCC)
+- # Rational C++ 2.4.1
+- ac_cv_prog_cc_pic='-pic'
+- ;;
+- cxx)
+- # Digital/Compaq C++
+- ac_cv_prog_cc_wl='-Wl,'
+- # Make sure the PIC flag is empty. It appears that all Alpha
+- # Linux and Compaq Tru64 Unix objects are PIC.
+- ac_cv_prog_cc_pic=
+- ac_cv_prog_cc_static='-non_shared'
+- ;;
+- *)
+- ;;
+- esac
+- ;;
+- psos*)
+- ;;
+- sco*)
+- case $cc_basename in
+- CC)
+- ac_cv_prog_cc_pic='-fPIC'
+- ;;
+- *)
+- ;;
+- esac
+- ;;
+- solaris*)
+- case $cc_basename in
+- CC)
+- # Sun C++ 4.2, 5.x and Centerline C++
+- ac_cv_prog_cc_pic='-KPIC'
+- ac_cv_prog_cc_static='-Bstatic'
+- ac_cv_prog_cc_wl='-Qoption ld '
+- ;;
+- gcx)
+- # Green Hills C++ Compiler
+- ac_cv_prog_cc_pic='-PIC'
+- ;;
+- *)
+- ;;
+- esac
+- ;;
+- sunos4*)
+- case $cc_basename in
+- CC)
+- # Sun C++ 4.x
+- ac_cv_prog_cc_pic='-pic'
+- ac_cv_prog_cc_static='-Bstatic'
+- ;;
+- lcc)
+- # Lucid
+- ac_cv_prog_cc_pic='-pic'
+- ;;
+- *)
+- ;;
+- esac
+- ;;
+- tandem*)
+- case $cc_basename in
+- NCC)
+- # NonStop-UX NCC 3.20
+- ac_cv_prog_cc_pic='-KPIC'
+- ;;
+- *)
+- ;;
+- esac
+- ;;
+- unixware*)
+- ;;
+- vxworks*)
+- ;;
+- *)
+- ac_cv_prog_cc_can_build_shared=no
+- ;;
+- esac
+-fi
+-
+-case "$host_os" in
+- # Platforms which do not suport PIC and -DPIC is meaningless
+- # on them:
+- *djgpp*)
+- ac_cv_prog_cc_pic=
+- ;;
+- *)
+- ac_cv_prog_cc_pic="$ac_cv_prog_cc_pic -DPIC"
+- ;;
+-esac
+-
+-
+-# Figure out "hidden" C++ library dependencies from verbose
+-# compiler output whening linking a shared library.
+-cat > conftest.$ac_ext <<EOF
+-class Foo
+-{
+-public:
+- Foo (void) { a = 0; }
+-private:
+- int a;
+-};
+-EOF
+-
+-
+-if (eval $ac_compile) 2>&5; then
+- # Parse the compiler output and extract the necessary
+- # objects, libraries and library flags.
+-
+- # Sentinel used to keep track of whether or not we are before
+- # the conftest object file.
+- pre_test_object_deps_done=no
+-
+- for p in `eval $output_verbose_link_cmds`; do
+-
+- case $p in
+-
+- -L* | -R* | -l*)
+- # Some compilers place space between "-{L,R}" and the path.
+- # Remove the space.
+- if test $p = "-L" \
+- || test $p = "-R"; then
+- prev=$p
+- continue
+- else
+- prev=
+- fi
+-
+- if test "$pre_test_object_deps_done" = no; then
+- case $p in
+- -L* | -R*)
+- # Internal compiler library paths should come after those
+- # provided the user. The postdeps already come after the
+- # user supplied libs so there is no need to process them.
+- if test -z "$compiler_lib_search_path"; then
+- compiler_lib_search_path="${prev}${p}"
+- else
+- compiler_lib_search_path="${compiler_lib_search_path} ${prev}${p}"
+- fi
+- ;;
+- # The "-l" case would never come before the object being
+- # linked, so don't bother handling this case.
+- esac
+- else
+- add="${prev}${p}"
+- if test "x$remove_lgcc" = "xyes" ; then
+- case "$add" in
+- -lgcc ) add="" ;;
+- esac
+- fi
+- if test -n "$add" ; then
+- if test -z "$postdeps"; then
+- postdeps="$add"
+- else
+- postdeps="${postdeps} ${add}"
+- fi
+- fi
+- fi
+- ;;
+-
+- *.$objext)
+- # This assumes that the test object file only shows up
+- # once in the compiler output.
+- if test "$p" = "conftest.$objext"; then
+- pre_test_object_deps_done=yes
+- continue
+- fi
+-
+- if test "$pre_test_object_deps_done" = no; then
+- if test -z "$predep_objects"; then
+- predep_objects="$p"
+- else
+- predep_objects="$predep_objects $p"
+- fi
+- else
+- if test -z "$postdep_objects"; then
+- postdep_objects="$p"
+- else
+- postdep_objects="$postdep_objects $p"
+- fi
+- fi
+- ;;
+-
+- *) ;; # Ignore the rest.
+-
+- esac
+- done
+-
+- # Clean up.
+- rm -f a.out
+-else
+- echo "ltcf-cxx.sh: error: problem compiling test program"
+-fi
+-
+-$rm -f confest.$objext
+-
+-if test "x$skip_need_lc_check" = "xyes" ; then
+- need_lc=no
+-else
+- case " $postdeps " in
+- *" -lc "*) need_lc=no ;;
+- *) need_lc=yes ;;
+- esac
+-fi
+--- a/admin/ltcf-gcj.sh
++++ /dev/null
+@@ -1,636 +0,0 @@
+-#### This script is meant to be sourced by ltconfig.
+-
+-# ltcf-gcj.sh - Create a GCJ compiler specific configuration
+-#
+-# Copyright (C) 1996-1999, 2000, 2001 Free Software Foundation, Inc.
+-# Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+-#
+-# Original GCJ support by:
+-# Alexandre Oliva <oliva at lsd.ic.unicamp.br>
+-#
+-# This file is free software; you can redistribute it and/or modify it
+-# under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2 of the License, or
+-# (at your option) any later version.
+-#
+-# This program is distributed in the hope that it will be useful, but
+-# WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-# General Public License for more details.
+-#
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+-#
+-# As a special exception to the GNU General Public License, if you
+-# distribute this file as part of a program that contains a
+-# configuration script generated by Autoconf, you may include it under
+-# the same distribution terms that you use for the rest of that program.
+-
+-
+-# Source file extension for Java test sources.
+-ac_ext=java
+-
+-# Object file extension for compiled Java test sources.
+-objext=o
+-
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code="class foo {}"
+-
+-# Code to be used in simple link tests
+-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }'
+-
+-## Linker Characteristics
+-case $host_os in
+-cygwin* | mingw*)
+- # FIXME: the MSVC++ port hasn't been tested in a loooong time
+- # When not using gcc, we currently assume that we are using
+- # Microsoft Visual C++.
+- if test "$with_gcc" != yes; then
+- with_gnu_ld=no
+- fi
+- ;;
+-
+-esac
+-
+-ld_shlibs=yes
+-if test "$with_gnu_ld" = yes; then
+- # If archive_cmds runs LD, not CC, wlarc should be empty
+- wlarc='${wl}'
+-
+- # See if GNU ld supports shared libraries.
+- case $host_os in
+- aix3* | aix4*)
+- # On AIX, the GNU linker is very broken
+- ld_shlibs=no
+- cat <<EOF 1>&2
+-
+-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+-*** to be unable to reliably create shared libraries on AIX.
+-*** Therefore, libtool is disabling shared libraries support. If you
+-*** really care for shared libraries, you may want to modify your PATH
+-*** so that a non-GNU linker is found, and then restart.
+-
+-EOF
+- ;;
+-
+- amigaos*)
+- archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+- hardcode_libdir_flag_spec='-L$libdir'
+- hardcode_minus_L=yes
+-
+- # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
+- # that the semantics of dynamic libraries on AmigaOS, at least up
+- # to version 4, is to share data among multiple programs linked
+- # with the same dynamic library. Since this doesn't match the
+- # behavior of shared libraries on other platforms, we can use
+- # them.
+- ld_shlibs=no
+- ;;
+-
+- beos*)
+- if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+- allow_undefined_flag=unsupported
+- # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
+- # support --undefined. This deserves some investigation. FIXME
+- archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+- else
+- ld_shlibs=no
+- fi
+- ;;
+-
+- cygwin* | mingw*)
+- # hardcode_libdir_flag_spec is actually meaningless, as there is
+- # no search path for DLLs.
+- hardcode_libdir_flag_spec='-L$libdir'
+- allow_undefined_flag=unsupported
+- always_export_symbols=yes
+-
+- extract_expsyms_cmds='test -f $output_objdir/impgen.c || \
+- sed -e "/^# \/\* impgen\.c starts here \*\//,/^# \/\* impgen.c ends here \*\// { s/^# //; p; }" -e d < $0 > $output_objdir/impgen.c~
+- test -f $output_objdir/impgen.exe || (cd $output_objdir && \
+- if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \
+- else $CC -o impgen impgen.c ; fi)~
+- $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def'
+-
+- old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib'
+-
+- # cygwin and mingw dlls have different entry points and sets of symbols
+- # to exclude.
+- # FIXME: what about values for MSVC?
+- dll_entry=__cygwin_dll_entry at 12
+- dll_exclude_symbols=DllMain at 12,_cygwin_dll_entry at 12,_cygwin_noncygwin_dll_entry at 12~
+- case $host_os in
+- mingw*)
+- # mingw values
+- dll_entry=_DllMainCRTStartup at 12
+- dll_exclude_symbols=DllMain at 12,DllMainCRTStartup at 12,DllEntryPoint at 12~
+- ;;
+- esac
+-
+- # mingw and cygwin differ, and it's simplest to just exclude the union
+- # of the two symbol sets.
+- dll_exclude_symbols=DllMain at 12,_cygwin_dll_entry at 12,_cygwin_noncygwin_dll_entry at 12,DllMainCRTStartup at 12,DllEntryPoint at 12
+-
+- # recent cygwin and mingw systems supply a stub DllMain which the user
+- # can override, but on older systems we have to supply one (in ltdll.c)
+- if test "x$lt_cv_need_dllmain" = "xyes"; then
+- ltdll_obj='$output_objdir/$soname-ltdll.'"$objext "
+- ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $output_objdir/$soname-ltdll.c~
+- test -f $output_objdir/$soname-ltdll.$objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~'
+- else
+- ltdll_obj=
+- ltdll_cmds=
+- fi
+-
+- # Extract the symbol export list from an `--export-all' def file,
+- # then regenerate the def file from the symbol export list, so that
+- # the compiled dll only exports the symbol export list.
+- # Be careful not to strip the DATA tag left be newer dlltools.
+- export_symbols_cmds="$ltdll_cmds"'
+- $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~
+- sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols'
+-
+- # If the export-symbols file already is a .def file (1st line
+- # is EXPORTS), use it as is.
+- # If DATA tags from a recent dlltool are present, honour them!
+- archive_expsym_cmds='if test "x`head -n 1 $export_symbols`" = xEXPORTS; then
+- cp $export_symbols $output_objdir/$soname-def;
+- else
+- echo EXPORTS > $output_objdir/$soname-def;
+- _lt_hint=1;
+- cat $export_symbols | while read symbol; do
+- set dummy \$symbol;
+- case \[$]# in
+- 2) echo " \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
+- *) echo " \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;;
+- esac;
+- _lt_hint=`expr 1 + \$_lt_hint`;
+- done;
+- fi~
+- '"$ltdll_cmds"'
+- $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
+- $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp~
+- $CC -Wl,--base-file,$output_objdir/$soname-base $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
+- $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp --output-lib $output_objdir/$libname.dll.a~
+- $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags'
+- ;;
+-
+- netbsd*)
+- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+- archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+- wlarc=
+- else
+- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+- fi
+- ;;
+-
+- solaris* | sysv5*)
+- if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
+- ld_shlibs=no
+- cat <<EOF 1>&2
+-
+-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+-*** create shared libraries on Solaris systems. Therefore, libtool
+-*** is disabling shared libraries support. We urge you to upgrade GNU
+-*** binutils to release 2.9.1 or newer. Another option is to modify
+-*** your PATH or compiler configuration so that the native linker is
+-*** used, and then restart.
+-
+-EOF
+- elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+- else
+- ld_shlibs=no
+- fi
+- ;;
+-
+- sunos4*)
+- archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+- wlarc=
+- hardcode_direct=yes
+- hardcode_shlibpath_var=no
+- ;;
+-
+- *)
+- if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+- else
+- ld_shlibs=no
+- fi
+- ;;
+- esac
+-
+- if test "$ld_shlibs" = yes; then
+- runpath_var=LD_RUN_PATH
+- hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
+- export_dynamic_flag_spec='${wl}--export-dynamic'
+- case $host_os in
+- cygwin* | mingw*)
+- # dlltool doesn't understand --whole-archive et. al.
+- whole_archive_flag_spec=
+- ;;
+- *)
+- # ancient GNU ld didn't support --whole-archive et. al.
+- if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then
+- whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+- else
+- whole_archive_flag_spec=
+- fi
+- ;;
+- esac
+- fi
+-else
+- # PORTME fill in a description of your system's linker (not GNU ld)
+- case $host_os in
+- aix3*)
+- allow_undefined_flag=unsupported
+- always_export_symbols=yes
+- archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+- # Note: this linker hardcodes the directories in LIBPATH if there
+- # are no directories specified by -L.
+- hardcode_minus_L=yes
+- if test "$with_gcc" = yes && test -z "$link_static_flag"; then
+- # Neither direct hardcoding nor static linking is supported with a
+- # broken collect2.
+- hardcode_direct=unsupported
+- fi
+- ;;
+-
+- aix4* | aix5*)
+- hardcode_direct=yes
+- hardcode_libdir_separator=':'
+- link_all_deplibs=yes
+- # When large executables or shared objects are built, AIX ld can
+- # have problems creating the table of contents. If linking a library
+- # or program results in "error TOC overflow" add -mminimal-toc to
+- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
+- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+- if test "$with_gcc" = yes; then
+- case $host_os in aix4.[012]|aix4.[012].*)
+- # 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`
+- if test -f "$collect2name" && \
+- strings "$collect2name" | grep resolve_lib_name >/dev/null
+- then
+- # We have reworked collect2
+- hardcode_direct=yes
+- else
+- # We have old collect2
+- hardcode_direct=unsupported
+- # It fails to find uninstalled libraries when the uninstalled
+- # path is not listed in the libpath. Setting hardcode_minus_L
+- # to unsupported forces relinking
+- hardcode_minus_L=yes
+- hardcode_libdir_flag_spec='-L$libdir'
+- hardcode_libdir_separator=
+- fi
+- esac
+- shared_flag='-shared'
+- else
+- # not using gcc
+- if test "$host_cpu" = ia64; then
+- shared_flag='${wl}-G'
+- else
+- shared_flag='${wl}-bM:SRE'
+- fi
+- fi
+-
+- 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.
+- aix_use_runtimelinking=no
+- exp_sym_flag='-Bexport'
+- no_entry_flag=""
+- else
+- # Test if we are trying to use run time linking, or normal AIX style linking.
+- # If -brtl is somewhere in LDFLAGS, we need to do run time linking.
+- aix_use_runtimelinking=no
+- for ld_flag in $LDFLAGS; do
+- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl" ); then
+- aix_use_runtimelinking=yes
+- break
+- fi
+- done
+- exp_sym_flag='-bexport'
+- no_entry_flag='-bnoentry'
+- fi
+- # -bexpall does not export symbols beginning with underscore (_)
+- always_export_symbols=yes
+- if test "$aix_use_runtimelinking" = yes; then
+- # Warning - without using the other run time loading flags (-brtl), -berok will
+- # link without error, but may produce a broken library.
+- allow_undefined_flag=' ${wl}-berok'
+- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
+- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+- else
+- if test "$host_cpu" = ia64; then
+- hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+- allow_undefined_flag="-z nodefs"
+- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+- else
+- allow_undefined_flag=' ${wl}-berok'
+- # -bexpall does not export symbols beginning with underscore (_)
+- always_export_symbols=yes
+- # Exported symbols can be pulled into shared objects from archives
+- whole_archive_flag_spec=' '
+- build_libtool_need_lc=yes
+- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
+- # This is similar to how AIX traditionally builds it's shared libraries.
+- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+- fi
+- fi
+- ;;
+-
+- amigaos*)
+- archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+- hardcode_libdir_flag_spec='-L$libdir'
+- hardcode_minus_L=yes
+- # see comment about different semantics on the GNU ld section
+- ld_shlibs=no
+- ;;
+-
+- cygwin* | mingw*)
+- # When not using gcc, we currently assume that we are using
+- # Microsoft Visual C++.
+- # hardcode_libdir_flag_spec is actually meaningless, as there is
+- # no search path for DLLs.
+- hardcode_libdir_flag_spec=' '
+- allow_undefined_flag=unsupported
+- # Tell ltmain to make .lib files, not .a files.
+- libext=lib
+- # FIXME: Setting linknames here is a bad hack.
+- archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames='
+- # The linker will automatically build a .lib file if we build a DLL.
+- old_archive_from_new_cmds='true'
+- # FIXME: Should let the user specify the lib program.
+- old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
+- fix_srcfile_path='`cygpath -w "$srcfile"`'
+- ;;
+-
+- freebsd1*)
+- ld_shlibs=no
+- ;;
+-
+- # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+- # support. Future versions do this automatically, but an explicit c++rt0.o
+- # does not break anything, and helps significantly (at the cost of a little
+- # extra space).
+- freebsd2.2*)
+- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+- hardcode_libdir_flag_spec='-R$libdir'
+- hardcode_direct=yes
+- hardcode_shlibpath_var=no
+- ;;
+-
+- # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+- freebsd2*)
+- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+- hardcode_direct=yes
+- hardcode_minus_L=yes
+- hardcode_shlibpath_var=no
+- ;;
+-
+- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+- freebsd*)
+- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+- hardcode_libdir_flag_spec='-R$libdir'
+- hardcode_direct=yes
+- hardcode_shlibpath_var=no
+- ;;
+-
+- hpux9* | hpux10* | hpux11*)
+- case $host_os in
+- hpux9*) archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;;
+- *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;;
+- esac
+- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+- hardcode_libdir_separator=:
+- hardcode_direct=yes
+- hardcode_minus_L=yes # Not in the search PATH, but as the default
+- # location of the library.
+- export_dynamic_flag_spec='${wl}-E'
+- ;;
+-
+- irix5* | irix6*)
+- if test "$with_gcc" = yes; then
+- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+- else
+- archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+- fi
+- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+- hardcode_libdir_separator=:
+- link_all_deplibs=yes
+- ;;
+-
+- netbsd*)
+- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+- else
+- archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
+- fi
+- hardcode_libdir_flag_spec='${wl}-R$libdir'
+- hardcode_direct=yes
+- hardcode_shlibpath_var=no
+- ;;
+-
+- openbsd*)
+- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+- hardcode_libdir_flag_spec='-R$libdir'
+- hardcode_direct=yes
+- hardcode_shlibpath_var=no
+- ;;
+-
+- os2*)
+- hardcode_libdir_flag_spec='-L$libdir'
+- hardcode_minus_L=yes
+- allow_undefined_flag=unsupported
+- archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+- old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+- ;;
+-
+- osf3*)
+- if test "$with_gcc" = yes; then
+- allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+- else
+- allow_undefined_flag=' -expect_unresolved \*'
+- archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+- fi
+- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+- hardcode_libdir_separator=:
+- ;;
+-
+- osf4* | osf5*) # as osf3* with the addition of -msym flag
+- if test "$with_gcc" = yes; then
+- allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+- else
+- allow_undefined_flag=' -expect_unresolved \*'
+- archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+- fi
+- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+- hardcode_libdir_separator=:
+- ;;
+-
+- sco3.2v5*)
+- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+- hardcode_shlibpath_var=no
+- runpath_var=LD_RUN_PATH
+- hardcode_runpath_var=yes
+- ;;
+-
+- solaris*)
+- no_undefined_flag=' -z text'
+- # $CC -shared without GNU ld will not create a library from C++
+- # object files and a static libstdc++, better avoid it by now
+- archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+- archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+- hardcode_libdir_flag_spec='-R$libdir'
+- hardcode_shlibpath_var=no
+- case $host_os in
+- solaris2.[0-5] | solaris2.[0-5].*) ;;
+- *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+- whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
+- esac
+- link_all_deplibs=yes
+- ;;
+-
+- sunos4*)
+- archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+- hardcode_libdir_flag_spec='-L$libdir'
+- hardcode_direct=yes
+- hardcode_minus_L=yes
+- hardcode_shlibpath_var=no
+- ;;
+-
+- sysv4)
+- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+- runpath_var='LD_RUN_PATH'
+- hardcode_shlibpath_var=no
+- hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+- ;;
+-
+- sysv4.3*)
+- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+- hardcode_shlibpath_var=no
+- export_dynamic_flag_spec='-Bexport'
+- ;;
+-
+- sysv5*)
+- no_undefined_flag=' -z text'
+- # $CC -shared without GNU ld will not create a library from C++
+- # object files and a static libstdc++, better avoid it by now
+- archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+- archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+- hardcode_libdir_flag_spec=
+- hardcode_shlibpath_var=no
+- runpath_var='LD_RUN_PATH'
+- ;;
+-
+- uts4*)
+- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+- hardcode_libdir_flag_spec='-L$libdir'
+- hardcode_shlibpath_var=no
+- ;;
+-
+- dgux*)
+- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+- hardcode_libdir_flag_spec='-L$libdir'
+- hardcode_shlibpath_var=no
+- ;;
+-
+- sysv4*MP*)
+- if test -d /usr/nec; then
+- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+- hardcode_shlibpath_var=no
+- runpath_var=LD_RUN_PATH
+- hardcode_runpath_var=yes
+- ld_shlibs=yes
+- fi
+- ;;
+-
+- sysv4.2uw2*)
+- archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+- hardcode_direct=yes
+- hardcode_minus_L=no
+- hardcode_shlibpath_var=no
+- hardcode_runpath_var=yes
+- runpath_var=LD_RUN_PATH
+- ;;
+-
+- unixware7*)
+- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+- runpath_var='LD_RUN_PATH'
+- hardcode_shlibpath_var=no
+- ;;
+-
+- *)
+- ld_shlibs=no
+- ;;
+- esac
+-fi
+-
+-## Compiler Characteristics: PIC flags, static flags, etc
+-
+-# We don't use cached values here since only the C compiler
+-# characteristics should be cached.
+- ac_cv_prog_cc_pic=
+- ac_cv_prog_cc_shlib=
+- ac_cv_prog_cc_wl=
+- ac_cv_prog_cc_static=
+- ac_cv_prog_cc_no_builtin=
+- ac_cv_prog_cc_can_build_shared=$can_build_shared
+-
+- ac_cv_prog_cc_wl='-Wl,'
+- ac_cv_prog_cc_static='-static'
+-
+- case $host_os in
+- beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
+- # PIC is the default for these OSes.
+- ;;
+- aix*)
+- # Below there is a dirty hack to force normal static linking with -ldl
+- # The problem is because libdl dynamically linked with both libc and
+- # libC (AIX C++ library), which obviously doesn't included in libraries
+- # list by gcc. This cause undefined symbols with -static flags.
+- # This hack allows C programs to be linked with "-static -ldl", but
+- # we not sure about C++ programs.
+- ac_cv_prog_cc_static="$ac_cv_prog_cc_static ${ac_cv_prog_cc_wl}-lC"
+- ;;
+- *djgpp*)
+- # DJGPP does not suppot shared libraries at all
+- ac_cv_prog_cc_pic=
+- ;;
+- cygwin* | mingw* | os2*)
+- # This hack is so that the source file can tell whether it is being
+- # built for inclusion in a dll (and should export symbols for example).
+- ac_cv_prog_cc_pic='-DDLL_EXPORT'
+- ;;
+- amigaos*)
+- # FIXME: we need at least 68020 code to build shared libraries, but
+- # adding the `-m68020' flag to GCC prevents building anything better,
+- # like `-m68040'.
+- ac_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
+- ;;
+- sysv4*MP*)
+- if test -d /usr/nec; then
+- ac_cv_prog_cc_pic=-Kconform_pic
+- fi
+- ;;
+- *)
+- ac_cv_prog_cc_pic='-fPIC'
+- ;;
+- esac
+-
+-# GCJ did not exist at the time GCC didn't implicitly link libc in.
+-need_lc=no
+-
+-# All existing releases of GCJ support `-c -o'.
+-lt_cv_compiler_c_o=yes
+--- a/admin/ltconfig
++++ /dev/null
+@@ -1,2795 +0,0 @@
+-#! /bin/sh
+-
+-# ltconfig - Create a system-specific libtool.
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+-# Free Software Foundation, Inc.
+-# Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+-#
+-# This file is free software; you can redistribute it and/or modify it
+-# under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2 of the License, or
+-# (at your option) any later version.
+-#
+-# This program is distributed in the hope that it will be useful, but
+-# WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-# General Public License for more details.
+-#
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+-#
+-# As a special exception to the GNU General Public License, if you
+-# distribute this file as part of a program that contains a
+-# configuration script generated by Autoconf, you may include it under
+-# the same distribution terms that you use for the rest of that program.
+-
+-# A lot of this script is taken from autoconf-2.10.
+-
+-# Check that we are running under the correct shell.
+-SHELL=${CONFIG_SHELL-/bin/sh}
+-echo=echo
+-if test "X$1" = X--no-reexec; then
+- # Discard the --no-reexec flag, and continue.
+- shift
+-elif test "X$1" = X--fallback-echo; then
+- # Avoid inline document here, it may be left over
+- :
+-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
+- # Yippee, $echo works!
+- :
+-else
+- # Restart under the correct shell.
+- exec "$SHELL" "$0" --no-reexec ${1+"$@"}
+-fi
+-
+-if test "X$1" = X--fallback-echo; then
+- # used as fallback echo
+- shift
+- cat <<EOF
+-$*
+-EOF
+- exit 0
+-fi
+-
+-# Find the correct PATH separator. Usually this is `:', but
+-# DJGPP uses `;' like DOS.
+-if test "X${PATH_SEPARATOR+set}" != Xset; then
+- UNAME=${UNAME-`uname 2>/dev/null`}
+- case X$UNAME in
+- *-DOS) PATH_SEPARATOR=';' ;;
+- *) PATH_SEPARATOR=':' ;;
+- esac
+-fi
+-
+-# The HP-UX ksh and POSIX shell print the target directory to stdout
+-# if CDPATH is set.
+-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+-
+-if test "X${echo_test_string+set}" != Xset; then
+- # find a string as large as possible, as long as the shell can cope with it
+- for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
+- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+- if (echo_test_string="`eval $cmd`") 2>/dev/null &&
+- echo_test_string="`eval $cmd`" &&
+- (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null; then
+- break
+- fi
+- done
+-fi
+-
+-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+- test "X$echo_testing_string" = "X$echo_test_string"; then
+- :
+-else
+- # The Solaris, AIX, and Digital Unix default echo programs unquote
+- # backslashes. This makes it impossible to quote backslashes using
+- # echo "$something" | sed 's/\\/\\\\/g'
+- #
+- # So, first we look for a working echo in the user's PATH.
+-
+- IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
+- for dir in $PATH /usr/ucb; do
+- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+- test "X$echo_testing_string" = "X$echo_test_string"; then
+- echo="$dir/echo"
+- break
+- fi
+- done
+- IFS="$save_ifs"
+-
+- if test "X$echo" = Xecho; then
+- # We didn't find a better echo, so look for alternatives.
+- if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
+- echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
+- test "X$echo_testing_string" = "X$echo_test_string"; then
+- # This shell has a builtin print -r that does the trick.
+- echo='print -r'
+- elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
+- test "X$CONFIG_SHELL" != X/bin/ksh; then
+- # If we have ksh, try running ltconfig again with it.
+- ORIGINAL_CONFIG_SHELL="${CONFIG_SHELL-/bin/sh}"
+- export ORIGINAL_CONFIG_SHELL
+- CONFIG_SHELL=/bin/ksh
+- export CONFIG_SHELL
+- exec "$CONFIG_SHELL" "$0" --no-reexec ${1+"$@"}
+- else
+- # Try using printf.
+- echo='printf %s\n'
+- if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+- test "X$echo_testing_string" = "X$echo_test_string"; then
+- # Cool, printf works
+- :
+- elif echo_testing_string=`("$ORIGINAL_CONFIG_SHELL" "$0" --fallback-echo '\t') 2>/dev/null` &&
+- test "X$echo_testing_string" = 'X\t' &&
+- echo_testing_string=`("$ORIGINAL_CONFIG_SHELL" "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+- test "X$echo_testing_string" = "X$echo_test_string"; then
+- CONFIG_SHELL="$ORIGINAL_CONFIG_SHELL"
+- export CONFIG_SHELL
+- SHELL="$CONFIG_SHELL"
+- export SHELL
+- echo="$CONFIG_SHELL $0 --fallback-echo"
+- elif echo_testing_string=`("$CONFIG_SHELL" "$0" --fallback-echo '\t') 2>/dev/null` &&
+- test "X$echo_testing_string" = 'X\t' &&
+- echo_testing_string=`("$CONFIG_SHELL" "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+- test "X$echo_testing_string" = "X$echo_test_string"; then
+- echo="$CONFIG_SHELL $0 --fallback-echo"
+- else
+- # maybe with a smaller string...
+- prev=:
+-
+- for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
+- if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null; then
+- break
+- fi
+- prev="$cmd"
+- done
+-
+- if test "$prev" != 'sed 50q "$0"'; then
+- echo_test_string=`eval $prev`
+-
+- export echo_test_string
+- exec "${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}}" "$0" ${1+"$@"}
+- else
+- # Oops. We lost completely, so just stick with echo.
+- echo=echo
+- fi
+- fi
+- fi
+- fi
+-fi
+-
+-# Sed substitution that helps us do robust quoting. It backslashifies
+-# metacharacters that are still active within double-quoted strings.
+-Xsed='sed -e s/^X//'
+-sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
+-
+-# Same as above, but do not quote variable references.
+-double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'
+-
+-# Sed substitution to delay expansion of an escaped shell variable in a
+-# double_quote_subst'ed string.
+-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+-
+-# The name of this program.
+-progname=`$echo "X$0" | $Xsed -e 's%^.*/%%'`
+-
+-# Constants:
+-PROGRAM=ltconfig
+-PACKAGE=libtool
+-VERSION=1.4a
+-TIMESTAMP=" (1.641.2.206mm 2001/04/03 21:47:47)"
+-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-rm="rm -f"
+-
+-help="Try \`$progname --help' for more information."
+-
+-# Global variables:
+-default_ofile=libtool
+-can_build_shared=yes
+-enable_shared=yes
+-# All known linkers require a `.a' archive for static linking (except M$VC,
+-# which needs '.lib').
+-enable_static=yes
+-enable_fast_install=yes
+-enable_dlopen=unknown
+-enable_win32_dll=no
+-pic_mode=default
+-ltmain=
+-silent=
+-srcdir=
+-ac_config_guess=
+-ac_config_sub=
+-host=
+-build=NONE
+-nonopt=NONE
+-ofile="$default_ofile"
+-verify_host=yes
+-tagname=
+-with_gcc=no
+-with_gnu_ld=no
+-need_locks=yes
+-ac_ext=c
+-libext=a
+-cache_file=
+-max_cmd_len=
+-
+-## Dependencies to place before and after the object being linked:
+-predep_objects=
+-postdep_objects=
+-predeps=
+-postdeps=
+-compiler_lib_search_path=
+-
+-## Link characteristics:
+-allow_undefined_flag=
+-no_undefined_flag=
+-need_lib_prefix=unknown
+-need_version=unknown
+-# when you set need_version to no, make sure it does not cause -set_version
+-# flags to be left without arguments
+-archive_cmds=
+-archive_expsym_cmds=
+-old_archive_from_new_cmds=
+-old_archive_from_expsyms_cmds=
+-striplib=
+-old_striplib=
+-export_dynamic_flag_spec=
+-whole_archive_flag_spec=
+-thread_safe_flag_spec=
+-hardcode_into_libs=no
+-hardcode_libdir_flag_spec=
+-hardcode_libdir_separator=
+-hardcode_direct=no
+-hardcode_minus_L=no
+-hardcode_shlibpath_var=unsupported
+-runpath_var=
+-link_all_deplibs=unknown
+-always_export_symbols=no
+-export_symbols_cmds='$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*
+-# included in the symbol list
+-include_expsyms=
+-# exclude_expsyms can be an egrep regular expression of symbols to exclude
+-# 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'.
+-exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
+-# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+-# platforms (ab)use it in PIC code, but their linkers get confused if
+-# the symbol is explicitly referenced. Since portable code cannot
+-# rely on this symbol name, it's probably fine to never include it in
+-# preloaded symbol tables.
+-extract_expsyms_cmds=
+-
+-## Tools:
+-old_AR="$AR"
+-old_AR_FLAGS="$AR_FLAGS"
+-old_CC="$CC"
+-old_CFLAGS="$CFLAGS"
+-old_CPPFLAGS="$CPPFLAGS"
+-old_LDFLAGS="$LDFLAGS"
+-old_LIBS="$LIBS"
+-old_MAGIC_CMD="$MAGIC_CMD"
+-old_LD="$LD"
+-old_LN_S="$LN_S"
+-old_LTCC="$LTCC"
+-old_NM="$NM"
+-old_RANLIB="$RANLIB"
+-old_STRIP="$STRIP"
+-old_AS="$AS"
+-old_DLLTOOL="$DLLTOOL"
+-old_OBJDUMP="$OBJDUMP"
+-old_OBJEXT="$OBJEXT"
+-old_EXEEXT="$EXEEXT"
+-old_reload_flag="$reload_flag"
+-old_deplibs_check_method="$deplibs_check_method"
+-old_file_magic_cmd="$file_magic_cmd"
+-
+-# Parse the command line options.
+-args=
+-prev=
+-for option
+-do
+- case $option in
+- -*=*) optarg=`echo "$option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+- *) optarg= ;;
+- esac
+-
+- # If the previous option needs an argument, assign it.
+- if test -n "$prev"; then
+- eval "$prev=\$option"
+- prev=
+- continue
+- fi
+-
+- case $option in
+- --help) cat <<EOM
+-Usage: $progname [OPTION]... LTMAIN [HOST]
+-
+-Generate a system-specific libtool script.
+-
+- --build configure for building on BUILD [BUILD=HOST]
+- --debug enable verbose shell tracing
+- --disable-shared do not build shared libraries
+- --disable-static do not build static libraries
+- --disable-fast-install do not optimize for fast installation
+- --enable-dlopen enable dlopen support
+- --enable-win32-dll enable building dlls on win32 hosts
+- --help display this help and exit
+- --no-verify do not verify that HOST is a valid host type
+--o, --output=FILE specify the output file [default=$default_ofile]
+- --quiet same as \`--silent'
+- --silent do not print informational messages
+- --srcdir=DIR find \`config.guess' in DIR
+- --version output version information and exit
+- --add-tag=TAG append an alternate configuration
+- --with-gcc assume that the GNU C compiler will be used
+- --with-gnu-ld assume that the C compiler uses the GNU linker
+- --prefer-pic try to use only PIC objects
+- --prefer-non-pic try to use only non-PIC objects
+- --disable-lock disable file locking
+- --cache-file=FILE configure cache file
+-
+-LTMAIN is the \`ltmain.sh' shell script fragment or \`ltmain.c' program
+-that provides basic libtool functionality.
+-
+-HOST is the canonical host system name [default=guessed].
+-EOM
+- exit 0
+- ;;
+-
+- --build) prev=build ;;
+- --build=*) build="$optarg" ;;
+-
+- --debug)
+- echo "$progname: enabling shell trace mode"
+- set -x
+- ;;
+-
+- --disable-shared) enable_shared=no ;;
+-
+- --disable-static) enable_static=no ;;
+-
+- --disable-fast-install) enable_fast_install=no ;;
+-
+- --enable-dlopen) enable_dlopen=yes ;;
+-
+- --enable-win32-dll) enable_win32_dll=yes ;;
+-
+- --quiet | --silent) silent=yes ;;
+-
+- --srcdir) prev=srcdir ;;
+- --srcdir=*) srcdir="$optarg" ;;
+-
+- --no-verify) verify_host=no ;;
+-
+- --output | -o) prev=ofile ;;
+- --output=*) ofile="$optarg" ;;
+-
+- --version) echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"; exit 0 ;;
+-
+- --add-tag) prev=tagname ;;
+- --add-tag=*) tagname="$optarg" ;;
+-
+- --with-gcc) with_gcc=yes ;;
+- --with-gnu-ld) with_gnu_ld=yes ;;
+-
+- --prefer-pic) pic_mode=yes ;;
+- --prefer-non-pic) pic_mode=no ;;
+-
+- --disable-lock) need_locks=no ;;
+-
+- --cache-file=*) cache_file="$optarg" ;;
+-
+- -*)
+- echo "$progname: unrecognized option \`$option'" 1>&2
+- echo "$help" 1>&2
+- exit 1
+- ;;
+-
+- *)
+- if test -z "$ltmain"; then
+- ltmain="$option"
+- elif test -z "$host"; then
+-# This generates an unnecessary warning for sparc-sun-solaris4.1.3_U1
+-# if test -n "`echo $option| sed 's/[-a-z0-9.]//g'`"; then
+-# echo "$progname: warning \`$option' is not a valid host type" 1>&2
+-# fi
+- host="$option"
+- else
+- echo "$progname: too many arguments" 1>&2
+- echo "$help" 1>&2
+- exit 1
+- fi ;;
+- esac
+-done
+-
+-if test -z "$ltmain"; then
+- echo "$progname: you must specify a LTMAIN file" 1>&2
+- echo "$help" 1>&2
+- exit 1
+-fi
+-
+-if test ! -f "$ltmain"; then
+- echo "$progname: \`$ltmain' does not exist" 1>&2
+- echo "$help" 1>&2
+- exit 1
+-fi
+-
+-if test -n "$tagname"; then
+- # Check whether tagname contains only valid characters
+- case `$echo "X$tagname" | $Xsed -e 's/[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]//g'` in
+- "") ;;
+- *)
+- echo "$progname: invalid tag name: $tagname" 1>&2
+- exit 1
+- ;;
+- esac
+-
+- if grep "^### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$ofile" > /dev/null; then
+- echo "$progname: tag name $tagname already exists" 1>&2
+- exit 1
+- fi
+-
+- if test ! -f "$ofile"; then
+- echo "$progname: warning: output file \`$ofile' does not exist" 1>&2
+- fi
+-
+- if test -z "$LTCC"; then
+- eval "`$SHELL $ofile --config | grep '^LTCC='`"
+- if test -z "$LTCC"; then
+- echo "$progname: warning: output file \`$ofile' does not look like a libtool script" 1>&2
+- else
+- echo "$progname: warning: using \`LTCC=$LTCC', extracted from \`$ofile'" 1>&2
+- fi
+- fi
+-fi
+-
+-# Quote any args containing shell metacharacters.
+-ltconfig_args=
+-for arg
+-do
+- case $arg in
+- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
+- ltconfig_args="$ltconfig_args '$arg'" ;;
+- *) ltconfig_args="$ltconfig_args $arg" ;;
+- esac
+-done
+-
+-# A relevant subset of AC_INIT.
+-
+-# File descriptor usage:
+-# 0 standard input
+-# 1 file creation
+-# 2 errors and warnings
+-# 3 some systems may open it to /dev/tty
+-# 4 used on the Kubota Titan
+-# 5 compiler messages saved in config.log
+-# 6 checking for... messages and results
+-if test "$silent" = yes; then
+- exec 6>/dev/null
+-else
+- exec 6>&1
+-fi
+-exec 5>>./config.log
+-
+-# NLS nuisances.
+-# Only set LANG and LC_ALL to C if already set.
+-# These must not be set unconditionally because not all systems understand
+-# e.g. LANG=C (notably SCO).
+-if test "X${LC_ALL+set}" = Xset; then LC_ALL=C; export LC_ALL; fi
+-if test "X${LANG+set}" = Xset; then LANG=C; export LANG; fi
+-
+-if test -n "$cache_file" && test -r "$cache_file" && test -f "$cache_file"; then
+- echo "loading cache $cache_file within ltconfig"
+- . $cache_file
+-fi
+-
+-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
+- # Stardent Vistra SVR4 grep lacks -e, says ghazi at caip.rutgers.edu.
+- if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
+- ac_n= ac_c='
+-' ac_t=' '
+- else
+- ac_n=-n ac_c= ac_t=
+- fi
+-else
+- ac_n= ac_c='\c' ac_t=
+-fi
+-
+-if test -z "$srcdir"; then
+- # Assume the source directory is the same one as the path to LTMAIN.
+- srcdir=`$echo "X$ltmain" | $Xsed -e 's%/[^/]*$%%'`
+- test "$srcdir" = "$ltmain" && srcdir=.
+-fi
+-
+-trap "$rm conftest*; exit 1" 1 2 15
+-if test "$verify_host" = yes; then
+- # Check for config.guess and config.sub.
+- ac_aux_dir=
+- for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
+- if test -f $ac_dir/config.guess; then
+- ac_aux_dir=$ac_dir
+- break
+- fi
+- done
+- if test -z "$ac_aux_dir"; then
+- echo "$progname: cannot find config.guess in $srcdir $srcdir/.. $srcdir/../.." 1>&2
+- echo "$help" 1>&2
+- exit 1
+- fi
+- ac_config_guess=$ac_aux_dir/config.guess
+- ac_config_sub=$ac_aux_dir/config.sub
+-
+- # Make sure we can run config.sub.
+- if $SHELL $ac_config_sub sun4 >/dev/null 2>&1; then :
+- else
+- echo "$progname: cannot run $ac_config_sub" 1>&2
+- echo "$help" 1>&2
+- exit 1
+- fi
+-
+- echo $ac_n "checking host system type""... $ac_c" 1>&6
+-
+- host_alias=$host
+- case $host_alias in
+- "")
+- # Force config.guess to use the C compiler.
+- # CC_FOR_BUILD overrides the CC variable in config.guess but I had
+- # problems with it so do it this way for now.
+- CC="$LTCC"
+-
+- if host_alias=`$SHELL $ac_config_guess`; then :
+- else
+- echo "$progname: cannot guess host type; you must specify one" 1>&2
+- echo "$help" 1>&2
+- exit 1
+- fi
+-
+- # Restore the C compiler.
+- CC="$old_CC"
+- ;;
+- esac
+- host=`$SHELL $ac_config_sub $host_alias`
+- echo "$ac_t$host" 1>&6
+-
+- # Make sure the host verified.
+- test -z "$host" && exit 1
+-
+- # Check for the build system type
+- echo $ac_n "checking build system type... $ac_c" 1>&6
+-
+- build_alias=$build
+- case $build_alias in
+- NONE)
+- case $nonopt in
+- NONE) build_alias=$host_alias ;;
+- *) build_alias=$nonopt ;;
+- esac ;;
+- esac
+-
+- build=`$SHELL $ac_config_sub $build_alias`
+- build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+- build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+- build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+- echo "$ac_t""$build" 1>&6
+-
+-elif test -z "$host"; then
+- echo "$progname: you must specify a host type if you use \`--no-verify'" 1>&2
+- echo "$help" 1>&2
+- exit 1
+-else
+- host_alias=$host
+- build_alias=$host_alias
+- build=$host
+-fi
+-
+-if test x"$host" != x"$build"; then
+- ac_tool_prefix=${host_alias}-
+-else
+- ac_tool_prefix=
+-fi
+-
+-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+-
+-# Transform linux* to *-*-linux-gnu*, to support old configure scripts.
+-case $host_os in
+-linux-gnu*) ;;
+-linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
+-esac
+-
+-case $host_os in
+-aix3*)
+- # AIX sometimes has problems with the GCC collect2 program. For some
+- # reason, if we set the COLLECT_NAMES environment variable, the problems
+- # vanish in a puff of smoke.
+- if test "X${COLLECT_NAMES+set}" != Xset; then
+- COLLECT_NAMES=
+- export COLLECT_NAMES
+- fi
+- ;;
+-esac
+-
+-# Determine commands to create old-style static archives.
+-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+-old_postinstall_cmds='chmod 644 $oldlib'
+-old_postuninstall_cmds=
+-
+-if test -n "$RANLIB"; then
+- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+-fi
+-
+-# Source the script associated with the $tagname tag configuration.
+-if test -n "$tagname"; then
+- . $ltmain
+-else
+- # FIXME: We should use a variable here
+- # Configure for a C compiler
+- . $srcdir/ltcf-c.sh
+-fi
+-
+-# Set sane defaults for various variables
+-test -z "$AR" && AR=ar
+-test -z "$AR_FLAGS" && AR_FLAGS=cru
+-test -z "$AS" && AS=as
+-test -z "$CC" && CC=cc
+-test -z "$DLLTOOL" && DLLTOOL=dlltool
+-test -z "$MAGIC_CMD" && MAGIC_CMD=file
+-test -z "$LD" && LD=ld
+-test -z "$LN_S" && LN_S="ln -s"
+-test -z "$NM" && NM=nm
+-test -z "$OBJDUMP" && OBJDUMP=objdump
+-test -z "$RANLIB" && RANLIB=:
+-test -z "$STRIP" && STRIP=:
+-test -z "$objext" && objext=o
+-
+-echo $ac_n "checking for objdir... $ac_c" 1>&6
+-rm -f .libs 2>/dev/null
+-mkdir .libs 2>/dev/null
+-if test -d .libs; then
+- objdir=.libs
+-else
+- # MS-DOS does not allow filenames that begin with a dot.
+- objdir=_libs
+-fi
+-rmdir .libs 2>/dev/null
+-echo "$ac_t$objdir" 1>&6
+-
+-# If no C compiler was specified, use CC.
+-LTCC=${LTCC-"$CC"}
+-
+-# Allow CC to be a program name with arguments.
+-set dummy $CC
+-compiler="$2"
+-
+-# We assume here that the value for ac_cv_prog_cc_pic will not be cached
+-# in isolation, and that seeing it set (from the cache) indicates that
+-# the associated values are set (in the cache) correctly too.
+-echo $ac_n "checking for $compiler option to produce PIC... $ac_c" 1>&6
+-echo "$progname:678:checking for $compiler option to produce PIC" 1>&5
+-
+-if test -z "$ac_cv_prog_cc_pic"; then
+- echo "$ac_t"none 1>&6
+-else
+- echo "$ac_t""$ac_cv_prog_cc_pic" 1>&6
+-
+- # Check to make sure the pic_flag actually works.
+- echo $ac_n "checking if $compiler PIC flag $ac_cv_prog_cc_pic works... $ac_c" 1>&6
+- echo "$progname:687:checking that $compiler PIC flag $ac_cv_prog_cc_pic works." 1>&5
+- if test "X${ac_cv_prog_cc_pic_works+set}" = Xset && \
+- test "X${ac_cv_prog_cc_pic_works}" != X; then
+- echo $ac_n "(cached) $ac_c" 1>&6
+- else
+- ac_cv_prog_cc_pic_works=yes
+- $rm conftest*
+- echo $lt_simple_compile_test_code > conftest.$ac_ext
+- save_CFLAGS="$CFLAGS"
+- CFLAGS="$CFLAGS $ac_cv_prog_cc_pic -DPIC"
+- if { (eval echo $progname:697: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then
+- # Append any warnings to the config.log.
+- cat conftest.err 1>&5
+-
+- case $host_os in
+- hpux9* | hpux10* | hpux11*)
+- # On HP-UX, both CC and GCC only warn that PIC is supported... then
+- # they create non-PIC objects. So, if there were any warnings, we
+- # assume that PIC is not supported.
+- if test -s conftest.err; then
+- ac_cv_prog_cc_pic_works=no
+- ac_cv_prog_cc_can_build_shared=no
+- ac_cv_prog_cc_pic=
+- else
+- ac_cv_prog_cc_pic_works=yes
+- ac_cv_prog_cc_pic=" $ac_cv_prog_cc_pic"
+- fi
+- ;;
+- *)
+- ac_cv_prog_cc_pic_works=yes
+- ac_cv_prog_cc_pic=" $ac_cv_prog_cc_pic"
+- ;;
+- esac
+- else
+- # Append any errors to the config.log.
+- cat conftest.err 1>&5
+- ac_cv_prog_cc_pic_works=no
+- ac_cv_prog_cc_can_build_shared=no
+- ac_cv_prog_cc_pic=
+- fi
+- CFLAGS="$save_CFLAGS"
+- $rm conftest*
+- fi
+- # Belt *and* braces to stop my trousers falling down:
+- if test "X$ac_cv_prog_cc_pic_works" = Xno; then
+- ac_cv_prog_cc_pic=
+- ac_cv_prog_cc_can_build_shared=no
+- fi
+- echo "$ac_t""$ac_cv_prog_cc_pic_works" 1>&6
+-fi
+-
+-# Check for any special shared library compilation flags.
+-if test -n "$ac_cv_prog_cc_shlib"; then
+- echo "$progname: warning: \`$CC' requires \`$ac_cv_prog_cc_shlib' to build shared libraries" 1>&2
+- if echo "$old_CC $old_CFLAGS " | egrep -e "[ ]$ac_cv_prog_cc_shlib[ ]" >/dev/null; then :
+- else
+- echo "$progname: add \`$ac_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" 1>&2
+- ac_cv_prog_cc_can_build_shared=no
+- fi
+-fi
+-
+-echo $ac_n "checking if $compiler static flag $ac_cv_prog_cc_static works... $ac_c" 1>&6
+-echo "$progname:749: checking if $compiler static flag $ac_cv_prog_cc_static works" >&5
+-if test "X${ac_cv_prog_cc_static_works+set}" = Xset && \
+- test "X${ac_cv_prog_cc_static_works}" != X; then
+- echo $ac_n "(cached) $ac_c" 1>&6
+-else
+- $rm conftest*
+- echo $lt_simple_link_test_code > conftest.$ac_ext
+- save_LDFLAGS="$LDFLAGS"
+- LDFLAGS="$LDFLAGS $ac_cv_prog_cc_static"
+- if { (eval echo $progname:758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+- ac_cv_prog_cc_static_works=yes
+- else
+- ac_cv_prog_cc_static_works=no
+- ac_cv_prog_cc_static=
+- fi
+- LDFLAGS="$save_LDFLAGS"
+- $rm conftest*
+-fi
+-# Belt *and* braces to stop my trousers falling down:
+-if test "X$ac_cv_prog_cc_static_works" = Xno; then
+- ac_cv_prog_cc_static=
+-fi
+-echo "$ac_t""$ac_cv_prog_cc_static_works" 1>&6
+-pic_flag="$ac_cv_prog_cc_pic"
+-special_shlib_compile_flags="$ac_cv_prog_cc_shlib"
+-wl="$ac_cv_prog_cc_wl"
+-link_static_flag="$ac_cv_prog_cc_static"
+-no_builtin_flag="$ac_cv_prog_cc_no_builtin"
+-can_build_shared="$ac_cv_prog_cc_can_build_shared"
+-
+-# find the maximum length of command line arguments
+-echo "$progname:780: finding the maximum length of command line arguments" 1>&5
+-echo $ac_n "finding the maximum length of command line arguments... $ac_c" 1>&6
+-if test "${lt_cv_sys_max_cmd_len+set}" = set; then
+- echo $ac_n "(cached) $ac_c" 1>&6
+-else
+- i=0
+- testring="ABCDEF"
+- while test `$CONFIG_SHELL $0 --fallback-echo "X$testring" >/dev/null 2>&1` == `echo "X$testring" >/dev/null 2>&1` &&
+- new_result=`expr "X$testring" : ".*" 2>&1` &&
+- lt_cv_sys_max_cmd_len=$new_result &&
+- test $i != 32 # 1 MB should be enough
+- do
+- i=`expr $i + 1`
+- testring=$testring$testring
+- done
+- testring=
+- # add a significant safety factor because C++ compilers can tack on massive amounts
+- # of additional arguments before passing them to the linker. 1/4 should be good.
+- len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len - $len`
+-fi
+-echo "$progname:@lineno@: result: $lt_cv_sys_max_cmd_len" 1>&5
+-echo "${ac_t}$lt_cv_sys_max_cmd_len" 1>&6
+-
+-if test -n $lt_cv_sys_max_cmd_len ; then
+- max_cmd_len=$lt_cv_sys_max_cmd_len
+-else
+- max_cmd_len=none
+-fi
+-
+-# Check to see if options -o and -c are simultaneously supported by compiler
+-echo $ac_n "checking if $compiler supports -c -o file.$objext... $ac_c" 1>&6
+-if test "${lt_cv_compiler_c_o+set}" = set; then
+- echo $ac_n "(cached) $ac_c" 1>&6
+-else
+- $rm -r conftest 2>/dev/null
+- mkdir conftest
+- cd conftest
+- $rm conftest*
+- echo $lt_simple_compile_test_code > conftest.$ac_ext
+- mkdir out
+- # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+- # that will create temporary files in the current directory regardless of
+- # the output directory. Thus, making CWD read-only will cause this test
+- # to fail, enabling locking or at least warning the user not to do parallel
+- # builds.
+- chmod -w .
+- save_CFLAGS="$CFLAGS"
+- CFLAGS="$CFLAGS -o out/conftest2.$objext"
+- echo "$progname:829: checking if $compiler supports -c -o file.$objext" >&5
+- if { (eval echo $progname:830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$objext; then
+-
+- # The compiler can only warn and ignore the option if not recognized
+- # So say no if there are warnings
+- if test -s out/conftest.err; then
+- lt_cv_compiler_c_o=no
+- else
+- lt_cv_compiler_c_o=yes
+- fi
+- else
+- # Append any errors to the config.log.
+- cat out/conftest.err 1>&5
+- lt_cv_compiler_c_o=no
+- fi
+- CFLAGS="$save_CFLAGS"
+- chmod u+w .
+- $rm conftest* out/*
+- rmdir out
+- cd ..
+- rmdir conftest
+- $rm -r conftest 2>/dev/null
+-fi
+-compiler_c_o=$lt_cv_compiler_c_o
+-echo "${ac_t}$compiler_c_o" 1>&6
+-
+-# Check to see if we can do hard links to lock some files if needed
+-hard_links="nottested"
+-if test "$compiler_c_o" = no && test "$need_locks" != no; then
+- # do not overwrite the value of need_locks provided by the user
+- echo $ac_n "checking if we can lock with hard links... $ac_c" 1>&6
+- hard_links=yes
+- $rm conftest*
+- ln conftest.a conftest.b 2>/dev/null && hard_links=no
+- touch conftest.a
+- ln conftest.a conftest.b 2>&5 || hard_links=no
+- ln conftest.a conftest.b 2>/dev/null && hard_links=no
+- echo "$ac_t$hard_links" 1>&6
+- $rm conftest*
+- if test "$hard_links" = no; then
+- echo "*** WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2
+- need_locks=warn
+- fi
+-else
+- need_locks=no
+-fi
+-
+-if test "$with_gcc" = yes; then
+- # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
+- echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions ... $ac_c" 1>&6
+- $rm conftest*
+- echo $lt_simple_compile_test_code > conftest.$ac_ext
+- save_CFLAGS="$CFLAGS"
+- CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext"
+- echo "$progname:883: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+- if { (eval echo $progname:884: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then
+-
+- # The compiler can only warn and ignore the option if not recognized
+- # So say no if there are warnings
+- if test -s conftest.err; then
+- echo "$ac_t"no 1>&6
+- compiler_rtti_exceptions=no
+- else
+- echo "$ac_t"yes 1>&6
+- compiler_rtti_exceptions=yes
+- fi
+- else
+- # Append any errors to the config.log.
+- cat conftest.err 1>&5
+- compiler_rtti_exceptions=no
+- echo "$ac_t"no 1>&6
+- fi
+- CFLAGS="$save_CFLAGS"
+- $rm conftest*
+-
+- if test "$compiler_rtti_exceptions" = "yes"; then
+- no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions'
+- else
+- no_builtin_flag=' -fno-builtin'
+- fi
+-
+-fi
+-
+-# See if the linker supports building shared libraries.
+-echo $ac_n "checking whether the linker ($LD) supports shared libraries... $ac_c" 1>&6
+-
+-echo "$ac_t$ld_shlibs" 1>&6
+-test "$ld_shlibs" = no && can_build_shared=no
+-
+-# Check hardcoding attributes.
+-echo $ac_n "checking how to hardcode library paths into programs... $ac_c" 1>&6
+-hardcode_action=
+-if test -n "$hardcode_libdir_flag_spec" || \
+- test -n "$runpath_var"; then
+-
+- # We can hardcode non-existant directories.
+- if test "$hardcode_direct" != no &&
+- # If the only mechanism to avoid hardcoding is shlibpath_var, we
+- # have to relink, otherwise we might link with an installed library
+- # when we should be linking with a yet-to-be-installed one
+- ## test "$hardcode_shlibpath_var" != no &&
+- test "$hardcode_minus_L" != no; then
+- # Linking always hardcodes the temporary library directory.
+- hardcode_action=relink
+- else
+- # We can link without hardcoding, and we can hardcode nonexisting dirs.
+- hardcode_action=immediate
+- fi
+-else
+- # We cannot hardcode anything, or else we can only hardcode existing
+- # directories.
+- hardcode_action=unsupported
+-fi
+-echo "$ac_t$hardcode_action" 1>&6
+-
+-echo $ac_n "checking whether stripping libraries is possible... $ac_c" 1>&6
+-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+- test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+- echo "${ac_t}yes" 1>&6
+-else
+- echo "${ac_t}no" 1>&6
+-fi
+-
+-case $reload_flag in
+-"" | " "*) ;;
+-*) reload_flag=" $reload_flag" ;;
+-esac
+-reload_cmds='$LD$reload_flag -o $output$reload_objs'
+-test -z "$deplibs_check_method" && deplibs_check_method=unknown
+-
+-# PORTME Fill in your ld.so characteristics
+-library_names_spec=
+-libname_spec='lib$name'
+-soname_spec=
+-postinstall_cmds=
+-postuninstall_cmds=
+-finish_cmds=
+-finish_eval=
+-shlibpath_var=
+-shlibpath_overrides_runpath=unknown
+-version_type=none
+-dynamic_linker="$host_os ld.so"
+-sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+-
+-echo $ac_n "checking dynamic linker characteristics... $ac_c" 1>&6
+-case $host_os in
+-aix3*)
+- version_type=linux
+- library_names_spec='${libname}${release}.so$versuffix $libname.a'
+- shlibpath_var=LIBPATH
+-
+- # AIX 3 has no versioning support, so we append a major version to the name.
+- soname_spec='${libname}${release}.so$major'
+- ;;
+-
+-aix4* | aix5*)
+- if test "$host_cpu" = ia64; then
+- # AIX 5 supports IA64
+- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+- shlibpath_var=LD_LIBRARY_PATH
+- else
+- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+- # soname into executable. Probably we can add versioning support to
+- # collect2, so additional links can be useful in future.
+- # We preserve .a as extension for shared libraries though AIX4.2
+- # and later linker supports .so
+- if test "$aix_use_runtimelinking" = yes; then
+- # If using run time linking (on AIX 4.2 or later) use lib<name>.so instead of
+- # lib<name>.a to let people know that these are not typical AIX shared libraries.
+- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+- # We want symlinks to be created for the different names.
+- version_type=linux
+- else
+- # We preserve .a as extension for shared libraries though AIX4.2
+- # and later when we are not doing run time linking.
+- library_names_spec='${libname}${release}.a $libname.a'
+- soname_spec='${libname}${release}.so$major.o'
+- fi
+- # 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 | egrep '(GNU)' > /dev/null; then
+- export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
+- else
+- export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
+- fi
+- shlibpath_var=LIBPATH
+- deplibs_check_method=pass_all
+- # Put the right runpath into libraries.
+- hardcode_into_libs=yes
+- case $host_os in
+- aix4 | aix4.[01] | aix4.[01].*)
+- if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+- echo ' yes '
+- echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+- :
+- else
+- # With GCC up to 2.95.x, collect2 would create an import file
+- # for dependence libraries. The import file would start with
+- # the line `#! .'. This would cause the generated library to
+- # depend on `.', always an invalid library. This was fixed in
+- # development snapshots of GCC prior to 3.0.
+- can_build_shared=no
+- fi
+- ;;
+- esac
+- fi
+- ;;
+-
+-amigaos*)
+- library_names_spec='$libname.ixlibrary $libname.a'
+- # Create ${libname}_ixlibrary.a entries in /sys/libs.
+- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
+- ;;
+-
+-beos*)
+- library_names_spec='${libname}.so'
+- dynamic_linker="$host_os ld.so"
+- shlibpath_var=LIBRARY_PATH
+- lt_cv_dlopen="load_add_on"
+- lt_cv_dlopen_libs=
+- lt_cv_dlopen_self=yes
+- ;;
+-
+-bsdi4*)
+- version_type=linux
+- need_version=no
+- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+- soname_spec='${libname}${release}.so$major'
+- finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+- shlibpath_var=LD_LIBRARY_PATH
+- sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+- sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+- export_dynamic_flag_spec=-rdynamic
+- # the default ld.so.conf also contains /usr/contrib/lib and
+- # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+- # libtool to hard-code these into programs
+- ;;
+-
+-cygwin* | mingw* | pw32*)
+- version_type=windows
+- need_version=no
+- need_lib_prefix=no
+- case $with_gcc,$host_os in
+- yes,cygwin*)
+- library_names_spec='$libname.dll.a'
+- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll'
+- postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i; echo \$dlname'\''`~
+- dldir=$destdir/`dirname \$dlpath`~
+- test -d \$dldir || mkdir -p \$dldir~
+- $install_prog .libs/$dlname \$dldir/$dlname'
+- postuninstall_cmds='dldll=`bash 2>&1 -c '\''. $file; echo \$dlname'\''`~
+- dlpath=$dir/\$dldll; $rm \$dlpath'
+- ;;
+- yes,mingw*)
+- library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
+- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"`
+- ;;
+- yes,pw32*)
+- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
+-;;
+- *)
+- library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.lib'
+- ;;
+- esac
+- dynamic_linker='Win32 ld.exe'
+- # FIXME: first we should search . and the directory the executable is in
+- shlibpath_var=PATH
+- lt_cv_dlopen="LoadLibrary"
+- lt_cv_dlopen_libs=
+- ;;
+-
+-darwin* | rhapsody*)
+- dynamic_linker="$host_os dyld"
+- version_type=darwin
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='${libname}${release}${versuffix}.`test .$module = .yes && echo so || echo dylib` ${libname}${release}${major}.$`test .$module = .yes && echo so || echo dylib` ${libname}.`test .$module = .yes && echo so || echo dylib`'
+- soname_spec='${libname}${release}${major}.`test .$module = .yes && echo so || echo dylib`'
+- shlibpath_overrides_runpath=yes
+- shlibpath_var=DYLD_LIBRARY_PATH
+- ;;
+-
+-freebsd1*)
+- dynamic_linker=no
+- ;;
+-
+-freebsd*)
+- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+- version_type=freebsd-$objformat
+- case $version_type in
+- freebsd-elf*)
+- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
+- need_version=no
+- need_lib_prefix=no
+- ;;
+- freebsd-*)
+- library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
+- need_version=yes
+- ;;
+- esac
+- shlibpath_var=LD_LIBRARY_PATH
+- case $host_os in
+- freebsd2*)
+- shlibpath_overrides_runpath=yes
+- ;;
+- *)
+- shlibpath_overrides_runpath=no
+- hardcode_into_libs=yes
+- ;;
+- esac
+- ;;
+-
+-gnu*)
+- version_type=linux
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so'
+- soname_spec='${libname}${release}.so$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- hardcode_into_libs=yes
+- ;;
+-
+-hpux9* | hpux10* | hpux11*)
+- # Give a soname corresponding to the major version so that dld.sl refuses to
+- # link against other versions.
+- dynamic_linker="$host_os dld.sl"
+- version_type=sunos
+- hardcode_into_libs=all
+- need_lib_prefix=no
+- need_version=no
+- shlibpath_var=SHLIB_PATH
+- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+- library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl'
+- soname_spec='${libname}${release}.sl$major'
+- # HP-UX runs *really* slowly unless shared libraries are mode 555.
+- postinstall_cmds='chmod 555 $lib'
+- ;;
+-
+-irix5* | irix6*)
+- version_type=irix
+- need_lib_prefix=no
+- need_version=no
+- soname_spec='${libname}${release}.so$major'
+- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so'
+- case $host_os in
+- irix5*)
+- libsuff= shlibsuff=
+- ;;
+- *)
+- case $LD in # libtool.m4 will add one of these switches to LD
+- *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;;
+- *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;;
+- *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;;
+- *) libsuff= shlibsuff= libmagic=never-match;;
+- esac
+- ;;
+- esac
+- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+- shlibpath_overrides_runpath=no
+- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+- ;;
+-
+-# No shared lib support for Linux oldld, aout, or coff.
+-linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
+- dynamic_linker=no
+- ;;
+-
+-# This must be Linux ELF.
+-linux-gnu*)
+- version_type=linux
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+- soname_spec='${libname}${release}.so$major'
+- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=no
+- # This implies no fast_install, which is unacceptable.
+- # Some rework will be needed to allow for fast_install
+- # before this can be enabled.
+- hardcode_into_libs=yes
+-
+- # 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,
+- # most powerpc-linux boxes support dynamic linking these days and
+- # people can always --disable-shared, the test was removed, and we
+- # assume the GNU/Linux dynamic linker is in use.
+- dynamic_linker='GNU/Linux ld.so'
+- ;;
+-
+-netbsd*)
+- version_type=sunos
+- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+- library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
+- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+- dynamic_linker='NetBSD (a.out) ld.so'
+- need_version=yes
+- else
+- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
+- soname_spec='${libname}${release}.so$major'
+- dynamic_linker='NetBSD ld.elf_so'
+- fi
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=yes
+- hardcode_into_libs=yes
+- ;;
+-
+-newsos6)
+- version_type=linux
+- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=yes
+- ;;
+-
+-openbsd*)
+- version_type=sunos
+- if test "$with_gnu_ld" = yes; then
+- need_lib_prefix=no
+- need_version=no
+- fi
+- library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
+- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+- shlibpath_var=LD_LIBRARY_PATH
+- # OpenBSD 2.7 the overriding is needed for fast-install
+- shlibpath_overrides_runpath=yes
+- ;;
+-
+-os2*)
+- libname_spec='$name'
+- need_lib_prefix=no
+- library_names_spec='$libname.dll $libname.a'
+- dynamic_linker='OS/2 ld.exe'
+- shlibpath_var=LIBPATH
+- ;;
+-
+-osf3* | osf4* | osf5*)
+- version_type=osf
+- need_version=no
+- soname_spec='${libname}${release}.so'
+- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
+- shlibpath_var=LD_LIBRARY_PATH
+- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+- ;;
+-
+-sco3.2v5*)
+- version_type=osf
+- soname_spec='${libname}${release}.so$major'
+- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+- shlibpath_var=LD_LIBRARY_PATH
+- ;;
+-
+-solaris*)
+- version_type=linux
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+- soname_spec='${libname}${release}.so$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=yes
+- hardcode_into_libs=yes
+- # ldd complains unless libraries are executable
+- postinstall_cmds='chmod +x $lib'
+- ;;
+-
+-sunos4*)
+- version_type=sunos
+- library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
+- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=yes
+- if test "$with_gnu_ld" = yes; then
+- need_lib_prefix=no
+- fi
+- need_version=yes
+- ;;
+-
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+- version_type=linux
+- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+- soname_spec='${libname}${release}.so$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- case $host_vendor in
+- motorola)
+- need_lib_prefix=no
+- need_version=no
+- shlibpath_overrides_runpath=no
+- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+- ;;
+- esac
+- ;;
+-
+-uts4*)
+- version_type=linux
+- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+- soname_spec='${libname}${release}.so$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- ;;
+-
+-dgux*)
+- version_type=linux
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+- soname_spec='${libname}${release}.so$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- ;;
+-
+-sysv4*MP*)
+- if test -d /usr/nec ;then
+- version_type=linux
+- library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so'
+- soname_spec='$libname.so.$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- fi
+- ;;
+-
+-*)
+- dynamic_linker=no
+- ;;
+-esac
+-echo "$ac_t$dynamic_linker" 1>&6
+-test "$dynamic_linker" = no && can_build_shared=no
+-
+-# Check for command to grab the raw symbol name followed by C symbol from nm.
+-echo $ac_n "checking command to parse $NM output... $ac_c" 1>&6
+-
+-# These are sane defaults that work on at least a few old systems.
+-# [They come from Ultrix. What could be older than Ultrix?!! ;)]
+-
+-# Character class describing NM global symbol codes.
+-symcode='[BCDEGRST]'
+-
+-# Regexp to match symbols that can be accessed directly from C.
+-sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
+-
+-# Transform the above into a raw symbol and a C symbol.
+-symxfrm='\1 \2\3 \3'
+-
+-# Transform an extracted symbol line into a proper C declaration
+-global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'"
+-
+-# Define system-specific variables.
+-case $host_os in
+-aix*)
+- symcode='[BCDT]'
+- ;;
+-cygwin* | mingw* | pw32*)
+- symcode='[ABCDGISTW]'
+- ;;
+-hpux*) # Its linker distinguishes data from code symbols
+- global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^. .* \(.*\)$/extern char \1;/p'"
+- ;;
+-irix*)
+- symcode='[BCDEGRST]'
+- ;;
+-solaris* | sysv5*)
+- symcode='[BDT]'
+- ;;
+-sysv4)
+- symcode='[DFNSTU]'
+- ;;
+-esac
+-
+-# Handle CRLF in mingw tool chain
+-opt_cr=
+-case $host_os in
+-mingw*)
+- opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+- ;;
+-esac
+-
+-# If we're using GNU nm, then use its standard symbol codes.
+-if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
+- symcode='[ABCDGISTW]'
+-fi
+-
+-# Try without a prefix undercore, then with it.
+-for ac_symprfx in "" "_"; do
+-
+- # Write the raw and C identifiers.
+-global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode\)[ ][ ]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
+-
+- # Check to see that the pipe works correctly.
+- pipe_works=no
+- $rm conftest*
+- cat > conftest.$ac_ext <<EOF
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-char nm_test_var;
+-void nm_test_func(){}
+-#ifdef __cplusplus
+-}
+-#endif
+-int main(){nm_test_var='a';nm_test_func();return(0);}
+-EOF
+-
+- echo "$progname:1423: checking if global_symbol_pipe works" >&5
+- if { (eval echo $progname:1424: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then
+- # Now try to grab the symbols.
+- nlist=conftest.nm
+- if { echo "$progname:1427: eval \"$NM conftest.$objext | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then
+-
+- # Try sorting and uniquifying the output.
+- if sort "$nlist" | uniq > "$nlist"T; then
+- mv -f "$nlist"T "$nlist"
+- else
+- rm -f "$nlist"T
+- fi
+-
+- # Make sure that we snagged all the symbols we need.
+- if egrep ' nm_test_var$' "$nlist" >/dev/null; then
+- if egrep ' nm_test_func$' "$nlist" >/dev/null; then
+- cat <<EOF > conftest.$ac_ext
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-
+-EOF
+- # Now generate the symbol file.
+- eval "$global_symbol_to_cdecl"' < "$nlist" >> conftest.$ac_ext'
+-
+- cat <<EOF >> conftest.$ac_ext
+-#if defined (__STDC__) && __STDC__
+-# define lt_ptr_t void *
+-#else
+-# define lt_ptr_t char *
+-# define const
+-#endif
+-
+-/* The mapping between symbol names and symbols. */
+-const struct {
+- const char *name;
+- lt_ptr_t address;
+-}
+-lt_preloaded_symbols[] =
+-{
+-EOF
+- sed 's/^. \(.*\) \(.*\)$/ {"\2", (lt_ptr_t) \&\2},/' < "$nlist" >> conftest.$ac_ext
+- cat <<\EOF >> conftest.$ac_ext
+- {0, (lt_ptr_t) 0}
+-};
+-
+-#ifdef __cplusplus
+-}
+-#endif
+-EOF
+- # Now try linking the two files.
+- mv conftest.$objext conftstm.$objext
+- save_LIBS="$LIBS"
+- save_CFLAGS="$CFLAGS"
+- LIBS="conftstm.$objext"
+- CFLAGS="$CFLAGS$no_builtin_flag"
+- if { (eval echo $progname:1479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+- pipe_works=yes
+- else
+- echo "$progname: failed program was:" >&5
+- cat conftest.$ac_ext >&5
+- fi
+- LIBS="$save_LIBS"
+- else
+- echo "cannot find nm_test_func in $nlist" >&5
+- fi
+- else
+- echo "cannot find nm_test_var in $nlist" >&5
+- fi
+- else
+- echo "cannot run $global_symbol_pipe" >&5
+- fi
+- else
+- echo "$progname: failed program was:" >&5
+- cat conftest.$ac_ext >&5
+- fi
+- $rm conftest* conftst*
+-
+- # Do not use the global_symbol_pipe unless it works.
+- if test "$pipe_works" = yes; then
+- break
+- else
+- global_symbol_pipe=
+- fi
+-done
+-if test "$pipe_works" = yes; then
+- echo "${ac_t}ok" 1>&6
+-else
+- echo "${ac_t}failed" 1>&6
+-fi
+-
+-if test -z "$global_symbol_pipe"; then
+- global_symbol_to_cdecl=
+-fi
+-
+-# Report the final consequences.
+-echo "checking if libtool supports shared libraries... $can_build_shared" 1>&6
+-
+-# Only try to build win32 dlls if AC_LIBTOOL_WIN32_DLL was used in
+-# configure.in, otherwise build static only libraries.
+-case $host_os in
+-cygwin* | mingw* | pw32* | os2*)
+- if test x$can_build_shared = xyes; then
+- test x$enable_win32_dll = xno && can_build_shared=no
+- echo "checking if package supports dlls... $can_build_shared" 1>&6
+- fi
+-;;
+-esac
+-
+-echo $ac_n "checking whether to build shared libraries... $ac_c" 1>&6
+-test "$can_build_shared" = "no" && enable_shared=no
+-
+-# On AIX, shared libraries and static libraries use the same namespace, and
+-# are all built from PIC.
+-case $host_os in
+-aix3*)
+- test "$enable_shared" = yes && enable_static=no
+- if test -n "$RANLIB"; then
+- archive_cmds="$archive_cmds~\$RANLIB \$lib"
+- postinstall_cmds='$RANLIB $lib'
+- fi
+- ;;
+-
+-aix4* | aix5*)
+- test "$enable_shared" = yes && enable_static=no
+- ;;
+-esac
+-
+-echo "$ac_t$enable_shared" 1>&6
+-
+-# Make sure either enable_shared or enable_static is yes.
+-test "$enable_shared" = yes || enable_static=yes
+-
+-echo "checking whether to build static libraries... $enable_static" 1>&6
+-
+-if test "$hardcode_action" = relink; then
+- # Fast installation is not supported
+- enable_fast_install=no
+-elif test "$shlibpath_overrides_runpath" = yes ||
+- test "$enable_shared" = no; then
+- # Fast installation is not necessary
+- enable_fast_install=needless
+-fi
+-
+-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+-if test "$with_gcc" = yes; then
+- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+-fi
+-
+-# Check whether we must set pic_mode to default
+-test -z "$pic_flag" && pic_mode=default
+-
+-if test "x$enable_dlopen" != xyes; then
+- enable_dlopen=unknown
+- enable_dlopen_self=unknown
+- enable_dlopen_self_static=unknown
+-else
+-if test "X${lt_cv_dlopen+set}" != Xset; then
+- lt_cv_dlopen=no lt_cv_dlopen_libs=
+-echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
+-echo "$progname:1583: checking for dlopen in -ldl" >&5
+-if test "X${ac_cv_lib_dl_dlopen+set}" = Xset; then
+- echo $ac_n "(cached) $ac_c" 1>&6
+-else
+- ac_save_LIBS="$LIBS"
+-LIBS="-ldl $LIBS"
+-cat > conftest.$ac_ext <<EOF
+-/*#line 1590 "ltconfig"*/
+-/* Override any gcc2 internal prototype to avoid an error. */
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char dlopen();
+-
+-int main() {
+-dlopen()
+-; return 0; }
+-EOF
+-if { (eval echo $progname:1603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+- rm -rf conftest*
+- ac_cv_lib_dl_dlopen=yes
+-else
+- echo "$progname: failed program was:" >&5
+- cat conftest.$ac_ext >&5
+- rm -rf conftest*
+- ac_cv_lib_dl_dlopen=no
+-fi
+-rm -f conftest*
+-LIBS="$ac_save_LIBS"
+-
+-fi
+-if test "X$ac_cv_lib_dl_dlopen" = Xyes; then
+- echo "$ac_t""yes" 1>&6
+- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+-else
+- echo "$ac_t""no" 1>&6
+-echo $ac_n "checking for dlopen""... $ac_c" 1>&6
+-echo "$progname:1622: checking for dlopen" >&5
+-if test "X${ac_cv_func_dlopen+set}" = Xset; then
+- echo $ac_n "(cached) $ac_c" 1>&6
+-else
+- cat > conftest.$ac_ext <<EOF
+-/*#line 1627 "ltconfig"*/
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char dlopen(); below. */
+-#include <assert.h>
+-/* Override any gcc2 internal prototype to avoid an error. */
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char dlopen();
+-
+-int main() {
+-
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined (__stub_dlopen) || defined (__stub___dlopen)
+-choke me
+-#else
+-dlopen();
+-#endif
+-
+-; return 0; }
+-EOF
+-if { (eval echo $progname:1652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+- rm -rf conftest*
+- ac_cv_func_dlopen=yes
+-else
+- echo "$progname: failed program was:" >&5
+- cat conftest.$ac_ext >&5
+- rm -rf conftest*
+- ac_cv_func_dlopen=no
+-fi
+-rm -f conftest*
+-fi
+-if test "X$ac_cv_func_dlopen" = Xyes; then
+- echo "$ac_t""yes" 1>&6
+- lt_cv_dlopen="dlopen"
+-else
+- echo "$ac_t""no" 1>&6
+-echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6
+-echo "$progname:1669: checking for dlopen in -lsvld" >&5
+-if test "X${ac_cv_lib_svld_dlopen+set}" = Xset; then
+- echo $ac_n "(cached) $ac_c" 1>&6
+-else
+- ac_save_LIBS="$LIBS"
+-LIBS="-lsvld $LIBS"
+-cat > conftest.$ac_ext <<EOF
+-/*#line 1676 "ltconfig"*/
+-/* Override any gcc2 internal prototype to avoid an error. */
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char dlopen();
+-
+-int main() {
+-dlopen()
+-; return 0; }
+-EOF
+-if { (eval echo $progname:1689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+- rm -rf conftest*
+- ac_cv_lib_svld_dlopen=yes
+-else
+- echo "$progname: failed program was:" >&5
+- cat conftest.$ac_ext >&5
+- rm -rf conftest*
+- ac_cv_lib_svld_dlopen=no
+-fi
+-rm -f conftest*
+-LIBS="$ac_save_LIBS"
+-
+-fi
+-if test "X$ac_cv_lib_svld_dlopen" = Xyes; then
+- echo "$ac_t""yes" 1>&6
+- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+-else
+- echo "$ac_t""no" 1>&6
+-echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
+-echo "$progname:1708: checking for dld_link in -ldld" >&5
+-if test "X${ac_cv_lib_dld_dld_link+set}" = Xset; then
+- echo $ac_n "(cached) $ac_c" 1>&6
+-else
+- ac_save_LIBS="$LIBS"
+-LIBS="-ldld $LIBS"
+-cat > conftest.$ac_ext <<EOF
+-/*#line 1715 "ltconfig"*/
+-/* Override any gcc2 internal prototype to avoid an error. */
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char dld_link();
+-
+-int main() {
+-dld_link()
+-; return 0; }
+-EOF
+-if { (eval echo $progname:1728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+- rm -rf conftest*
+- ac_cv_lib_dld_dld_link=yes
+-else
+- echo "$progname: failed program was:" >&5
+- cat conftest.$ac_ext >&5
+- rm -rf conftest*
+- ac_cv_lib_dld_dld_link=no
+-fi
+-rm -f conftest*
+-LIBS="$ac_save_LIBS"
+-
+-fi
+-if test "X$ac_cv_lib_dld_dld_link" = Xyes; then
+- echo "$ac_t""yes" 1>&6
+- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
+-else
+- echo "$ac_t""no" 1>&6
+-echo $ac_n "checking for shl_load""... $ac_c" 1>&6
+-echo "$progname:1747: checking for shl_load" >&5
+-if test "X${ac_cv_func_shl_load+set}" = Xset; then
+- echo $ac_n "(cached) $ac_c" 1>&6
+-else
+- cat > conftest.$ac_ext <<EOF
+-/*#line 1752 "ltconfig"*/
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char shl_load(); below. */
+-#include <assert.h>
+-/* Override any gcc2 internal prototype to avoid an error. */
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char shl_load();
+-
+-int main() {
+-
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined (__stub_shl_load) || defined (__stub___shl_load)
+-choke me
+-#else
+-shl_load();
+-#endif
+-
+-; return 0; }
+-EOF
+-if { (eval echo $progname:1777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+- rm -rf conftest*
+- ac_cv_func_shl_load=yes
+-else
+- echo "$progname: failed program was:" >&5
+- cat conftest.$ac_ext >&5
+- rm -rf conftest*
+- ac_cv_func_shl_load=no
+-fi
+-rm -f conftest*
+-fi
+-
+-if test "X$ac_cv_func_shl_load" = Xyes; then
+- echo "$ac_t""yes" 1>&6
+- lt_cv_dlopen="shl_load"
+-else
+- echo "$ac_t""no" 1>&6
+-echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
+-echo "$progname:1795: checking for shl_load in -ldld" >&5
+-if test "X${ac_cv_lib_dld_shl_load+set}" = Xset; then
+- echo $ac_n "(cached) $ac_c" 1>&6
+-else
+- ac_save_LIBS="$LIBS"
+-LIBS="-ldld $LIBS"
+-cat > conftest.$ac_ext <<EOF
+-/*#line 1802 "ltconfig"*/
+-#include "confdefs.h"
+-/* Override any gcc2 internal prototype to avoid an error. */
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char shl_load();
+-
+-int main() {
+-shl_load()
+-; return 0; }
+-EOF
+-if { (eval echo $progname:1816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+- rm -rf conftest*
+- ac_cv_lib_dld_shl_load=yes
+-else
+- echo "$progname: failed program was:" >&5
+- cat conftest.$ac_ext >&5
+- rm -rf conftest*
+- ac_cv_lib_dld_shl_load=no
+-fi
+-rm -f conftest*
+-LIBS="$ac_save_LIBS"
+-
+-fi
+-if test "X$ac_cv_lib_dld_shl_load" = Xyes; then
+- echo "$ac_t""yes" 1>&6
+- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+-else
+- echo "$ac_t""no" 1>&6
+-fi
+-
+-
+-fi
+-
+-
+-fi
+-
+-
+-fi
+-
+-
+-fi
+-
+-fi
+-
+-fi
+-
+- if test "x$lt_cv_dlopen" != xno; then
+- enable_dlopen=yes
+- else
+- enable_dlopen=no
+- fi
+-
+- case $lt_cv_dlopen in
+- dlopen)
+-for ac_hdr in dlfcn.h; do
+-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "$progname:1863: checking for $ac_hdr" >&5
+-if eval "test \"`echo 'X$''{'ac_cv_header_$ac_safe'+set}'`\" = Xset"; then
+- echo $ac_n "(cached) $ac_c" 1>&6
+-else
+- cat > conftest.$ac_ext <<EOF
+-/*#line 1868 "ltconfig"*/
+-#include <$ac_hdr>
+-int fnord = 0;
+-int main () { return(0); }
+-EOF
+-ac_try="$ac_compile >/dev/null 2>conftest.out"
+-{ (eval echo $progname:1874: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+-if test -z "$ac_err"; then
+- rm -rf conftest*
+- eval "ac_cv_header_$ac_safe=yes"
+-else
+- echo "$ac_err" >&5
+- echo "$progname: failed program was:" >&5
+- cat conftest.$ac_ext >&5
+- rm -rf conftest*
+- eval "ac_cv_header_$ac_safe=no"
+-fi
+-rm -f conftest*
+-fi
+-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+- echo "$ac_t""yes" 1>&6
+-else
+- echo "$ac_t""no" 1>&6
+-fi
+-done
+-
+- if test "x$ac_cv_header_dlfcn_h" = xyes; then
+- CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+- fi
+- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+- LIBS="$lt_cv_dlopen_libs $LIBS"
+-
+- echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
+-echo "$progname:1902: checking whether a program can dlopen itself" >&5
+-if test "X${lt_cv_dlopen_self+set}" = Xset; then
+- echo $ac_n "(cached) $ac_c" 1>&6
+-else
+- if test "$cross_compiling" = yes; then
+- lt_cv_dlopen_self=cross
+- else
+- cat > conftest.$ac_ext <<EOF
+-/*#line 1910 "ltconfig"*/
+-
+-#if HAVE_DLFCN_H
+-#include <dlfcn.h>
+-#endif
+-
+-#include <stdio.h>
+-
+-#ifdef RTLD_GLOBAL
+-# define LTDL_GLOBAL RTLD_GLOBAL
+-#else
+-# ifdef DL_GLOBAL
+-# define LTDL_GLOBAL DL_GLOBAL
+-# else
+-# define LTDL_GLOBAL 0
+-# endif
+-#endif
+-
+-/* We may have to define LTDL_LAZY_OR_NOW in the command line if we
+- find out it does not work in some platform. */
+-#ifndef LTDL_LAZY_OR_NOW
+-# ifdef RTLD_LAZY
+-# define LTDL_LAZY_OR_NOW RTLD_LAZY
+-# else
+-# ifdef DL_LAZY
+-# define LTDL_LAZY_OR_NOW DL_LAZY
+-# else
+-# ifdef RTLD_NOW
+-# define LTDL_LAZY_OR_NOW RTLD_NOW
+-# else
+-# ifdef DL_NOW
+-# define LTDL_LAZY_OR_NOW DL_NOW
+-# else
+-# define LTDL_LAZY_OR_NOW 0
+-# endif
+-# endif
+-# endif
+-# endif
+-#endif
+-
+-void fnord() { int i=42; }
+-int main() {
+- void *self, *ptr1, *ptr2; self=dlopen(0,LTDL_GLOBAL|LTDL_LAZY_OR_NOW);
+- if(self) { ptr1=dlsym(self,"fnord"); ptr2=dlsym(self,"_fnord");
+- if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); return 1;}
+-
+-EOF
+-if { (eval echo $progname:1957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+-then
+- lt_cv_dlopen_self=yes
+-else
+- echo "$progname: failed program was:" >&5
+- cat conftest.$ac_ext >&5
+- rm -fr conftest*
+- lt_cv_dlopen_self=no
+-fi
+-rm -fr conftest*
+-fi
+-
+-fi
+-
+-echo "$ac_t""$lt_cv_dlopen_self" 1>&6
+-
+- if test "$lt_cv_dlopen_self" = yes; then
+- LDFLAGS="$LDFLAGS $link_static_flag"
+- echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
+-echo "$progname:1976: checking whether a statically linked program can dlopen itself" >&5
+-if test "X${lt_cv_dlopen_self_static+set}" = Xset; then
+- echo $ac_n "(cached) $ac_c" 1>&6
+-else
+- if test "$cross_compiling" = yes; then
+- lt_cv_dlopen_self_static=cross
+- else
+- cat > conftest.$ac_ext <<EOF
+-/*#line 1984 "ltconfig"*/
+-
+-#if HAVE_DLFCN_H
+-#include <dlfcn.h>
+-#endif
+-
+-#include <stdio.h>
+-
+-#ifdef RTLD_GLOBAL
+-# define LTDL_GLOBAL RTLD_GLOBAL
+-#else
+-# ifdef DL_GLOBAL
+-# define LTDL_GLOBAL DL_GLOBAL
+-# else
+-# define LTDL_GLOBAL 0
+-# endif
+-#endif
+-
+-/* We may have to define LTDL_LAZY_OR_NOW in the command line if we
+- find out it does not work in some platform. */
+-#ifndef LTDL_LAZY_OR_NOW
+-# ifdef RTLD_LAZY
+-# define LTDL_LAZY_OR_NOW RTLD_LAZY
+-# else
+-# ifdef DL_LAZY
+-# define LTDL_LAZY_OR_NOW DL_LAZY
+-# else
+-# ifdef RTLD_NOW
+-# define LTDL_LAZY_OR_NOW RTLD_NOW
+-# else
+-# ifdef DL_NOW
+-# define LTDL_LAZY_OR_NOW DL_NOW
+-# else
+-# define LTDL_LAZY_OR_NOW 0
+-# endif
+-# endif
+-# endif
+-# endif
+-#endif
+-
+-void fnord() { int i=42; }
+-int main() {
+- void *self, *ptr1, *ptr2; self=dlopen(0,LTDL_GLOBAL|LTDL_LAZY_OR_NOW);
+- if(self) { ptr1=dlsym(self,"fnord"); ptr2=dlsym(self,"_fnord");
+- if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); return 1; }
+-
+-EOF
+-if { (eval echo $progname:2031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+-then
+- lt_cv_dlopen_self_static=yes
+-else
+- echo "$progname: failed program was:" >&5
+- cat conftest.$ac_ext >&5
+- rm -fr conftest*
+- lt_cv_dlopen_self_static=no
+-fi
+-rm -fr conftest*
+-fi
+-
+-fi
+-
+-echo "$ac_t""$lt_cv_dlopen_self_static" 1>&6
+-fi
+- ;;
+- esac
+-
+- case $lt_cv_dlopen_self in
+- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+- *) enable_dlopen_self=unknown ;;
+- esac
+-
+- case $lt_cv_dlopen_self_static in
+- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+- *) enable_dlopen_self_static=unknown ;;
+- esac
+-fi
+-
+-# Copy echo and quote the copy, instead of the original, because it is
+-# used later.
+-ltecho="$echo"
+-if test "X$ltecho" = "X$CONFIG_SHELL $0 --fallback-echo"; then
+- ltecho="$CONFIG_SHELL \$0 --fallback-echo"
+-fi
+-LTSHELL="$SHELL"
+-
+-LTCONFIG_VERSION="$VERSION"
+-
+-# Only quote variables if we're using ltmain.sh.
+-case $ltmain in
+-*.sh)
+- # Now quote all the things that may contain metacharacters.
+- for var in ltecho old_AR old_AR_FLAGS old_CC old_LTCC old_CFLAGS old_CPPFLAGS \
+- old_MAGIC_CMD old_LD old_LDFLAGS old_LIBS \
+- old_LN_S old_NM old_RANLIB old_STRIP \
+- old_AS old_DLLTOOL old_OBJDUMP \
+- old_OBJEXT old_EXEEXT old_reload_flag \
+- old_deplibs_check_method old_file_magic_cmd \
+- AR AR_FLAGS CC LTCC LD LN_S NM LTSHELL LTCONFIG_VERSION \
+- reload_flag reload_cmds wl \
+- pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
+- thread_safe_flag_spec whole_archive_flag_spec libname_spec \
+- library_names_spec soname_spec \
+- RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \
+- old_postuninstall_cmds archive_cmds archive_expsym_cmds postinstall_cmds \
+- postuninstall_cmds extract_expsyms_cmds old_archive_from_expsyms_cmds \
+- predep_objects postdep_objects predeps postdeps compiler_lib_search_path \
+- old_striplib striplib file_magic_cmd export_symbols_cmds \
+- deplibs_check_method allow_undefined_flag no_undefined_flag \
+- finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \
+- hardcode_libdir_flag_spec hardcode_libdir_separator \
+- sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+- compiler_c_o need_locks exclude_expsyms include_expsyms; do
+-
+- case $var in
+- reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \
+- old_postinstall_cmds | old_postuninstall_cmds | \
+- export_symbols_cmds | archive_cmds | archive_expsym_cmds | \
+- extract_expsyms_cmds | old_archive_from_expsyms_cmds | \
+- postinstall_cmds | postuninstall_cmds | \
+- finish_cmds | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+- # Double-quote double-evaled strings.
+- eval "$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" ### testsuite: skip nested quoting test
+- ;;
+- *)
+- eval "$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" ### testsuite: skip nested quoting test
+- ;;
+- esac
+- done
+-
+- case $ltecho in
+- *'\$0 --fallback-echo"')
+- ltecho=`$echo "X$ltecho" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
+- ;;
+- esac
+-
+- if test -z "$tagname"; then
+- trap "$rm \"$ofile\"; exit 1" 1 2 15
+- echo "creating $ofile"
+- $rm "$ofile"
+- cat <<EOF > "$ofile"
+-#! $SHELL
+-
+-# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+-# NOTE: Changes made to this file will be lost: look at ltconfig or ltmain.sh.
+-#
+-# Copyright (C) 1996-2000 Free Software Foundation, Inc.
+-# Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+-#
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2 of the License, or
+-# (at your option) any later version.
+-#
+-# This program is distributed in the hope that it will be useful, but
+-# WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-# General Public License for more details.
+-#
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+-#
+-# As a special exception to the GNU General Public License, if you
+-# distribute this file as part of a program that contains a
+-# configuration script generated by Autoconf, you may include it under
+-# the same distribution terms that you use for the rest of that program.
+-
+-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+-Xsed="sed -e s/^X//"
+-
+-# The HP-UX ksh and POSIX shell print the target directory to stdout
+-# if CDPATH is set.
+-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+-
+-# The names of the tagged configurations supported by this script.
+-available_tags=
+-
+-### BEGIN LIBTOOL CONFIG
+-EOF
+- else
+- echo "appending configuration tag \"$tagname\" to $ofile"
+- echo "### BEGIN LIBTOOL TAG CONFIG: $tagname" >> "$ofile"
+- fi
+- cfgfile="$ofile"
+- ;;
+-
+-*)
+- # Double-quote the variables that need it (for aesthetics).
+- for var in old_AR old_AR_FLAGS old_CC old_LTCC old_CFLAGS old_CPPFLAGS \
+- old_MAGIC_CMD old_LD old_LDFLAGS old_LIBS \
+- old_LN_S old_NM old_RANLIB old_STRIP \
+- old_AS old_DLLTOOL old_OBJDUMP \
+- old_OBJEXT old_EXEEXT old_reload_flag \
+- old_deplibs_check_method old_file_magic_cmd; do
+- eval "$var=\\\"\$var\\\""
+- done
+-
+- # Just create a config file.
+- cfgfile="$ofile.cfg"
+- if test -z "$tagname"; then
+- trap "$rm \"$cfgfile\"; exit 1" 1 2 15
+- echo "creating $cfgfile"
+- $rm "$cfgfile"
+- cat <<EOF > "$cfgfile"
+-# `$echo "$cfgfile" | sed 's%^.*/%%'` - Libtool configuration file.
+-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+-
+-### BEGIN LIBTOOL CONFIG
+-EOF
+- else
+- echo "appending to $cfgfile"
+- echo "### BEGIN LIBTOOL TAG CONFIG: $tagname" >> "$ofile"
+- fi
+- ;;
+-esac
+-
+-cat <<EOF >> "$cfgfile"
+-# Libtool was configured as follows, on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+-#
+-# AR=$old_AR AR_FLAGS=$old_AR_FLAGS LTCC=$old_LTCC CC=$old_CC \\
+-# CFLAGS=$old_CFLAGS CPPFLAGS=$old_CPPFLAGS \\
+-# MAGIC_CMD=$old_MAGIC_CMD LD=$old_LD LDFLAGS=$old_LDFLAGS LIBS=$old_LIBS \\
+-# LN_S=$old_LN_S NM=$old_NM RANLIB=$old_RANLIB STRIP=$old_STRIP \\
+-# AS=$old_AS DLLTOOL=$old_DLLTOOL OBJDUMP=$old_OBJDUMP \\
+-# objext=$old_OBJEXT exeext=$old_EXEEXT reload_flag=$old_reload_flag \\
+-# deplibs_check_method=$old_deplibs_check_method \\
+-# file_magic_cmd=$old_file_magic_cmd \\
+-# $0$ltconfig_args
+-#
+-# Compiler and other test output produced by $progname, useful for
+-# debugging $progname, is in ./config.log if it exists.
+-
+-# The version of $progname that generated this script.
+-LTCONFIG_VERSION=$LTCONFIG_VERSION
+-
+-# Shell to use when invoking shell scripts.
+-SHELL=$LTSHELL
+-
+-# Whether or not to build shared libraries.
+-build_libtool_libs=$enable_shared
+-
+-# Whether or not to add -lc for building shared libraries.
+-build_libtool_need_lc=$need_lc
+-
+-# Whether or not to build static libraries.
+-build_old_libs=$enable_static
+-
+-# Whether or not to optimize for fast installation.
+-fast_install=$enable_fast_install
+-
+-# The host system.
+-host_alias=$host_alias
+-host=$host
+-
+-# An echo program that does not interpret backslashes.
+-echo=$ltecho
+-
+-# The archiver.
+-AR=$AR
+-AR_FLAGS=$AR_FLAGS
+-
+-# A C compiler.
+-LTCC=$LTCC
+-
+-# A language-specific compiler.
+-CC=$CC
+-
+-# Is the compiler the GNU C compiler?
+-with_gcc=$with_gcc
+-
+-# The linker used to build libraries.
+-LD=$LD
+-
+-# Whether we need hard or soft links.
+-LN_S=$LN_S
+-
+-# A BSD-compatible nm program.
+-NM=$NM
+-
+-# A symbol stripping program
+-STRIP=$STRIP
+-
+-# Used to examine libraries when file_magic_cmd begins "file"
+-MAGIC_CMD=$MAGIC_CMD
+-
+-# Used on cygwin: DLL creation program.
+-DLLTOOL="$DLLTOOL"
+-
+-# Used on cygwin: object dumper.
+-OBJDUMP="$OBJDUMP"
+-
+-# Used on cygwin: assembler.
+-AS="$AS"
+-
+-# The name of the directory that contains temporary libtool files.
+-objdir=$objdir
+-
+-# How to create reloadable object files.
+-reload_flag=$reload_flag
+-reload_cmds=$reload_cmds
+-
+-# How to pass a linker flag through the compiler.
+-wl=$wl
+-
+-# Object file suffix (normally "o").
+-objext="$objext"
+-
+-# Old archive suffix (normally "a").
+-libext="$libext"
+-
+-# Executable file suffix (normally "").
+-exeext="$exeext"
+-
+-# Additional compiler flags for building library objects.
+-pic_flag=$pic_flag
+-pic_mode=$pic_mode
+-
+-# What is the maximum length of a command?
+-max_cmd_len=$max_cmd_len
+-
+-# Does compiler simultaneously support -c and -o options?
+-compiler_c_o=$compiler_c_o
+-
+-# Must we lock files when doing compilation ?
+-need_locks=$need_locks
+-
+-# Do we need the lib prefix for modules?
+-need_lib_prefix=$need_lib_prefix
+-
+-# Do we need a version for libraries?
+-need_version=$need_version
+-
+-# Whether dlopen is supported.
+-dlopen_support=$enable_dlopen
+-
+-# Whether dlopen of programs is supported.
+-dlopen_self=$enable_dlopen_self
+-
+-# Whether dlopen of statically linked programs is supported.
+-dlopen_self_static=$enable_dlopen_self_static
+-
+-# Compiler flag to prevent dynamic linking.
+-link_static_flag=$link_static_flag
+-
+-# Compiler flag to turn off builtin functions.
+-no_builtin_flag=$no_builtin_flag
+-
+-# Compiler flag to allow reflexive dlopens.
+-export_dynamic_flag_spec=$export_dynamic_flag_spec
+-
+-# Compiler flag to generate shared objects directly from archives.
+-whole_archive_flag_spec=$whole_archive_flag_spec
+-
+-# Compiler flag to generate thread-safe objects.
+-thread_safe_flag_spec=$thread_safe_flag_spec
+-
+-# Library versioning type.
+-version_type=$version_type
+-
+-# Format of library name prefix.
+-libname_spec=$libname_spec
+-
+-# List of archive names. First name is the real one, the rest are links.
+-# The last name is the one that the linker finds with -lNAME.
+-library_names_spec=$library_names_spec
+-
+-# The coded name of the library, if different from the real name.
+-soname_spec=$soname_spec
+-
+-# Commands used to build and install an old-style archive.
+-RANLIB=$RANLIB
+-old_archive_cmds=$old_archive_cmds
+-old_postinstall_cmds=$old_postinstall_cmds
+-old_postuninstall_cmds=$old_postuninstall_cmds
+-
+-# Create an old-style archive from a shared archive.
+-old_archive_from_new_cmds=$old_archive_from_new_cmds
+-
+-# Create a temporary old-style archive to link instead of a shared archive.
+-old_archive_from_expsyms_cmds=$old_archive_from_expsyms_cmds
+-
+-# Commands used to build and install a shared archive.
+-archive_cmds=$archive_cmds
+-archive_expsym_cmds=$archive_expsym_cmds
+-postinstall_cmds=$postinstall_cmds
+-postuninstall_cmds=$postuninstall_cmds
+-
+-# Commands to strip libraries.
+-old_striplib=$old_striplib
+-striplib=$striplib
+-
+-# Dependencies to place before the objects being linked to create a
+-# shared library.
+-predep_objects=$predep_objects
+-
+-# Dependencies to place after the objects being linked to create a
+-# shared library.
+-postdep_objects=$postdep_objects
+-
+-# Dependencies to place before the objects being linked to create a
+-# shared library.
+-predeps=$predeps
+-
+-# Dependencies to place after the objects being linked to create a
+-# shared library.
+-postdeps=$postdeps
+-
+-# The library search path used internally by the compiler when linking
+-# a shared library.
+-compiler_lib_search_path=$compiler_lib_search_path
+-
+-# Method to check whether dependent libraries are shared objects.
+-deplibs_check_method=$deplibs_check_method
+-
+-# Command to use when deplibs_check_method == file_magic.
+-file_magic_cmd=$file_magic_cmd
+-
+-# Flag that allows shared libraries with undefined symbols to be built.
+-allow_undefined_flag=$allow_undefined_flag
+-
+-# Flag that forces no undefined symbols.
+-no_undefined_flag=$no_undefined_flag
+-
+-# Commands used to finish a libtool library installation in a directory.
+-finish_cmds=$finish_cmds
+-
+-# Same as above, but a single script fragment to be evaled but not shown.
+-finish_eval=$finish_eval
+-
+-# Take the output of nm and produce a listing of raw symbols and C names.
+-global_symbol_pipe=$global_symbol_pipe
+-
+-# Transform the output of nm in a proper C declaration
+-global_symbol_to_cdecl=$global_symbol_to_cdecl
+-
+-# This is the shared library runtime path variable.
+-runpath_var=$runpath_var
+-
+-# This is the shared library path variable.
+-shlibpath_var=$shlibpath_var
+-
+-# Is shlibpath searched before the hard-coded library search path?
+-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+-
+-# How to hardcode a shared library path into an executable.
+-hardcode_action=$hardcode_action
+-
+-# Whether we should hardcode library paths into libraries.
+-hardcode_into_libs=$hardcode_into_libs
+-
+-# Flag to hardcode \$libdir into a binary during linking.
+-# This must work even if \$libdir does not exist.
+-hardcode_libdir_flag_spec=$hardcode_libdir_flag_spec
+-
+-# Whether we need a single -rpath flag with a separated argument.
+-hardcode_libdir_separator=$hardcode_libdir_separator
+-
+-# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
+-# resulting binary.
+-hardcode_direct=$hardcode_direct
+-
+-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+-# resulting binary.
+-hardcode_minus_L=$hardcode_minus_L
+-
+-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+-# the resulting binary.
+-hardcode_shlibpath_var=$hardcode_shlibpath_var
+-
+-# Variables whose values should be saved in libtool wrapper scripts and
+-# restored at relink time.
+-variables_saved_for_relink="$variables_saved_for_relink"
+-
+-# Whether libtool must link a program against all its dependency libraries.
+-link_all_deplibs=$link_all_deplibs
+-
+-# Compile-time system search path for libraries
+-sys_lib_search_path_spec=$sys_lib_search_path_spec
+-
+-# Run-time system search path for libraries
+-sys_lib_dlsearch_path_spec=$sys_lib_dlsearch_path_spec
+-
+-# Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$fix_srcfile_path"
+-
+-# Set to yes if exported symbols are required.
+-always_export_symbols=$always_export_symbols
+-
+-# The commands to list exported symbols.
+-export_symbols_cmds=$export_symbols_cmds
+-
+-# The commands to extract the exported symbol list from a shared archive.
+-extract_expsyms_cmds=$extract_expsyms_cmds
+-
+-# Symbols that should not be listed in the preloaded symbols.
+-exclude_expsyms=$exclude_expsyms
+-
+-# Symbols that must always be exported.
+-include_expsyms=$include_expsyms
+-
+-EOF
+-
+-if test -z "$tagname"; then
+- echo '### END LIBTOOL CONFIG' >> "$ofile"
+-else
+- echo "### END LIBTOOL TAG CONFIG: $tagname" >> "$ofile"
+-fi
+-
+-case $ltmain in
+-*.sh)
+- echo >> "$ofile"
+- if test -z "$tagname"; then
+- case $host_os in
+- aix3*)
+- cat <<\EOF >> "$ofile"
+-
+-# AIX sometimes has problems with the GCC collect2 program. For some
+-# reason, if we set the COLLECT_NAMES environment variable, the problems
+-# vanish in a puff of smoke.
+-if test "X${COLLECT_NAMES+set}" != Xset; then
+- COLLECT_NAMES=
+- export COLLECT_NAMES
+-fi
+-EOF
+- ;;
+- esac
+- case $host in
+- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+- cat <<'EOF' >> "$ofile"
+- # This is a source program that is used to create dlls on Windows
+- # Don't remove nor modify the starting and closing comments
+-# /* ltdll.c starts here */
+-# #define WIN32_LEAN_AND_MEAN
+-# #include <windows.h>
+-# #undef WIN32_LEAN_AND_MEAN
+-# #include <stdio.h>
+-#
+-# #ifndef __CYGWIN__
+-# # ifdef __CYGWIN32__
+-# # define __CYGWIN__ __CYGWIN32__
+-# # endif
+-# #endif
+-#
+-# #ifdef __cplusplus
+-# extern "C" {
+-# #endif
+-# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
+-# #ifdef __cplusplus
+-# }
+-# #endif
+-#
+-# #ifdef __CYGWIN__
+-# #include <cygwin/cygwin_dll.h>
+-# DECLARE_CYGWIN_DLL( DllMain );
+-# #endif
+-# HINSTANCE __hDllInstance_base;
+-#
+-# BOOL APIENTRY
+-# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
+-# {
+-# __hDllInstance_base = hInst;
+-# return TRUE;
+-# }
+-# /* ltdll.c ends here */
+- # This is a source program that is used to create import libraries
+- # on Windows for dlls which lack them. Don't remove nor modify the
+- # starting and closing comments
+-# /* impgen.c starts here */
+-# /* Copyright (C) 1999-2000 Free Software Foundation, Inc.
+-#
+-# This file is part of GNU libtool.
+-#
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2 of the License, or
+-# (at your option) any later version.
+-#
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-# GNU General Public License for more details.
+-#
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+-# */
+-#
+-# #include <stdio.h> /* for printf() */
+-# #include <unistd.h> /* for open(), lseek(), read() */
+-# #include <fcntl.h> /* for O_RDONLY, O_BINARY */
+-# #include <string.h> /* for strdup() */
+-#
+-# /* O_BINARY isn't required (or even defined sometimes) under Unix */
+-# #ifndef O_BINARY
+-# #define O_BINARY 0
+-# #endif
+-#
+-# static unsigned int
+-# pe_get16 (fd, offset)
+-# int fd;
+-# int offset;
+-# {
+-# unsigned char b[2];
+-# lseek (fd, offset, SEEK_SET);
+-# read (fd, b, 2);
+-# return b[0] + (b[1]<<8);
+-# }
+-#
+-# static unsigned int
+-# pe_get32 (fd, offset)
+-# int fd;
+-# int offset;
+-# {
+-# unsigned char b[4];
+-# lseek (fd, offset, SEEK_SET);
+-# read (fd, b, 4);
+-# return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
+-# }
+-#
+-# static unsigned int
+-# pe_as32 (ptr)
+-# void *ptr;
+-# {
+-# unsigned char *b = ptr;
+-# return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
+-# }
+-#
+-# int
+-# main (argc, argv)
+-# int argc;
+-# char *argv[];
+-# {
+-# int dll;
+-# unsigned long pe_header_offset, opthdr_ofs, num_entries, i;
+-# unsigned long export_rva, export_size, nsections, secptr, expptr;
+-# unsigned long name_rvas, nexp;
+-# unsigned char *expdata, *erva;
+-# char *filename, *dll_name;
+-#
+-# filename = argv[1];
+-#
+-# dll = open(filename, O_RDONLY|O_BINARY);
+-# if (dll < 1)
+-# return 1;
+-#
+-# dll_name = filename;
+-#
+-# for (i=0; filename[i]; i++)
+-# if (filename[i] == '/' || filename[i] == '\\' || filename[i] == ':')
+-# dll_name = filename + i +1;
+-#
+-# pe_header_offset = pe_get32 (dll, 0x3c);
+-# opthdr_ofs = pe_header_offset + 4 + 20;
+-# num_entries = pe_get32 (dll, opthdr_ofs + 92);
+-#
+-# if (num_entries < 1) /* no exports */
+-# return 1;
+-#
+-# export_rva = pe_get32 (dll, opthdr_ofs + 96);
+-# export_size = pe_get32 (dll, opthdr_ofs + 100);
+-# nsections = pe_get16 (dll, pe_header_offset + 4 +2);
+-# secptr = (pe_header_offset + 4 + 20 +
+-# pe_get16 (dll, pe_header_offset + 4 + 16));
+-#
+-# expptr = 0;
+-# for (i = 0; i < nsections; i++)
+-# {
+-# char sname[8];
+-# unsigned long secptr1 = secptr + 40 * i;
+-# unsigned long vaddr = pe_get32 (dll, secptr1 + 12);
+-# unsigned long vsize = pe_get32 (dll, secptr1 + 16);
+-# unsigned long fptr = pe_get32 (dll, secptr1 + 20);
+-# lseek(dll, secptr1, SEEK_SET);
+-# read(dll, sname, 8);
+-# if (vaddr <= export_rva && vaddr+vsize > export_rva)
+-# {
+-# expptr = fptr + (export_rva - vaddr);
+-# if (export_rva + export_size > vaddr + vsize)
+-# export_size = vsize - (export_rva - vaddr);
+-# break;
+-# }
+-# }
+-#
+-# expdata = (unsigned char*)malloc(export_size);
+-# lseek (dll, expptr, SEEK_SET);
+-# read (dll, expdata, export_size);
+-# erva = expdata - export_rva;
+-#
+-# nexp = pe_as32 (expdata+24);
+-# name_rvas = pe_as32 (expdata+32);
+-#
+-# printf ("EXPORTS\n");
+-# for (i = 0; i<nexp; i++)
+-# {
+-# unsigned long name_rva = pe_as32 (erva+name_rvas+i*4);
+-# printf ("\t%s @ %ld ;\n", erva+name_rva, 1+ i);
+-# }
+-#
+-# return 0;
+-# }
+-# /* impgen.c ends here */
+-
+-EOF
+- ;;
+- esac
+-
+-
+- # Append the ltmain.sh script.
+- sed '$q' "$ltmain" >> "$ofile" || (rm -f "$ofile"; exit 1)
+- # We use sed instead of cat because bash on DJGPP gets confused if
+- # if finds mixed CR/LF and LF-only lines. Since sed operates in
+- # text mode, it properly converts lines to CR/LF. This bash problem
+- # is reportedly fixed, but why not run on old versions too?
+-
+- chmod +x "$ofile"
+- fi
+- ;;
+-
+-*)
+- # Compile the libtool program.
+- echo "FIXME: would compile $ltmain"
+- ;;
+-esac
+-
+-# Update the list of available tags.
+-if test -n "$tagname"; then
+-
+- # Extract list of available tagged configurations in $ofile.
+- # Note that this assumes the entire list is on one line.
+- available_tags=`grep "^available_tags=" $ofile | sed -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
+-
+- # Append the new tag name to the list of available tags.
+- available_tags="$available_tags $tagname"
+-
+- # Now substitute the updated of available tags.
+- if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' ${ofile} > ${ofile}.new"; then
+- mv ${ofile}.new ${ofile}
+- chmod +x "$ofile"
+- else
+- rm -f ${ofile}.new
+- echo "$progname: unable to update list of available tagged configurations."
+- exit 1
+- fi
+-fi
+-
+-# Don't cache tagged configuration!
+-test -n "$cache_file" && test -z "$tagname" || exit 0
+-
+-# AC_CACHE_SAVE
+-trap '' 1 2 15
+-cat > confcache <<\EOF
+-# This file is a shell script that caches the results of configure
+-# tests run on this system so they can be shared between configure
+-# scripts and configure runs. It is not useful on other systems.
+-# If it contains results you don't want to keep, you may remove or edit it.
+-#
+-# By default, configure uses ./config.cache as the cache file,
+-# creating it if it does not exist already. You can give configure
+-# the --cache-file=FILE option to use a different cache file; that is
+-# what configure does when it calls configure scripts in
+-# subdirectories, so they share the cache.
+-# Giving --cache-file=/dev/null disables caching, for debugging configure.
+-# config.status only pays attention to the cache file if you give it the
+-# --recheck option to rerun configure.
+-#
+-EOF
+-# The following way of writing the cache mishandles newlines in values,
+-# but we know of no workaround that is simple, portable, and efficient.
+-# So, don't put newlines in cache variables' values.
+-# Ultrix sh set writes to stderr and can't be redirected directly,
+-# and sets the high bit in the cache file unless we assign to the vars.
+-(set) 2>&1 |
+- case `(ac_space=' '; set | grep ac_space) 2>&1` in
+- *ac_space=\ *)
+- # `set' does not quote correctly, so add quotes (double-quote substitution
+- # turns \\\\ into \\, and sed turns \\ into \).
+- sed -n \
+- -e "s/'/'\\\\''/g" \
+- -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
+- ;;
+- *)
+- # `set' quotes correctly as required by POSIX, so do not add quotes.
+- sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
+- ;;
+- esac >> confcache
+-if cmp -s $cache_file confcache; then
+- :
+-else
+- if test -w $cache_file; then
+- echo "updating cache $cache_file"
+- cat confcache > $cache_file
+- else
+- echo "not updating unwritable cache $cache_file"
+- fi
+-fi
+-rm -f confcache
+-
+-exit 0
+-
+-# Local Variables:
+-# mode:shell-script
+-# sh-indentation:2
+-# End:
+--- a/admin/ltmain.sh
++++ b/admin/ltmain.sh
+@@ -1276,9 +1276,6 @@
+ # These systems don't actually have a C or math library (as such)
+ continue
+ ;;
+- *-*-freebsd*-gnu*)
+- # prevent being parsed by the freebsd regexp below
+- ;;
+ *-*-mingw* | *-*-os2*)
+ # These systems don't actually have a C library (as such)
+ test "X$arg" = "X-lc" && continue
+@@ -1294,9 +1291,6 @@
+ esac
+ elif test "X$arg" = "X-lc_r"; then
+ case $host in
+- *-*-freebsd*-gnu*)
+- # prevent being parsed by the freebsd regexp below
+- ;;
+ *-*-openbsd*)
+ # Do not include libc_r directly, use -pthread flag.
+ continue
+@@ -3104,7 +3098,7 @@
+ tempremovelist=`$echo "$output_objdir/*"`
+ for p in $tempremovelist; do
+ case $p in
+- *.$objext)
++ *.$objext | *$exeext)
+ ;;
+ $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
+ removelist="$removelist $p"
+@@ -3181,12 +3175,6 @@
+ *-*-netbsd*)
+ # Don't link with libc until the a.out ld.so is fixed.
+ ;;
+- *-*-freebsd*-gnu*)
+- # Prevent $arg from being parsed by the freebsd regexp below.
+- if test "$build_libtool_need_lc" = "yes"; then
+- deplibs="$deplibs -lc"
+- fi
+- ;;
+ *-*-openbsd* | *-*-freebsd*)
+ # Do not include libc due to us having libc/libc_r.
+ test "X$arg" = "X-lc" && continue
+@@ -4585,8 +4573,8 @@
+ *) exeext= ;;
+ esac
+ case $host in
+- *cygwin* | *mingw* )
+- cwrappersource=`$echo ${objdir}/lt-${output}.c`
++ *mingw* )
++ cwrappersource=`$echo ${output_objdir}/lt-${outputname}.c`
+ cwrapper=`$echo ${output}.exe`
+ $rm $cwrappersource $cwrapper
+ trap "$rm $cwrappersource $cwrapper; exit 1" 1 2 15
+--- a/admin/Makefile.common
++++ b/admin/Makefile.common
+@@ -6,7 +6,7 @@
+
+ SHELL=/bin/sh
+
+-cvs dist cvs-clean configure configure.in configure.files subdirs package-messages package-merge Makefile.am acinclude.m4 extract-messages:
++cvs dist configure configure.in configure.files subdirs package-messages package-merge Makefile.am acinclude.m4 extract-messages:
+ @admindir=$(admindir); \
+ if test "x$$admindir" = x; then \
+ admindir=.; until test -f $$admindir/admin/cvs.sh; do \
+@@ -30,6 +30,8 @@
+ configure.in: configure.files subdirs
+ configure.files: subdirs
+
++svn: cvs
++
+ .SILENT:
+
+-.PHONY: cvs dist cvs-clean package-merge package-messages
++.PHONY: svn cvs dist package-merge package-messages
+--- a/admin/missing
++++ b/admin/missing
+@@ -1,6 +1,10 @@
+ #! /bin/sh
+ # Common stub for a few missing GNU programs while installing.
+-# Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
++
++scriptversion=2004-09-07.08
++
++# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004
++# Free Software Foundation, Inc.
+ # Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
+
+ # This program is free software; you can redistribute it and/or modify
+@@ -15,8 +19,8 @@
+
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+-# 02110-1301, USA.
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
+
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+@@ -38,18 +42,24 @@
+ configure_ac=configure.in
+ fi
+
++msg="missing on your system"
++
+ case "$1" in
+ --run)
+ # Try to run requested program, and just exit if it succeeds.
+ run=
+ shift
+ "$@" && exit 0
++ # Exit code 63 means version mismatch. This often happens
++ # when the user try to use an ancient version of a tool on
++ # a file that requires a minimum version. In this case we
++ # we should proceed has if the program had been absent, or
++ # if --run hadn't been passed.
++ if test $? = 63; then
++ run=:
++ msg="probably too old"
++ fi
+ ;;
+-esac
+-
+-# If it does not exist, or fails to run (possibly an outdated version),
+-# try to emulate it.
+-case "$1" in
+
+ -h|--h|--he|--hel|--help)
+ echo "\
+@@ -74,11 +84,15 @@
+ 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
+- yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
++ yacc create \`y.tab.[ch]', if possible, from existing .[ch]
++
++Send bug reports to <bug-automake at gnu.org>."
++ exit 0
+ ;;
+
+ -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+- echo "missing 0.4 - GNU automake"
++ echo "missing $scriptversion (GNU Automake)"
++ exit 0
+ ;;
+
+ -*)
+@@ -87,14 +101,44 @@
+ exit 1
+ ;;
+
+- aclocal*)
++esac
++
++# Now exit if we have it, but it failed. Also exit now if we
++# don't have it and --version was passed (most likely to detect
++# the program).
++case "$1" in
++ lex|yacc)
++ # Not GNU programs, they don't have --version.
++ ;;
++
++ tar)
++ if test -n "$run"; then
++ echo 1>&2 "ERROR: \`tar' requires --run"
++ exit 1
++ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
++ exit 1
++ fi
++ ;;
++
++ *)
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+ # We have it, but it failed.
+ exit 1
++ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
++ # Could not run --version or --help. This is probably someone
++ # running `$TOOL --version' or `$TOOL --help' to check whether
++ # $TOOL exists and not knowing $TOOL uses missing.
++ exit 1
+ fi
++ ;;
++esac
+
++# If it does not exist, or fails to run (possibly an outdated version),
++# try to emulate it.
++case "$1" in
++ aclocal*)
+ echo 1>&2 "\
+-WARNING: \`$1' is missing on your system. You should only need it if
++WARNING: \`$1' is $msg. You should only need it if
+ 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 +146,8 @@
+ ;;
+
+ autoconf)
+- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+- # We have it, but it failed.
+- exit 1
+- fi
+-
+ echo 1>&2 "\
+-WARNING: \`$1' is missing on your system. You should only need it if
++WARNING: \`$1' is $msg. You should only need it if
+ you modified \`${configure_ac}'. You might want to install the
+ \`Autoconf' and \`GNU m4' packages. Grab them from any GNU
+ archive site."
+@@ -116,13 +155,8 @@
+ ;;
+
+ autoheader)
+- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+- # We have it, but it failed.
+- exit 1
+- fi
+-
+ echo 1>&2 "\
+-WARNING: \`$1' is missing on your system. You should only need it if
++WARNING: \`$1' is $msg. You should only need it if
+ 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."
+@@ -140,13 +174,8 @@
+ ;;
+
+ automake*)
+- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+- # We have it, but it failed.
+- exit 1
+- fi
+-
+ echo 1>&2 "\
+-WARNING: \`$1' is missing on your system. You should only need it if
++WARNING: \`$1' is $msg. You should only need it if
+ 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,16 +185,11 @@
+ ;;
+
+ autom4te)
+- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+- # We have it, but it failed.
+- exit 1
+- fi
+-
+ echo 1>&2 "\
+-WARNING: \`$1' is needed, and you do not seem to have it handy on your
+- system. You might have modified some files without having the
++WARNING: \`$1' is needed, but is $msg.
++ You might have modified some files without having the
+ proper tools for further handling them.
+- You can get \`$1Help2man' as part of \`Autoconf' from any GNU
++ You can get \`$1' as part of \`Autoconf' from any GNU
+ archive site."
+
+ file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+@@ -185,7 +209,7 @@
+
+ bison|yacc)
+ echo 1>&2 "\
+-WARNING: \`$1' is missing on your system. You should only need it if
++WARNING: \`$1' $msg. You should only need it if
+ you modified a \`.y' file. You may need the \`Bison' package
+ in order for those modifications to take effect. You can get
+ \`Bison' from any GNU archive site."
+@@ -215,7 +239,7 @@
+
+ lex|flex)
+ echo 1>&2 "\
+-WARNING: \`$1' is missing on your system. You should only need it if
++WARNING: \`$1' is $msg. You should only need it if
+ you modified a \`.l' file. You may need the \`Flex' package
+ in order for those modifications to take effect. You can get
+ \`Flex' from any GNU archive site."
+@@ -237,13 +261,8 @@
+ ;;
+
+ help2man)
+- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+- # We have it, but it failed.
+- exit 1
+- fi
+-
+ echo 1>&2 "\
+-WARNING: \`$1' is missing on your system. You should only need it if
++WARNING: \`$1' is $msg. You should only need it if
+ you modified a dependency of a manual page. You may need the
+ \`Help2man' package in order for those modifications to take
+ effect. You can get \`Help2man' from any GNU archive site."
+@@ -262,13 +281,8 @@
+ ;;
+
+ makeinfo)
+- if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
+- # We have makeinfo, but it failed.
+- exit 1
+- fi
+-
+ echo 1>&2 "\
+-WARNING: \`$1' is missing on your system. You should only need it if
++WARNING: \`$1' is $msg. You should only need it if
+ you modified a \`.texi' or \`.texinfo' file, or any other file
+ indirectly affecting the aspect of the manual. The spurious
+ call might also be the consequence of using a buggy \`make' (AIX,
+@@ -284,10 +298,6 @@
+
+ tar)
+ shift
+- if test -n "$run"; then
+- echo 1>&2 "ERROR: \`tar' requires --run"
+- exit 1
+- fi
+
+ # We have already tried tar in the generic part.
+ # Look for gnutar/gtar before invocation to avoid ugly error
+@@ -323,10 +333,10 @@
+
+ *)
+ echo 1>&2 "\
+-WARNING: \`$1' is needed, and you do not seem to have it handy on your
+- system. You might have modified some files without having the
++WARNING: \`$1' is needed, and is $msg.
++ You might have modified some files without having the
+ proper tools for further handling them. Check the \`README' file,
+- it often tells you about the needed prerequirements for installing
++ it often tells you about the needed prerequisites for installing
+ 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 +344,10 @@
+ esac
+
+ exit 0
++
++# Local variables:
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-end: "$"
++# End:
+--- a/admin/mkinstalldirs
++++ b/admin/mkinstalldirs
+@@ -1,21 +1,33 @@
+ #! /bin/sh
+ # mkinstalldirs --- make directory hierarchy
+-# Author: Noah Friedman <friedman at prep.ai.mit.edu>
++
++scriptversion=2005-06-29.22
++
++# Original author: Noah Friedman <friedman at prep.ai.mit.edu>
+ # Created: 1993-05-16
+-# Public domain
++# Public domain.
++#
++# This file is maintained in Automake, please report
++# bugs to <bug-automake at gnu.org> or send patches to
++# <automake-patches at gnu.org>.
+
+ errstatus=0
+-dirmode=""
++dirmode=
+
+ usage="\
+-Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
++Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
++
++Create each directory DIR (with mode MODE, if specified), including all
++leading file name components.
++
++Report bugs to <bug-automake at gnu.org>."
+
+ # process command line arguments
+ while test $# -gt 0 ; do
+ case $1 in
+ -h | --help | --h*) # -h for help
+- echo "$usage" 1>&2
+- exit 0
++ echo "$usage"
++ exit $?
+ ;;
+ -m) # -m PERM arg
+ shift
+@@ -23,6 +35,10 @@
+ dirmode=$1
+ shift
+ ;;
++ --version)
++ echo "$0 $scriptversion"
++ exit $?
++ ;;
+ --) # stop option processing
+ shift
+ break
+@@ -50,30 +66,58 @@
+ 0) exit 0 ;;
+ esac
+
++# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and
++# mkdir -p a/c at the same time, both will detect that a is missing,
++# one will create a, then the other will try to create a and die with
++# a "File exists" error. This is a problem when calling mkinstalldirs
++# from a parallel make. We use --version in the probe to restrict
++# ourselves to GNU mkdir, which is thread-safe.
+ case $dirmode in
+ '')
+- if mkdir -p -- . 2>/dev/null; then
++ if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+ echo "mkdir -p -- $*"
+ exec mkdir -p -- "$@"
++ else
++ # On NextStep and OpenStep, the `mkdir' command does not
++ # recognize any option. It will interpret all options as
++ # directories to create, and then abort because `.' already
++ # exists.
++ test -d ./-p && rmdir ./-p
++ test -d ./--version && rmdir ./--version
+ fi
+ ;;
+ *)
+- if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
++ if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
++ test ! -d ./--version; then
+ echo "mkdir -m $dirmode -p -- $*"
+ exec mkdir -m "$dirmode" -p -- "$@"
++ else
++ # Clean up after NextStep and OpenStep mkdir.
++ for d in ./-m ./-p ./--version "./$dirmode";
++ do
++ test -d $d && rmdir $d
++ done
+ fi
+ ;;
+ esac
+
+ for file
+ do
+- set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
++ case $file in
++ /*) pathcomp=/ ;;
++ *) pathcomp= ;;
++ esac
++ oIFS=$IFS
++ IFS=/
++ set fnord $file
+ shift
++ IFS=$oIFS
+
+- pathcomp=
+ for d
+ do
+- pathcomp="$pathcomp$d"
++ test "x$d" = x && continue
++
++ pathcomp=$pathcomp$d
+ case $pathcomp in
+ -*) pathcomp=./$pathcomp ;;
+ esac
+@@ -84,21 +128,21 @@
+ mkdir "$pathcomp" || lasterr=$?
+
+ if test ! -d "$pathcomp"; then
+- errstatus=$lasterr
++ errstatus=$lasterr
+ else
+- if test ! -z "$dirmode"; then
++ if test ! -z "$dirmode"; then
+ echo "chmod $dirmode $pathcomp"
+- lasterr=""
+- chmod "$dirmode" "$pathcomp" || lasterr=$?
++ lasterr=
++ chmod "$dirmode" "$pathcomp" || lasterr=$?
+
+- if test ! -z "$lasterr"; then
+- errstatus=$lasterr
+- fi
+- fi
++ if test ! -z "$lasterr"; then
++ errstatus=$lasterr
++ fi
++ fi
+ fi
+ fi
+
+- pathcomp="$pathcomp/"
++ pathcomp=$pathcomp/
+ done
+ done
+
+@@ -107,5 +151,8 @@
+ # Local Variables:
+ # mode: shell-script
+ # sh-indentation: 2
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-end: "$"
+ # End:
+-# mkinstalldirs ends here
+--- a/admin/ylwrap
++++ b/admin/ylwrap
+@@ -1,6 +1,11 @@
+ #! /bin/sh
+ # ylwrap - wrapper for lex/yacc invocations.
+-# Copyright 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
++
++scriptversion=2005-05-14.22
++
++# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005
++# Free Software Foundation, Inc.
++#
+ # Written by Tom Tromey <tromey at cygnus.com>.
+ #
+ # This program is free software; you can redistribute it and/or modify
+@@ -15,51 +20,73 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
+
+-# Usage:
+-# ylwrap INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]...
+-# * INPUT is the input file
+-# * OUTPUT is file PROG generates
+-# * DESIRED is file we actually want
+-# * PROGRAM is program to run
+-# * ARGS are passed to PROG
+-# Any number of OUTPUT,DESIRED pairs may be used.
++# This file is maintained in Automake, please report
++# bugs to <bug-automake at gnu.org> or send patches to
++# <automake-patches at gnu.org>.
++
++case "$1" in
++ '')
++ echo "$0: No files given. Try \`$0 --help' for more information." 1>&2
++ exit 1
++ ;;
++ --basedir)
++ basedir=$2
++ shift 2
++ ;;
++ -h|--h*)
++ cat <<\EOF
++Usage: ylwrap [--help|--version] INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]...
++
++Wrapper for lex/yacc invocations, renaming files as desired.
++
++ INPUT is the input file
++ OUTPUT is one file PROG generates
++ DESIRED is the file we actually want instead of OUTPUT
++ PROGRAM is program to run
++ ARGS are passed to PROG
++
++Any number of OUTPUT,DESIRED pairs may be used.
++
++Report bugs to <bug-automake at gnu.org>.
++EOF
++ exit $?
++ ;;
++ -v|--v*)
++ echo "ylwrap $scriptversion"
++ exit $?
++ ;;
++esac
++
+
+ # The input.
+ input="$1"
+ shift
+ case "$input" in
+- [\\/]* | ?:[\\/]*)
++ [\\/]* | ?:[\\/]*)
+ # Absolute path; do nothing.
+ ;;
+- *)
++ *)
+ # Relative path. Make it absolute.
+ input="`pwd`/$input"
+ ;;
+ esac
+
+-# The directory holding the input.
+-input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'`
+-# Quote $INPUT_DIR so we can use it in a regexp.
+-# FIXME: really we should care about more than `.' and `\'.
+-input_rx=`echo "$input_dir" | sed -e 's,\\\\,\\\\\\\\,g' -e 's,\\.,\\\\.,g'`
+-
+-echo "got $input_rx"
+-
+ pairlist=
+ while test "$#" -ne 0; do
+- if test "$1" = "--"; then
+- shift
+- break
+- fi
+- pairlist="$pairlist $1"
+- shift
++ if test "$1" = "--"; then
++ shift
++ break
++ fi
++ pairlist="$pairlist $1"
++ shift
+ done
+
+ # The program to run.
+@@ -67,8 +94,8 @@
+ shift
+ # Make any relative path in $prog absolute.
+ case "$prog" in
+- [\\/]* | ?:[\\/]*) ;;
+- *[\\/]*) prog="`pwd`/$prog" ;;
++ [\\/]* | ?:[\\/]*) ;;
++ *[\\/]*) prog="`pwd`/$prog" ;;
+ esac
+
+ # FIXME: add hostname here for parallel makes that run commands on
+@@ -79,65 +106,118 @@
+
+ cd $dirname
+
+-$prog ${1+"$@"} "$input"
+-status=$?
++case $# in
++ 0) $prog "$input" ;;
++ *) $prog "$@" "$input" ;;
++esac
++ret=$?
+
+-if test $status -eq 0; then
+- set X $pairlist
+- shift
+- first=yes
+- # Since DOS filename conventions don't allow two dots,
+- # the DOS version of Bison writes out y_tab.c instead of y.tab.c
+- # and y_tab.h instead of y.tab.h. Test to see if this is the case.
+- y_tab_nodot="no"
+- if test -f y_tab.c || test -f y_tab.h; then
+- y_tab_nodot="yes"
+- fi
+-
+- while test "$#" -ne 0; do
+- from="$1"
+- # Handle y_tab.c and y_tab.h output by DOS
+- if test $y_tab_nodot = "yes"; then
+- if test $from = "y.tab.c"; then
+- from="y_tab.c"
+- else
+- if test $from = "y.tab.h"; then
+- from="y_tab.h"
+- fi
+- fi
+- fi
+- if test -f "$from"; then
+- # If $2 is an absolute path name, then just use that,
+- # otherwise prepend `../'.
+- case "$2" in
+- [\\/]* | ?:[\\/]*) target="$2";;
+- *) target="../$2";;
+- esac
+-
+- # Edit out `#line' or `#' directives. We don't want the
+- # resulting debug information to point at an absolute srcdir;
+- # it is better for it to just mention the .y file with no
+- # path.
+- sed -e "/^#/ s,$input_rx,," "$from" > "$target" || status=$?
++if test $ret -eq 0; then
++ set X $pairlist
++ shift
++ first=yes
++ # Since DOS filename conventions don't allow two dots,
++ # the DOS version of Bison writes out y_tab.c instead of y.tab.c
++ # and y_tab.h instead of y.tab.h. Test to see if this is the case.
++ y_tab_nodot="no"
++ if test -f y_tab.c || test -f y_tab.h; then
++ y_tab_nodot="yes"
++ fi
++
++ # The directory holding the input.
++ input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'`
++ # Quote $INPUT_DIR so we can use it in a regexp.
++ # FIXME: really we should care about more than `.' and `\'.
++ input_rx=`echo "$input_dir" | sed 's,\\\\,\\\\\\\\,g;s,\\.,\\\\.,g'`
++
++ while test "$#" -ne 0; do
++ from="$1"
++ # Handle y_tab.c and y_tab.h output by DOS
++ if test $y_tab_nodot = "yes"; then
++ if test $from = "y.tab.c"; then
++ from="y_tab.c"
+ else
+- # A missing file is only an error for the first file. This
+- # is a blatant hack to let us support using "yacc -d". If -d
+- # is not specified, we don't want an error when the header
+- # file is "missing".
+- if test $first = yes; then
+- status=1
+- fi
++ if test $from = "y.tab.h"; then
++ from="y_tab.h"
++ fi
+ fi
+- shift
+- shift
+- first=no
+- done
++ fi
++ if test -f "$from"; then
++ # If $2 is an absolute path name, then just use that,
++ # otherwise prepend `../'.
++ case "$2" in
++ [\\/]* | ?:[\\/]*) target="$2";;
++ *) target="../$2";;
++ esac
++
++ # We do not want to overwrite a header file if it hasn't
++ # changed. This avoid useless recompilations. However the
++ # parser itself (the first file) should always be updated,
++ # because it is the destination of the .y.c rule in the
++ # Makefile. Divert the output of all other files to a temporary
++ # file so we can compare them to existing versions.
++ if test $first = no; then
++ realtarget="$target"
++ target="tmp-`echo $target | sed s/.*[\\/]//g`"
++ fi
++ # Edit out `#line' or `#' directives.
++ #
++ # We don't want the resulting debug information to point at
++ # an absolute srcdir; it is better for it to just mention the
++ # .y file with no path.
++ #
++ # We want to use the real output file name, not yy.lex.c for
++ # instance.
++ #
++ # We want the include guards to be adjusted too.
++ FROM=`echo "$from" | sed \
++ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
++ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
++ TARGET=`echo "$2" | sed \
++ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
++ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
++
++ sed -e "/^#/!b" -e "s,$input_rx,," -e "s,$from,$2," \
++ -e "s,$FROM,$TARGET," "$from" >"$target" || ret=$?
++
++ # Check whether header files must be updated.
++ if test $first = no; then
++ if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then
++ echo "$2" is unchanged
++ rm -f "$target"
++ else
++ echo updating "$2"
++ mv -f "$target" "$realtarget"
++ fi
++ fi
++ else
++ # A missing file is only an error for the first file. This
++ # is a blatant hack to let us support using "yacc -d". If -d
++ # is not specified, we don't want an error when the header
++ # file is "missing".
++ if test $first = yes; then
++ ret=1
++ fi
++ fi
++ shift
++ shift
++ first=no
++ done
+ else
+- status=$?
++ ret=$?
+ fi
+
+ # Remove the directory.
+ cd ..
+ rm -rf $dirname
+
+-exit $status
++exit $ret
++
++# Local Variables:
++# mode: shell-script
++# sh-indentation: 2
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-end: "$"
++# End:
Modified: kde-extras/taskjuggler/trunk/debian/patches/02_autotools_update.diff
===================================================================
--- kde-extras/taskjuggler/trunk/debian/patches/02_autotools_update.diff 2008-01-19 14:00:16 UTC (rev 9045)
+++ kde-extras/taskjuggler/trunk/debian/patches/02_autotools_update.diff 2008-01-19 18:00:18 UTC (rev 9046)
@@ -1,1799 +1,347 @@
-diff -Nrua a/admin/compile b/admin/compile
---- a/admin/compile 2007-06-12 09:55:28.000000000 +0200
-+++ b/admin/compile 2007-06-12 14:39:08.000000000 +0200
-@@ -1,8 +1,9 @@
- #! /bin/sh
--
- # Wrapper for compilers which do not understand `-c -o'.
+--- a/admin/install-sh
++++ b/admin/install-sh
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ # install - install a program, script, or datafile
--# Copyright 1999, 2000 Free Software Foundation, Inc.
+-scriptversion=2005-11-07.23
+scriptversion=2005-05-14.22
-+
-+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
- # Written by Tom Tromey <tromey at cygnus.com>.
- #
- # This program is free software; you can redistribute it and/or modify
-@@ -24,76 +25,118 @@
- # configuration script generated by Autoconf, you may include it under
- # the same distribution terms that you use for the rest of that program.
--# Usage:
--# compile PROGRAM [ARGS]...
--# `-o FOO.o' is removed from the args passed to the actual compile.
--
--prog=$1
--shift
-+# This file is maintained in Automake, please report
-+# bugs to <bug-automake at gnu.org> or send patches to
-+# <automake-patches at gnu.org>.
-+
-+case $1 in
-+ '')
-+ echo "$0: No command. Try \`$0 --help' for more information." 1>&2
-+ exit 1;
-+ ;;
-+ -h | --h*)
-+ cat <<\EOF
-+Usage: compile [--help] [--version] PROGRAM [ARGS]
-+
-+Wrapper for compilers which do not understand `-c -o'.
-+Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
-+arguments, and rename the output as expected.
-+
-+If you are trying to build a whole package this is not the
-+right script to run: please start by reading the file `INSTALL'.
-+
-+Report bugs to <bug-automake at gnu.org>.
-+EOF
-+ exit $?
-+ ;;
-+ -v | --v*)
-+ echo "compile $scriptversion"
-+ exit $?
-+ ;;
-+esac
+ # This originates from X11R5 (mit/util/scripts/install.sh), which was
+ # later released in X11R6 (xc/config/util/install.sh) with the
+@@ -58,21 +58,7 @@
+ rmprog="${RMPROG-rm}"
+ mkdirprog="${MKDIRPROG-mkdir}"
- ofile=
- cfile=
--args=
--while test $# -gt 0; do
-- case "$1" in
-- -o)
-- # configure might choose to run compile as `compile cc -o foo foo.c'.
-- # So we do something ugly here.
-- ofile=$2
-- shift
-- case "$ofile" in
-- *.o | *.obj)
-- ;;
-- *)
-- args="$args -o $ofile"
-- ofile=
-- ;;
-- esac
-- ;;
-- *.c)
-- cfile=$1
-- args="$args $1"
-- ;;
-- *)
-- args="$args $1"
-- ;;
-- esac
-- shift
-+eat=
-+
-+for arg
-+do
-+ if test -n "$eat"; then
-+ eat=
-+ else
-+ case $1 in
-+ -o)
-+ # configure might choose to run compile as `compile cc -o foo foo.c'.
-+ # So we strip `-o arg' only if arg is an object.
-+ eat=1
-+ case $2 in
-+ *.o | *.obj)
-+ ofile=$2
-+ ;;
-+ *)
-+ set x "$@" -o "$2"
-+ shift
-+ ;;
-+ esac
-+ ;;
-+ *.c)
-+ cfile=$1
-+ set x "$@" "$1"
-+ shift
-+ ;;
-+ *)
-+ set x "$@" "$1"
-+ shift
-+ ;;
-+ esac
-+ fi
-+ shift
- done
-
- if test -z "$ofile" || test -z "$cfile"; then
-- # If no `-o' option was seen then we might have been invoked from a
-- # pattern rule where we don't need one. That is ok -- this is a
-- # normal compilation that the losing compiler can handle. If no
-- # `.c' file was seen then we are probably linking. That is also
-- # ok.
-- exec "$prog" $args
-+ # If no `-o' option was seen then we might have been invoked from a
-+ # pattern rule where we don't need one. That is ok -- this is a
-+ # normal compilation that the losing compiler can handle. If no
-+ # `.c' file was seen then we are probably linking. That is also
-+ # ok.
-+ exec "$@"
- fi
-
- # Name of file we expect compiler to create.
--cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
-+cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
-
- # Create the lock directory.
- # Note: use `[/.-]' here to ensure that we don't use the same name
- # that we are using for the .o file. Also, base the name on the expected
- # object file name, since that is what matters with a parallel build.
--lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d
-+lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
- while true; do
-- if mkdir $lockdir > /dev/null 2>&1; then
-- break
-- fi
-- sleep 1
-+ if mkdir "$lockdir" >/dev/null 2>&1; then
-+ break
-+ fi
-+ sleep 1
- done
- # FIXME: race condition here if user kills between mkdir and trap.
--trap "rmdir $lockdir; exit 1" 1 2 15
-+trap "rmdir '$lockdir'; exit 1" 1 2 15
-
- # Run the compile.
--"$prog" $args
--status=$?
-+"$@"
-+ret=$?
-
- if test -f "$cofile"; then
-- mv "$cofile" "$ofile"
-+ mv "$cofile" "$ofile"
-+elif test -f "${cofile}bj"; then
-+ mv "${cofile}bj" "$ofile"
- fi
-
--rmdir $lockdir
--exit $status
-+rmdir "$lockdir"
-+exit $ret
-+
-+# Local Variables:
-+# mode: shell-script
-+# sh-indentation: 2
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-end: "$"
-+# End:
-diff -Nrua a/admin/depcomp b/admin/depcomp
---- a/admin/depcomp 2007-06-12 09:55:28.000000000 +0200
-+++ b/admin/depcomp 2007-06-12 14:39:08.000000000 +0200
-@@ -1,7 +1,10 @@
- #! /bin/sh
+-posix_glob=
+-posix_mkdir=
-
- # depcomp - compile a program generating dependencies as side-effects
--# Copyright 1999, 2000 Free Software Foundation, Inc.
-+
-+scriptversion=2006-10-15.18
-+
-+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
-+# Foundation, Inc.
+-# Symbolic mode for testing mkdir with directories.
+-# It is the same as 755, but also tests that "u+" works.
+-test_mode=u=rwx,g=rx,o=rx,u+wx
+-
+-# Desired mode of installed file.
+-mode=0755
+-
+-# Desired mode of newly created intermediate directories.
+-# It is empty if not known yet.
+-intermediate_mode=
+-
+-chmodcmd=$chmodprog
++chmodcmd="$chmodprog 0755"
+ chowncmd=
+ chgrpcmd=
+ stripcmd=
+@@ -125,7 +111,7 @@
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
-@@ -25,13 +28,45 @@
+ --help) echo "$usage"; exit $?;;
- # Originally written by Alexandre Oliva <oliva at dcc.unicamp.br>.
-
-+case $1 in
-+ '')
-+ echo "$0: No command. Try \`$0 --help' for more information." 1>&2
-+ exit 1;
-+ ;;
-+ -h | --h*)
-+ cat <<\EOF
-+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
-+
-+Run PROGRAMS ARGS to compile a file, generating dependencies
-+as side-effects.
-+
-+Environment variables:
-+ depmode Dependency tracking mode.
-+ source Source file read by `PROGRAMS ARGS'.
-+ object Object file output by `PROGRAMS ARGS'.
-+ DEPDIR directory where to store dependencies.
-+ depfile Dependency file to output.
-+ tmpdepfile Temporary file to use when outputing dependencies.
-+ libtool Whether libtool is used (yes/no).
-+
-+Report bugs to <bug-automake at gnu.org>.
-+EOF
-+ exit $?
-+ ;;
-+ -v | --v*)
-+ echo "depcomp $scriptversion"
-+ exit $?
-+ ;;
-+esac
-+
- if test -z "$depmode" || test -z "$source" || test -z "$object"; then
- echo "depcomp: Variables source, object and depmode must be set" 1>&2
- exit 1
+- -m) mode=$2
++ -m) chmodcmd="$chmodprog $2"
+ shift
+ shift
+ continue;;
+@@ -178,8 +164,6 @@
+ exit 0
fi
--# `libtool' can also be set to `yes' or `no'.
--depfile=${depfile-`echo "$object" | sed 's,\([^/]*\)$,.deps/\1,;s/\.\([^.]*\)$/.P\1/'`}
-+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-+depfile=${depfile-`echo "$object" |
-+ sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
- tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-
- rm -f "$tmpdepfile"
-@@ -57,7 +92,20 @@
- ## 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.
-- "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
-+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
-+## the command line argument order; so add the flags where they
-+## appear in depend2.am. Note that the slowdown incurred here
-+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
-+ for arg
-+ do
-+ case $arg in
-+ -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
-+ *) set fnord "$@" "$arg" ;;
-+ esac
-+ shift # fnord
-+ shift # $arg
-+ done
-+ "$@"
- stat=$?
- if test $stat -eq 0; then :
- else
-@@ -163,19 +211,25 @@
-
- aix)
- # The C for AIX Compiler uses -M and outputs the dependencies
-- # in a .u file. This file always lives in the current directory.
-- # Also, the AIX compiler puts `$object:' at the start of each line;
-- # $object doesn't have directory information.
-- stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
-+ # in a .u file. In older versions, this file always lives in the
-+ # current directory. Also, the AIX compiler puts `$object:' at the
-+ # start of each line; $object doesn't have directory information.
-+ # Version 6 uses the directory in both cases.
-+ stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
- tmpdepfile="$stripped.u"
-- outname="$stripped.o"
- if test "$libtool" = yes; then
- "$@" -Wc,-M
- else
- "$@" -M
- fi
+-test -n "$dir_arg" || trap '(exit $?); exit' 1 2 13 15
-
- stat=$?
-+
-+ if test -f "$tmpdepfile"; then :
-+ else
-+ stripped=`echo "$stripped" | sed 's,^.*/,,'`
-+ tmpdepfile="$stripped.u"
-+ fi
-+
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile"
-@@ -183,6 +237,7 @@
- fi
+ for src
+ do
+ # Protect names starting with `-'.
+@@ -189,11 +173,15 @@
- if test -f "$tmpdepfile"; then
-+ outname="$stripped.o"
- # Each line is of the form `foo.o: dependent.h'.
- # Do two passes, one to just change these to
- # `$object: dependent.h' and one to simply `dependent.h:'.
-@@ -198,11 +253,9 @@
- ;;
+ if test -n "$dir_arg"; then
+ dst=$src
+- dstdir=$dst
+- test -d "$dstdir"
+- dstdir_status=$?
+- else
++ src=
- icc)
-- # Must come before tru64.
++ if test -d "$dst"; then
++ mkdircmd=:
++ chmodcmd=
++ else
++ mkdircmd=$mkdirprog
++ fi
++ else
+ # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+ # might cause directories to be created, which would be especially bad
+ # if $src (and thus $dsttmp) contains '*'.
+@@ -220,122 +208,53 @@
+ echo "$0: $dstarg: Is a directory" >&2
+ exit 1
+ fi
+- dstdir=$dst
+- dst=$dstdir/`basename "$src"`
+- dstdir_status=0
+- else
+- # Prefer dirname, but fall back on a substitute if dirname fails.
+- dstdir=`
+- (dirname "$dst") 2>/dev/null ||
+- expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+- X"$dst" : 'X\(//\)[^/]' \| \
+- X"$dst" : 'X\(//\)$' \| \
+- X"$dst" : 'X\(/\)' \| \
+- . : '\(.\)' 2>/dev/null ||
+- echo X"$dst" |
+- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+- /^X\(\/\/\)$/{ s//\1/; q; }
+- /^X\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'
+- `
-
-- # Intel's C compiler understands `-MD -MF file'. However
-+ # Intel's C compiler understands `-MD -MF file'. However on
- # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-- # will fill foo.d with something like
-+ # ICC 7.0 will fill foo.d with something like
- # foo.o: sub/foo.c
- # foo.o: sub/foo.h
- # which is wrong. We want:
-@@ -210,6 +263,12 @@
- # sub/foo.o: sub/foo.h
- # sub/foo.c:
- # sub/foo.h:
-+ # ICC 7.1 will output
-+ # foo.o: sub/foo.c sub/foo.h
-+ # and will wrap long lines using \ :
-+ # foo.o: sub/foo.c ... \
-+ # sub/foo.h ... \
-+ # ...
-
- "$@" -MD -MF "$tmpdepfile"
- stat=$?
-@@ -219,45 +278,110 @@
- exit $stat
+- test -d "$dstdir"
+- dstdir_status=$?
++ dst=$dst/`basename "$src"`
+ fi
fi
- rm -f "$depfile"
-- # Each line is of the form `foo.o: dependent.h'.
-+ # Each line is of the form `foo.o: dependent.h',
-+ # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
- # Do two passes, one to just change these to
- # `$object: dependent.h' and one to simply `dependent.h:'.
-- sed -e "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-- sed -e "s,^[^:]*: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
-+ sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-+ # Some versions of the HPUX 10.20 sed can't process this invocation
-+ # correctly. Breaking it into two sed invocations is a workaround.
-+ sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-+ sed -e 's/$/ :/' >> "$depfile"
- rm -f "$tmpdepfile"
- ;;
-+hp2)
-+ # The "hp" stanza above does not work with aCC (C++) and HP's ia64
-+ # compilers, which have integrated preprocessors. The correct option
-+ # to use with these is +Maked; it writes dependencies to a file named
-+ # 'foo.d', which lands next to the object file, wherever that
-+ # happens to be.
-+ # Much of this is similar to the tru64 case; see comments there.
-+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-+ test "x$dir" = "x$object" && dir=
-+ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-+ if test "$libtool" = yes; then
-+ tmpdepfile1=$dir$base.d
-+ tmpdepfile2=$dir.libs/$base.d
-+ "$@" -Wc,+Maked
-+ else
-+ tmpdepfile1=$dir$base.d
-+ tmpdepfile2=$dir$base.d
-+ "$@" +Maked
-+ fi
-+ stat=$?
-+ if test $stat -eq 0; then :
-+ else
-+ rm -f "$tmpdepfile1" "$tmpdepfile2"
-+ exit $stat
-+ fi
-+
-+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
-+ do
-+ test -f "$tmpdepfile" && break
-+ done
-+ if test -f "$tmpdepfile"; then
-+ sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
-+ # Add `dependent.h:' lines.
-+ sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
-+ else
-+ echo "#dummy" > "$depfile"
-+ fi
-+ rm -f "$tmpdepfile" "$tmpdepfile2"
-+ ;;
-+
- tru64)
-- # The Tru64 AIX compiler uses -MD to generate dependencies as a side
-+ # The Tru64 compiler uses -MD to generate dependencies as a side
- # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-- # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-+ # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
- # dependencies in `foo.d' instead, so we check for that too.
- # Subdirectories are respected.
-+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-+ test "x$dir" = "x$object" && dir=
-+ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+- obsolete_mkdir_used=false
++ # This sed command emulates the dirname command.
++ dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
-- tmpdepfile1="$object.d"
-- tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'`
- if test "$libtool" = yes; then
-+ # With Tru64 cc, shared objects can also be used to make a
-+ # static library. This mechanism is used in libtool 1.4 series to
-+ # handle both shared and static libraries in a single compilation.
-+ # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-+ #
-+ # With libtool 1.5 this exception was removed, and libtool now
-+ # generates 2 separate objects for the 2 libraries. These two
-+ # compilations output dependencies in $dir.libs/$base.o.d and
-+ # in $dir$base.o.d. We have to check for both files, because
-+ # one of the two compilations can be disabled. We should prefer
-+ # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-+ # automatically cleaned when .libs/ is deleted, while ignoring
-+ # the former would cause a distcleancheck panic.
-+ tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4
-+ tmpdepfile2=$dir$base.o.d # libtool 1.5
-+ tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5
-+ tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504
- "$@" -Wc,-MD
- else
-+ tmpdepfile1=$dir$base.o.d
-+ tmpdepfile2=$dir$base.d
-+ tmpdepfile3=$dir$base.d
-+ tmpdepfile4=$dir$base.d
- "$@" -MD
- fi
+- if test $dstdir_status != 0; then
+- case $posix_mkdir in
+- '')
+- posix_mkdir=false
+- if $mkdirprog -m $test_mode -p -- / >/dev/null 2>&1; then
+- posix_mkdir=true
+- else
+- # Remove any dirs left behind by ancient mkdir implementations.
+- rmdir ./-m "$test_mode" ./-p ./-- 2>/dev/null
+- fi ;;
+- esac
++ # Make sure that the destination directory exists.
- stat=$?
- if test $stat -eq 0; then :
- else
-- rm -f "$tmpdepfile1" "$tmpdepfile2"
-+ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
- exit $stat
- fi
-
-- if test -f "$tmpdepfile1"; then
-- tmpdepfile="$tmpdepfile1"
-- else
-- tmpdepfile="$tmpdepfile2"
-- fi
-+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-+ do
-+ test -f "$tmpdepfile" && break
-+ done
- if test -f "$tmpdepfile"; then
- sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-- # That's a space and a tab in the [].
-- sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-+ # That's a tab and a space in the [].
-+ sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
- else
- echo "#dummy" > "$depfile"
- fi
-@@ -270,34 +394,42 @@
-
- dashmstdout)
- # Important note: in order to support this mode, a compiler *must*
-- # always write the proprocessed file to stdout, regardless of -o,
-- # because we must use -o when running libtool.
-- test -z "$dashmflag" && dashmflag=-M
-- ( IFS=" "
-- case " $* " in
-- *" --mode=compile "*) # this is libtool, let us make it quiet
-- for arg
-- do # cycle over the arguments
-- case "$arg" in
-- "--mode=compile")
-- # insert --quiet before "--mode=compile"
-- set fnord "$@" --quiet
-- shift # fnord
-- ;;
-- esac
-- set fnord "$@" "$arg"
-- shift # fnord
-- shift # "$arg"
-- done
-+ # always write the preprocessed file to stdout, regardless of -o.
-+ "$@" || exit $?
+- if
+- $posix_mkdir && {
++ # Skip lots of stat calls in the usual case.
++ if test ! -d "$dstdir"; then
++ defaultIFS='
++ '
++ IFS="${IFS-$defaultIFS}"
+
-+ # Remove the call to Libtool.
-+ if test "$libtool" = yes; then
-+ while test $1 != '--mode=compile'; do
-+ shift
-+ done
++ oIFS=$IFS
++ # Some sh's can't handle IFS=/ for some reason.
++ IFS='%'
++ set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+ shift
-+ fi
-+
-+ # Remove `-o $object'.
-+ IFS=" "
-+ for arg
-+ do
-+ case $arg in
-+ -o)
-+ shift
-+ ;;
-+ $object)
-+ shift
-+ ;;
-+ *)
-+ set fnord "$@" "$arg"
-+ shift # fnord
-+ shift # $arg
- ;;
- esac
-- "$@" $dashmflag | sed 's:^[^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
-- ) &
-- proc=$!
-- "$@"
-- stat=$?
-- wait "$proc"
-- if test "$stat" != 0; then exit $stat; fi
-+ done
-+
-+ test -z "$dashmflag" && dashmflag=-M
-+ # Require at least two characters before searching for `:'
-+ # in the target name. This is to cope with DOS-style filenames:
-+ # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
-+ "$@" $dashmflag |
-+ sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
- rm -f "$depfile"
- cat < "$tmpdepfile" > "$depfile"
- tr ' ' '
-@@ -315,36 +447,40 @@
- ;;
++ IFS=$oIFS
- makedepend)
-- # X makedepend
-- (
-- shift
-- cleared=no
-- for arg in "$@"; do
-- case $cleared in no)
-- set ""; shift
-- cleared=yes
-- esac
-- case "$arg" in
-- -D*|-I*)
-- set fnord "$@" "$arg"; shift;;
-- -*)
-- ;;
-- *)
-- set fnord "$@" "$arg"; shift;;
-- esac
-+ "$@" || exit $?
-+ # Remove any Libtool call
-+ if test "$libtool" = yes; then
-+ while test $1 != '--mode=compile'; do
-+ shift
- done
-- obj_suffix="`echo $object | sed 's/^.*\././'`"
-- touch "$tmpdepfile"
-- ${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@"
-- ) &
-- proc=$!
-- "$@"
-- stat=$?
-- wait "$proc"
-- if test "$stat" != 0; then exit $stat; fi
-+ shift
-+ fi
-+ # X makedepend
-+ shift
-+ cleared=no
-+ for arg in "$@"; do
-+ case $cleared in
-+ no)
-+ set ""; shift
-+ cleared=yes ;;
-+ esac
-+ case "$arg" in
-+ -D*|-I*)
-+ set fnord "$@" "$arg"; shift ;;
-+ # Strip any option that makedepend may not understand. Remove
-+ # the object too, otherwise makedepend will parse it as a source file.
-+ -*|$object)
-+ ;;
-+ *)
-+ set fnord "$@" "$arg"; shift ;;
-+ esac
-+ done
-+ obj_suffix="`echo $object | sed 's/^.*\././'`"
-+ touch "$tmpdepfile"
-+ ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
- rm -f "$depfile"
- cat < "$tmpdepfile" > "$depfile"
-- tail +3 "$tmpdepfile" | tr ' ' '
-+ sed '1,2d' "$tmpdepfile" | tr ' ' '
- ' | \
- ## 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 +490,40 @@
-
- cpp)
- # Important note: in order to support this mode, a compiler *must*
-- # always write the proprocessed file to stdout, regardless of -o,
-- # because we must use -o when running libtool.
-- ( IFS=" "
-- case " $* " in
-- *" --mode=compile "*)
-- for arg
-- do # cycle over the arguments
-- case $arg in
-- "--mode=compile")
-- # insert --quiet before "--mode=compile"
-- set fnord "$@" --quiet
-- shift # fnord
-- ;;
-- esac
-- set fnord "$@" "$arg"
-- shift # fnord
-- shift # "$arg"
-- done
-+ # always write the preprocessed file to stdout.
-+ "$@" || exit $?
-+
-+ # Remove the call to Libtool.
-+ if test "$libtool" = yes; then
-+ while test $1 != '--mode=compile'; do
-+ shift
-+ done
-+ shift
-+ fi
-+
-+ # Remove `-o $object'.
-+ IFS=" "
-+ for arg
-+ do
-+ case $arg in
-+ -o)
-+ shift
-+ ;;
-+ $object)
-+ shift
-+ ;;
-+ *)
-+ set fnord "$@" "$arg"
-+ shift # fnord
-+ shift # $arg
- ;;
- esac
-- "$@" -E |
-- sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-+ done
-+
-+ "$@" -E |
-+ sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-+ -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
- sed '$ s: \\$::' > "$tmpdepfile"
-- ) &
-- proc=$!
-- "$@"
-- stat=$?
-- wait "$proc"
-- if test "$stat" != 0; then exit $stat; fi
- rm -f "$depfile"
- echo "$object : \\" > "$depfile"
- cat < "$tmpdepfile" >> "$depfile"
-@@ -392,34 +533,27 @@
-
- msvisualcpp)
- # Important note: in order to support this mode, a compiler *must*
-- # always write the proprocessed file to stdout, regardless of -o,
-+ # always write the preprocessed file to stdout, regardless of -o,
- # because we must use -o when running libtool.
-- ( IFS=" "
-- case " $* " in
-- *" --mode=compile "*)
-- for arg
-- do # cycle over the arguments
-- case $arg in
-- "--mode=compile")
-- # insert --quiet before "--mode=compile"
-- set fnord "$@" --quiet
-- shift # fnord
-- ;;
-- esac
-+ "$@" || exit $?
-+ IFS=" "
-+ for arg
-+ do
-+ case "$arg" in
-+ "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-+ set fnord "$@"
-+ shift
-+ shift
-+ ;;
-+ *)
- set fnord "$@" "$arg"
-- shift # fnord
-- shift # "$arg"
-- done
-- ;;
-+ shift
-+ shift
-+ ;;
- esac
-- "$@" -E |
-- sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
-- ) &
-- proc=$!
-- "$@"
-- stat=$?
-- wait "$proc"
-- if test "$stat" != 0; then exit $stat; fi
-+ done
-+ "$@" -E |
-+ sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
- rm -f "$depfile"
- echo "$object : \\" > "$depfile"
- . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
-@@ -439,3 +573,12 @@
- esac
-
- exit 0
-+
-+# Local Variables:
-+# mode: shell-script
-+# sh-indentation: 2
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-end: "$"
-+# End:
-diff -Nrua a/admin/install-sh b/admin/install-sh
---- a/admin/install-sh 2007-06-12 09:55:28.000000000 +0200
-+++ b/admin/install-sh 2007-06-12 14:39:08.000000000 +0200
-@@ -1,36 +1,62 @@
- #!/bin/sh
--#
- # install - install a program, script, or datafile
--# This comes from X11R5 (mit/util/scripts/install.sh).
-+
-+scriptversion=2006-10-14.15
-+
-+# This originates from X11R5 (mit/util/scripts/install.sh), which was
-+# later released in X11R6 (xc/config/util/install.sh) with the
-+# following copyright and license.
-+#
-+# Copyright (C) 1994 X Consortium
-+#
-+# Permission is hereby granted, free of charge, to any person obtaining a copy
-+# of this software and associated documentation files (the "Software"), to
-+# deal in the Software without restriction, including without limitation the
-+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-+# sell copies of the Software, and to permit persons to whom the Software is
-+# furnished to do so, subject to the following conditions:
- #
--# Copyright 1991 by the Massachusetts Institute of Technology
-+# The above copyright notice and this permission notice shall be included in
-+# all copies or substantial portions of the Software.
- #
--# Permission to use, copy, modify, distribute, and sell this software and its
--# documentation for any purpose is hereby granted without fee, provided that
--# the above copyright notice appear in all copies and that both that
--# copyright notice and this permission notice appear in supporting
--# documentation, and that the name of M.I.T. not be used in advertising or
--# publicity pertaining to distribution of the software without specific,
--# written prior permission. M.I.T. makes no representations about the
--# suitability of this software for any purpose. It is provided "as is"
--# without express or implied warranty.
-+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+#
-+# Except as contained in this notice, the name of the X Consortium shall not
-+# be used in advertising or otherwise to promote the sale, use or other deal-
-+# ings in this Software without prior written authorization from the X Consor-
-+# tium.
-+#
-+#
-+# FSF changes to this file are in the public domain.
- #
- # Calling this script install-sh is preferred over install.sh, to prevent
- # `make' implicit rules from creating a file called install from it
- # when there is no Makefile.
- #
- # This script is compatible with the BSD install script, but was written
--# from scratch. It can only install one file at a time, a restriction
--# shared with many OS's install programs.
-+# from scratch.
-
-+nl='
-+'
-+IFS=" "" $nl"
-
- # set DOITPROG to echo to test this script
-
- # Don't use :- since 4.3BSD and earlier shells don't like it.
- doit="${DOITPROG-}"
-+if test -z "$doit"; then
-+ doit_exec=exec
-+else
-+ doit_exec=$doit
-+fi
-
+- # With -d, create the new directory with the user-specified mode.
+- # Otherwise, create it using the same intermediate mode that
+- # mkdir -p would use when creating intermediate directories.
+- # POSIX says that this mode is "$(umask -S),u+wx", so use that
+- # if umask -S works.
-
--# put in absolute paths if you don't have them in your path; or use env. vars.
-+# Put in absolute file names if you don't have them in your path;
-+# or use environment vars.
-
- mvprog="${MVPROG-mv}"
- cpprog="${CPPROG-cp}"
-@@ -41,236 +67,441 @@
- rmprog="${RMPROG-rm}"
- mkdirprog="${MKDIRPROG-mkdir}"
-
--transformbasename=""
--transform_arg=""
--instcmd="$mvprog"
--chmodcmd="$chmodprog 0755"
--chowncmd=""
--chgrpcmd=""
--stripcmd=""
-+posix_glob=
-+posix_mkdir=
-+
-+# Desired mode of installed file.
-+mode=0755
-+
-+chmodcmd=$chmodprog
-+chowncmd=
-+chgrpcmd=
-+stripcmd=
- rmcmd="$rmprog -f"
- mvcmd="$mvprog"
--src=""
--dst=""
--dir_arg=""
--
--while [ x"$1" != x ]; do
-- case $1 in
-- -c) instcmd=$cpprog
-- shift
-- continue;;
--
-- -d) dir_arg=true
-- shift
-- continue;;
--
-- -m) chmodcmd="$chmodprog $2"
-- shift
-- shift
-- continue;;
--
-- -o) chowncmd="$chownprog $2"
-- shift
-- shift
-- continue;;
--
-- -g) chgrpcmd="$chgrpprog $2"
-- shift
-- shift
-- continue;;
--
-- -s) stripcmd=$stripprog
-- shift
-- continue;;
--
-- -t=*) transformarg=`echo $1 | sed 's/-t=//'`
-- shift
-- continue;;
--
-- -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-- shift
-- continue;;
-+src=
-+dst=
-+dir_arg=
-+dstarg=
-+no_target_directory=
-+
-+usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-+ or: $0 [OPTION]... SRCFILES... DIRECTORY
-+ or: $0 [OPTION]... -t DIRECTORY SRCFILES...
-+ or: $0 [OPTION]... -d DIRECTORIES...
-+
-+In the 1st form, copy SRCFILE to DSTFILE.
-+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-+In the 4th, create DIRECTORIES.
-+
-+Options:
-+-c (ignored)
-+-d create directories instead of installing files.
-+-g GROUP $chgrpprog installed files to GROUP.
-+-m MODE $chmodprog installed files to MODE.
-+-o USER $chownprog installed files to USER.
-+-s $stripprog installed files.
-+-t DIRECTORY install into DIRECTORY.
-+-T report an error if DSTFILE is a directory.
-+--help display this help and exit.
-+--version display version info and exit.
-+
-+Environment variables override the default commands:
-+ CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
-+"
-+
-+while test $# -ne 0; do
-+ case $1 in
-+ -c) shift
-+ continue;;
-+
-+ -d) dir_arg=true
-+ shift
-+ continue;;
-+
-+ -g) chgrpcmd="$chgrpprog $2"
-+ shift
-+ shift
-+ continue;;
-+
-+ --help) echo "$usage"; exit $?;;
-+
-+ -m) mode=$2
-+ shift
-+ shift
-+ case $mode in
-+ *' '* | *' '* | *'
-+'* | *'*'* | *'?'* | *'['*)
-+ echo "$0: invalid mode: $mode" >&2
-+ exit 1;;
-+ esac
-+ continue;;
-+
-+ -o) chowncmd="$chownprog $2"
-+ shift
-+ shift
-+ continue;;
-+
-+ -s) stripcmd=$stripprog
-+ shift
-+ continue;;
-
-- *) if [ x"$src" = x ]
-- then
-- src=$1
-- else
-- # this colon is to work around a 386BSD /bin/sh bug
-- :
-- dst=$1
-- fi
-- shift
-- continue;;
-- esac
--done
-+ -t) dstarg=$2
-+ shift
-+ shift
-+ continue;;
-
--if [ x"$src" = x ]
--then
-- echo "$0: no input file specified" >&2
-- exit 1
--else
-- :
--fi
-+ -T) no_target_directory=true
-+ shift
-+ continue;;
-
--if [ x"$dir_arg" != x ]; then
-- dst=$src
-- src=""
--
-- if [ -d "$dst" ]; then
-- instcmd=:
-- chmodcmd=""
+- if test -n "$dir_arg"; then
+- mkdir_mode=$mode
- else
-- instcmd=$mkdirprog
+- case $intermediate_mode in
+- '')
+- if umask_S=`(umask -S) 2>/dev/null`; then
+- intermediate_mode=$umask_S,u+wx
+- else
+- intermediate_mode=$test_mode
+- fi ;;
+- esac
+- mkdir_mode=$intermediate_mode
- fi
--else
-+ --version) echo "$0 $scriptversion"; exit $?;;
-
--# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
--# might cause directories to be created, which would be especially bad
--# if $src (and thus $dsttmp) contains '*'.
-
-- if [ -f "$src" ] || [ -d "$src" ]
-- then
-- :
-- else
-- echo "$0: $src does not exist" >&2
-- exit 1
-- fi
-+ --) shift
-+ break;;
+- $mkdirprog -m "$mkdir_mode" -p -- "$dstdir"
+- }
+- then :
+- else
++ pathcomp=
-- if [ x"$dst" = x ]
-- then
-- echo "$0: no destination specified" >&2
-- exit 1
-- else
-- :
-- fi
-+ -*) echo "$0: invalid option: $1" >&2
-+ exit 1;;
-
--# If destination is a directory, append the input filename; if your system
--# does not like double slashes in filenames, you may need to add some logic
-+ *) break;;
-+ esac
-+done
-
-- if [ -d "$dst" ]
-- then
-- dst=$dst/`basename "$src"`
-- else
-- :
-- fi
-+if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
-+ # When -d is used, all remaining arguments are directories to create.
-+ # When -t is used, the destination is already specified.
-+ # Otherwise, the last argument is the destination. Remove it from $@.
-+ for arg
-+ do
-+ if test -n "$dstarg"; then
-+ # $@ is not empty: it contains at least $arg.
-+ set fnord "$@" "$dstarg"
-+ shift # fnord
-+ fi
-+ shift # arg
-+ dstarg=$arg
-+ done
- fi
-
--## this sed command emulates the dirname command
--dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+- # mkdir does not conform to POSIX, or it failed possibly due to
+- # a race condition. Create the directory the slow way, step by
+- # step, checking for races as we go.
-
--# Make sure that the destination directory exists.
--# this part is taken from Noah Friedman's mkinstalldirs script
+- case $dstdir in
+- /*) pathcomp=/ ;;
+- -*) pathcomp=./ ;;
+- *) pathcomp= ;;
+- esac
-
--# Skip lots of stat calls in the usual case.
--if [ ! -d "$dstdir" ]; then
--defaultIFS='
-- '
--IFS="${IFS-$defaultIFS}"
+- case $posix_glob in
+- '')
+- if (set -f) 2>/dev/null; then
+- posix_glob=true
+- else
+- posix_glob=false
+- fi ;;
+- esac
-
--oIFS=$IFS
--# Some sh's can't handle IFS=/ for some reason.
--IFS='%'
--set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
--IFS=$oIFS
+- oIFS=$IFS
+- IFS=/
+- $posix_glob && set -f
+- set fnord $dstdir
++ while test $# -ne 0 ; do
++ pathcomp=$pathcomp$1
+ shift
+- $posix_glob && set +f
+- IFS=$oIFS
-
--pathcomp=''
+- for d
+- do
+- test "x$d" = x && continue
-
--while [ $# -ne 0 ] ; do
-- pathcomp=$pathcomp$1
-- shift
--
-- if [ ! -d "$pathcomp" ] ;
-- then
-- $mkdirprog "$pathcomp"
-- else
-- :
+- pathcomp=$pathcomp$d
+- if test ! -d "$pathcomp"; then
+- $mkdirprog "$pathcomp"
+- # Don't fail if two instances are running concurrently.
+- test -d "$pathcomp" || exit 1
- fi
--
- pathcomp=$pathcomp/
--done
-+if test $# -eq 0; then
-+ if test -z "$dir_arg"; then
-+ echo "$0: no input file specified." >&2
-+ exit 1
-+ fi
-+ # It's OK to call `install-sh -d' without argument.
-+ # This can happen when creating conditional directories.
-+ exit 0
- fi
-
--if [ x"$dir_arg" != x ]
--then
-- $doit $instcmd "$dst" &&
--
-- if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi &&
-- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi &&
-- if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi &&
-- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi
--else
--
--# If we're going to rename the final executable, determine the name now.
-+if test -z "$dir_arg"; then
-+ trap '(exit $?); exit' 1 2 13 15
-
-- if [ x"$transformarg" = x ]
-- then
-- dstfile=`basename "$dst"`
-- else
-- dstfile=`basename "$dst" $transformbasename |
-- sed $transformarg`$transformbasename
-- fi
-+ # Set umask so as not to create temps with too-generous modes.
-+ # However, 'strip' requires both read and write access to temps.
-+ case $mode in
-+ # Optimize common cases.
-+ *644) cp_umask=133;;
-+ *755) cp_umask=22;;
-+
-+ *[0-7])
-+ if test -z "$stripcmd"; then
-+ u_plus_rw=
-+ else
-+ u_plus_rw='% 200'
+- done
+- obsolete_mkdir_used=true
+- fi
++ if test ! -d "$pathcomp"; then
++ $mkdirprog "$pathcomp"
++ # mkdir can fail with a `File exist' error in case several
++ # install-sh are creating the directory concurrently. This
++ # is OK.
++ test -d "$pathcomp" || exit
+ fi
-+ cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
-+ *)
-+ if test -z "$stripcmd"; then
-+ u_plus_rw=
-+ else
-+ u_plus_rw=,u+rw
-+ fi
-+ cp_umask=$mode$u_plus_rw;;
-+ esac
-+fi
++ pathcomp=$pathcomp/
++ done
+ fi
--# don't allow the sed command to completely eliminate the filename
-+for src
-+do
-+ # Protect names starting with `-'.
-+ case $src in
-+ -*) src=./$src ;;
-+ esac
+ if test -n "$dir_arg"; then
+- { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+- { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+- { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+- test -z "$chmodcmd" || $doit $chmodcmd "$mode" "$dst"; } || exit 1
++ $doit $mkdircmd "$dst" \
++ && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
++ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
++ && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
++ && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
+
-+ if test -n "$dir_arg"; then
-+ dst=$src
-+ dstdir=$dst
-+ test -d "$dstdir"
-+ dstdir_status=$?
-+ else
-+
-+ # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
-+ # might cause directories to be created, which would be especially bad
-+ # if $src (and thus $dsttmp) contains '*'.
-+ if test ! -f "$src" && test ! -d "$src"; then
-+ echo "$0: $src does not exist." >&2
-+ exit 1
-+ fi
-+
-+ if test -z "$dstarg"; then
-+ echo "$0: no destination specified." >&2
-+ exit 1
-+ fi
-+
-+ dst=$dstarg
-+ # Protect names starting with `-'.
-+ case $dst in
-+ -*) dst=./$dst ;;
-+ esac
+ else
++ dstfile=`basename "$dst"`
-- if [ x"$dstfile" = x ]
-- then
-- dstfile=`basename "$dst"`
-+ # If destination is a directory, append the input filename; won't work
-+ # if double slashes aren't ignored.
-+ if test -d "$dst"; then
-+ if test -n "$no_target_directory"; then
-+ echo "$0: $dstarg: Is a directory" >&2
-+ exit 1
-+ fi
-+ dstdir=$dst
-+ dst=$dstdir/`basename "$src"`
-+ dstdir_status=0
-+ else
-+ # Prefer dirname, but fall back on a substitute if dirname fails.
-+ dstdir=`
-+ (dirname "$dst") 2>/dev/null ||
-+ expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+ X"$dst" : 'X\(//\)[^/]' \| \
-+ X"$dst" : 'X\(//\)$' \| \
-+ X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
-+ echo X"$dst" |
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)[^/].*/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\).*/{
-+ s//\1/
-+ q
-+ }
-+ s/.*/./; q'
-+ `
-+
-+ test -d "$dstdir"
-+ dstdir_status=$?
-+ fi
-+ fi
-+
-+ obsolete_mkdir_used=false
-+
-+ if test $dstdir_status != 0; then
-+ case $posix_mkdir in
-+ '')
-+ # Create intermediate dirs using mode 755 as modified by the umask.
-+ # This is like FreeBSD 'install' as of 1997-10-28.
-+ umask=`umask`
-+ case $stripcmd.$umask in
-+ # Optimize common cases.
-+ *[2367][2367]) mkdir_umask=$umask;;
-+ .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-+
-+ *[0-7])
-+ mkdir_umask=`expr $umask + 22 \
-+ - $umask % 100 % 40 + $umask % 20 \
-+ - $umask % 10 % 4 + $umask % 2
-+ `;;
-+ *) mkdir_umask=$umask,go-w;;
-+ esac
-+
-+ # With -d, create the new directory with the user-specified mode.
-+ # Otherwise, rely on $mkdir_umask.
-+ if test -n "$dir_arg"; then
-+ mkdir_mode=-m$mode
- else
-- :
-+ mkdir_mode=
- fi
+ # Make a couple of temp file names in the proper directory.
+ dsttmp=$dstdir/_inst.$$_
+@@ -343,6 +262,7 @@
--# Make a couple of temp file names in the proper directory.
--
-- dsttmp=$dstdir/#inst.$$#
-- rmtmp=$dstdir/#rm.$$#
--
--# Trap to clean up temp files at exit.
--
-- trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
-- trap '(exit $?); exit' 1 2 13 15
--
--# Move or copy the file name to the temp name
--
-- $doit $instcmd "$src" "$dsttmp" &&
--
--# and set any options; do chmod last to preserve setuid bits
--
--# If any of these fail, we abort the whole thing. If we want to
--# ignore errors from any of these, just make sure not to ignore
--# errors from the above "$doit $instcmd $src $dsttmp" command.
-+ posix_mkdir=false
-+ case $umask in
-+ *[123567][0-7][0-7])
-+ # POSIX mkdir -p sets u+wx bits regardless of umask, which
-+ # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-+ ;;
-+ *)
-+ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-+ trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+ # Trap to clean up those temp files at exit.
+ trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
++ trap '(exit $?); exit' 1 2 13 15
-- if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi &&
-- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi &&
-- if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi &&
-- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi &&
--
--# Now remove or move aside any old file at destination location. We try this
--# two ways since rm can't unlink itself on some systems and the destination
--# file might be busy for other reasons. In this case, the final cleanup
--# might fail but the new file should still install successfully.
-+ if (umask $mkdir_umask &&
-+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-+ then
-+ if test -z "$dir_arg" || {
-+ # Check for POSIX incompatibilities with -m.
-+ # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-+ # other-writeable bit of parent directory when it shouldn't.
-+ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-+ ls_ld_tmpdir=`ls -ld "$tmpdir"`
-+ case $ls_ld_tmpdir in
-+ d????-?r-*) different_mode=700;;
-+ d????-?--*) different_mode=755;;
-+ *) false;;
-+ esac &&
-+ $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-+ ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-+ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-+ }
-+ }
-+ then posix_mkdir=:
-+ fi
-+ rmdir "$tmpdir/d" "$tmpdir"
-+ else
-+ # Remove any dirs left behind by ancient mkdir implementations.
-+ rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-+ fi
-+ trap '' 0;;
-+ esac;;
-+ esac
+ # Copy the file name to the temp name.
+ $doit $cpprog "$src" "$dsttmp" &&
+@@ -356,10 +276,10 @@
+ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
+ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
+ && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
+- && { test -z "$chmodcmd" || $doit $chmodcmd "$mode" "$dsttmp"; } &&
++ && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
--{
-- if [ -f "$dstdir/$dstfile" ]
-- then
-- $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null ||
-- $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null ||
-- {
-- echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-- (exit 1); exit
-- }
-+ if
-+ $posix_mkdir && (
-+ umask $mkdir_umask &&
-+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
-+ )
-+ then :
-+ else
-+
-+ # The umask is ridiculous, or mkdir does not conform to POSIX,
-+ # or it failed possibly due to a race condition. Create the
-+ # directory the slow way, step by step, checking for races as we go.
-+
-+ case $dstdir in
-+ /*) prefix=/ ;;
-+ -*) prefix=./ ;;
-+ *) prefix= ;;
-+ esac
-+
-+ case $posix_glob in
-+ '')
-+ if (set -f) 2>/dev/null; then
-+ posix_glob=true
-+ else
-+ posix_glob=false
-+ fi ;;
-+ esac
-+
-+ oIFS=$IFS
-+ IFS=/
-+ $posix_glob && set -f
-+ set fnord $dstdir
-+ shift
-+ $posix_glob && set +f
-+ IFS=$oIFS
-+
-+ prefixes=
-+
-+ for d
-+ do
-+ test -z "$d" && continue
-+
-+ prefix=$prefix$d
-+ if test -d "$prefix"; then
-+ prefixes=
- else
-- :
-+ if $posix_mkdir; then
-+ (umask=$mkdir_umask &&
-+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-+ # Don't fail if two instances are running concurrently.
-+ test -d "$prefix" || exit 1
-+ else
-+ case $prefix in
-+ *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-+ *) qprefix=$prefix;;
-+ esac
-+ prefixes="$prefixes '$qprefix'"
-+ fi
- fi
--} &&
--
--# Now rename the file to the real destination.
-+ prefix=$prefix/
-+ done
+ # Now rename the file to the real destination.
+- { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
++ { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
+ || {
+ # The rename failed, perhaps because mv can't rename something else
+ # to itself, or perhaps because mv is so ancient that it does not
+@@ -371,12 +291,11 @@
+ # reasons. In this case, the final cleanup might fail but the new
+ # file should still install successfully.
+ {
+- if test -f "$dst"; then
+- $doit $rmcmd -f "$dst" 2>/dev/null \
+- || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
+- && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
++ if test -f "$dstdir/$dstfile"; then
++ $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
++ || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
+ || {
+- echo "$0: cannot unlink or rename $dst" >&2
++ echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+ (exit 1); exit 1
+ }
+ else
+@@ -385,14 +304,17 @@
+ } &&
-- $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
-+ if test -n "$prefixes"; then
-+ # Don't fail if two instances are running concurrently.
-+ (umask $mkdir_umask &&
-+ eval "\$doit_exec \$mkdirprog $prefixes") ||
-+ test -d "$dstdir" || exit 1
-+ obsolete_mkdir_used=true
-+ fi
-+ fi
-+ fi
-+
-+ if test -n "$dir_arg"; then
-+ { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
-+ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
-+ { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
-+ test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
-+ else
-+
-+ # Make a couple of temp file names in the proper directory.
-+ dsttmp=$dstdir/_inst.$$_
-+ rmtmp=$dstdir/_rm.$$_
-+
-+ # Trap to clean up those temp files at exit.
-+ trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-+
-+ # Copy the file name to the temp name.
-+ (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
-+
-+ # and set any options; do chmod last to preserve setuid bits.
-+ #
-+ # If any of these fail, we abort the whole thing. If we want to
-+ # ignore errors from any of these, just make sure not to ignore
-+ # errors from the above "$doit $cpprog $src $dsttmp" command.
-+ #
-+ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
-+ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
-+ && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
-+ && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
-+
-+ # Now rename the file to the real destination.
-+ { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
-+ || {
-+ # The rename failed, perhaps because mv can't rename something else
-+ # to itself, or perhaps because mv is so ancient that it does not
-+ # support -f.
-+
-+ # Now remove or move aside any old file at destination location.
-+ # We try this two ways since rm can't unlink itself on some
-+ # systems and the destination file might be busy for other
-+ # reasons. In this case, the final cleanup might fail but the new
-+ # file should still install successfully.
-+ {
-+ if test -f "$dst"; then
-+ $doit $rmcmd -f "$dst" 2>/dev/null \
-+ || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
-+ && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
-+ || {
-+ echo "$0: cannot unlink or rename $dst" >&2
-+ (exit 1); exit 1
-+ }
-+ else
-+ :
-+ fi
-+ } &&
-+
-+ # Now rename the file to the real destination.
-+ $doit $mvcmd "$dsttmp" "$dst"
-+ }
-+ } || exit 1
-
--fi &&
+ # Now rename the file to the real destination.
+- $doit $mvcmd "$dsttmp" "$dst"
++ $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+ }
+- } || exit 1
-
--# The final little trick to "correctly" pass the exit status to the exit trap.
-+ trap '' 0
-+ fi
-+done
+- trap '' 0
+- fi
++ }
++ fi || { (exit 1); exit 1; }
+ done
--{
-- (exit 0); exit
--}
-+# Local variables:
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-end: "$"
-+# End:
-diff -Nrua a/admin/missing b/admin/missing
---- a/admin/missing 2007-06-12 09:55:28.000000000 +0200
-+++ b/admin/missing 2007-06-12 14:39:08.000000000 +0200
-@@ -1,6 +1,10 @@
++# The final little trick to "correctly" pass the exit status to the exit trap.
++{
++ (exit 0); exit 0
++}
++
+ # Local variables:
+ # eval: (add-hook 'write-file-hooks 'time-stamp)
+ # time-stamp-start: "scriptversion="
+--- a/admin/missing
++++ b/admin/missing
+@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
--# Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
-+
-+scriptversion=2006-05-10.23
-+
-+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-+# Free Software Foundation, Inc.
- # 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 @@
- fi
+-scriptversion=2004-09-07.08
++scriptversion=2005-06-08.21
- run=:
-+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
+-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004
++# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+ # Free Software Foundation, Inc.
+ # Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
- # In the cases where this matters, `missing' is being run in the
- # srcdir already.
-@@ -38,18 +44,24 @@
- configure_ac=configure.in
- fi
+@@ -19,8 +19,8 @@
--case "$1" in
-+msg="missing on your system"
-+
-+case $1 in
- --run)
- # Try to run requested program, and just exit if it succeeds.
- run=
- shift
- "$@" && exit 0
-+ # Exit code 63 means version mismatch. This often happens
-+ # when the user try to use an ancient version of a tool on
-+ # a file that requires a minimum version. In this case we
-+ # we should proceed has if the program had been absent, or
-+ # if --run hadn't been passed.
-+ if test $? = 63; then
-+ run=:
-+ msg="probably too old"
-+ fi
- ;;
--esac
--
--# If it does not exist, or fails to run (possibly an outdated version),
--# try to emulate it.
--case "$1" in
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
++# 02110-1301, USA.
- -h|--h|--he|--hel|--help)
- echo "\
-@@ -67,6 +79,7 @@
- aclocal touch file \`aclocal.m4'
- autoconf touch file \`configure'
- autoheader touch file \`config.h.in'
-+ autom4te touch the output file, or create a stub one
- 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 @@
- 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
-- yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
-+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]
-+
-+Send bug reports to <bug-automake at gnu.org>."
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+@@ -87,12 +87,12 @@
+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+
+ Send bug reports to <bug-automake at gnu.org>."
+- exit 0
+ exit $?
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-- echo "missing 0.4 - GNU automake"
-+ echo "missing $scriptversion (GNU Automake)"
+ echo "missing $scriptversion (GNU Automake)"
+- exit 0
+ exit $?
;;
-*)
-@@ -87,14 +104,44 @@
- exit 1
- ;;
-
-- aclocal*)
-+esac
-+
-+# Now exit if we have it, but it failed. Also exit now if we
-+# don't have it and --version was passed (most likely to detect
-+# the program).
-+case $1 in
-+ lex|yacc)
-+ # Not GNU programs, they don't have --version.
-+ ;;
-+
-+ tar)
-+ if test -n "$run"; then
-+ echo 1>&2 "ERROR: \`tar' requires --run"
-+ exit 1
-+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-+ exit 1
-+ fi
-+ ;;
-+
-+ *)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
-+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-+ # Could not run --version or --help. This is probably someone
-+ # running `$TOOL --version' or `$TOOL --help' to check whether
-+ # $TOOL exists and not knowing $TOOL uses missing.
-+ exit 1
- fi
-+ ;;
-+esac
-
-+# If it does not exist, or fails to run (possibly an outdated version),
-+# try to emulate it.
-+case $1 in
-+ aclocal*)
- echo 1>&2 "\
--WARNING: \`$1' is missing on your system. You should only need it if
-+WARNING: \`$1' is $msg. You should only need it if
- 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 @@
- ;;
-
- autoconf)
-- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-- # We have it, but it failed.
-- exit 1
-- fi
--
- echo 1>&2 "\
--WARNING: \`$1' is missing on your system. You should only need it if
-+WARNING: \`$1' is $msg. You should only need it if
- 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 @@
- ;;
-
- autoheader)
-- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-- # We have it, but it failed.
-- exit 1
-- fi
--
- echo 1>&2 "\
--WARNING: \`$1' is missing on your system. You should only need it if
-+WARNING: \`$1' is $msg. You should only need it if
- 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 @@
- test -z "$files" && files="config.h"
- touch_files=
- for f in $files; do
-- case "$f" in
-+ case $f in
- *:*) touch_files="$touch_files "`echo "$f" |
- sed -e 's/^[^:]*://' -e 's/:.*//'`;;
- *) touch_files="$touch_files $f.in";;
-@@ -140,13 +177,8 @@
- ;;
-
- automake*)
-- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-- # We have it, but it failed.
-- exit 1
-- fi
--
- echo 1>&2 "\
--WARNING: \`$1' is missing on your system. You should only need it if
-+WARNING: \`$1' is $msg. You should only need it if
- 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 @@
- ;;
-
- autom4te)
-- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-- # We have it, but it failed.
-- exit 1
-- fi
--
- echo 1>&2 "\
--WARNING: \`$1' is needed, and you do not seem to have it handy on your
-- system. You might have modified some files without having the
-+WARNING: \`$1' is needed, but is $msg.
-+ You might have modified some files without having the
- proper tools for further handling them.
-- You can get \`$1Help2man' as part of \`Autoconf' from any GNU
-+ You can get \`$1' as part of \`Autoconf' from any GNU
- archive site."
-
-- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
-- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
-+ file=`echo "$*" | sed -n "$sed_output"`
-+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
- touch $file
- else
-@@ -185,74 +212,67 @@
-
- bison|yacc)
- echo 1>&2 "\
--WARNING: \`$1' is missing on your system. You should only need it if
-+WARNING: \`$1' $msg. You should only need it if
- you modified a \`.y' file. You may need the \`Bison' package
- in order for those modifications to take effect. You can get
- \`Bison' from any GNU archive site."
- rm -f y.tab.c y.tab.h
-- if [ $# -ne 1 ]; then
-+ if test $# -ne 1; then
- eval LASTARG="\${$#}"
-- case "$LASTARG" in
-+ case $LASTARG in
- *.y)
- SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-- if [ -f "$SRCFILE" ]; then
-+ if test -f "$SRCFILE"; then
- cp "$SRCFILE" y.tab.c
- fi
- SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-- if [ -f "$SRCFILE" ]; then
-+ if test -f "$SRCFILE"; then
- cp "$SRCFILE" y.tab.h
- fi
- ;;
- esac
- fi
-- if [ ! -f y.tab.h ]; then
-+ if test ! -f y.tab.h; then
- echo >y.tab.h
- fi
-- if [ ! -f y.tab.c ]; then
-+ if test ! -f y.tab.c; then
- echo 'main() { return 0; }' >y.tab.c
- fi
- ;;
-
- lex|flex)
- echo 1>&2 "\
--WARNING: \`$1' is missing on your system. You should only need it if
-+WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.l' file. You may need the \`Flex' package
- in order for those modifications to take effect. You can get
- \`Flex' from any GNU archive site."
- rm -f lex.yy.c
-- if [ $# -ne 1 ]; then
-+ if test $# -ne 1; then
- eval LASTARG="\${$#}"
-- case "$LASTARG" in
-+ case $LASTARG in
- *.l)
- SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-- if [ -f "$SRCFILE" ]; then
-+ if test -f "$SRCFILE"; then
- cp "$SRCFILE" lex.yy.c
- fi
- ;;
- esac
- fi
-- if [ ! -f lex.yy.c ]; then
-+ if test ! -f lex.yy.c; then
- echo 'main() { return 0; }' >lex.yy.c
- fi
- ;;
-
- help2man)
-- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-- # We have it, but it failed.
-- exit 1
-- fi
--
- echo 1>&2 "\
--WARNING: \`$1' is missing on your system. You should only need it if
-+WARNING: \`$1' is $msg. You should only need it if
- you modified a dependency of a manual page. You may need the
- \`Help2man' package in order for those modifications to take
- effect. You can get \`Help2man' from any GNU archive site."
-
-- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-- if test -z "$file"; then
-- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
-- fi
-- if [ -f "$file" ]; then
-+ file=`echo "$*" | sed -n "$sed_output"`
-+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-+ if test -f "$file"; then
- touch $file
- else
- test -z "$file" || exec >$file
-@@ -262,32 +282,36 @@
- ;;
-
- makeinfo)
-- if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
-- # We have makeinfo, but it failed.
-- exit 1
-- fi
--
- echo 1>&2 "\
--WARNING: \`$1' is missing on your system. You should only need it if
-+WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.texi' or \`.texinfo' file, or any other file
- indirectly affecting the aspect of the manual. The spurious
+@@ -288,11 +288,18 @@
call might also be the consequence of using a buggy \`make' (AIX,
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
-- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ # The file to touch is that specified with -o ...
-+ file=`echo "$*" | sed -n "$sed_output"`
-+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
if test -z "$file"; then
- file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
- fi
+ # ... or it is the one specified with @setfilename ...
+ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-+ file=`sed -n '
-+ /^@setfilename/{
-+ s/.* \([^ ]*\) *$/\1/
-+ p
-+ q
-+ }' $infile`
++ file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ # ... or it is derived from the source name (dir/f.texi becomes f.info)
+ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+ fi
@@ -1803,513 +351,3 @@
touch $file
;;
- tar)
- shift
-- if test -n "$run"; then
-- echo 1>&2 "ERROR: \`tar' requires --run"
-- exit 1
-- fi
-
- # We have already tried tar in the generic part.
- # Look for gnutar/gtar before invocation to avoid ugly error
-@@ -300,13 +324,13 @@
- fi
- firstarg="$1"
- if shift; then
-- case "$firstarg" in
-+ case $firstarg in
- *o*)
- firstarg=`echo "$firstarg" | sed s/o//`
- tar "$firstarg" "$@" && exit 0
- ;;
- esac
-- case "$firstarg" in
-+ case $firstarg in
- *h*)
- firstarg=`echo "$firstarg" | sed s/h//`
- tar "$firstarg" "$@" && exit 0
-@@ -323,10 +347,10 @@
-
- *)
- echo 1>&2 "\
--WARNING: \`$1' is needed, and you do not seem to have it handy on your
-- system. You might have modified some files without having the
-+WARNING: \`$1' is needed, and is $msg.
-+ You might have modified some files without having the
- proper tools for further handling them. Check the \`README' file,
-- it often tells you about the needed prerequirements for installing
-+ it often tells you about the needed prerequisites for installing
- 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 @@
- esac
-
- exit 0
-+
-+# Local variables:
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-end: "$"
-+# End:
-diff -Nrua a/admin/mkinstalldirs b/admin/mkinstalldirs
---- a/admin/mkinstalldirs 2007-06-12 09:55:28.000000000 +0200
-+++ b/admin/mkinstalldirs 2007-06-12 14:39:08.000000000 +0200
-@@ -1,21 +1,36 @@
- #! /bin/sh
- # mkinstalldirs --- make directory hierarchy
--# Author: Noah Friedman <friedman at prep.ai.mit.edu>
--# Created: 1993-05-16
--# Public domain
-
-+scriptversion=2006-05-11.19
-+
-+# Original author: Noah Friedman <friedman at prep.ai.mit.edu>
-+# Created: 1993-05-16
-+# Public domain.
-+#
-+# This file is maintained in Automake, please report
-+# bugs to <bug-automake at gnu.org> or send patches to
-+# <automake-patches at gnu.org>.
-+
-+nl='
-+'
-+IFS=" "" $nl"
- errstatus=0
--dirmode=""
-+dirmode=
-
- usage="\
--Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
-+Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
-+
-+Create each directory DIR (with mode MODE, if specified), including all
-+leading file name components.
-+
-+Report bugs to <bug-automake at gnu.org>."
-
- # process command line arguments
- while test $# -gt 0 ; do
- case $1 in
- -h | --help | --h*) # -h for help
-- echo "$usage" 1>&2
-- exit 0
-+ echo "$usage"
-+ exit $?
- ;;
- -m) # -m PERM arg
- shift
-@@ -23,6 +38,10 @@
- dirmode=$1
- shift
- ;;
-+ --version)
-+ echo "$0 $scriptversion"
-+ exit $?
-+ ;;
- --) # stop option processing
- shift
- break
-@@ -50,30 +69,58 @@
- 0) exit 0 ;;
- esac
-
-+# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and
-+# mkdir -p a/c at the same time, both will detect that a is missing,
-+# one will create a, then the other will try to create a and die with
-+# a "File exists" error. This is a problem when calling mkinstalldirs
-+# from a parallel make. We use --version in the probe to restrict
-+# ourselves to GNU mkdir, which is thread-safe.
- case $dirmode in
- '')
-- if mkdir -p -- . 2>/dev/null; then
-+ if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
- echo "mkdir -p -- $*"
- exec mkdir -p -- "$@"
-+ else
-+ # On NextStep and OpenStep, the `mkdir' command does not
-+ # recognize any option. It will interpret all options as
-+ # directories to create, and then abort because `.' already
-+ # exists.
-+ test -d ./-p && rmdir ./-p
-+ test -d ./--version && rmdir ./--version
- fi
- ;;
- *)
-- if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
-+ if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
-+ test ! -d ./--version; then
- echo "mkdir -m $dirmode -p -- $*"
- exec mkdir -m "$dirmode" -p -- "$@"
-+ else
-+ # Clean up after NextStep and OpenStep mkdir.
-+ for d in ./-m ./-p ./--version "./$dirmode";
-+ do
-+ test -d $d && rmdir $d
-+ done
- fi
- ;;
- esac
-
- for file
- do
-- set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-+ case $file in
-+ /*) pathcomp=/ ;;
-+ *) pathcomp= ;;
-+ esac
-+ oIFS=$IFS
-+ IFS=/
-+ set fnord $file
- shift
-+ IFS=$oIFS
-
-- pathcomp=
- for d
- do
-- pathcomp="$pathcomp$d"
-+ test "x$d" = x && continue
-+
-+ pathcomp=$pathcomp$d
- case $pathcomp in
- -*) pathcomp=./$pathcomp ;;
- esac
-@@ -84,21 +131,21 @@
- mkdir "$pathcomp" || lasterr=$?
-
- if test ! -d "$pathcomp"; then
-- errstatus=$lasterr
-+ errstatus=$lasterr
- else
-- if test ! -z "$dirmode"; then
-+ if test ! -z "$dirmode"; then
- echo "chmod $dirmode $pathcomp"
-- lasterr=""
-- chmod "$dirmode" "$pathcomp" || lasterr=$?
-+ lasterr=
-+ chmod "$dirmode" "$pathcomp" || lasterr=$?
-
-- if test ! -z "$lasterr"; then
-- errstatus=$lasterr
-- fi
-- fi
-+ if test ! -z "$lasterr"; then
-+ errstatus=$lasterr
-+ fi
-+ fi
- fi
- fi
-
-- pathcomp="$pathcomp/"
-+ pathcomp=$pathcomp/
- done
- done
-
-@@ -107,5 +154,8 @@
- # Local Variables:
- # mode: shell-script
- # sh-indentation: 2
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-end: "$"
- # End:
--# mkinstalldirs ends here
-diff -Nrua a/admin/ylwrap b/admin/ylwrap
---- a/admin/ylwrap 2007-06-12 09:55:28.000000000 +0200
-+++ b/admin/ylwrap 2007-06-12 14:39:08.000000000 +0200
-@@ -1,6 +1,11 @@
- #! /bin/sh
- # ylwrap - wrapper for lex/yacc invocations.
--# Copyright 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
-+
-+scriptversion=2005-05-14.22
-+
-+# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
- # Written by Tom Tromey <tromey at cygnus.com>.
- #
- # This program is free software; you can redistribute it and/or modify
-@@ -15,51 +20,73 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
-
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
- # configuration script generated by Autoconf, you may include it under
- # the same distribution terms that you use for the rest of that program.
-
--# Usage:
--# ylwrap INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]...
--# * INPUT is the input file
--# * OUTPUT is file PROG generates
--# * DESIRED is file we actually want
--# * PROGRAM is program to run
--# * ARGS are passed to PROG
--# Any number of OUTPUT,DESIRED pairs may be used.
-+# This file is maintained in Automake, please report
-+# bugs to <bug-automake at gnu.org> or send patches to
-+# <automake-patches at gnu.org>.
-+
-+case "$1" in
-+ '')
-+ echo "$0: No files given. Try \`$0 --help' for more information." 1>&2
-+ exit 1
-+ ;;
-+ --basedir)
-+ basedir=$2
-+ shift 2
-+ ;;
-+ -h|--h*)
-+ cat <<\EOF
-+Usage: ylwrap [--help|--version] INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]...
-+
-+Wrapper for lex/yacc invocations, renaming files as desired.
-+
-+ INPUT is the input file
-+ OUTPUT is one file PROG generates
-+ DESIRED is the file we actually want instead of OUTPUT
-+ PROGRAM is program to run
-+ ARGS are passed to PROG
-+
-+Any number of OUTPUT,DESIRED pairs may be used.
-+
-+Report bugs to <bug-automake at gnu.org>.
-+EOF
-+ exit $?
-+ ;;
-+ -v|--v*)
-+ echo "ylwrap $scriptversion"
-+ exit $?
-+ ;;
-+esac
-+
-
- # The input.
- input="$1"
- shift
- case "$input" in
-- [\\/]* | ?:[\\/]*)
-+ [\\/]* | ?:[\\/]*)
- # Absolute path; do nothing.
- ;;
-- *)
-+ *)
- # Relative path. Make it absolute.
- input="`pwd`/$input"
- ;;
- esac
-
--# The directory holding the input.
--input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'`
--# Quote $INPUT_DIR so we can use it in a regexp.
--# FIXME: really we should care about more than `.' and `\'.
--input_rx=`echo "$input_dir" | sed -e 's,\\\\,\\\\\\\\,g' -e 's,\\.,\\\\.,g'`
--
--echo "got $input_rx"
--
- pairlist=
- while test "$#" -ne 0; do
-- if test "$1" = "--"; then
-- shift
-- break
-- fi
-- pairlist="$pairlist $1"
-- shift
-+ if test "$1" = "--"; then
-+ shift
-+ break
-+ fi
-+ pairlist="$pairlist $1"
-+ shift
- done
-
- # The program to run.
-@@ -67,8 +94,8 @@
- shift
- # Make any relative path in $prog absolute.
- case "$prog" in
-- [\\/]* | ?:[\\/]*) ;;
-- *[\\/]*) prog="`pwd`/$prog" ;;
-+ [\\/]* | ?:[\\/]*) ;;
-+ *[\\/]*) prog="`pwd`/$prog" ;;
- esac
-
- # FIXME: add hostname here for parallel makes that run commands on
-@@ -79,65 +106,118 @@
-
- cd $dirname
-
--$prog ${1+"$@"} "$input"
--status=$?
-+case $# in
-+ 0) $prog "$input" ;;
-+ *) $prog "$@" "$input" ;;
-+esac
-+ret=$?
-
--if test $status -eq 0; then
-- set X $pairlist
-- shift
-- first=yes
-- # Since DOS filename conventions don't allow two dots,
-- # the DOS version of Bison writes out y_tab.c instead of y.tab.c
-- # and y_tab.h instead of y.tab.h. Test to see if this is the case.
-- y_tab_nodot="no"
-- if test -f y_tab.c || test -f y_tab.h; then
-- y_tab_nodot="yes"
-- fi
--
-- while test "$#" -ne 0; do
-- from="$1"
-- # Handle y_tab.c and y_tab.h output by DOS
-- if test $y_tab_nodot = "yes"; then
-- if test $from = "y.tab.c"; then
-- from="y_tab.c"
-- else
-- if test $from = "y.tab.h"; then
-- from="y_tab.h"
-- fi
-- fi
-- fi
-- if test -f "$from"; then
-- # If $2 is an absolute path name, then just use that,
-- # otherwise prepend `../'.
-- case "$2" in
-- [\\/]* | ?:[\\/]*) target="$2";;
-- *) target="../$2";;
-- esac
--
-- # Edit out `#line' or `#' directives. We don't want the
-- # resulting debug information to point at an absolute srcdir;
-- # it is better for it to just mention the .y file with no
-- # path.
-- sed -e "/^#/ s,$input_rx,," "$from" > "$target" || status=$?
-+if test $ret -eq 0; then
-+ set X $pairlist
-+ shift
-+ first=yes
-+ # Since DOS filename conventions don't allow two dots,
-+ # the DOS version of Bison writes out y_tab.c instead of y.tab.c
-+ # and y_tab.h instead of y.tab.h. Test to see if this is the case.
-+ y_tab_nodot="no"
-+ if test -f y_tab.c || test -f y_tab.h; then
-+ y_tab_nodot="yes"
-+ fi
-+
-+ # The directory holding the input.
-+ input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'`
-+ # Quote $INPUT_DIR so we can use it in a regexp.
-+ # FIXME: really we should care about more than `.' and `\'.
-+ input_rx=`echo "$input_dir" | sed 's,\\\\,\\\\\\\\,g;s,\\.,\\\\.,g'`
-+
-+ while test "$#" -ne 0; do
-+ from="$1"
-+ # Handle y_tab.c and y_tab.h output by DOS
-+ if test $y_tab_nodot = "yes"; then
-+ if test $from = "y.tab.c"; then
-+ from="y_tab.c"
- else
-- # A missing file is only an error for the first file. This
-- # is a blatant hack to let us support using "yacc -d". If -d
-- # is not specified, we don't want an error when the header
-- # file is "missing".
-- if test $first = yes; then
-- status=1
-- fi
-+ if test $from = "y.tab.h"; then
-+ from="y_tab.h"
-+ fi
- fi
-- shift
-- shift
-- first=no
-- done
-+ fi
-+ if test -f "$from"; then
-+ # If $2 is an absolute path name, then just use that,
-+ # otherwise prepend `../'.
-+ case "$2" in
-+ [\\/]* | ?:[\\/]*) target="$2";;
-+ *) target="../$2";;
-+ esac
-+
-+ # We do not want to overwrite a header file if it hasn't
-+ # changed. This avoid useless recompilations. However the
-+ # parser itself (the first file) should always be updated,
-+ # because it is the destination of the .y.c rule in the
-+ # Makefile. Divert the output of all other files to a temporary
-+ # file so we can compare them to existing versions.
-+ if test $first = no; then
-+ realtarget="$target"
-+ target="tmp-`echo $target | sed s/.*[\\/]//g`"
-+ fi
-+ # Edit out `#line' or `#' directives.
-+ #
-+ # We don't want the resulting debug information to point at
-+ # an absolute srcdir; it is better for it to just mention the
-+ # .y file with no path.
-+ #
-+ # We want to use the real output file name, not yy.lex.c for
-+ # instance.
-+ #
-+ # We want the include guards to be adjusted too.
-+ FROM=`echo "$from" | sed \
-+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
-+ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
-+ TARGET=`echo "$2" | sed \
-+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
-+ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
-+
-+ sed -e "/^#/!b" -e "s,$input_rx,," -e "s,$from,$2," \
-+ -e "s,$FROM,$TARGET," "$from" >"$target" || ret=$?
-+
-+ # Check whether header files must be updated.
-+ if test $first = no; then
-+ if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then
-+ echo "$2" is unchanged
-+ rm -f "$target"
-+ else
-+ echo updating "$2"
-+ mv -f "$target" "$realtarget"
-+ fi
-+ fi
-+ else
-+ # A missing file is only an error for the first file. This
-+ # is a blatant hack to let us support using "yacc -d". If -d
-+ # is not specified, we don't want an error when the header
-+ # file is "missing".
-+ if test $first = yes; then
-+ ret=1
-+ fi
-+ fi
-+ shift
-+ shift
-+ first=no
-+ done
- else
-- status=$?
-+ ret=$?
- fi
-
- # Remove the directory.
- cd ..
- rm -rf $dirname
-
--exit $status
-+exit $ret
-+
-+# Local Variables:
-+# mode: shell-script
-+# sh-indentation: 2
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-end: "$"
-+# End:
Modified: kde-extras/taskjuggler/trunk/debian/patches/03_libtool_update.diff
===================================================================
--- kde-extras/taskjuggler/trunk/debian/patches/03_libtool_update.diff 2008-01-19 14:00:16 UTC (rev 9045)
+++ kde-extras/taskjuggler/trunk/debian/patches/03_libtool_update.diff 2008-01-19 18:00:18 UTC (rev 9046)
@@ -1,10 +1,9 @@
-diff -Nrua a/admin/libtool.m4.in b/admin/libtool.m4.in
---- a/admin/libtool.m4.in 2007-06-12 09:55:28.000000000 +0200
-+++ b/admin/libtool.m4.in 2007-06-12 14:39:08.000000000 +0200
+--- a/admin/libtool.m4.in
++++ b/admin/libtool.m4.in
@@ -1,28 +1,13 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-## Copyright 1996, 1997, 1998, 1999, 2000, 2001
-+## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
++## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007
## Free Software Foundation, Inc.
## Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
##
@@ -31,7 +30,7 @@
+## modifications, as long as this notice is preserved.
-# serial 47 AC_PROG_LIBTOOL
-+# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL
++# serial 51 Debian 1.5.24-2 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -70,7 +69,15 @@
test -z "$DLLTOOL" && DLLTOOL=dlltool
test -z "$LD" && LD=ld
test -z "$LN_S" && LN_S="ln -s"
-@@ -191,15 +177,17 @@
+@@ -184,22 +170,24 @@
+ test -z "$ac_objext" && ac_objext=o
+
+ # Determine commands to create old-style static archives.
+-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+ old_postinstall_cmds='chmod 644 $oldlib'
+ old_postuninstall_cmds=
+
if test -n "$RANLIB"; then
case $host_os in
openbsd*)
@@ -90,7 +97,7 @@
# Only perform the check for file, if the check method requires it
case $deplibs_check_method in
file_magic*)
-@@ -240,11 +228,56 @@
+@@ -240,11 +228,58 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -123,8 +130,9 @@
+# Check for compiler boilerplate output or warnings with
+# the simple compiler test code.
+AC_DEFUN([_LT_COMPILER_BOILERPLATE],
-+[ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++ac_outfile=conftest.$ac_objext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
@@ -136,8 +144,9 @@
+# Check for linker boilerplate output or warnings with
+# the simple link test code.
+AC_DEFUN([_LT_LINKER_BOILERPLATE],
-+[ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_link_test_code" >conftest.$ac_ext
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++ac_outfile=conftest.$ac_objext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
@@ -147,8 +156,34 @@
# _LT_AC_SYS_LIBPATH_AIX
# ----------------------
# Links a minimal program and checks the executable
-@@ -317,15 +350,15 @@
+@@ -254,12 +289,20 @@
+ # If we don't find anything, use the default library path according
+ # to the aix ld manual.
+ AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
+-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_LINK_IFELSE(AC_LANG_PROGRAM,[
++lt_aix_libpath_sed='
++ /Import File Strings/,/^$/ {
++ /^0/ {
++ s/^0 *\(.*\)$/\1/
++ p
++ }
++ }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`; fi],[])
++if test -z "$aix_libpath"; then
++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi],[])
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ ])# _LT_AC_SYS_LIBPATH_AIX
+@@ -317,15 +360,15 @@
+
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
@@ -166,7 +201,13 @@
(test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
then
break
-@@ -494,14 +527,13 @@
+@@ -490,18 +533,21 @@
+ rm -rf conftest*
+ ;;
+
+-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
++s390*-*linux*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
@@ -175,6 +216,9 @@
*32-bit*)
- LINUX_64_MODE="32"
case $host in
++ x86_64-*kfreebsd*-gnu)
++ LD="${LD-ld} -m elf_i386_fbsd"
++ ;;
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
@@ -183,15 +227,19 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -513,7 +545,6 @@
+@@ -513,8 +559,10 @@
esac
;;
*64-bit*)
- LINUX_64_MODE="64"
case $host in
++ x86_64-*kfreebsd*-gnu)
++ LD="${LD-ld} -m elf_x86_64_fbsd"
++ ;;
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -547,6 +578,22 @@
+ ;;
+@@ -547,6 +595,22 @@
CFLAGS="$SAVE_CFLAGS"
fi
;;
@@ -214,7 +262,16 @@
AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-@@ -578,7 +625,7 @@
+@@ -570,7 +634,7 @@
+ AC_CACHE_CHECK([$1], [$2],
+ [$2=no
+ ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 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 +642,7 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -223,7 +280,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 +635,10 @@
+@@ -588,8 +652,10 @@
echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
@@ -236,9 +293,18 @@
$2=yes
fi
fi
-@@ -615,11 +664,16 @@
+@@ -609,17 +675,23 @@
+ # ------------------------------------------------------------
+ # Check whether the given compiler option works
+ AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
+-[AC_CACHE_CHECK([$1], [$2],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_CACHE_CHECK([$1], [$2],
+ [$2=no
+ save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $3"
- printf "$lt_simple_link_test_code" > conftest.$ac_ext
+- printf "$lt_simple_link_test_code" > conftest.$ac_ext
++ echo "$lt_simple_link_test_code" > conftest.$ac_ext
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
- # The compiler can only warn and ignore the option if not recognized
+ # The linker can only warn and ignore the option if not recognized
@@ -254,7 +320,7 @@
else
$2=yes
fi
-@@ -643,7 +697,7 @@
+@@ -643,7 +715,7 @@
AC_MSG_CHECKING([the maximum length of command line arguments])
AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
i=0
@@ -263,11 +329,28 @@
case $build_os in
msdosdjgpp*)
-@@ -672,20 +726,70 @@
+@@ -672,24 +744,77 @@
lt_cv_sys_max_cmd_len=8192;
;;
- *)
+- # If test is not a shell built-in, we'll probably end up computing a
+- # maximum length that is only half of the actual maximum length, but
+- # we can't tell.
+- while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \
+- = "XX$testring") >/dev/null 2>&1 &&
+- new_result=`expr "X$testring" : ".*" 2>&1` &&
+- lt_cv_sys_max_cmd_len=$new_result &&
+- test $i != 17 # 1/2 MB should be enough
+- do
+- i=`expr $i + 1`
+- testring=$testring$testring
+- done
+- testring=
+- # Add a significant safety factor because C++ compilers can tack on massive
+- # amounts of additional arguments before passing them to the linker.
+- # It appears as though 1/2 is a usable value.
+- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+ amigaos*)
+ # On AmigaOS with pdksh, this test takes hours, literally.
+ # So we just punt and use a minimum line length of 8192.
@@ -318,29 +401,31 @@
+ fi
+ ;;
+ *)
- # If test is not a shell built-in, we'll probably end up computing a
- # maximum length that is only half of the actual maximum length, but
- # we can't tell.
-- while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \
-- = "XX$testring") >/dev/null 2>&1 &&
-- new_result=`expr "X$testring" : ".*" 2>&1` &&
-+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-+ while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
++ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
++ if test -n "$lt_cv_sys_max_cmd_len"; then
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
++ else
++ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
++ while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
+ = "XX$teststring") >/dev/null 2>&1 &&
-+ new_result=`expr "X$teststring" : ".*" 2>&1` &&
- lt_cv_sys_max_cmd_len=$new_result &&
- test $i != 17 # 1/2 MB should be enough
- do
- i=`expr $i + 1`
-- testring=$testring$testring
-+ teststring=$teststring$teststring
- done
-- testring=
-+ teststring=
- # Add a significant safety factor because C++ compilers can tack on massive
- # amounts of additional arguments before passing them to the linker.
- # It appears as though 1/2 is a usable value.
-@@ -702,7 +806,7 @@
++ new_result=`expr "X$teststring" : ".*" 2>&1` &&
++ lt_cv_sys_max_cmd_len=$new_result &&
++ test $i != 17 # 1/2 MB should be enough
++ do
++ i=`expr $i + 1`
++ teststring=$teststring$teststring
++ done
++ teststring=
++ # Add a significant safety factor because C++ compilers can tack on massive
++ # amounts of additional arguments before passing them to the linker.
++ # It appears as though 1/2 is a usable value.
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++ fi
+ ;;
+ esac
+ ])
+@@ -702,7 +827,7 @@
# _LT_AC_CHECK_DLFCN
@@ -349,7 +434,7 @@
AC_DEFUN([_LT_AC_CHECK_DLFCN],
[AC_CHECK_HEADERS(dlfcn.h)dnl
])# _LT_AC_CHECK_DLFCN
-@@ -710,7 +814,7 @@
+@@ -710,7 +835,7 @@
# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
@@ -358,7 +443,7 @@
AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
if test "$cross_compiling" = yes; then :
-@@ -776,17 +880,19 @@
+@@ -776,17 +901,19 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -380,7 +465,7 @@
esac
else :
# compilation failed
-@@ -798,7 +904,7 @@
+@@ -798,7 +925,7 @@
# AC_LIBTOOL_DLOPEN_SELF
@@ -389,7 +474,7 @@
AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
if test "x$enable_dlopen" != xyes; then
-@@ -835,7 +941,7 @@
+@@ -835,7 +962,7 @@
lt_cv_dlopen_self=yes
])
;;
@@ -398,7 +483,7 @@
*)
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
-@@ -869,7 +975,7 @@
+@@ -869,7 +996,7 @@
test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
save_LDFLAGS="$LDFLAGS"
@@ -407,7 +492,7 @@
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
-@@ -882,7 +988,7 @@
+@@ -882,7 +1009,7 @@
])
if test "x$lt_cv_dlopen_self" = xyes; then
@@ -416,20 +501,33 @@
AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
lt_cv_dlopen_self_static, [dnl
_LT_AC_TRY_DLOPEN_SELF(
-@@ -924,20 +1030,13 @@
+@@ -914,7 +1041,8 @@
+ # ---------------------------------
+ # Check to see if options -c and -o are simultaneously supported by compiler
+ AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
+-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+ 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 +1050,7 @@
+ mkdir conftest
+ cd conftest
mkdir out
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+-
- # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
- # that will create temporary files in the current directory regardless of
- # the output directory. Thus, making CWD read-only will cause this test
- # to fail, enabling locking or at least warning the user not to do parallel
- # builds.
- chmod -w .
--
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
+@@ -937,7 +1058,7 @@
# Note that $ac_compile itself does not contain backslashes and begins
# with a dollar sign (not a hyphen), so the echo should work correctly.
lt_compile=`echo "$ac_compile" | $SED \
@@ -438,7 +536,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 +1048,18 @@
+@@ -949,13 +1070,18 @@
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -461,7 +559,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -1014,8 +1118,8 @@
+@@ -1014,8 +1140,8 @@
[AC_MSG_CHECKING([how to hardcode library paths into programs])
_LT_AC_TAGVAR(hardcode_action, $1)=
if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
@@ -472,7 +570,15 @@
# We can hardcode non-existant directories.
if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-@@ -1072,7 +1176,7 @@
+@@ -1064,6 +1190,7 @@
+ darwin*)
+ if test -n "$STRIP" ; then
+ striplib="$STRIP -x"
++ old_striplib="$STRIP -S"
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+@@ -1072,7 +1199,7 @@
*)
AC_MSG_RESULT([no])
;;
@@ -481,7 +587,13 @@
fi
])# AC_LIBTOOL_SYS_LIB_STRIP
-@@ -1085,7 +1189,7 @@
+@@ -1081,11 +1208,12 @@
+ # -----------------------------
+ # PORTME Fill in your ld.so characteristics
+ AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
+-[AC_MSG_CHECKING([dynamic linker characteristics])
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_MSG_CHECKING([dynamic linker characteristics])
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -490,29 +602,67 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -1095,7 +1199,20 @@
+@@ -1095,7 +1223,58 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++m4_if($1,[],[
+if test "$GCC" = yes; then
-+ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+ if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++ case $host_os in
++ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
++ *) lt_awk_arg="/^libraries:/" ;;
++ esac
++ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
+ # if the path contains ";" then we assume it to be the separator
+ # otherwise default to the standard path separator (i.e. ":") - it is
+ # assumed that no part of a normal pathname contains ";" but that should
+ # okay in the real world where ";" in dirpaths is itself problematic.
-+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
+ else
-+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
++ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ fi
++ # Ok, now we have the path, separated by spaces, we can step through it
++ # and add multilib dir if necessary.
++ lt_tmp_lt_search_path_spec=
++ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
++ for lt_sys_path in $lt_search_path_spec; do
++ if test -d "$lt_sys_path/$lt_multi_os_dir"; then
++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
++ else
++ test -d "$lt_sys_path" && \
++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
++ fi
++ done
++ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
++BEGIN {RS=" "; FS="/|\n";} {
++ lt_foo="";
++ lt_count=0;
++ for (lt_i = NF; lt_i > 0; lt_i--) {
++ if ($lt_i != "" && $lt_i != ".") {
++ if ($lt_i == "..") {
++ lt_count++;
++ } else {
++ if (lt_count == 0) {
++ lt_foo="/" $lt_i lt_foo;
++ } else {
++ lt_count--;
++ }
++ }
++ }
++ }
++ if (lt_foo != "") { lt_freq[[lt_foo]]++; }
++ if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
++}'`
++ sys_lib_search_path_spec=`echo $lt_search_path_spec`
+else
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+fi
++fi])
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -1160,7 +1277,7 @@
+@@ -1160,7 +1339,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -521,7 +671,7 @@
;;
beos*)
-@@ -1169,7 +1286,7 @@
+@@ -1169,7 +1348,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -530,7 +680,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 +1302,7 @@
+@@ -1185,7 +1364,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -539,7 +689,7 @@
need_version=no
need_lib_prefix=no
-@@ -1197,7 +1314,8 @@
+@@ -1197,7 +1376,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -549,7 +699,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -1227,7 +1345,7 @@
+@@ -1227,7 +1407,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -558,20 +708,28 @@
;;
esac
;;
-@@ -1250,7 +1368,7 @@
+@@ -1250,13 +1430,9 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
- shrext='$(test .$module = .yes && echo .so || echo .dylib)'
+- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+- if test "$GCC" = yes; then
+- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+- else
+- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+- fi
+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
- if test "$GCC" = yes; then
- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -1273,20 +1391,17 @@
++ m4_if([$1], [],[
++ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+ ;;
+
+@@ -1273,20 +1449,17 @@
dynamic_linker=no
;;
--freebsd*-gnu*)
+-kfreebsd*-gnu*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
@@ -599,7 +757,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -1304,14 +1419,19 @@
+@@ -1304,14 +1477,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -614,14 +772,14 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
-+ freebsd*) # from 4.6 on
++ *) # from 4.6 on, and DragonFly
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
esac
;;
-@@ -1331,9 +1451,9 @@
+@@ -1331,9 +1509,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -633,7 +791,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -1348,7 +1468,7 @@
+@@ -1348,7 +1526,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -642,7 +800,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -1359,7 +1479,7 @@
+@@ -1359,7 +1537,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -651,11 +809,11 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -1371,6 +1491,18 @@
+@@ -1371,6 +1549,18 @@
postinstall_cmds='chmod 555 $lib'
;;
-+interix3*)
++interix[[3-9]]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
@@ -670,7 +828,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -1414,29 +1546,26 @@
+@@ -1414,29 +1604,26 @@
;;
# This must be Linux ELF.
@@ -685,7 +843,7 @@
- libsuff=
- if test "x$LINUX_64_MODE" = x64; then
- # Some platforms are per default 64-bit, so there's no /lib64
-- if test -d /lib64; then
+- if test -d /lib64 -a ! -h /lib64; then
- libsuff=64
- fi
- fi
@@ -700,14 +858,14 @@
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
-+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
# 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 +1575,18 @@
+@@ -1446,6 +1633,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -726,7 +884,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -1455,7 +1596,7 @@
+@@ -1455,7 +1654,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -735,7 +893,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -1483,8 +1624,13 @@
+@@ -1483,8 +1682,13 @@
openbsd*)
version_type=sunos
@@ -750,7 +908,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 +1650,7 @@
+@@ -1504,7 +1708,7 @@
os2*)
libname_spec='$name'
@@ -759,7 +917,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -1522,13 +1668,6 @@
+@@ -1522,11 +1726,8 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -768,12 +926,12 @@
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
-- ;;
--
++rdos*)
++ dynamic_linker=no
+ ;;
+
solaris*)
- version_type=linux
- need_lib_prefix=no
-@@ -1554,7 +1693,7 @@
+@@ -1554,7 +1755,7 @@
need_version=yes
;;
@@ -782,7 +940,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 +1726,29 @@
+@@ -1587,6 +1788,29 @@
fi
;;
@@ -812,7 +970,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -1600,6 +1762,11 @@
+@@ -1600,13 +1824,19 @@
esac
AC_MSG_RESULT([$dynamic_linker])
test "$dynamic_linker" = no && can_build_shared=no
@@ -824,7 +982,16 @@
])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-@@ -1624,6 +1791,9 @@
+ # _LT_AC_TAGCONFIG
+ # ----------------
+ AC_DEFUN([_LT_AC_TAGCONFIG],
+-[AC_ARG_WITH([tags],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_ARG_WITH([tags],
+ [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
+ [include additional configurations @<:@automatic@:>@])],
+ [tagnames="$withval"])
+@@ -1624,6 +1854,9 @@
AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
fi
fi
@@ -834,7 +1001,7 @@
# Extract list of available tagged configurations in $ofile.
# Note that this assumes the entire list is on one line.
-@@ -1650,7 +1820,9 @@
+@@ -1650,7 +1883,9 @@
case $tagname in
CXX)
@@ -845,7 +1012,7 @@
AC_LIBTOOL_LANG_CXX_CONFIG
else
tagname=""
-@@ -1712,7 +1884,7 @@
+@@ -1712,7 +1947,7 @@
# AC_LIBTOOL_WIN32_DLL
# --------------------
@@ -854,7 +1021,7 @@
AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
])# AC_LIBTOOL_WIN32_DLL
-@@ -1750,7 +1922,7 @@
+@@ -1750,7 +1985,7 @@
# AC_DISABLE_SHARED
# -----------------
@@ -863,7 +1030,16 @@
AC_DEFUN([AC_DISABLE_SHARED],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
AC_ENABLE_SHARED(no)
-@@ -1886,7 +2058,7 @@
+@@ -1862,7 +2097,7 @@
+
+ # AC_PATH_TOOL_PREFIX
+ # -------------------
+-# find a file program which can recognise shared library
++# find a file program which can recognize shared library
+ AC_DEFUN([AC_PATH_TOOL_PREFIX],
+ [AC_REQUIRE([AC_PROG_EGREP])dnl
+ AC_MSG_CHECKING([for $1])
+@@ -1886,7 +2121,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -872,7 +1048,16 @@
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
-@@ -1996,7 +2168,7 @@
+@@ -1925,7 +2160,7 @@
+
+ # AC_PATH_MAGIC
+ # -------------
+-# find a file program which can recognise a shared library
++# find a file program which can recognize a shared library
+ 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 +2231,7 @@
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
lt_cv_path_LD="$ac_dir/$ac_prog"
# Check to see if the program is GNU ld. I'd rather use --version,
@@ -881,7 +1066,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 +2200,7 @@
+@@ -2028,7 +2263,7 @@
AC_DEFUN([AC_PROG_LD_GNU],
[AC_REQUIRE([AC_PROG_EGREP])dnl
AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
@@ -890,7 +1075,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -2055,6 +2227,15 @@
+@@ -2055,6 +2290,15 @@
*) reload_flag=" $reload_flag" ;;
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -906,7 +1091,16 @@
])# AC_PROG_LD_RELOAD_FLAG
-@@ -2088,44 +2269,36 @@
+@@ -2063,7 +2307,7 @@
+ # how to check for library dependencies
+ # -- PORTME fill in with the dynamic library characteristics
+ AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
+-[AC_CACHE_CHECK([how to recognise dependent libraries],
++[AC_CACHE_CHECK([how to recognize dependent libraries],
+ lt_cv_deplibs_check_method,
+ [lt_cv_file_magic_cmd='$MAGIC_CMD'
+ lt_cv_file_magic_test_file=
+@@ -2088,44 +2332,42 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -930,9 +1124,15 @@
- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
- lt_cv_file_magic_cmd='win32_libid'
+ # Base MSYS/MinGW do not provide the 'file' command needed by
-+ # func_win32_libid shell function, so use a weaker test based on 'objdump'.
-+ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-+ lt_cv_file_magic_cmd='$OBJDUMP -f'
++ # func_win32_libid shell function, so use a weaker test based on 'objdump',
++ # unless we find 'file', for example because we are cross-compiling.
++ if ( file / ) >/dev/null 2>&1; then
++ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++ lt_cv_file_magic_cmd='func_win32_libid'
++ else
++ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++ lt_cv_file_magic_cmd='$OBJDUMP -f'
++ fi
;;
darwin* | rhapsody*)
@@ -950,7 +1150,7 @@
lt_cv_deplibs_check_method=pass_all
;;
--freebsd*)
+-freebsd* | kfreebsd*-gnu)
+freebsd* | dragonfly*)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
@@ -962,7 +1162,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -2141,7 +2314,7 @@
+@@ -2141,7 +2383,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -971,11 +1171,11 @@
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 +2330,27 @@
+@@ -2157,43 +2399,27 @@
esac
;;
-+interix3*)
++interix[[3-9]]*)
+ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
+ ;;
@@ -1028,7 +1228,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 +2369,22 @@
+@@ -2212,32 +2438,26 @@
;;
openbsd*)
@@ -1047,10 +1247,11 @@
- # this will be overridden with pass_all, but let us keep it just in case
- lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
- lt_cv_file_magic_test_file=/shlib/libc.so
-- lt_cv_deplibs_check_method=pass_all
-- ;;
--
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
-sco3.2v5*)
++rdos*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -1064,7 +1265,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 +2405,13 @@
+@@ -2258,10 +2478,13 @@
siemens)
lt_cv_deplibs_check_method=pass_all
;;
@@ -1079,7 +1280,7 @@
lt_cv_deplibs_check_method=pass_all
;;
esac
-@@ -2281,36 +2431,43 @@
+@@ -2281,36 +2504,43 @@
# Let the user override the test.
lt_cv_path_NM="$NM"
else
@@ -1103,7 +1304,7 @@
- */dev/null*)
- lt_cv_path_NM="$tmp_nm -p"
+ lt_nm_to_check="${ac_tool_prefix}nm"
-+ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
++ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+ lt_nm_to_check="$lt_nm_to_check nm"
+ fi
+ for lt_tmp_nm in $lt_nm_to_check; do
@@ -1147,7 +1348,7 @@
test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
fi])
NM="$lt_cv_path_NM"
-@@ -2342,13 +2499,13 @@
+@@ -2342,13 +2572,13 @@
# -----------------------------------
# sets LIBLTDL to the link flags for the libltdl convenience library and
# LTDLINCL to the include flags for the libltdl header and adds
@@ -1168,7 +1369,7 @@
AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
case $enable_ltdl_convenience in
-@@ -2367,13 +2524,13 @@
+@@ -2367,13 +2597,13 @@
# -----------------------------------
# sets LIBLTDL to the link flags for the libltdl installable library and
# LTDLINCL to the include flags for the libltdl header and adds
@@ -1189,7 +1390,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 +2568,21 @@
+@@ -2411,10 +2641,21 @@
# ---------------
AC_DEFUN([_LT_AC_LANG_CXX],
[AC_REQUIRE([AC_PROG_CXX])
@@ -1212,7 +1413,7 @@
# AC_LIBTOOL_F77
# --------------
-@@ -2454,7 +2622,7 @@
+@@ -2454,7 +2695,7 @@
# AC_LIBTOOL_RC
@@ -1221,8 +1422,17 @@
# enable support for Windows resource files
AC_DEFUN([AC_LIBTOOL_RC],
[AC_REQUIRE([LT_AC_PROG_RC])
-@@ -2487,36 +2655,9 @@
+@@ -2480,43 +2721,16 @@
+ _LT_AC_TAGVAR(objext, $1)=$objext
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
++lt_simple_compile_test_code="int some_variable = 0;"
+
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='int main(){return(0);}\n'
++lt_simple_link_test_code='int main(){return(0);}'
+
_LT_AC_SYS_COMPILER
-#
@@ -1261,7 +1471,7 @@
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
-@@ -2530,9 +2671,9 @@
+@@ -2530,9 +2744,9 @@
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
AC_LIBTOOL_SYS_LIB_STRIP
@@ -1273,7 +1483,7 @@
AC_MSG_CHECKING([if libtool supports shared libraries])
AC_MSG_RESULT([$can_build_shared])
-@@ -2541,7 +2682,7 @@
+@@ -2541,7 +2755,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -1282,7 +1492,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -2550,37 +2691,11 @@
+@@ -2550,48 +2764,11 @@
fi
;;
@@ -1297,10 +1507,21 @@
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- case "$host_os" in
- rhapsody* | darwin1.[[012]])
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
- ;;
- *) # Darwin 1.3 on
-- test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
+- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- else
+- case ${MACOSX_DEPLOYMENT_TARGET} in
+- 10.[012])
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- ;;
+- 10.*)
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
+- ;;
+- esac
+- fi
- ;;
- esac
- output_verbose_link_cmd='echo'
@@ -1322,7 +1543,7 @@
esac
AC_MSG_RESULT([$enable_shared])
-@@ -2605,7 +2720,7 @@
+@@ -2616,7 +2793,7 @@
AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
[AC_LANG_PUSH(C++)
AC_REQUIRE([AC_PROG_CXX])
@@ -1331,7 +1552,7 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -2617,6 +2732,7 @@
+@@ -2628,6 +2805,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
@@ -1339,7 +1560,7 @@
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-@@ -2634,7 +2750,7 @@
+@@ -2645,21 +2823,25 @@
_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
# Source file extension for C++ test sources.
@@ -1348,12 +1569,15 @@
# Object file extension for compiled C++ test sources.
objext=o
-@@ -2644,11 +2760,15 @@
- lt_simple_compile_test_code="int some_variable = 0;\n"
+ _LT_AC_TAGVAR(objext, $1)=$objext
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
++lt_simple_compile_test_code="int some_variable = 0;"
+
# Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
-+lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
++lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -1365,7 +1589,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -2659,18 +2779,18 @@
+@@ -2670,18 +2852,18 @@
if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
else
@@ -1387,7 +1611,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -2688,8 +2808,8 @@
+@@ -2699,8 +2881,8 @@
# Check if GNU C++ uses GNU ld as the underlying linker, since the
# archiving commands below assume that GNU ld is being used.
if test "$with_gnu_ld" = yes; then
@@ -1398,7 +1622,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 +2835,7 @@
+@@ -2726,7 +2908,7 @@
# linker, instead of GNU ld. If possible, this setting should
# overridden to take advantage of the native linker features on
# the platform it is being used on.
@@ -1407,14 +1631,18 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -2745,8 +2865,23 @@
+@@ -2756,13 +2938,28 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
- # KDE requires run time linking. Make it the default.
- aix_use_runtimelinking=yes
+- exp_sym_flag='-bexport'
+- no_entry_flag='-bnoentry'
+- fi
+ aix_use_runtimelinking=no
-+
+
+- # When large executables or shared objects are built, AIX ld can
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
@@ -1430,10 +1658,15 @@
+ ;;
+ esac
+
- exp_sym_flag='-bexport'
- no_entry_flag='-bnoentry'
- fi
-@@ -2763,7 +2898,7 @@
++ exp_sym_flag='-bexport'
++ no_entry_flag='-bnoentry'
++ fi
++
++ # When large executables or shared objects are built, AIX ld can
+ # have problems creating the table of contents. If linking a library
+ # or program results in "error TOC overflow" add -mminimal-toc to
+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
+@@ -2774,7 +2971,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GXX" = yes; then
@@ -1442,7 +1675,16 @@
# 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`
-@@ -2782,8 +2917,12 @@
+@@ -2782,7 +2979,7 @@
+ strings "$collect2name" | grep resolve_lib_name >/dev/null
+ then
+ # We have reworked collect2
+- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++ :
+ else
+ # We have old collect2
+ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+@@ -2793,8 +2990,12 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
fi
@@ -1455,7 +1697,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -2792,15 +2931,16 @@
+@@ -2803,15 +3004,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -1476,7 +1718,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 +2949,12 @@
+@@ -2820,13 +3022,12 @@
_LT_AC_SYS_LIBPATH_AIX
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -1492,7 +1734,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -2824,16 +2963,26 @@
+@@ -2835,16 +3036,26 @@
# -berok will link without error, but may produce a broken library.
_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
@@ -1524,7 +1766,7 @@
chorus*)
case $cc_basename in
*)
-@@ -2847,12 +2996,12 @@
+@@ -2858,12 +3069,12 @@
# _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'
@@ -1539,7 +1781,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 +3010,81 @@
+@@ -2872,70 +3083,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -1581,10 +1823,53 @@
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- case "$host_os" in
- rhapsody* | darwin1.[[012]])
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
- ;;
- *) # Darwin 1.3 on
-- test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
+- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
++ if test "$GXX" = yes ; then
++ lt_int_apple_cc_single_mod=no
++ output_verbose_link_cmd='echo'
++ if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
++ lt_int_apple_cc_single_mod=yes
++ fi
++ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+ else
+- case ${MACOSX_DEPLOYMENT_TARGET} in
+- 10.[012])
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- ;;
+- 10.*)
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
+- ;;
+- esac
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++ fi
++ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ else
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ fi
++ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ else
++ case $cc_basename in
++ xlc*)
++ output_verbose_link_cmd='echo'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
++ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ ;;
++ *)
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ ;;
++ esac
+ fi
- ;;
- esac
- lt_int_apple_cc_single_mod=no
@@ -1615,40 +1900,6 @@
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-+ if test "$GXX" = yes ; then
-+ lt_int_apple_cc_single_mod=no
-+ output_verbose_link_cmd='echo'
-+ if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
-+ lt_int_apple_cc_single_mod=yes
-+ fi
-+ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+ else
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+ fi
-+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ else
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ fi
-+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ else
-+ case $cc_basename in
-+ xlc*)
-+ output_verbose_link_cmd='echo'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ ;;
-+ *)
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ esac
-+ fi
+ ;;
dgux*)
@@ -1663,7 +1914,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -2924,14 +3095,14 @@
+@@ -2946,14 +3168,14 @@
;;
esac
;;
@@ -1675,12 +1926,12 @@
freebsd-elf*)
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
;;
-- freebsd*)
+- freebsd* | kfreebsd*-gnu)
+ freebsd* | dragonfly*)
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -2948,12 +3119,12 @@
+@@ -2970,12 +3192,12 @@
# location of the library.
case $cc_basename in
@@ -1696,7 +1947,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 +3133,11 @@
+@@ -2984,11 +3206,11 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -1710,24 +1961,24 @@
else
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -2976,33 +3147,22 @@
+@@ -2998,33 +3220,20 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
- case "$host_cpu" in
- hppa*64*)
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+- ;;
+- ia64*)
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+- ;;
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+ case $host_cpu in
-+ hppa*64*|ia64*)
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-- ;;
-- ia64*)
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- ;;
++ hppa*64*|ia64*) ;;
*)
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
@@ -1751,7 +2002,7 @@
;;
*)
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
-@@ -3013,17 +3173,20 @@
+@@ -3035,17 +3244,20 @@
esac
case $cc_basename in
@@ -1778,7 +2029,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -3039,12 +3202,15 @@
+@@ -3061,12 +3273,15 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -1798,11 +2049,11 @@
;;
esac
fi
-@@ -3055,11 +3221,25 @@
+@@ -3077,11 +3292,25 @@
;;
esac
;;
-+ interix3*)
++ interix[[3-9]]*)
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
@@ -1826,7 +2077,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -3070,9 +3250,9 @@
+@@ -3092,9 +3321,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -1838,7 +2089,7 @@
fi
fi
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -3081,16 +3261,16 @@
+@@ -3103,16 +3332,16 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
;;
@@ -1859,7 +2110,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 +3288,44 @@
+@@ -3130,20 +3359,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -1910,8 +2161,38 @@
runpath_var=LD_RUN_PATH
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -3149,7 +3353,7 @@
+@@ -3159,6 +3412,29 @@
+ # 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'
+ ;;
++ *)
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*)
++ # Sun C++ 5.9
++ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++
++ # Not sure whether something based on
++ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
++ # would be better.
++ output_verbose_link_cmd='echo'
++
++ # Archives containing C++ object files must be created using
++ # "CC -xar", where "CC" is the Sun C++ compiler. This is
++ # necessary to make sure instantiated templates are included
++ # in the archive.
++ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
++ ;;
++ esac
++ ;;
+ esac
;;
+ lynxos*)
+@@ -3171,7 +3447,7 @@
+ ;;
mvs*)
case $cc_basename in
- cxx)
@@ -1919,7 +2200,7 @@
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
-@@ -3159,7 +3363,7 @@
+@@ -3181,7 +3457,7 @@
;;
esac
;;
@@ -1928,7 +2209,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 +3374,31 @@
+@@ -3192,15 +3468,35 @@
# 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::"'
;;
@@ -1937,16 +2218,20 @@
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ openbsd*)
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++ if test -f /usr/libexec/ld.so; then
++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++ fi
++ output_verbose_link_cmd='echo'
++ else
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
-+ output_verbose_link_cmd='echo'
+ ;;
osf3*)
case $cc_basename in
@@ -1962,7 +2247,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -3188,14 +3408,14 @@
+@@ -3210,14 +3506,14 @@
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -1980,7 +2265,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -3213,7 +3433,7 @@
+@@ -3235,7 +3531,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -1989,7 +2274,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -3232,13 +3452,13 @@
+@@ -3254,13 +3550,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -2005,7 +2290,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -3247,17 +3467,17 @@
+@@ -3269,17 +3565,17 @@
# the KAI C++ compiler.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
;;
@@ -2027,7 +2312,7 @@
$rm $lib.exp'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -3276,7 +3496,7 @@
+@@ -3298,7 +3594,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -2036,7 +2321,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -3297,27 +3517,14 @@
+@@ -3319,27 +3615,14 @@
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -2066,7 +2351,7 @@
# Lucid
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -3330,36 +3537,33 @@
+@@ -3352,36 +3635,28 @@
;;
solaris*)
case $cc_basename in
@@ -2087,17 +2372,14 @@
- solaris2.[0-5] | solaris2.[0-5].*) ;;
+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
*)
- # The C++ compiler is used as linker so we must use $wl
- # flag to pass the commands to the underlying system
+- # The C++ compiler is used as linker so we must use $wl
+- # flag to pass the commands to the underlying system
- # linker.
-+ # linker. We must also pass each convience library through
-+ # to the system linker between allextract/defaultextract.
-+ # The C++ compiler will combine linker options so we
-+ # cannot just pass the convience library names through
-+ # without $wl.
++ # The compiler driver will combine and reorder linker options,
++ # but understands `-z linker_flag'.
# Supported since Solaris 2.6 (maybe 2.5.1?)
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
;;
esac
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
@@ -2115,7 +2397,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -3367,9 +3571,9 @@
+@@ -3389,9 +3664,9 @@
# in the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
;;
@@ -2127,7 +2409,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 +3583,9 @@
+@@ -3401,9 +3676,9 @@
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
if $CC --version | grep -v '^2\.7' > /dev/null; then
@@ -2139,7 +2421,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -3390,9 +3594,9 @@
+@@ -3412,9 +3687,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -2151,14 +2433,24 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -3405,12 +3609,63 @@
+@@ -3423,16 +3698,73 @@
+ fi
+
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
++ case $host_os in
++ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
++ *)
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++ ;;
++ esac
+ fi
;;
esac
;;
- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ runpath_var='LD_RUN_PATH'
+
@@ -2191,7 +2483,7 @@
+ # names for shared libraries.
+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
@@ -2217,7 +2509,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -3447,8 +3702,6 @@
+@@ -3469,8 +3801,6 @@
AC_LIBTOOL_PROG_LD_SHLIBS($1)
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2226,7 +2518,7 @@
AC_LIBTOOL_CONFIG($1)
-@@ -3466,7 +3719,7 @@
+@@ -3488,7 +3818,7 @@
])# AC_LIBTOOL_LANG_CXX_CONFIG
# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
@@ -2235,7 +2527,7 @@
# Figure out "hidden" library dependencies from verbose
# compiler output when linking a shared library.
# Parse the compiler output and extract the necessary
-@@ -3520,7 +3773,7 @@
+@@ -3542,7 +3872,7 @@
# The `*' in the case matches for architectures that use `case' in
# $output_verbose_cmd can trigger glob expansion during the loop
# eval without this substitution.
@@ -2244,7 +2536,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -3560,7 +3813,7 @@
+@@ -3582,7 +3912,7 @@
fi
;;
@@ -2253,14 +2545,14 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -3596,13 +3849,37 @@
+@@ -3618,13 +3948,70 @@
$rm -f confest.$objext
+# PORTME: override above test on systems where it is broken
+ifelse([$1],[CXX],
+[case $host_os in
-+interix3*)
++interix[[3-9]]*)
+ # Interix 3.5 installs completely hosed .la files for C++, so rather than
+ # hack all around it, let's just trust "g++" to DTRT.
+ _LT_AC_TAGVAR(predep_objects,$1)=
@@ -2268,13 +2560,46 @@
+ _LT_AC_TAGVAR(postdeps,$1)=
+ ;;
+
++linux*)
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*)
++ # Sun C++ 5.9
++ #
++ # The more standards-conforming stlport4 library is
++ # incompatible with the Cstd library. Avoid specifying
++ # it if it's in CXXFLAGS. Ignore libCrun as
++ # -library=stlport4 depends on it.
++ case " $CXX $CXXFLAGS " in
++ *" -library=stlport4 "*)
++ solaris_use_stlport4=yes
++ ;;
++ esac
++ if test "$solaris_use_stlport4" != yes; then
++ _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
++ fi
++ ;;
++ esac
++ ;;
++
+solaris*)
+ case $cc_basename in
+ CC*)
++ # The more standards-conforming stlport4 library is
++ # incompatible with the Cstd library. Avoid specifying
++ # it if it's in CXXFLAGS. Ignore libCrun as
++ # -library=stlport4 depends on it.
++ case " $CXX $CXXFLAGS " in
++ *" -library=stlport4 "*)
++ solaris_use_stlport4=yes
++ ;;
++ esac
++
+ # Adding this requires a known-good setup of shared libraries for
+ # Sun compiler versions before 5.6, else PIC objects from an old
+ # archive will be linked into the output, leading to subtle bugs.
-+ _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
++ if test "$solaris_use_stlport4" != yes; then
++ _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
++ fi
+ ;;
+ esac
+ ;;
@@ -2292,7 +2617,24 @@
# 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'.
-@@ -3646,12 +3923,16 @@
+@@ -3660,20 +4047,31 @@
+ _LT_AC_TAGVAR(objext, $1)=$objext
+
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code=" subroutine t\n return\n end\n"
++lt_simple_compile_test_code="\
++ subroutine t
++ return
++ end
++"
+
+ # Code to be used in simple link tests
+-lt_simple_link_test_code=" program t\n end\n"
++lt_simple_link_test_code="\
++ program t
++ end
++"
+
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -2310,7 +2652,7 @@
AC_MSG_CHECKING([if libtool supports shared libraries])
AC_MSG_RESULT([$can_build_shared])
-@@ -3661,7 +3942,7 @@
+@@ -3683,7 +4081,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -2319,7 +2661,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -3669,8 +3950,10 @@
+@@ -3691,8 +4089,10 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -2332,7 +2674,7 @@
;;
esac
AC_MSG_RESULT([$enable_shared])
-@@ -3680,8 +3963,6 @@
+@@ -3702,8 +4102,6 @@
test "$enable_shared" = yes || enable_static=yes
AC_MSG_RESULT([$enable_static])
@@ -2341,7 +2683,7 @@
_LT_AC_TAGVAR(GCC, $1)="$G77"
_LT_AC_TAGVAR(LD, $1)="$LD"
-@@ -3691,8 +3972,6 @@
+@@ -3713,8 +4111,6 @@
AC_LIBTOOL_PROG_LD_SHLIBS($1)
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2350,12 +2692,16 @@
AC_LIBTOOL_CONFIG($1)
-@@ -3721,20 +4000,27 @@
- lt_simple_compile_test_code="class foo {}\n"
+@@ -3740,23 +4136,30 @@
+ _LT_AC_TAGVAR(objext, $1)=$objext
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="class foo {}\n"
++lt_simple_compile_test_code="class foo {}"
+
# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
-+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
++lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -2379,7 +2725,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 +4032,6 @@
+@@ -3768,8 +4171,6 @@
AC_LIBTOOL_PROG_LD_SHLIBS($1)
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2388,7 +2734,7 @@
AC_LIBTOOL_CONFIG($1)
-@@ -3757,7 +4041,7 @@
+@@ -3779,7 +4180,7 @@
# AC_LIBTOOL_LANG_RC_CONFIG
@@ -2397,7 +2743,16 @@
# 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'.
-@@ -3781,11 +4065,16 @@
+@@ -3795,7 +4196,7 @@
+ _LT_AC_TAGVAR(objext, $1)=$objext
+
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
++lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+
+ # Code to be used in simple link tests
+ lt_simple_link_test_code="$lt_simple_compile_test_code"
+@@ -3803,11 +4204,16 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -2414,7 +2769,7 @@
_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
AC_LIBTOOL_CONFIG($1)
-@@ -3811,11 +4100,12 @@
+@@ -3833,11 +4239,12 @@
# without removal of \ escapes.
if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
@@ -2429,7 +2784,15 @@
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 \
-@@ -3865,7 +4155,7 @@
+@@ -3878,6 +4285,7 @@
+ _LT_AC_TAGVAR(module_cmds, $1) \
+ _LT_AC_TAGVAR(module_expsym_cmds, $1) \
+ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
++ _LT_AC_TAGVAR(fix_srcfile_path, $1) \
+ _LT_AC_TAGVAR(exclude_expsyms, $1) \
+ _LT_AC_TAGVAR(include_expsyms, $1); do
+
+@@ -3887,7 +4295,7 @@
_LT_AC_TAGVAR(archive_cmds, $1) | \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
_LT_AC_TAGVAR(module_cmds, $1) | \
@@ -2438,7 +2801,16 @@
_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
_LT_AC_TAGVAR(export_symbols_cmds, $1) | \
extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -3931,11 +4221,11 @@
+@@ -3924,7 +4332,7 @@
+ # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+ # NOTE: Changes made to this file will be lost: look at ltmain.sh.
+ #
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+ # Free Software Foundation, Inc.
+ #
+ # This file is part of GNU Libtool:
+@@ -3953,11 +4361,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -2452,7 +2824,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -3966,6 +4256,12 @@
+@@ -3988,6 +4396,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -2465,7 +2837,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -3977,6 +4273,9 @@
+@@ -3999,6 +4413,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -2475,7 +2847,7 @@
# A language-specific compiler.
CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
-@@ -3996,7 +4295,7 @@
+@@ -4018,7 +4435,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -2484,7 +2856,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -4027,7 +4326,7 @@
+@@ -4049,7 +4466,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -2493,7 +2865,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -4042,7 +4341,7 @@
+@@ -4064,7 +4481,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
@@ -2502,7 +2874,16 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -4271,7 +4570,10 @@
+@@ -4240,7 +4657,7 @@
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+ # Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
++fix_srcfile_path=$lt_fix_srcfile_path
+
+ # Set to yes if exported symbols are required.
+ always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
+@@ -4293,7 +4710,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -2514,7 +2895,15 @@
fi
])# AC_LIBTOOL_CONFIG
-@@ -4313,9 +4615,6 @@
+@@ -4320,6 +4740,7 @@
+ # ---------------------------------
+ AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
+ [AC_REQUIRE([AC_CANONICAL_HOST])
++AC_REQUIRE([LT_AC_PROG_SED])
+ AC_REQUIRE([AC_PROG_NM])
+ AC_REQUIRE([AC_OBJEXT])
+ # Check for command to grab the raw symbol name followed by C symbol from nm.
+@@ -4335,9 +4756,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
@@ -2524,7 +2913,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 +4636,30 @@
+@@ -4359,14 +4777,30 @@
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'"
;;
@@ -2557,7 +2946,7 @@
;;
sysv4)
symcode='[[DFNSTU]]'
-@@ -4362,14 +4677,17 @@
+@@ -4384,14 +4818,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -2577,18 +2966,35 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -4525,6 +4843,10 @@
+@@ -4530,12 +4967,14 @@
+ # like `-m68040'.
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+ ;;
+- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ # PIC is the default for these OSes.
+ ;;
+- mingw* | os2* | pw32*)
++ mingw* | cygwin* | os2* | pw32*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
++ # Although the cygwin gcc ignores -fPIC, still need this for old-style
++ # (--disable-auto-import) libraries
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+ ;;
+ darwin* | rhapsody*)
+@@ -4547,6 +4986,10 @@
# DJGPP does not support shared libraries at all
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
;;
-+ interix3*)
++ interix[[3-9]]*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+ # Instead, we relocate shared libraries at runtime.
+ ;;
sysv4*MP*)
if test -d /usr/nec; then
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-@@ -4533,7 +4855,7 @@
+@@ -4555,7 +4998,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -2597,7 +3003,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -4558,18 +4880,28 @@
+@@ -4580,18 +5023,28 @@
;;
chorus*)
case $cc_basename in
@@ -2629,11 +3035,11 @@
# Green Hills C++ Compiler
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
;;
-@@ -4577,22 +4909,22 @@
+@@ -4599,22 +5052,22 @@
;;
esac
;;
-- freebsd*)
+- freebsd* | kfreebsd*-gnu)
+ freebsd* | dragonfly*)
# FreeBSD uses GNU C++
;;
@@ -2658,7 +3064,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -4605,9 +4937,13 @@
+@@ -4627,9 +5080,13 @@
;;
esac
;;
@@ -2673,7 +3079,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 +4952,26 @@
+@@ -4638,20 +5095,26 @@
;;
esac
;;
@@ -2705,8 +3111,23 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -4646,25 +4988,25 @@
+@@ -4659,6 +5122,14 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
+ *)
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*)
++ # Sun C++ 5.9
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
++ ;;
++ esac
+ ;;
+ esac
;;
+@@ -4668,25 +5139,25 @@
+ ;;
mvs*)
case $cc_basename in
- cxx)
@@ -2736,7 +3157,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 +5020,15 @@
+@@ -4700,24 +5171,15 @@
;;
psos*)
;;
@@ -2763,7 +3184,7 @@
# Green Hills C++ Compiler
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
;;
-@@ -4705,12 +5038,12 @@
+@@ -4727,12 +5189,12 @@
;;
sunos4*)
case $cc_basename in
@@ -2778,7 +3199,7 @@
# Lucid
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
;;
-@@ -4720,7 +5053,7 @@
+@@ -4742,7 +5204,7 @@
;;
tandem*)
case $cc_basename in
@@ -2787,7 +3208,7 @@
# NonStop-UX NCC 3.20
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
;;
-@@ -4728,7 +5061,14 @@
+@@ -4750,7 +5212,14 @@
;;
esac
;;
@@ -2803,11 +3224,29 @@
;;
vxworks*)
;;
-@@ -4775,6 +5115,11 @@
+@@ -4781,13 +5250,15 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+ ;;
+
+- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ # PIC is the default for these OSes.
+ ;;
+
+- mingw* | pw32* | os2*)
++ mingw* | cygwin* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
++ # Although the cygwin gcc ignores -fPIC, still need this for old-style
++ # (--disable-auto-import) libraries
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+ ;;
+
+@@ -4797,6 +5268,11 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
;;
-+ interix3*)
++ interix[[3-9]]*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+ # Instead, we relocate shared libraries at runtime.
+ ;;
@@ -2815,7 +3254,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -4791,7 +5136,7 @@
+@@ -4813,7 +5289,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -2824,7 +3263,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -4817,6 +5162,16 @@
+@@ -4839,8 +5315,18 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -2839,9 +3278,12 @@
+ esac
+ ;;
- mingw* | pw32* | os2*)
+- mingw* | pw32* | os2*)
++ mingw* | cygwin* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -4828,7 +5183,7 @@
+ # built for inclusion in a dll (and should export symbols for example).
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+@@ -4850,7 +5336,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -2850,7 +3292,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -4851,13 +5206,20 @@
+@@ -4873,18 +5359,41 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
@@ -2873,15 +3315,38 @@
ccc*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
# All Alpha code is PIC.
-@@ -4872,15 +5234,15 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
++ *)
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*)
++ # Sun C 5.9
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ ;;
++ *Sun\ F*)
++ # Sun Fortran 8.3 passes all unrecognized flags to the linker
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=''
++ ;;
++ esac
++ ;;
+ esac
+ ;;
+
+@@ -4894,15 +5403,19 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
- sco3.2v5*)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn'
-- ;;
--
++ rdos*)
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
+
solaris*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
@@ -2895,7 +3360,7 @@
;;
sunos4*)
-@@ -4889,7 +5251,7 @@
+@@ -4911,7 +5424,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
@@ -2904,7 +3369,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 +5264,17 @@
+@@ -4924,6 +5437,17 @@
fi
;;
@@ -2922,7 +3387,7 @@
uts4*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -4929,7 +5302,7 @@
+@@ -4951,7 +5475,7 @@
[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
fi
@@ -2931,7 +3396,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-@@ -4938,6 +5311,16 @@
+@@ -4960,6 +5484,16 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
;;
esac
@@ -2948,19 +3413,29 @@
])
-@@ -4962,7 +5345,10 @@
+@@ -4967,7 +5501,8 @@
+ # ------------------------------------
+ # See if the linker supports building shared libraries.
+ AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
+-[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+ ifelse([$1],[CXX],[
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ case $host_os in
+@@ -4984,7 +5519,10 @@
_LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
;;
cygwin* | mingw*)
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+ ;;
+ linux* | k*bsd*-gnu)
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
;;
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -4988,7 +5374,7 @@
+@@ -5010,7 +5548,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
@@ -2969,7 +3444,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*
-@@ -5005,7 +5391,8 @@
+@@ -5027,7 +5565,8 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -2979,7 +3454,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
# FIXME: the MSVC++ port hasn't been tested in a loooong time
-@@ -5015,6 +5402,10 @@
+@@ -5037,6 +5576,10 @@
with_gnu_ld=no
fi
;;
@@ -2990,7 +3465,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -5025,6 +5416,27 @@
+@@ -5047,6 +5590,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -3018,7 +3493,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -5062,7 +5474,7 @@
+@@ -5084,7 +5648,7 @@
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -3027,7 +3502,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -5072,13 +5484,13 @@
+@@ -5094,13 +5658,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -3036,7 +3511,7 @@
_LT_AC_TAGVAR(always_export_symbols, $1)=no
_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
@@ -3044,18 +3519,20 @@
# 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 +5499,70 @@
+@@ -5109,23 +5673,79 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
- $CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+ else
+ else
+- ld_shlibs=no
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ fi
-+ ;;
-+
-+ interix3*)
+ fi
+ ;;
+
+- netbsd*)
++ interix[[3-9]]*)
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
@@ -3070,7 +3547,7 @@
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
+
-+ linux* | k*bsd*-gnu)
++ gnu* | linux* | k*bsd*-gnu)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ tmp_addflag=
+ case $cc_basename,$host_cpu in
@@ -3088,22 +3565,29 @@
+ ifc* | ifort*) # Intel Fortran compiler
+ tmp_addflag=' -nofor_main' ;;
+ esac
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*) # Sun C 5.9
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++ tmp_sharedflag='-G' ;;
++ *Sun\ F*) # Sun Fortran 8.3
++ tmp_sharedflag='-G' ;;
++ *)
++ tmp_sharedflag='-shared' ;;
++ esac
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+ if test $supports_anon_versioning = yes; then
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ $echo "local: *; };" >> $output_objdir/$libname.ver~
-+ $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
- else
-- ld_shlibs=no
++ else
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
-- netbsd*)
++ fi
++ ;;
++
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -3121,7 +3605,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 +5576,40 @@
+@@ -5139,13 +5759,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -3136,7 +3620,7 @@
+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+ case `$LD -v 2>&1` in
-+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
++ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ cat <<_LT_EOF 1>&2
+
@@ -3164,7 +3648,7 @@
sunos4*)
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -5133,24 +5619,19 @@
+@@ -5155,24 +5802,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -3196,7 +3680,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -5162,7 +5643,7 @@
+@@ -5184,7 +5826,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
@@ -3205,7 +3689,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -5184,9 +5665,21 @@
+@@ -5206,9 +5848,21 @@
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
@@ -3229,7 +3713,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -5203,7 +5696,7 @@
+@@ -5225,7 +5879,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GCC" = yes; then
@@ -3238,7 +3722,16 @@
# 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`
-@@ -5222,8 +5715,12 @@
+@@ -5233,7 +5887,7 @@
+ strings "$collect2name" | grep resolve_lib_name >/dev/null
+ then
+ # We have reworked collect2
+- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++ :
+ else
+ # We have old collect2
+ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+@@ -5244,8 +5898,12 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
fi
@@ -3251,7 +3744,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -5231,30 +5728,30 @@
+@@ -5253,30 +5911,30 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -3293,7 +3786,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -5263,13 +5760,11 @@
+@@ -5285,13 +5943,11 @@
# -berok will link without error, but may produce a broken library.
_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
@@ -3310,7 +3803,7 @@
fi
fi
;;
-@@ -5282,7 +5777,7 @@
+@@ -5304,7 +5960,7 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -3319,7 +3812,7 @@
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
;;
-@@ -5292,58 +5787,69 @@
+@@ -5314,69 +5970,69 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -3336,8 +3829,9 @@
# The linker will automatically build a .lib file if we build a DLL.
_LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
# FIXME: Should let the user specify the lib program.
- _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
+- _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
- fix_srcfile_path='`cygpath -w "$srcfile"`'
++ _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+ _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
;;
@@ -3347,10 +3841,21 @@
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- case "$host_os" in
- rhapsody* | darwin1.[[012]])
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
- ;;
- *) # Darwin 1.3 on
-- test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
+- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- else
+- case ${MACOSX_DEPLOYMENT_TARGET} in
+- 10.[012])
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- ;;
+- 10.*)
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
+- ;;
+- esac
+- fi
- ;;
+ case $host_os in
+ rhapsody* | darwin1.[[012]])
@@ -3410,10 +3915,10 @@
+ case $cc_basename in
+ xlc*)
+ output_verbose_link_cmd='echo'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ ;;
+ *)
@@ -3424,18 +3929,18 @@
;;
dgux*)
-@@ -5376,8 +5882,8 @@
+@@ -5409,8 +6065,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-- freebsd*)
+- freebsd* | kfreebsd*-gnu)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
+ freebsd* | dragonfly*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -5385,7 +5891,7 @@
+@@ -5418,7 +6074,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -3444,7 +3949,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 +5905,62 @@
+@@ -5432,47 +6088,62 @@
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
;;
@@ -3531,7 +4036,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-@@ -5453,7 +5974,7 @@
+@@ -5486,7 +6157,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -3540,7 +4045,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 +5984,7 @@
+@@ -5496,7 +6167,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -3549,26 +4054,52 @@
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
-@@ -5486,7 +6007,8 @@
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+@@ -5516,23 +6187,28 @@
+ ;;
+
+ openbsd*)
+- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++ if test -f /usr/libexec/ld.so; then
++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++ else
++ case $host_os in
++ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++ ;;
++ *)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ ;;
++ esac
++ fi
else
-@@ -5496,7 +6018,7 @@
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- ;;
- *)
+- case $host_os in
+- openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+- ;;
+- *)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- ;;
- esac
-@@ -5507,14 +6029,14 @@
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+- ;;
+- esac
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+
+@@ -5540,14 +6216,14 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
@@ -3585,7 +4116,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 +6048,13 @@
+@@ -5559,13 +6235,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -3601,7 +4132,7 @@
# Both c and cxx compiler support -rpath directly
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -5540,21 +6062,15 @@
+@@ -5573,21 +6249,15 @@
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
;;
@@ -3627,28 +4158,27 @@
_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 +6079,18 @@
+@@ -5596,8 +6266,17 @@
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
- *) # Supported since Solaris 2.6 (maybe 2.5.1?)
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
+ *)
-+ # The compiler driver will combine linker options so we
-+ # cannot just pass the convience library names through
-+ # without $wl, iff we do not link with $LD.
-+ # Luckily, gcc supports the same syntax we need for Sun Studio.
++ # The compiler driver will combine and reorder linker options,
++ # but understands `-z linker_flag'. GCC discards it without `$wl',
++ # but is careful enough not to reorder.
+ # Supported since Solaris 2.6 (maybe 2.5.1?)
-+ case $wlarc in
-+ '')
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
-+ *)
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-+ esac ;;
++ if test "$GCC" = yes; then
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++ else
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
++ fi
++ ;;
esac
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
-@@ -5573,7 +6099,7 @@
+@@ -5606,7 +6285,7 @@
if test "x$host_vendor" = xsequent; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
@@ -3657,7 +4187,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -5621,36 +6147,45 @@
+@@ -5654,36 +6333,45 @@
fi
;;
@@ -3665,7 +4195,7 @@
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -3724,7 +4254,7 @@
;;
uts4*)
-@@ -5668,11 +6203,6 @@
+@@ -5701,11 +6389,6 @@
AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
@@ -3736,11 +4266,13 @@
#
# Do we need to explicitly link libc?
#
-@@ -5693,13 +6223,14 @@
+@@ -5725,14 +6408,15 @@
+ # to ld, don't add -lc before -lgcc.
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
soname=conftest
@@ -3752,7 +4284,51 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -5827,7 +6358,7 @@
+@@ -5827,6 +6511,30 @@
+ [AC_CHECK_TOOL(RC, windres, no)
+ ])
+
++
++# Cheap backport of AS_EXECUTABLE_P and required macros
++# from Autoconf 2.59; we should not use $as_executable_p directly.
++
++# _AS_TEST_PREPARE
++# ----------------
++m4_ifndef([_AS_TEST_PREPARE],
++[m4_defun([_AS_TEST_PREPARE],
++[if test -x / >/dev/null 2>&1; then
++ as_executable_p='test -x'
++else
++ as_executable_p='test -f'
++fi
++])])# _AS_TEST_PREPARE
++
++# AS_EXECUTABLE_P
++# ---------------
++# Check whether a file is executable.
++m4_ifndef([AS_EXECUTABLE_P],
++[m4_defun([AS_EXECUTABLE_P],
++[AS_REQUIRE([_AS_TEST_PREPARE])dnl
++$as_executable_p $1[]dnl
++])])# AS_EXECUTABLE_P
++
+ ############################################################
+ # NOTE: This macro has been submitted for inclusion into #
+ # GNU Autoconf as AC_PROG_SED. When it is available in #
+@@ -5849,18 +6557,19 @@
+ test -z "$as_dir" && as_dir=.
+ for lt_ac_prog in sed gsed; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
++ if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then
+ lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+ fi
+ done
+ done
+ done
++IFS=$as_save_IFS
+ lt_ac_max=0
+ lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
# along with /bin/sed that truncates output.
for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
@@ -3761,19 +4337,27 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-diff -Nrua a/admin/ltmain.sh b/admin/ltmain.sh
---- a/admin/ltmain.sh 2007-06-12 09:55:28.000000000 +0200
-+++ b/admin/ltmain.sh 2007-06-12 14:39:08.000000000 +0200
-@@ -1,7 +1,7 @@
+@@ -5887,5 +6596,6 @@
+ done
+ ])
+ SED=$lt_cv_path_SED
++AC_SUBST([SED])
+ AC_MSG_RESULT([$SED])
+ ])
+--- a/admin/ltmain.sh
++++ b/admin/ltmain.sh
+@@ -1,8 +1,8 @@
# ltmain.sh - Provide generalized library-building support services.
# NOTE: Changing this file will not affect anything until you rerun configure.
#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
- # Free Software Foundation, Inc.
+-# Free Software Foundation, Inc.
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
++# 2007 Free Software Foundation, Inc.
# Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
#
-@@ -24,6 +24,34 @@
+ # This program is free software; you can redistribute it and/or modify
+@@ -24,6 +24,42 @@
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
@@ -3796,19 +4380,27 @@
+
+PROGRAM=ltmain.sh
+PACKAGE=libtool
-+VERSION="1.5.22 Debian 1.5.22-4"
-+TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
++VERSION="1.5.24 Debian 1.5.24-2"
++TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
+
-+# See if we are running on zsh, and set the options which allow our
-+# commands through without removal of \ escapes.
-+if test -n "${ZSH_VERSION+set}" ; then
++# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++ emulate sh
++ NULLCMD=:
++ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++ # is contrary to our usage. Disable this feature.
++ alias -g '${1+"$@"}'='"$@"'
+ setopt NO_GLOB_SUBST
++else
++ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+fi
++BIN_SH=xpg4; export BIN_SH # for Tru64
++DUALCASE=1; export DUALCASE # for MKS sh
+
# Check that we have a working $echo.
if test "X$1" = X--no-reexec; then
# Discard the --no-reexec flag, and continue.
-@@ -36,7 +64,7 @@
+@@ -36,7 +72,7 @@
:
else
# Restart under the correct shell, and then maybe $echo will work.
@@ -3817,7 +4409,7 @@
fi
if test "X$1" = X--fallback-echo; then
-@@ -45,19 +73,9 @@
+@@ -45,19 +81,9 @@
cat <<EOF
$*
EOF
@@ -3838,7 +4430,7 @@
default_mode=
help="Try \`$progname --help' for more information."
magic="%%%MAGIC variable%%%"
-@@ -70,14 +88,15 @@
+@@ -70,14 +96,15 @@
Xsed="${SED}"' -e 1s/^X//'
sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
# test EBCDIC or ASCII
@@ -3861,8 +4453,24 @@
;;
esac
-@@ -94,12 +113,14 @@
- fi
+@@ -86,20 +113,24 @@
+ # 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.
+-if test "${LC_ALL+set}" = set; then
+- save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
+-fi
+-if test "${LANG+set}" = set; then
+- save_LANG="$LANG"; LANG=C; export LANG
+-fi
++for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
++do
++ eval "if test \"\${$lt_var+set}\" = set; then
++ save_$lt_var=\$$lt_var
++ $lt_var=C
++ export $lt_var
++ fi"
++done
# Make sure IFS has a sensible default
-: ${IFS=" "}
@@ -3878,7 +4486,7 @@
fi
# Global variables.
-@@ -111,6 +132,8 @@
+@@ -111,17 +142,62 @@
show="$echo"
show_help=
execute_dlfiles=
@@ -3886,8 +4494,10 @@
+preserve_args=
lo2o="s/\\.lo\$/.${objext}/"
o2lo="s/\\.${objext}\$/.lo/"
++extracted_archives=
++extracted_serial=0
-@@ -118,10 +141,51 @@
+ #####################################
# Shell function definitions:
# This seems to be the best place for them
@@ -3940,7 +4550,7 @@
win32_libid_type="unknown"
win32_fileres=`file -L $1 2>/dev/null`
case $win32_fileres in
-@@ -130,17 +194,16 @@
+@@ -130,17 +206,22 @@
;;
*ar\ archive*) # could be an import, or static
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
@@ -3953,7 +4563,13 @@
- else
- win32_libid_type="x86 archive static"
- fi
-+ $SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
++ $SED -n -e '1,100{
++ / I /{
++ s,.*,import,
++ p
++ q
++ }
++ }'`
+ case $win32_nmres in
+ import*) win32_libid_type="x86 archive import";;
+ *) win32_libid_type="x86 archive static";;
@@ -3965,7 +4581,7 @@
win32_libid_type="x86 DLL"
;;
*executable*) # but shell scripts are "executable" too...
-@@ -154,9 +217,181 @@
+@@ -154,9 +235,191 @@
$echo $win32_libid_type
}
@@ -4079,7 +4695,17 @@
+ *) my_xabs=`pwd`"/$my_xlib" ;;
+ esac
+ my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
-+ my_xdir="$my_gentop/$my_xlib"
++ my_xlib_u=$my_xlib
++ while :; do
++ case " $extracted_archives " in
++ *" $my_xlib_u "*)
++ extracted_serial=`expr $extracted_serial + 1`
++ my_xlib_u=lt$extracted_serial-$my_xlib ;;
++ *) break ;;
++ esac
++ done
++ extracted_archives="$extracted_archives $my_xlib_u"
++ my_xdir="$my_gentop/$my_xlib_u"
+
+ $show "${rm}r $my_xdir"
+ $run ${rm}r "$my_xdir"
@@ -4147,7 +4773,7 @@
# Parse our command line options once, thoroughly.
while test "$#" -gt 0
do
-@@ -176,12 +411,13 @@
+@@ -176,12 +439,13 @@
;;
tag)
tagname="$arg"
@@ -4162,7 +4788,7 @@
;;
esac
-@@ -191,10 +427,10 @@
+@@ -191,10 +455,10 @@
# not specially marked.
;;
*)
@@ -4175,15 +4801,22 @@
else
$echo "$progname: ignoring unknown tag $tagname" 1>&2
fi
-@@ -220,24 +456,25 @@
+@@ -218,26 +482,28 @@
+ ;;
+
--version)
- $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
- $echo
+- $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
+- $echo
- $echo "Copyright (C) 2003 Free Software Foundation, Inc."
-+ $echo "Copyright (C) 2005 Free Software Foundation, Inc."
- $echo "This is free software; see the source for copying conditions. There is NO"
- $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+- $echo "This is free software; see the source for copying conditions. There is NO"
+- $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
- exit 0
++ echo "\
++$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
++
++Copyright (C) 2007 Free Software Foundation, Inc.
++This is free software; see the source for copying conditions. There is NO
++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+ exit $?
;;
@@ -4206,7 +4839,7 @@
;;
--dry-run | -n)
-@@ -256,7 +493,7 @@
+@@ -256,7 +522,7 @@
else
$echo "disable static libraries"
fi
@@ -4215,7 +4848,7 @@
;;
--finish) mode="finish" ;;
-@@ -268,13 +505,19 @@
+@@ -268,13 +534,19 @@
--quiet | --silent)
show=:
@@ -4236,7 +4869,7 @@
;;
-dlopen)
-@@ -285,7 +528,7 @@
+@@ -285,7 +557,7 @@
-*)
$echo "$modename: unrecognized option \`$arg'" 1>&2
$echo "$help" 1>&2
@@ -4245,7 +4878,7 @@
;;
*)
-@@ -298,9 +541,21 @@
+@@ -298,9 +570,21 @@
if test -n "$prevopt"; then
$echo "$modename: option \`$prevopt' requires an argument" 1>&2
$echo "$help" 1>&2
@@ -4268,7 +4901,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 +566,7 @@
+@@ -311,7 +595,7 @@
# Infer the operation mode.
if test -z "$mode"; then
$echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
@@ -4277,7 +4910,7 @@
case $nonopt in
*cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
mode=link
-@@ -354,7 +609,7 @@
+@@ -354,7 +638,7 @@
if test -n "$execute_dlfiles" && test "$mode" != execute; then
$echo "$modename: unrecognized option \`-dlopen'" 1>&2
$echo "$help" 1>&2
@@ -4286,7 +4919,7 @@
fi
# Change the help message to a mode-specific one.
-@@ -369,13 +624,15 @@
+@@ -369,13 +653,15 @@
# Get the compilation command and the source file.
base_compile=
srcfile="$nonopt" # always keep a non-empty value in "srcfile"
@@ -4303,7 +4936,7 @@
arg )
# do not "continue". Instead, add this to base_compile
lastarg="$arg"
-@@ -394,24 +651,19 @@
+@@ -394,24 +680,19 @@
-o)
if test -n "$libobj" ; then
$echo "$modename: you cannot specify \`-o' more than once" 1>&2
@@ -4333,7 +4966,7 @@
continue
;;
-@@ -424,7 +676,7 @@
+@@ -424,7 +705,7 @@
args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
lastarg=
save_ifs="$IFS"; IFS=','
@@ -4342,7 +4975,7 @@
IFS="$save_ifs"
# Double-quote args containing other shell metacharacters.
-@@ -462,7 +714,10 @@
+@@ -462,7 +743,10 @@
case $lastarg in
# Double-quote args containing other shell metacharacters.
# Many Bourne shells cannot handle close brackets correctly
@@ -4354,7 +4987,7 @@
*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
lastarg="\"$lastarg\""
;;
-@@ -474,11 +729,11 @@
+@@ -474,11 +758,11 @@
case $arg_mode in
arg)
$echo "$modename: you must specify an argument for -Xcompile"
@@ -4368,7 +5001,19 @@
;;
*)
# Get the name of the library object.
-@@ -511,51 +766,39 @@
+@@ -500,9 +784,10 @@
+ *.class) xform=class ;;
+ *.cpp) xform=cpp ;;
+ *.cxx) xform=cxx ;;
+- *.f90) xform=f90 ;;
++ *.[fF][09]?) xform=[fF][09]. ;;
+ *.for) xform=for ;;
+ *.java) xform=java ;;
++ *.obj) xform=obj ;;
+ esac
+
+ libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
+@@ -511,51 +796,39 @@
*.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
*)
$echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
@@ -4447,7 +5092,7 @@
objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
if test "X$xdir" = "X$obj"; then
-@@ -568,7 +811,7 @@
+@@ -568,7 +841,7 @@
if test -z "$base_compile"; then
$echo "$modename: you must specify a compilation command" 1>&2
$echo "$help" 1>&2
@@ -4456,7 +5101,7 @@
fi
# Delete any leftover library objects.
-@@ -579,7 +822,7 @@
+@@ -579,7 +852,7 @@
fi
$run $rm $removelist
@@ -4465,7 +5110,7 @@
# On Cygwin there's no "real" PIC flag so we must build both object types
case $host_os in
-@@ -598,7 +841,7 @@
+@@ -598,7 +871,7 @@
output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
lockfile="$output_obj.lock"
removelist="$removelist $output_obj $lockfile"
@@ -4474,7 +5119,7 @@
else
output_obj=
need_locks=no
-@@ -608,7 +851,7 @@
+@@ -608,7 +881,7 @@
# 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
@@ -4483,7 +5128,7 @@
$show "Waiting for $lockfile to be removed"
sleep 2
done
-@@ -626,14 +869,19 @@
+@@ -626,14 +899,19 @@
compiler."
$run $rm $removelist
@@ -4505,7 +5150,7 @@
$run $rm "$libobj" "${libobj}T"
-@@ -655,18 +903,18 @@
+@@ -655,18 +933,18 @@
fbsd_hideous_sh_bug=$base_compile
if test "$pic_mode" != no; then
@@ -4529,7 +5174,7 @@
fi
fi
-@@ -681,7 +929,7 @@
+@@ -681,7 +959,7 @@
if $run eval "$command"; then :
else
test -n "$output_obj" && $run $rm $removelist
@@ -4538,7 +5183,7 @@
fi
if test "$need_locks" = warn &&
-@@ -701,7 +949,7 @@
+@@ -701,7 +979,7 @@
compiler."
$run $rm $removelist
@@ -4547,7 +5192,7 @@
fi
# Just move the object if needed, then go on to compile the next one
-@@ -722,7 +970,9 @@
+@@ -722,7 +1000,9 @@
EOF
# Allow error messages only from the first compilation.
@@ -4558,7 +5203,7 @@
else
# No PIC object so indicate it doesn't exist in the libtool
# object file.
-@@ -736,9 +986,9 @@
+@@ -736,9 +1016,9 @@
if test "$build_old_libs" = yes; then
if test "$pic_mode" != yes; then
# Don't build PIC code
@@ -4570,7 +5215,7 @@
fi
if test "$compiler_c_o" = yes; then
command="$command -o $obj"
-@@ -751,7 +1001,7 @@
+@@ -751,7 +1031,7 @@
if $run eval "$command"; then :
else
$run $rm $removelist
@@ -4579,7 +5224,7 @@
fi
if test "$need_locks" = warn &&
-@@ -771,7 +1021,7 @@
+@@ -771,7 +1051,7 @@
compiler."
$run $rm $removelist
@@ -4588,7 +5233,7 @@
fi
# Just move the object if needed
-@@ -809,7 +1059,7 @@
+@@ -809,7 +1089,7 @@
$run $rm "$lockfile"
fi
@@ -4597,7 +5242,7 @@
;;
# libtool link mode
-@@ -835,7 +1085,7 @@
+@@ -835,7 +1115,7 @@
;;
esac
libtool_args="$nonopt"
@@ -4606,7 +5251,7 @@
compile_command="$nonopt"
finalize_command="$nonopt"
-@@ -847,7 +1097,6 @@
+@@ -847,7 +1127,6 @@
old_convenience=
deplibs=
old_deplibs=
@@ -4614,7 +5259,7 @@
compiler_flags=
linker_flags=
dllsearchpath=
-@@ -868,6 +1117,8 @@
+@@ -868,6 +1147,8 @@
no_install=no
objs=
non_pic_objects=
@@ -4623,7 +5268,7 @@
prefer_static_libs=no
preload=no
prev=
-@@ -881,6 +1132,8 @@
+@@ -881,26 +1162,38 @@
vinfo=
vinfo_number=no
@@ -4632,24 +5277,42 @@
# We need to know -static, to get the right output filenames.
for arg
do
-@@ -893,14 +1146,15 @@
+ case $arg in
+- -all-static | -static)
+- if test "X$arg" = "X-all-static"; then
++ -all-static | -static | -static-libtool-libs)
++ case $arg in
++ -all-static)
+ if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+ $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
+ fi
if test -n "$link_static_flag"; then
dlopen_self=$dlopen_self_static
fi
+- else
+ prefer_static_libs=yes
- else
++ ;;
++ -static)
if test -z "$pic_flag" && test -n "$link_static_flag"; then
dlopen_self=$dlopen_self_static
fi
+- fi
+ prefer_static_libs=built
- fi
++ ;;
++ -static-libtool-libs)
++ if test -z "$pic_flag" && test -n "$link_static_flag"; then
++ dlopen_self=$dlopen_self_static
++ fi
++ prefer_static_libs=yes
++ ;;
++ esac
build_libtool_libs=no
build_old_libs=yes
- prefer_static_libs=yes
break
;;
esac
-@@ -912,7 +1166,6 @@
+@@ -912,7 +1205,6 @@
# Go through the arguments, transforming them on the way.
while test "$#" -gt 0; do
arg="$1"
@@ -4657,7 +5320,7 @@
shift
case $arg in
*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
-@@ -976,7 +1229,7 @@
+@@ -976,7 +1268,7 @@
export_symbols="$arg"
if test ! -f "$arg"; then
$echo "$modename: symbol file \`$arg' does not exist"
@@ -4666,7 +5329,7 @@
fi
prev=
continue
-@@ -991,6 +1244,11 @@
+@@ -991,6 +1283,11 @@
prev=
continue
;;
@@ -4678,7 +5341,7 @@
release)
release="-$arg"
prev=
-@@ -1023,7 +1281,7 @@
+@@ -1023,7 +1320,7 @@
test "$pic_object" = none && \
test "$non_pic_object" = none; then
$echo "$modename: cannot find name of object for \`$arg'" 1>&2
@@ -4687,7 +5350,7 @@
fi
# Extract subdirectory from the argument.
-@@ -1071,12 +1329,17 @@
+@@ -1071,12 +1368,17 @@
if test -z "$pic_object" || test "$pic_object" = none ; then
arg="$non_pic_object"
fi
@@ -4706,7 +5369,7 @@
else
# Dry-run case.
-@@ -1097,7 +1360,7 @@
+@@ -1097,7 +1399,7 @@
done
else
$echo "$modename: link input file \`$save_arg' does not exist"
@@ -4715,7 +5378,7 @@
fi
arg=$save_arg
prev=
-@@ -1109,7 +1372,7 @@
+@@ -1109,7 +1411,7 @@
[\\/]* | [A-Za-z]:[\\/]*) ;;
*)
$echo "$modename: only absolute run-paths are allowed" 1>&2
@@ -4724,7 +5387,7 @@
;;
esac
if test "$prev" = rpath; then
-@@ -1149,16 +1412,15 @@
+@@ -1149,16 +1451,15 @@
finalize_command="$finalize_command $qarg"
continue
;;
@@ -4750,7 +5413,7 @@
prev=
continue
;;
-@@ -1210,7 +1472,7 @@
+@@ -1210,7 +1511,7 @@
-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"
@@ -4759,7 +5422,7 @@
fi
if test "X$arg" = "X-export-symbols"; then
prev=expsyms
-@@ -1220,6 +1482,18 @@
+@@ -1220,6 +1521,18 @@
continue
;;
@@ -4778,7 +5441,7 @@
-inst-prefix-dir)
prev=inst_prefix
continue
-@@ -1246,7 +1520,8 @@
+@@ -1246,7 +1559,8 @@
absdir=`cd "$dir" && pwd`
if test -z "$absdir"; then
$echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
@@ -4788,7 +5451,7 @@
fi
dir="$absdir"
;;
-@@ -1260,10 +1535,15 @@
+@@ -1260,10 +1574,15 @@
esac
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
@@ -4804,7 +5467,7 @@
;;
esac
continue
-@@ -1272,32 +1552,35 @@
+@@ -1272,26 +1591,35 @@
-l*)
if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
case $host in
@@ -4813,9 +5476,6 @@
# These systems don't actually have a C or math library (as such)
continue
;;
-- *-*-freebsd*-gnu*)
-- # prevent being parsed by the freebsd regexp below
-- ;;
- *-*-mingw* | *-*-os2*)
+ *-*-os2*)
# These systems don't actually have a C library (as such)
@@ -4843,15 +5503,12 @@
esac
elif test "X$arg" = "X-lc_r"; then
case $host in
-- *-*-freebsd*-gnu*)
-- # prevent being parsed by the freebsd regexp below
-- ;;
- *-*-openbsd*)
+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
# Do not include libc_r directly, use -pthread flag.
continue
;;
-@@ -1307,18 +1590,41 @@
+@@ -1301,18 +1629,42 @@
continue
;;
@@ -4865,7 +5522,7 @@
+ continue
+ ;;
+
-+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
++ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+ compiler_flags="$compiler_flags $arg"
+ compile_command="$compile_command $arg"
+ finalize_command="$finalize_command $arg"
@@ -4892,15 +5549,16 @@
+ # -m* pass through architecture-specific compiler args for GCC
+ # -m*, -t[45]*, -txscale* pass through architecture-specific
+ # compiler args for GCC
-+ # -pg pass through profiling flag for GCC
++ # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
++ # -F/path gives path to uninstalled frameworks, gcc on darwin
+ # @file GCC response files
-+ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
-+ -t[45]*|-txscale*|@*)
++ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
+
# 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 +1635,7 @@
+@@ -1323,9 +1675,7 @@
esac
compile_command="$compile_command $arg"
finalize_command="$finalize_command $arg"
@@ -4911,8 +5569,20 @@
continue
;;
-@@ -1371,6 +1675,11 @@
+@@ -1341,9 +1691,9 @@
+ -no-install)
+ case $host in
+- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
+ # The PATH hackery in wrapper scripts is required on Windows
+- # in order for the loader to find any dlls it needs.
++ # and Darwin in order for the loader to find any dlls it needs.
+ $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
+ $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
+ fast_install=no
+@@ -1365,6 +1715,11 @@
+
-o) prev=output ;;
+ -precious-files-regex)
@@ -4923,7 +5593,7 @@
-release)
prev=release
continue
-@@ -1393,7 +1702,7 @@
+@@ -1387,7 +1742,7 @@
[\\/]* | [A-Za-z]:[\\/]*) ;;
*)
$echo "$modename: only absolute run-paths are allowed" 1>&2
@@ -4932,10 +5602,19 @@
;;
esac
case "$xrpath " in
-@@ -1479,11 +1788,6 @@
+@@ -1397,7 +1752,7 @@
continue
;;
+- -static)
++ -static | -static-libtool-libs)
+ # 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
+@@ -1473,11 +1828,6 @@
+ continue
+ ;;
+
- -framework)
- prev=framework
- continue
@@ -4944,7 +5623,7 @@
# Some other compiler flag.
-* | +*)
# Unknown arguments in both finalize_command and compile_command need
-@@ -1494,7 +1798,6 @@
+@@ -1488,7 +1838,6 @@
arg="\"$arg\""
;;
esac
@@ -4952,7 +5631,7 @@
;;
*.$objext)
-@@ -1522,7 +1825,7 @@
+@@ -1516,7 +1865,7 @@
test "$pic_object" = none && \
test "$non_pic_object" = none; then
$echo "$modename: cannot find name of object for \`$arg'" 1>&2
@@ -4961,7 +5640,7 @@
fi
# Extract subdirectory from the argument.
-@@ -1570,12 +1873,17 @@
+@@ -1564,12 +1913,17 @@
if test -z "$pic_object" || test "$pic_object" = none ; then
arg="$non_pic_object"
fi
@@ -4980,7 +5659,7 @@
else
# Dry-run case.
-@@ -1629,7 +1937,6 @@
+@@ -1623,7 +1977,6 @@
arg="\"$arg\""
;;
esac
@@ -4988,7 +5667,7 @@
;;
esac # arg
-@@ -1643,48 +1950,7 @@
+@@ -1637,48 +1990,7 @@
if test -n "$prev"; then
$echo "$modename: the \`$prevarg' option requires an argument" 1>&2
$echo "$help" 1>&2
@@ -5038,7 +5717,7 @@
fi
if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-@@ -1717,9 +1983,9 @@
+@@ -1711,9 +2023,9 @@
if test ! -d "$output_objdir"; then
$show "$mkdir $output_objdir"
$run $mkdir $output_objdir
@@ -5051,7 +5730,7 @@
fi
fi
-@@ -1728,7 +1994,7 @@
+@@ -1722,7 +2034,7 @@
"")
$echo "$modename: you must specify an output file" 1>&2
$echo "$help" 1>&2
@@ -5060,7 +5739,7 @@
;;
*.$libext) linkmode=oldlib ;;
*.lo | *.$objext) linkmode=obj ;;
-@@ -1738,7 +2004,7 @@
+@@ -1732,7 +2044,7 @@
case $host in
*cygwin* | *mingw* | *pw32*)
@@ -5069,7 +5748,7 @@
duplicate_compiler_generated_deps=yes
;;
*)
-@@ -1782,7 +2048,6 @@
+@@ -1776,7 +2088,6 @@
newlib_search_path=
need_relink=no # whether we're linking any uninstalled libtool libraries
notinst_deplibs= # not-installed libtool libraries
@@ -5077,7 +5756,7 @@
case $linkmode in
lib)
passes="conv link"
-@@ -1791,7 +2056,7 @@
+@@ -1785,7 +2096,7 @@
*.la) ;;
*)
$echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
@@ -5086,7 +5765,7 @@
;;
esac
done
-@@ -1817,7 +2082,10 @@
+@@ -1811,7 +2122,10 @@
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
@@ -5098,11 +5777,11 @@
esac
fi
if test "$pass" = dlopen; then
-@@ -1829,18 +2097,23 @@
+@@ -1823,18 +2137,23 @@
lib=
found=no
case $deplib in
-+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
++ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+ if test "$linkmode,$pass" = "prog,link"; then
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
@@ -5127,7 +5806,7 @@
# Search the libtool library
lib="$searchdir/lib${name}${search_ext}"
if test -f "$lib"; then
-@@ -1901,18 +2174,6 @@
+@@ -1895,18 +2214,6 @@
fi
fi
;; # -l
@@ -5146,7 +5825,7 @@
-L*)
case $linkmode in
lib)
-@@ -1928,11 +2189,11 @@
+@@ -1922,11 +2229,11 @@
fi
if test "$pass" = scan; then
deplibs="$deplib $deplibs"
@@ -5159,7 +5838,7 @@
;;
*)
$echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
-@@ -1960,7 +2221,22 @@
+@@ -1954,7 +2261,22 @@
fi
case $linkmode in
lib)
@@ -5183,7 +5862,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 +2286,15 @@
+@@ -2004,15 +2326,15 @@
esac # case $deplib
if test "$found" = yes || test -f "$lib"; then :
else
@@ -5202,7 +5881,7 @@
fi
ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-@@ -2034,6 +2310,8 @@
+@@ -2028,6 +2350,8 @@
# it will not redefine variables installed, or shouldnotlink
installed=yes
shouldnotlink=no
@@ -5211,7 +5890,7 @@
# Read the .la file
case $lib in
-@@ -2041,13 +2319,6 @@
+@@ -2035,13 +2359,6 @@
*) . ./$lib ;;
esac
@@ -5225,7 +5904,7 @@
if test "$linkmode,$pass" = "lib,link" ||
test "$linkmode,$pass" = "prog,scan" ||
{ test "$linkmode" != prog && test "$linkmode" != lib; }; then
-@@ -2058,33 +2329,32 @@
+@@ -2052,33 +2369,32 @@
if test "$pass" = conv; then
# Only check for convenience libraries
deplibs="$lib $deplibs"
@@ -5272,7 +5951,7 @@
# Get the name of the library we link against.
linklib=
for l in $old_library $library_names; do
-@@ -2092,16 +2362,18 @@
+@@ -2086,16 +2402,18 @@
done
if test -z "$linklib"; then
$echo "$modename: cannot find name of link library for \`$lib'" 1>&2
@@ -5294,7 +5973,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 +2410,19 @@
+@@ -2132,11 +2450,19 @@
dir="$libdir"
absdir="$libdir"
fi
@@ -5318,7 +5997,7 @@
fi # $installed = yes
name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-@@ -2150,7 +2430,7 @@
+@@ -2144,7 +2470,7 @@
if test "$pass" = dlpreopen; then
if test -z "$libdir"; then
$echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
@@ -5327,7 +6006,7 @@
fi
# Prefer using a static library (so that no silly _DYNAMIC symbols
# are required to link).
-@@ -2177,7 +2457,7 @@
+@@ -2171,7 +2497,7 @@
continue
fi
@@ -5336,9 +6015,14 @@
if test "$linkmode" = prog && test "$pass" != link; then
newlib_search_path="$newlib_search_path $ladir"
deplibs="$lib $deplibs"
-@@ -2215,12 +2495,12 @@
+@@ -2207,14 +2533,16 @@
+
+ if test "$linkmode,$pass" = "prog,link"; then
if test -n "$library_names" &&
- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
++ { { test "$prefer_static_libs" = no ||
++ test "$prefer_static_libs,$installed" = "built,yes"; } ||
++ test -z "$old_library"; }; then
# We need to hardcode the library path
- if test -n "$shlibpath_var"; then
+ if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
@@ -5351,7 +6035,7 @@
esac
fi
-@@ -2257,24 +2537,29 @@
+@@ -2251,24 +2579,29 @@
fi
link_static=no # Whether the deplib will be linked statically
@@ -5387,7 +6071,7 @@
if test "$linkmode" = lib &&
test "$hardcode_into_libs" = yes; then
# Hardcode the library path.
-@@ -2332,9 +2617,10 @@
+@@ -2326,9 +2659,10 @@
else
$show "extracting exported symbol list from \`$soname'"
save_ifs="$IFS"; IFS='~'
@@ -5399,7 +6083,7 @@
$show "$cmd"
$run eval "$cmd" || exit $?
done
-@@ -2345,9 +2631,10 @@
+@@ -2339,9 +2673,10 @@
if test -f "$output_objdir/$newlib"; then :; else
$show "generating import library for \`$soname'"
save_ifs="$IFS"; IFS='~'
@@ -5411,7 +6095,7 @@
$show "$cmd"
$run eval "$cmd" || exit $?
done
-@@ -2368,11 +2655,15 @@
+@@ -2362,11 +2697,15 @@
if test "$hardcode_direct" = no; then
add="$dir/$linklib"
case $host in
@@ -5431,7 +6115,7 @@
$echo "** Warning, lib $linklib is a module, not a shared library"
if test -z "$old_library" ; then
$echo
-@@ -2380,7 +2671,7 @@
+@@ -2374,7 +2713,7 @@
$echo "** The link will probably fail, sorry"
else
add="$dir/$old_library"
@@ -5440,7 +6124,7 @@
fi
esac
elif test "$hardcode_minus_L" = no; then
-@@ -2403,9 +2694,9 @@
+@@ -2397,9 +2736,9 @@
add_dir="-L$dir"
# Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then
@@ -5452,7 +6136,7 @@
;;
esac
fi
-@@ -2422,7 +2713,7 @@
+@@ -2416,7 +2755,7 @@
if test "$lib_linked" != yes; then
$echo "$modename: configuration error: unsupported hardcode properties"
@@ -5461,7 +6145,7 @@
fi
if test -n "$add_shlibpath"; then
-@@ -2465,7 +2756,8 @@
+@@ -2459,7 +2798,8 @@
esac
add="-l$name"
elif test "$hardcode_automatic" = yes; then
@@ -5471,7 +6155,7 @@
add="$inst_prefix_dir$libdir/$linklib"
else
add="$libdir/$linklib"
-@@ -2475,9 +2767,9 @@
+@@ -2469,9 +2809,9 @@
add_dir="-L$libdir"
# Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then
@@ -5483,7 +6167,7 @@
;;
esac
fi
-@@ -2536,17 +2828,16 @@
+@@ -2530,17 +2870,16 @@
fi
fi
else
@@ -5505,7 +6189,7 @@
# Extract -R from dependency_libs
temp_deplibs=
for libdir in $dependency_libs; do
-@@ -2560,7 +2851,7 @@
+@@ -2554,7 +2893,7 @@
esac
done
dependency_libs="$temp_deplibs"
@@ -5514,7 +6198,7 @@
newlib_search_path="$newlib_search_path $absdir"
# Link against this library
-@@ -2602,20 +2893,18 @@
+@@ -2596,20 +2935,18 @@
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
@@ -5539,7 +6223,7 @@
eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
if test -n "$deplibrary_names" ; then
for tmp in $deplibrary_names ; do
-@@ -2623,55 +2912,45 @@
+@@ -2617,55 +2954,45 @@
done
if test -f "$path/$depdepl" ; then
depdepl="$path/$depdepl"
@@ -5615,7 +6299,7 @@
esac
done
fi # link_all_deplibs != no
-@@ -2758,7 +3037,8 @@
+@@ -2752,7 +3079,8 @@
eval $var=\"$tmp_libs\"
done # for var
fi
@@ -5625,7 +6309,7 @@
tmp_libs=
for i in $dependency_libs ; do
case " $predeps $postdeps $compiler_lib_search_path " in
-@@ -2818,19 +3098,19 @@
+@@ -2812,19 +3140,19 @@
case $outputname in
lib*)
name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
@@ -5648,7 +6332,7 @@
eval libname=\"$libname_spec\"
else
libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-@@ -2841,7 +3121,7 @@
+@@ -2835,7 +3163,7 @@
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
@@ -5657,7 +6341,7 @@
else
$echo
$echo "*** Warning: Linking the shared library $output against the non-libtool"
-@@ -2889,13 +3169,13 @@
+@@ -2883,13 +3211,13 @@
if test -n "$8"; then
$echo "$modename: too many parameters to \`-version-info'" 1>&2
$echo "$help" 1>&2
@@ -5673,19 +6357,33 @@
case $vinfo_number in
yes)
number_major="$2"
-@@ -2924,6 +3204,11 @@
+@@ -2903,7 +3231,7 @@
+ # which has an extra 1 added just for fun
+ #
+ case $version_type in
+- darwin|linux|osf|windows)
++ darwin|linux|osf|windows|none)
+ current=`expr $number_major + $number_minor`
age="$number_minor"
+ revision="$number_revision"
+@@ -2914,9 +3242,15 @@
+ age="0"
+ ;;
+ irix|nonstopux)
+- current=`expr $number_major + $number_minor - 1`
++ current=`expr $number_major + $number_minor`
+ age="$number_minor"
revision="$number_minor"
- ;;
++ lt_irix_increment=no
++ ;;
+ *)
+ $echo "$modename: unknown library version type \`$version_type'" 1>&2
+ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
+ exit $EXIT_FAILURE
-+ ;;
+ ;;
esac
;;
- no)
-@@ -2935,36 +3220,36 @@
+@@ -2929,36 +3263,36 @@
# Check that each of the things are valid numbers.
case $current in
@@ -5732,16 +6430,29 @@
fi
# Calculate the version variables.
-@@ -2981,7 +3266,7 @@
+@@ -2975,6 +3309,7 @@
versuffix="$major.$age.$revision"
# Darwin ld doesn't like 0 for these options...
minor_current=`expr $current + 1`
-- verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-+ verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
++ xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+ verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
;;
- freebsd-aout)
-@@ -3053,7 +3338,7 @@
+@@ -2989,8 +3324,11 @@
+ ;;
+
+ irix | nonstopux)
+- major=`expr $current - $age + 1`
+-
++ if test "X$lt_irix_increment" = "Xno"; then
++ major=`expr $current - $age`
++ else
++ major=`expr $current - $age + 1`
++ fi
+ case $version_type in
+ nonstopux) verstring_prefix=nonstopux ;;
+ *) verstring_prefix=sgi ;;
+@@ -3047,7 +3385,7 @@
*)
$echo "$modename: unknown library version type \`$version_type'" 1>&2
$echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
@@ -5750,8 +6461,12 @@
;;
esac
-@@ -3107,6 +3392,12 @@
- *.$objext)
+@@ -3098,9 +3436,15 @@
+ tempremovelist=`$echo "$output_objdir/*"`
+ for p in $tempremovelist; do
+ case $p in
+- *.$objext | *$exeext)
++ *.$objext)
;;
$output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
+ if test "X$precious_files_regex" != "X"; then
@@ -5763,20 +6478,24 @@
removelist="$removelist $p"
;;
*) ;;
-@@ -3128,9 +3419,9 @@
+@@ -3121,11 +3465,11 @@
+ fi
# Eliminate all temporary directories.
- for path in $notinst_path; do
+- for path in $notinst_path; do
- lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
- deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
- dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
-+ lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
-+ deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
-+ dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
- done
+- done
++ #for path in $notinst_path; do
++ # lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
++ # deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
++ # dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
++ #done
if test -n "$xrpath"; then
-@@ -3143,7 +3434,7 @@
+ # If the user specified any rpath flags, then add them.
+@@ -3137,7 +3481,7 @@
*) finalize_rpath="$finalize_rpath $libdir" ;;
esac
done
@@ -5785,7 +6504,7 @@
dependency_libs="$temp_xrpath $dependency_libs"
fi
fi
-@@ -3176,20 +3467,19 @@
+@@ -3170,14 +3514,19 @@
;;
*-*-rhapsody* | *-*-darwin1.[012])
# Rhapsody C library is in the System framework
@@ -5795,12 +6514,6 @@
*-*-netbsd*)
# Don't link with libc until the a.out ld.so is fixed.
;;
-- *-*-freebsd*-gnu*)
-- # Prevent $arg from being parsed by the freebsd regexp below.
-- if test "$build_libtool_need_lc" = "yes"; then
-- deplibs="$deplibs -lc"
-- fi
-- ;;
- *-*-openbsd* | *-*-freebsd*)
+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
# Do not include libc due to us having libc/libc_r.
@@ -5814,21 +6527,24 @@
;;
*)
# Add libc to deplibs on all other systems if necessary.
-@@ -3233,11 +3523,11 @@
+@@ -3221,13 +3570,12 @@
int main() { return 0; }
EOF
$rm conftest
- $LTCC -o conftest conftest.c $deplibs
-+ $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
- if test "$?" -eq 0 ; then
+- if test "$?" -eq 0 ; then
++ if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
ldd_output=`ldd conftest`
for i in $deplibs; do
- name="`expr $i : '-l\(.*\)'`"
+ name=`expr $i : '-l\(.*\)'`
# If $name is empty we are operating on a -L argument.
- if test "$name" != "" && test "$name" -ne "0"; then
+- if test "$name" != "" && test "$name" -ne "0"; then
++ if test "$name" != "" && test "$name" != "0"; then
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-@@ -3274,11 +3564,11 @@
+ case " $predeps $postdeps " in
+ *" $i "*)
+@@ -3262,13 +3610,11 @@
# 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
@@ -5838,11 +6554,22 @@
if test "$name" != "" && test "$name" != "0"; then
$rm conftest
- $LTCC -o conftest conftest.c $i
-+ $LTCC $LTCFLAGS -o conftest conftest.c $i
- # Did it work?
- if test "$?" -eq 0 ; then
+- # Did it work?
+- if test "$?" -eq 0 ; then
++ if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
ldd_output=`ldd conftest`
-@@ -3326,7 +3616,7 @@
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ case " $predeps $postdeps " in
+@@ -3300,7 +3646,7 @@
+ droppeddeps=yes
+ $echo
+ $echo "*** Warning! Library $i is needed by this library but I was not able to"
+- $echo "*** make it link in! You will probably need to install it or some"
++ $echo "*** make it link in! You will probably need to install it or some"
+ $echo "*** library that it depends on before this library will be fully"
+ $echo "*** functional. Installing it before continuing would be even better."
+ fi
+@@ -3314,7 +3660,7 @@
set dummy $deplibs_check_method
file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
for a_deplib in $deplibs; do
@@ -5851,7 +6578,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 +3685,7 @@
+@@ -3383,7 +3729,7 @@
set dummy $deplibs_check_method
match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
for a_deplib in $deplibs; do
@@ -5860,7 +6587,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 +3765,7 @@
+@@ -3463,7 +3809,7 @@
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library is the System framework
@@ -5869,7 +6596,7 @@
;;
esac
-@@ -3521,17 +3811,39 @@
+@@ -3509,17 +3855,39 @@
fi
fi
fi
@@ -5916,7 +6643,7 @@
# All the library-specific variables (install_libdir is set above).
library_names=
old_library=
-@@ -3544,7 +3856,7 @@
+@@ -3532,7 +3900,7 @@
hardcode_libdirs=
dep_rpath=
rpath="$finalize_rpath"
@@ -5925,7 +6652,19 @@
for libdir in $rpath; do
if test -n "$hardcode_libdir_flag_spec"; then
if test -n "$hardcode_libdir_separator"; then
-@@ -3599,7 +3911,7 @@
+@@ -3564,7 +3932,10 @@
+ test -n "$hardcode_libdirs"; then
+ libdir="$hardcode_libdirs"
+ if test -n "$hardcode_libdir_flag_spec_ld"; then
+- eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
++ case $archive_cmds in
++ *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
++ *) eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
++ esac
+ else
+ eval dep_rpath=\"$hardcode_libdir_flag_spec\"
+ fi
+@@ -3587,7 +3958,7 @@
fi
# Get the real and link names of the library.
@@ -5934,7 +6673,7 @@
eval library_names=\"$library_names_spec\"
set dummy $library_names
realname="$2"
-@@ -3615,6 +3927,7 @@
+@@ -3603,6 +3974,7 @@
fi
lib="$output_objdir/$realname"
@@ -5942,7 +6681,7 @@
for link
do
linknames="$linknames $link"
-@@ -3629,10 +3942,11 @@
+@@ -3617,10 +3989,11 @@
$show "generating symbol list for \`$libname.la'"
export_symbols="$output_objdir/$libname.exp"
$run $rm $export_symbols
@@ -5955,7 +6694,7 @@
if len=`expr "X$cmd" : ".*"` &&
test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
$show "$cmd"
-@@ -3642,6 +3956,9 @@
+@@ -3630,6 +4003,9 @@
# The command line is too long to execute in one step.
$show "using reloadable object file for export list..."
skipped_export=:
@@ -5965,7 +6704,7 @@
fi
done
IFS="$save_ifs"
-@@ -3662,12 +3979,12 @@
+@@ -3650,12 +4026,12 @@
for test_deplib in $deplibs; do
case " $convenience " in
*" $test_deplib "*) ;;
@@ -5980,7 +6719,7 @@
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec"; then
-@@ -3675,67 +3992,13 @@
+@@ -3663,67 +4039,13 @@
eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
else
gentop="$output_objdir/${outputname}x"
@@ -6051,7 +6790,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 +4009,27 @@
+@@ -3734,31 +4056,27 @@
$run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
fi
@@ -6093,7 +6832,7 @@
test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
:
else
-@@ -3789,6 +4048,7 @@
+@@ -3777,6 +4095,7 @@
save_libobjs=$libobjs
fi
save_output=$output
@@ -6101,7 +6840,7 @@
# Clear the reloadable object creation command queue and
# initialize k to one.
-@@ -3798,13 +4058,13 @@
+@@ -3786,13 +4105,13 @@
delfiles=
last_robj=
k=1
@@ -6117,7 +6856,7 @@
test "$len" -le "$max_cmd_len"; }; then
objlist="$objlist $obj"
else
-@@ -3818,9 +4078,9 @@
+@@ -3806,9 +4125,9 @@
# the last one created.
eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
fi
@@ -6129,7 +6868,7 @@
objlist=$obj
len=1
fi
-@@ -3840,13 +4100,13 @@
+@@ -3828,13 +4147,13 @@
eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
fi
@@ -6145,7 +6884,7 @@
done
$echo "creating a temporary reloadable object file: $output"
-@@ -3871,28 +4131,54 @@
+@@ -3859,28 +4178,54 @@
# value of $libobjs for piecewise linking.
# Do each of the archive commands.
@@ -6205,7 +6944,7 @@
fi
# Create links to the real library.
-@@ -3940,7 +4226,7 @@
+@@ -3928,7 +4273,7 @@
*.lo)
if test -n "$objs$old_deplibs"; then
$echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
@@ -6214,8 +6953,20 @@
fi
libobj="$output"
obj=`$echo "X$output" | $Xsed -e "$lo2o"`
-@@ -3969,64 +4255,10 @@
- eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
+@@ -3949,72 +4294,20 @@
+ reload_conv_objs=
+ gentop=
+ # reload_cmds runs $LD directly, so let us get rid of
+- # -Wl from whole_archive_flag_spec
++ # -Wl from whole_archive_flag_spec and hope we can get by with
++ # turning comma into space..
+ wl=
+
+ if test -n "$convenience"; then
+ if test -n "$whole_archive_flag_spec"; then
+- eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
++ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
++ reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
else
gentop="$output_objdir/${obj}x"
- $show "${rm}r $gentop"
@@ -6281,7 +7032,7 @@
fi
fi
-@@ -4034,10 +4266,11 @@
+@@ -4022,10 +4315,11 @@
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"
@@ -6294,7 +7045,7 @@
$show "$cmd"
$run eval "$cmd" || exit $?
done
-@@ -4050,7 +4283,7 @@
+@@ -4038,7 +4332,7 @@
$run ${rm}r $gentop
fi
@@ -6303,7 +7054,7 @@
fi
if test "$build_libtool_libs" != yes; then
-@@ -4063,17 +4296,18 @@
+@@ -4051,17 +4345,18 @@
# accidentally link it into a program.
# $show "echo timestamp > $libobj"
# $run eval "echo timestamp > $libobj" || exit $?
@@ -6324,7 +7075,7 @@
$show "$cmd"
$run eval "$cmd" || exit $?
done
-@@ -4085,7 +4319,7 @@
+@@ -4073,7 +4368,7 @@
$run ${rm}r $gentop
fi
@@ -6333,7 +7084,7 @@
;;
prog)
-@@ -4110,24 +4344,50 @@
+@@ -4098,24 +4393,50 @@
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library is the System framework
@@ -6390,7 +7141,7 @@
compile_command="$compile_command $compile_deplibs"
finalize_command="$finalize_command $finalize_deplibs"
-@@ -4172,10 +4432,15 @@
+@@ -4160,10 +4481,15 @@
fi
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
@@ -6406,7 +7157,7 @@
;;
esac
done
-@@ -4289,13 +4554,25 @@
+@@ -4277,13 +4603,25 @@
# Prepare the list of exported symbols
if test -z "$export_symbols"; then
@@ -6436,7 +7187,7 @@
fi
fi
-@@ -4346,7 +4623,26 @@
+@@ -4334,7 +4672,26 @@
#endif
/* The mapping between symbol names and symbols. */
@@ -6463,7 +7214,7 @@
const char *name;
lt_ptr address;
}
-@@ -4393,20 +4689,33 @@
+@@ -4381,20 +4738,33 @@
esac
# Now compile the dynamic symbol file.
@@ -6482,16 +7233,16 @@
+ case $host in
+ *cygwin* | *mingw* )
+ if test -f "$output_objdir/${outputname}.def" ; then
-+ compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
-+ finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
++ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
++ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
+ else
-+ compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-+ finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
++ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
++ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+ fi
+ ;;
+ * )
-+ compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-+ finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
++ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
++ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+ ;;
+ esac
;;
@@ -6502,8 +7253,14 @@
;;
esac
else
-@@ -4419,17 +4728,6 @@
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+@@ -4403,30 +4773,19 @@
+ # really was required.
+
+ # Nullify the symbol file.
+- compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
+- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
++ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
++ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
fi
- # AIX runtime linking requires linking programs with -Wl,-brtl and libs with -Wl,-G
@@ -6519,8 +7276,10 @@
-
if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
# Replace the output file specification.
- compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-@@ -4438,7 +4736,7 @@
+- compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
++ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
+ link_command="$compile_command$compile_rpath"
+
# We have no uninstalled library dependencies, so finalize right now.
$show "$link_command"
$run eval "$link_command"
@@ -6529,7 +7288,7 @@
# Delete the generated files.
if test -n "$dlsyms"; then
-@@ -4446,7 +4744,7 @@
+@@ -4434,7 +4793,7 @@
$run $rm "$output_objdir/${outputname}S.${objext}"
fi
@@ -6538,7 +7297,7 @@
fi
if test -n "$shlibpath_var"; then
-@@ -4505,7 +4803,7 @@
+@@ -4493,7 +4852,7 @@
# Link the executable and exit
$show "$link_command"
$run eval "$link_command" || exit $?
@@ -6547,7 +7306,21 @@
fi
if test "$hardcode_action" = relink; then
-@@ -4560,10 +4858,10 @@
+@@ -4507,7 +4866,7 @@
+ if test "$fast_install" != no; then
+ link_command="$finalize_var$compile_command$finalize_rpath"
+ if test "$fast_install" = yes; then
+- relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
++ relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
+ else
+ # fast_install is set to needless
+ relink_command=
+@@ -4544,14 +4903,14 @@
+ fi
+ done
+ relink_command="(cd `pwd`; $relink_command)"
+- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
++ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
fi
# Quote $echo for shipping.
@@ -6562,14 +7335,16 @@
esac
qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
else
-@@ -4586,10 +4884,12 @@
+@@ -4573,11 +4932,13 @@
+ *) exeext= ;;
esac
case $host in
- *cygwin* | *mingw* )
-- cwrappersource=`$echo ${objdir}/lt-${output}.c`
+- *mingw* )
+- cwrappersource=`$echo ${output_objdir}/lt-${outputname}.c`
- cwrapper=`$echo ${output}.exe`
- $rm $cwrappersource $cwrapper
- trap "$rm $cwrappersource $cwrapper; exit 1" 1 2 15
++ *cygwin* | *mingw* )
+ output_name=`basename $output`
+ output_path=`dirname $output`
+ cwrappersource="$output_path/$objdir/lt-$output_name.c"
@@ -6579,7 +7354,7 @@
cat > $cwrappersource <<EOF
-@@ -4598,7 +4898,7 @@
+@@ -4586,7 +4947,7 @@
The $output program cannot be directly executed until all the libtool
libraries that it depends on are installed.
@@ -6588,7 +7363,7 @@
This wrapper executable should never be moved out of the build directory.
If it is, it will not operate correctly.
-@@ -4614,6 +4914,9 @@
+@@ -4602,6 +4963,9 @@
#include <malloc.h>
#include <stdarg.h>
#include <assert.h>
@@ -6598,7 +7373,7 @@
#if defined(PATH_MAX)
# define LT_PATHMAX PATH_MAX
-@@ -4624,15 +4927,19 @@
+@@ -4612,15 +4976,19 @@
#endif
#ifndef DIR_SEPARATOR
@@ -6623,7 +7398,7 @@
#endif
#ifndef DIR_SEPARATOR_2
-@@ -4642,17 +4949,32 @@
+@@ -4630,17 +4998,32 @@
(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
#endif /* DIR_SEPARATOR_2 */
@@ -6658,7 +7433,7 @@
char * strendzap(char *str, const char *pat);
void lt_fatal (const char *message, ...);
-@@ -4661,30 +4983,52 @@
+@@ -4649,30 +5032,52 @@
{
char **newargz;
int i;
@@ -6720,7 +7495,7 @@
}
void *
-@@ -4697,59 +5041,159 @@
+@@ -4685,59 +5090,159 @@
return p;
}
@@ -6751,10 +7526,8 @@
base = name + 1;
- return (char *) base;
+ return base;
- }
-
--char *
--fnqualify(const char *path)
++}
++
+int
+check_executable(const char * path)
+{
@@ -6778,8 +7551,10 @@
+ return 1;
+ else
+ return 0;
-+}
-+
+ }
+
+-char *
+-fnqualify(const char *path)
+/* Searches for the full path of the wrapper. Returns
+ newly allocated full path name if found, NULL otherwise */
+char *
@@ -6902,7 +7677,7 @@
{
size_t len, patlen;
-@@ -4769,7 +5213,7 @@
+@@ -4757,7 +5262,7 @@
}
static void
@@ -6911,7 +7686,7 @@
const char * message, va_list ap)
{
fprintf (stderr, "%s: %s: ", program_name, mode);
-@@ -4789,16 +5233,16 @@
+@@ -4777,16 +5282,16 @@
va_end (ap);
}
EOF
@@ -6938,8 +7713,24 @@
$echo > $output "\
#! $SHELL
-@@ -4819,7 +5263,7 @@
+@@ -4805,9 +5310,23 @@
+ Xsed='${SED} -e 1s/^X//'
+ sed_quote_subst='$sed_quote_subst'
++# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
++if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
++ emulate sh
++ NULLCMD=:
++ # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
++ # is contrary to our usage. Disable this feature.
++ alias -g '\${1+\"\$@\"}'='\"\$@\"'
++ setopt NO_GLOB_SUBST
++else
++ case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
++fi
++BIN_SH=xpg4; export BIN_SH # for Tru64
++DUALCASE=1; export DUALCASE # for MKS sh
++
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
-if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
@@ -6947,7 +7738,7 @@
relink_command=\"$relink_command\"
-@@ -4898,7 +5342,7 @@
+@@ -4886,7 +5405,7 @@
else
$echo \"\$relink_command_output\" >&2
$rm \"\$progdir/\$file\"
@@ -6956,7 +7747,7 @@
fi
fi
-@@ -4948,34 +5392,32 @@
+@@ -4936,34 +5455,32 @@
# Backslashes separate directories on plain windows
*-*-mingw | *-*-os2*)
$echo >> $output "\
@@ -6975,8 +7766,9 @@
;;
esac
$echo >> $output "\
- \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+- \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
- exit 1
++ \$echo \"\$0: cannot exec \$program \$*\"
+ exit $EXIT_FAILURE
fi
else
@@ -6997,7 +7789,7 @@
;;
esac
-@@ -4998,78 +5440,78 @@
+@@ -4986,78 +5503,78 @@
if test -n "$addlibs"; then
gentop="$output_objdir/${outputname}x"
@@ -7137,7 +7929,7 @@
else
# the command line is too long to link in one step, link in parts
$echo "using piecewise archive linking..."
-@@ -5078,31 +5520,18 @@
+@@ -5066,31 +5583,18 @@
objlist=
concat_cmds=
save_oldobjs=$oldobjs
@@ -7172,7 +7964,7 @@
test "$len" -le "$max_cmd_len"; then
:
else
-@@ -5110,7 +5539,7 @@
+@@ -5098,7 +5602,7 @@
oldobjs=$objlist
if test "$obj" = "$last_oldobj" ; then
RANLIB=$save_RANLIB
@@ -7181,7 +7973,7 @@
test -z "$concat_cmds" || concat_cmds=$concat_cmds~
eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
objlist=
-@@ -5121,12 +5550,13 @@
+@@ -5109,12 +5613,13 @@
if test "X$oldobjs" = "X" ; then
eval cmds=\"\$concat_cmds\"
else
@@ -7196,13 +7988,14 @@
IFS="$save_ifs"
$show "$cmd"
$run eval "$cmd" || exit $?
-@@ -5158,11 +5588,13 @@
+@@ -5146,11 +5651,13 @@
fi
done
# Quote the link command for shipping.
- relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)"
+- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
++ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
if test "$hardcode_automatic" = yes ; then
- relink_command=
- fi
@@ -7213,7 +8006,7 @@
# Only create the output if not a dry run.
if test -z "$run"; then
for installed in no yes; do
-@@ -5180,7 +5612,7 @@
+@@ -5168,7 +5675,7 @@
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
@@ -7222,7 +8015,7 @@
fi
newdependency_libs="$newdependency_libs $libdir/$name"
;;
-@@ -5194,7 +5626,7 @@
+@@ -5182,7 +5689,7 @@
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
@@ -7231,7 +8024,7 @@
fi
newdlfiles="$newdlfiles $libdir/$name"
done
-@@ -5205,11 +5637,30 @@
+@@ -5193,11 +5700,30 @@
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
@@ -7263,7 +8056,7 @@
fi
$rm $output
# place dlname in correct position for cygwin
-@@ -5253,7 +5704,7 @@
+@@ -5241,7 +5767,7 @@
# Directory that this library needs to be installed in:
libdir='$install_libdir'"
@@ -7272,7 +8065,7 @@
$echo >> $output "\
relink_command=\"$relink_command\""
fi
-@@ -5266,7 +5717,7 @@
+@@ -5254,7 +5780,7 @@
$run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
;;
esac
@@ -7281,7 +8074,7 @@
;;
# libtool install mode
-@@ -5277,11 +5728,11 @@
+@@ -5265,11 +5791,11 @@
# install_prog (especially on Windows NT).
if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
# Allow the use of GNU shtool's install command.
@@ -7295,7 +8088,7 @@
arg="\"$arg\""
;;
esac
-@@ -5290,14 +5741,14 @@
+@@ -5278,14 +5804,14 @@
shift
else
install_prog=
@@ -7312,7 +8105,7 @@
arg="\"$arg\""
;;
esac
-@@ -5315,28 +5766,31 @@
+@@ -5303,28 +5829,31 @@
do
if test -n "$dest"; then
files="$files $dest"
@@ -7352,7 +8145,7 @@
continue
fi
;;
-@@ -5345,7 +5799,7 @@
+@@ -5333,7 +5862,7 @@
# Aesthetically quote the argument.
arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
case $arg in
@@ -7361,7 +8154,7 @@
arg="\"$arg\""
;;
esac
-@@ -5355,13 +5809,13 @@
+@@ -5343,13 +5872,13 @@
if test -z "$install_prog"; then
$echo "$modename: you must specify an install program" 1>&2
$echo "$help" 1>&2
@@ -7377,7 +8170,7 @@
fi
if test -z "$files"; then
-@@ -5371,7 +5825,7 @@
+@@ -5359,7 +5888,7 @@
$echo "$modename: you must specify a destination" 1>&2
fi
$echo "$help" 1>&2
@@ -7386,7 +8179,7 @@
fi
# Strip any trailing slash from the destination.
-@@ -5392,7 +5846,7 @@
+@@ -5380,7 +5909,7 @@
if test "$#" -gt 2; then
$echo "$modename: \`$dest' is not a directory" 1>&2
$echo "$help" 1>&2
@@ -7395,7 +8188,7 @@
fi
fi
case $destdir in
-@@ -5404,7 +5858,7 @@
+@@ -5392,7 +5921,7 @@
*)
$echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
$echo "$help" 1>&2
@@ -7404,7 +8197,7 @@
;;
esac
done
-@@ -5433,7 +5887,7 @@
+@@ -5421,7 +5950,7 @@
else
$echo "$modename: \`$file' is not a valid libtool archive" 1>&2
$echo "$help" 1>&2
@@ -7413,7 +8206,7 @@
fi
library_names=
-@@ -5475,7 +5929,7 @@
+@@ -5463,14 +5992,14 @@
# 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
@@ -7422,7 +8215,16 @@
fi
if test -n "$inst_prefix_dir"; then
-@@ -5490,7 +5944,7 @@
+ # Stick the inst_prefix_dir data into the link command.
+- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
++ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
+ else
+- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
++ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
+ fi
+
+ $echo "$modename: warning: relinking \`$file'" 1>&2
+@@ -5478,7 +6007,7 @@
if $run eval "$relink_command"; then :
else
$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
@@ -7431,7 +8233,7 @@
fi
fi
-@@ -5514,23 +5968,36 @@
+@@ -5502,23 +6031,36 @@
if test "$#" -gt 0; then
# Delete the old symlinks, and create new ones.
@@ -7472,7 +8274,7 @@
done
IFS="$save_ifs"
fi
-@@ -5568,7 +6035,7 @@
+@@ -5556,7 +6098,7 @@
*)
$echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
$echo "$help" 1>&2
@@ -7481,7 +8283,7 @@
;;
esac
-@@ -5586,7 +6053,7 @@
+@@ -5574,7 +6116,7 @@
$show "$install_prog $staticobj $staticdest"
$run eval "$install_prog \$staticobj \$staticdest" || exit $?
fi
@@ -7490,7 +8292,7 @@
;;
*)
-@@ -5624,23 +6091,21 @@
+@@ -5612,23 +6154,21 @@
notinst_deplibs=
relink_command=
@@ -7523,7 +8325,7 @@
fi
finalize=yes
-@@ -5662,30 +6127,21 @@
+@@ -5650,34 +6190,25 @@
done
relink_command=
@@ -7563,7 +8365,12 @@
file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
outputname="$tmpdir/$file"
# Replace the output file specification.
-@@ -5709,7 +6165,7 @@
+- relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
++ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
+
+ $show "$relink_command"
+ if $run eval "$relink_command"; then :
+@@ -5697,7 +6228,7 @@
fi
# remove .exe since cygwin /usr/bin/install will append another
@@ -7572,7 +8379,7 @@
case $install_prog,$host in
*/usr/bin/install*,*cygwin*)
case $file:$destfile in
-@@ -5741,16 +6197,17 @@
+@@ -5729,16 +6260,17 @@
$show "$install_prog $file $oldlib"
$run eval "$install_prog \$file \$oldlib" || exit $?
@@ -7592,7 +8399,7 @@
$show "$cmd"
$run eval "$cmd" || exit $?
done
-@@ -5764,9 +6221,9 @@
+@@ -5752,9 +6284,9 @@
if test -n "$current_libdirs"; then
# Maybe just do a dry run.
test -n "$run" && current_libdirs=" -n$current_libdirs"
@@ -7604,7 +8411,7 @@
fi
;;
-@@ -5785,10 +6242,11 @@
+@@ -5773,10 +6305,11 @@
for libdir in $libdirs; do
if test -n "$finish_cmds"; then
# Do each command in the finish commands.
@@ -7617,7 +8424,7 @@
$show "$cmd"
$run eval "$cmd" || admincmds="$admincmds
$cmd"
-@@ -5805,9 +6263,9 @@
+@@ -5793,9 +6326,9 @@
fi
# Exit here if they wanted silent mode.
@@ -7629,7 +8436,7 @@
$echo "Libraries have been installed in:"
for libdir in $libdirs; do
$echo " $libdir"
-@@ -5840,8 +6298,8 @@
+@@ -5828,8 +6361,8 @@
$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."
@@ -7640,7 +8447,7 @@
;;
# libtool execute mode
-@@ -5853,7 +6311,7 @@
+@@ -5841,7 +6374,7 @@
if test -z "$cmd"; then
$echo "$modename: you must specify a COMMAND" 1>&2
$echo "$help"
@@ -7649,7 +8456,7 @@
fi
# Handle -dlopen flags immediately.
-@@ -5861,7 +6319,7 @@
+@@ -5849,7 +6382,7 @@
if test ! -f "$file"; then
$echo "$modename: \`$file' is not a file" 1>&2
$echo "$help" 1>&2
@@ -7658,7 +8465,7 @@
fi
dir=
-@@ -5872,7 +6330,7 @@
+@@ -5860,7 +6393,7 @@
else
$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
$echo "$help" 1>&2
@@ -7667,16 +8474,39 @@
fi
# Read the libtool library.
-@@ -5899,7 +6357,7 @@
+@@ -5886,8 +6419,10 @@
+ if test -f "$dir/$objdir/$dlname"; then
dir="$dir/$objdir"
else
- $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
+- $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
- exit 1
-+ exit $EXIT_FAILURE
++ if test ! -f "$dir/$dlname"; then
++ $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
++ exit $EXIT_FAILURE
++ fi
fi
;;
-@@ -5979,7 +6437,7 @@
+@@ -5951,12 +6486,12 @@
+ fi
+
+ # Restore saved environment variables
+- if test "${save_LC_ALL+set}" = set; then
+- LC_ALL="$save_LC_ALL"; export LC_ALL
+- fi
+- if test "${save_LANG+set}" = set; then
+- LANG="$save_LANG"; export LANG
+- fi
++ for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
++ do
++ eval "if test \"\${save_$lt_var+set}\" = set; then
++ $lt_var=\$save_$lt_var; export $lt_var
++ fi"
++ done
+
+ # Now prepare to actually exec the command.
+ exec_cmd="\$cmd$args"
+@@ -5967,7 +6502,7 @@
$echo "export $shlibpath_var"
fi
$echo "$cmd$args"
@@ -7685,7 +8515,7 @@
fi
;;
-@@ -6007,7 +6465,7 @@
+@@ -5995,7 +6530,7 @@
if test -z "$rm"; then
$echo "$modename: you must specify an RM program" 1>&2
$echo "$help" 1>&2
@@ -7694,7 +8524,7 @@
fi
rmdirs=
-@@ -6057,15 +6515,24 @@
+@@ -6045,15 +6580,24 @@
rmfiles="$rmfiles $objdir/$n"
done
test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
@@ -7722,7 +8552,7 @@
$show "$cmd"
$run eval "$cmd"
if test "$?" -ne 0 && test "$rmforce" != yes; then
-@@ -6077,10 +6544,11 @@
+@@ -6065,10 +6609,11 @@
if test -n "$old_library"; then
# Do each command in the old_postuninstall commands.
@@ -7735,7 +8565,7 @@
$show "$cmd"
$run eval "$cmd"
if test "$?" -ne 0 && test "$rmforce" != yes; then
-@@ -6090,7 +6558,8 @@
+@@ -6078,7 +6623,8 @@
IFS="$save_ifs"
fi
# FIXME: should reinstall the best remaining shared library.
@@ -7745,7 +8575,7 @@
fi
;;
-@@ -6119,7 +6588,7 @@
+@@ -6107,7 +6653,7 @@
if test "$mode" = clean ; then
noexename=$name
case $file in
@@ -7754,7 +8584,7 @@
file=`$echo $file|${SED} 's,.exe$,,'`
noexename=`$echo $name|${SED} 's,.exe$,,'`
# $file with .exe has already been added to rmfiles,
-@@ -6164,20 +6633,20 @@
+@@ -6152,20 +6698,20 @@
"")
$echo "$modename: you must specify a MODE" 1>&2
$echo "$generic_help" 1>&2
@@ -7778,7 +8608,7 @@
fi
# We need to display help for each of the modes.
-@@ -6213,7 +6682,7 @@
+@@ -6201,7 +6747,7 @@
a more detailed description of MODE.
Report bugs to <bug-libtool at gnu.org>."
@@ -7787,7 +8617,19 @@
;;
clean)
-@@ -6325,6 +6794,8 @@
+@@ -6302,9 +6848,9 @@
+ -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
+- try to export only the symbols listed in SYMFILE
++ try to export only the symbols listed in SYMFILE
+ -export-symbols-regex REGEX
+- try to export only the symbols matching REGEX
++ try to export only the symbols matching REGEX
+ -LLIBDIR search LIBDIR for required installed libraries
+ -lNAME OUTPUT-FILE requires the installed library libNAME
+ -module build a library that can dlopened
+@@ -6313,12 +6859,16 @@
-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
@@ -7796,7 +8638,17 @@
-release RELEASE specify package release information
-rpath LIBDIR the created library will eventually be installed in LIBDIR
-R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
-@@ -6366,14 +6837,14 @@
+- -static do not do any dynamic linking of libtool libraries
++ -static do not do any dynamic linking of uninstalled libtool libraries
++ -static-libtool-libs
++ do not do any dynamic linking of libtool libraries
+ -version-info CURRENT[:REVISION[:AGE]]
+- specify library version info [each variable defaults to 0]
++ specify library version info [each variable defaults to 0]
+
+ All other options (arguments beginning with \`-') are ignored.
+
+@@ -6354,14 +6904,14 @@
*)
$echo "$modename: invalid operation mode \`$mode'" 1>&2
$echo "$help" 1>&2
@@ -7813,7 +8665,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 +6858,11 @@
+@@ -6375,12 +6925,11 @@
# 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/05_pedantic-errors.diff
===================================================================
--- kde-extras/taskjuggler/trunk/debian/patches/05_pedantic-errors.diff 2008-01-19 14:00:16 UTC (rev 9045)
+++ kde-extras/taskjuggler/trunk/debian/patches/05_pedantic-errors.diff 2008-01-19 18:00:18 UTC (rev 9046)
@@ -1,6 +1,6 @@
--- a/admin/acinclude.m4.in
+++ b/admin/acinclude.m4.in
-@@ -2144,9 +2144,6 @@
+@@ -2168,9 +2168,6 @@
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 2008-01-19 14:00:16 UTC (rev 9045)
+++ kde-extras/taskjuggler/trunk/debian/patches/06_disable_no_undefined.diff 2008-01-19 18:00:18 UTC (rev 9046)
@@ -1,6 +1,6 @@
--- a/admin/acinclude.m4.in
+++ b/admin/acinclude.m4.in
-@@ -1689,15 +1689,6 @@
+@@ -1713,15 +1713,6 @@
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 2008-01-19 14:00:16 UTC (rev 9045)
+++ kde-extras/taskjuggler/trunk/debian/patches/11_fix_manpages_build.diff 2008-01-19 18:00:18 UTC (rev 9046)
@@ -1,419 +1,13 @@
-diff -Nur taskjuggler-2.4.0~beta1/configure taskjuggler-2.4.0~beta1.new/configure
---- taskjuggler-2.4.0~beta1/configure 2007-05-23 13:29:07.000000000 +0200
-+++ taskjuggler-2.4.0~beta1.new/configure 2007-05-25 00:59:03.000000000 +0200
-@@ -996,7 +996,7 @@
- KDE_LIBS
- LIBKCAL
- XSLTPROC
--DOCBOOK_TO_MAN
-+DOCBOOK2X_MAN
- DB2HTML
- HTMLMANUAL
- DB2PS
-@@ -35327,15 +35327,15 @@
- fi
-
-
-- # Extract the first word of "docbook-to-man", so it can be a program name with args.
--set dummy docbook-to-man; ac_word=$2
-+ # Extract the first word of "docbook2x-man", so it can be a program name with args.
-+set dummy docbook2x-man; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_prog_DOCBOOK_TO_MAN+set}" = set; then
-+if test "${ac_cv_prog_DOCBOOK2X_MAN+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- if test -n "$DOCBOOK_TO_MAN"; then
-- ac_cv_prog_DOCBOOK_TO_MAN="$DOCBOOK_TO_MAN" # Let the user override the test.
-+ if test -n "$DOCBOOK2X_MAN"; then
-+ ac_cv_prog_DOCBOOK2X_MAN="$DOCBOOK2X_MAN" # Let the user override the test.
- else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
-@@ -35344,7 +35344,7 @@
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_prog_DOCBOOK_TO_MAN="docbook-to-man"
-+ ac_cv_prog_DOCBOOK2X_MAN="docbook2x-man"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-@@ -35352,13 +35352,13 @@
- done
- IFS=$as_save_IFS
-
-- test -z "$ac_cv_prog_DOCBOOK_TO_MAN" && ac_cv_prog_DOCBOOK_TO_MAN="no"
-+ test -z "$ac_cv_prog_DOCBOOK2X_MAN" && ac_cv_prog_DOCBOOK2X_MAN="no"
- fi
- fi
--DOCBOOK_TO_MAN=$ac_cv_prog_DOCBOOK_TO_MAN
--if test -n "$DOCBOOK_TO_MAN"; then
-- { echo "$as_me:$LINENO: result: $DOCBOOK_TO_MAN" >&5
--echo "${ECHO_T}$DOCBOOK_TO_MAN" >&6; }
-+DOCBOOK2X_MAN=$ac_cv_prog_DOCBOOK2X_MAN
-+if test -n "$DOCBOOK2X_MAN"; then
-+ { echo "$as_me:$LINENO: result: $DOCBOOK2X_MAN" >&5
-+echo "${ECHO_T}$DOCBOOK2X_MAN" >&6; }
- else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
-@@ -36658,7 +36658,7 @@
- KDE_LIBS!$KDE_LIBS$ac_delim
- LIBKCAL!$LIBKCAL$ac_delim
- XSLTPROC!$XSLTPROC$ac_delim
--DOCBOOK_TO_MAN!$DOCBOOK_TO_MAN$ac_delim
-+DOCBOOK2X_MAN!$DOCBOOK2X_MAN$ac_delim
- DB2HTML!$DB2HTML$ac_delim
- HTMLMANUAL!$HTMLMANUAL$ac_delim
- DB2PS!$DB2PS$ac_delim
-@@ -37269,7 +37269,7 @@
-
- fi
-
-- if test "$DOCBOOK_TO_MAN" = no ; then
-+ if test "$DOCBOOK2X_MAN" = no ; then
- { echo "$as_me:$LINENO: WARNING: Man pages will not be generated" >&5
- echo "$as_me: WARNING: Man pages will not be generated" >&2;}
- DO_NOT_COMPILE="${DO_NOT_COMPILE} man"
-@@ -38384,7 +38384,7 @@
- KDE_LIBS!$KDE_LIBS$ac_delim
- LIBKCAL!$LIBKCAL$ac_delim
- XSLTPROC!$XSLTPROC$ac_delim
--DOCBOOK_TO_MAN!$DOCBOOK_TO_MAN$ac_delim
-+DOCBOOK2X_MAN!$DOCBOOK2X_MAN$ac_delim
- DB2HTML!$DB2HTML$ac_delim
- HTMLMANUAL!$HTMLMANUAL$ac_delim
- DB2PS!$DB2PS$ac_delim
-diff -Nur taskjuggler-2.4.0~beta1/configure.in taskjuggler-2.4.0~beta1.new/configure.in
---- taskjuggler-2.4.0~beta1/configure.in 2007-05-23 13:28:59.000000000 +0200
-+++ taskjuggler-2.4.0~beta1.new/configure.in 2007-05-25 00:59:03.000000000 +0200
-@@ -149,7 +149,7 @@
- if test "$tj_enable_docs" != "no" ; then
- dnl Check for the stuff needed to generate man pages
- AC_CHECK_PROG(XSLTPROC, xsltproc, xsltproc, no)
-- AC_CHECK_PROG(DOCBOOK_TO_MAN, docbook-to-man, docbook-to-man, no)
-+ AC_CHECK_PROG(DOCBOOK2X_MAN, docbook2x-man, docbook2x-man, no)
-
- dnl Check for the stuff needed to create the HTML manual
- if test "$XSLTPROC" = no ; then
-@@ -189,7 +189,7 @@
- AC_OUTPUT(docs/en/taskjuggler.xml)
- fi
-
-- if test "$DOCBOOK_TO_MAN" = no ; then
-+ if test "$DOCBOOK2X_MAN" = no ; then
- AC_MSG_WARN([Man pages will not be generated])
- DO_NOT_COMPILE="${DO_NOT_COMPILE} man"
- fi
-diff -Nur taskjuggler-2.4.0~beta1/configure.in.in taskjuggler-2.4.0~beta1.new/configure.in.in
---- taskjuggler-2.4.0~beta1/configure.in.in 2007-05-23 13:28:56.000000000 +0200
-+++ taskjuggler-2.4.0~beta1.new/configure.in.in 2007-05-25 00:59:03.000000000 +0200
-@@ -145,7 +145,7 @@
- if test "$tj_enable_docs" != "no" ; then
- dnl Check for the stuff needed to generate man pages
- AC_CHECK_PROG(XSLTPROC, xsltproc, xsltproc, no)
-- AC_CHECK_PROG(DOCBOOK_TO_MAN, docbook-to-man, docbook-to-man, no)
-+ AC_CHECK_PROG(DOCBOOK2X_MAN, docbook2x-man, docbook2x-man, no)
-
- dnl Check for the stuff needed to create the HTML manual
- if test "$XSLTPROC" = no ; then
-@@ -185,7 +185,7 @@
- AC_OUTPUT(docs/en/taskjuggler.xml)
- fi
-
-- if test "$DOCBOOK_TO_MAN" = no ; then
-+ if test "$DOCBOOK2X_MAN" = no ; then
- AC_MSG_WARN([Man pages will not be generated])
- DO_NOT_COMPILE="${DO_NOT_COMPILE} man"
- fi
-diff -Nur taskjuggler-2.4.0~beta1/Contrib/kate/Makefile.in taskjuggler-2.4.0~beta1.new/Contrib/kate/Makefile.in
---- taskjuggler-2.4.0~beta1/Contrib/kate/Makefile.in 2007-05-23 13:29:15.000000000 +0200
-+++ taskjuggler-2.4.0~beta1.new/Contrib/kate/Makefile.in 2007-05-25 00:59:13.000000000 +0200
-@@ -93,7 +93,7 @@
- DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
-+DOCBOOK2X_MAN = @DOCBOOK2X_MAN@
- DVIPS = @DVIPS@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
-diff -Nur taskjuggler-2.4.0~beta1/Contrib/Makefile.in taskjuggler-2.4.0~beta1.new/Contrib/Makefile.in
---- taskjuggler-2.4.0~beta1/Contrib/Makefile.in 2007-05-23 13:29:15.000000000 +0200
-+++ taskjuggler-2.4.0~beta1.new/Contrib/Makefile.in 2007-05-25 00:59:13.000000000 +0200
-@@ -99,7 +99,7 @@
- DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
-+DOCBOOK2X_MAN = @DOCBOOK2X_MAN@
- DVIPS = @DVIPS@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
-diff -Nur taskjuggler-2.4.0~beta1/docs/en/Makefile.in taskjuggler-2.4.0~beta1.new/docs/en/Makefile.in
---- taskjuggler-2.4.0~beta1/docs/en/Makefile.in 2007-05-23 13:29:15.000000000 +0200
-+++ taskjuggler-2.4.0~beta1.new/docs/en/Makefile.in 2007-05-25 00:59:13.000000000 +0200
-@@ -84,7 +84,7 @@
- DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
-+DOCBOOK2X_MAN = @DOCBOOK2X_MAN@
- DVIPS = @DVIPS@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
-diff -Nur taskjuggler-2.4.0~beta1/docs/Makefile.in taskjuggler-2.4.0~beta1.new/docs/Makefile.in
---- taskjuggler-2.4.0~beta1/docs/Makefile.in 2007-05-23 13:29:15.000000000 +0200
-+++ taskjuggler-2.4.0~beta1.new/docs/Makefile.in 2007-05-25 00:59:13.000000000 +0200
-@@ -99,7 +99,7 @@
- DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
-+DOCBOOK2X_MAN = @DOCBOOK2X_MAN@
- DVIPS = @DVIPS@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
-diff -Nur taskjuggler-2.4.0~beta1/Examples/BigProject/Common/Makefile.in taskjuggler-2.4.0~beta1.new/Examples/BigProject/Common/Makefile.in
---- taskjuggler-2.4.0~beta1/Examples/BigProject/Common/Makefile.in 2007-05-23 13:29:15.000000000 +0200
-+++ taskjuggler-2.4.0~beta1.new/Examples/BigProject/Common/Makefile.in 2007-05-25 00:59:13.000000000 +0200
-@@ -83,7 +83,7 @@
- DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
-+DOCBOOK2X_MAN = @DOCBOOK2X_MAN@
- DVIPS = @DVIPS@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
-diff -Nur taskjuggler-2.4.0~beta1/Examples/BigProject/Makefile.in taskjuggler-2.4.0~beta1.new/Examples/BigProject/Makefile.in
---- taskjuggler-2.4.0~beta1/Examples/BigProject/Makefile.in 2007-05-23 13:29:15.000000000 +0200
-+++ taskjuggler-2.4.0~beta1.new/Examples/BigProject/Makefile.in 2007-05-25 00:59:13.000000000 +0200
-@@ -99,7 +99,7 @@
- DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
-+DOCBOOK2X_MAN = @DOCBOOK2X_MAN@
- DVIPS = @DVIPS@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
-diff -Nur taskjuggler-2.4.0~beta1/Examples/BigProject/Project1/Makefile.in taskjuggler-2.4.0~beta1.new/Examples/BigProject/Project1/Makefile.in
---- taskjuggler-2.4.0~beta1/Examples/BigProject/Project1/Makefile.in 2007-05-23 13:29:15.000000000 +0200
-+++ taskjuggler-2.4.0~beta1.new/Examples/BigProject/Project1/Makefile.in 2007-05-25 00:59:13.000000000 +0200
-@@ -83,7 +83,7 @@
- DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
-+DOCBOOK2X_MAN = @DOCBOOK2X_MAN@
- DVIPS = @DVIPS@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
-diff -Nur taskjuggler-2.4.0~beta1/Examples/BigProject/Project2/Makefile.in taskjuggler-2.4.0~beta1.new/Examples/BigProject/Project2/Makefile.in
---- taskjuggler-2.4.0~beta1/Examples/BigProject/Project2/Makefile.in 2007-05-23 13:29:15.000000000 +0200
-+++ taskjuggler-2.4.0~beta1.new/Examples/BigProject/Project2/Makefile.in 2007-05-25 00:59:13.000000000 +0200
-@@ -83,7 +83,7 @@
- DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
-+DOCBOOK2X_MAN = @DOCBOOK2X_MAN@
- DVIPS = @DVIPS@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
-diff -Nur taskjuggler-2.4.0~beta1/Examples/FirstProject/Makefile.in taskjuggler-2.4.0~beta1.new/Examples/FirstProject/Makefile.in
---- taskjuggler-2.4.0~beta1/Examples/FirstProject/Makefile.in 2007-05-23 13:29:15.000000000 +0200
-+++ taskjuggler-2.4.0~beta1.new/Examples/FirstProject/Makefile.in 2007-05-25 00:59:13.000000000 +0200
-@@ -83,7 +83,7 @@
- DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
-+DOCBOOK2X_MAN = @DOCBOOK2X_MAN@
- DVIPS = @DVIPS@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
-diff -Nur taskjuggler-2.4.0~beta1/Examples/Makefile.in taskjuggler-2.4.0~beta1.new/Examples/Makefile.in
---- taskjuggler-2.4.0~beta1/Examples/Makefile.in 2007-05-23 13:29:15.000000000 +0200
-+++ taskjuggler-2.4.0~beta1.new/Examples/Makefile.in 2007-05-25 00:59:13.000000000 +0200
-@@ -99,7 +99,7 @@
- DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
-+DOCBOOK2X_MAN = @DOCBOOK2X_MAN@
- DVIPS = @DVIPS@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
-diff -Nur taskjuggler-2.4.0~beta1/Examples/ShiftSchedule/Makefile.in taskjuggler-2.4.0~beta1.new/Examples/ShiftSchedule/Makefile.in
---- taskjuggler-2.4.0~beta1/Examples/ShiftSchedule/Makefile.in 2007-05-23 13:29:15.000000000 +0200
-+++ taskjuggler-2.4.0~beta1.new/Examples/ShiftSchedule/Makefile.in 2007-05-25 00:59:13.000000000 +0200
-@@ -83,7 +83,7 @@
- DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
-+DOCBOOK2X_MAN = @DOCBOOK2X_MAN@
- DVIPS = @DVIPS@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
-diff -Nur taskjuggler-2.4.0~beta1/i18n/Makefile.in taskjuggler-2.4.0~beta1.new/i18n/Makefile.in
---- taskjuggler-2.4.0~beta1/i18n/Makefile.in 2007-05-23 13:29:15.000000000 +0200
-+++ taskjuggler-2.4.0~beta1.new/i18n/Makefile.in 2007-05-25 00:59:13.000000000 +0200
-@@ -99,7 +99,7 @@
- DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
-+DOCBOOK2X_MAN = @DOCBOOK2X_MAN@
- DVIPS = @DVIPS@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
-diff -Nur taskjuggler-2.4.0~beta1/i18n/TaskJugglerUI/Makefile.in taskjuggler-2.4.0~beta1.new/i18n/TaskJugglerUI/Makefile.in
---- taskjuggler-2.4.0~beta1/i18n/TaskJugglerUI/Makefile.in 2007-05-23 13:29:15.000000000 +0200
-+++ taskjuggler-2.4.0~beta1.new/i18n/TaskJugglerUI/Makefile.in 2007-05-25 00:59:13.000000000 +0200
-@@ -85,7 +85,7 @@
- DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
-+DOCBOOK2X_MAN = @DOCBOOK2X_MAN@
- DVIPS = @DVIPS@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
-diff -Nur taskjuggler-2.4.0~beta1/Makefile.in taskjuggler-2.4.0~beta1.new/Makefile.in
---- taskjuggler-2.4.0~beta1/Makefile.in 2007-05-23 13:29:15.000000000 +0200
-+++ taskjuggler-2.4.0~beta1.new/Makefile.in 2007-05-25 00:59:13.000000000 +0200
-@@ -127,7 +127,7 @@
- DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
-+DOCBOOK2X_MAN = @DOCBOOK2X_MAN@
- DVIPS = @DVIPS@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
-diff -Nur taskjuggler-2.4.0~beta1/man/en/Makefile.am taskjuggler-2.4.0~beta1.new/man/en/Makefile.am
---- taskjuggler-2.4.0~beta1/man/en/Makefile.am 2007-05-23 13:28:56.000000000 +0200
-+++ taskjuggler-2.4.0~beta1.new/man/en/Makefile.am 2007-05-25 00:59:13.000000000 +0200
-@@ -2,8 +2,8 @@
+--- a/man/en/Makefile.am
++++ b/man/en/Makefile.am
+@@ -2,9 +2,7 @@
EXTRA_DIST = $(man_MANS)
.xml.1:
- if test "${DOCBOOK_TO_MAN}" != "no" ; then \
- $(DOCBOOK_TO_MAN) --to-stdout $< > $@ ;\
-+ if test "${DOCBOOK2X_MAN}" != "no" ; then \
-+ $(DOCBOOK2X_MAN) --to-stdout $< > $@ ;\
- fi
+- fi
++ docbook2x-man --to-stdout $< > $@
clean-local:
-diff -Nur taskjuggler-2.4.0~beta1/man/en/Makefile.in taskjuggler-2.4.0~beta1.new/man/en/Makefile.in
---- taskjuggler-2.4.0~beta1/man/en/Makefile.in 2007-05-23 13:29:15.000000000 +0200
-+++ taskjuggler-2.4.0~beta1.new/man/en/Makefile.in 2007-05-25 00:59:13.000000000 +0200
-@@ -87,7 +87,7 @@
- DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
-+DOCBOOK2X_MAN = @DOCBOOK2X_MAN@
- DVIPS = @DVIPS@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
-@@ -545,8 +545,8 @@
-
-
- .xml.1:
-- if test "${DOCBOOK_TO_MAN}" != "no" ; then \
-- $(DOCBOOK_TO_MAN) --to-stdout $< > $@ ;\
-+ if test "${DOCBOOK2X_MAN}" != "no" ; then \
-+ $(DOCBOOK2X_MAN) --to-stdout $< > $@ ;\
- fi
-
- clean-local:
-diff -Nur taskjuggler-2.4.0~beta1/man/Makefile.in taskjuggler-2.4.0~beta1.new/man/Makefile.in
---- taskjuggler-2.4.0~beta1/man/Makefile.in 2007-05-23 13:29:15.000000000 +0200
-+++ taskjuggler-2.4.0~beta1.new/man/Makefile.in 2007-05-25 00:59:13.000000000 +0200
-@@ -99,7 +99,7 @@
- DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
-+DOCBOOK2X_MAN = @DOCBOOK2X_MAN@
- DVIPS = @DVIPS@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
-diff -Nur taskjuggler-2.4.0~beta1/taskjuggler/Makefile.in taskjuggler-2.4.0~beta1.new/taskjuggler/Makefile.in
---- taskjuggler-2.4.0~beta1/taskjuggler/Makefile.in 2007-05-23 13:29:15.000000000 +0200
-+++ taskjuggler-2.4.0~beta1.new/taskjuggler/Makefile.in 2007-05-25 00:59:13.000000000 +0200
-@@ -190,7 +190,7 @@
- DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
-+DOCBOOK2X_MAN = @DOCBOOK2X_MAN@
- DVIPS = @DVIPS@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
-diff -Nur taskjuggler-2.4.0~beta1/TaskJugglerUI/Makefile.in taskjuggler-2.4.0~beta1.new/TaskJugglerUI/Makefile.in
---- taskjuggler-2.4.0~beta1/TaskJugglerUI/Makefile.in 2007-05-23 13:29:15.000000000 +0200
-+++ taskjuggler-2.4.0~beta1.new/TaskJugglerUI/Makefile.in 2007-05-25 00:59:13.000000000 +0200
-@@ -178,7 +178,7 @@
- DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
-+DOCBOOK2X_MAN = @DOCBOOK2X_MAN@
- DVIPS = @DVIPS@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
-diff -Nur taskjuggler-2.4.0~beta1/TaskJugglerUI/pics/Makefile.in taskjuggler-2.4.0~beta1.new/TaskJugglerUI/pics/Makefile.in
---- taskjuggler-2.4.0~beta1/TaskJugglerUI/pics/Makefile.in 2007-05-23 13:29:15.000000000 +0200
-+++ taskjuggler-2.4.0~beta1.new/TaskJugglerUI/pics/Makefile.in 2007-05-25 00:59:13.000000000 +0200
-@@ -83,7 +83,7 @@
- DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
-+DOCBOOK2X_MAN = @DOCBOOK2X_MAN@
- DVIPS = @DVIPS@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
-diff -Nur taskjuggler-2.4.0~beta1/TaskJugglerUI/Templates/en_US/Makefile.in taskjuggler-2.4.0~beta1.new/TaskJugglerUI/Templates/en_US/Makefile.in
---- taskjuggler-2.4.0~beta1/TaskJugglerUI/Templates/en_US/Makefile.in 2007-05-23 13:29:15.000000000 +0200
-+++ taskjuggler-2.4.0~beta1.new/TaskJugglerUI/Templates/en_US/Makefile.in 2007-05-25 00:59:13.000000000 +0200
-@@ -93,7 +93,7 @@
- DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
-+DOCBOOK2X_MAN = @DOCBOOK2X_MAN@
- DVIPS = @DVIPS@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
-diff -Nur taskjuggler-2.4.0~beta1/TaskJugglerUI/Templates/Makefile.in taskjuggler-2.4.0~beta1.new/TaskJugglerUI/Templates/Makefile.in
---- taskjuggler-2.4.0~beta1/TaskJugglerUI/Templates/Makefile.in 2007-05-23 13:29:15.000000000 +0200
-+++ taskjuggler-2.4.0~beta1.new/TaskJugglerUI/Templates/Makefile.in 2007-05-25 00:59:13.000000000 +0200
-@@ -99,7 +99,7 @@
- DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
-+DOCBOOK2X_MAN = @DOCBOOK2X_MAN@
- DVIPS = @DVIPS@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
-diff -Nur taskjuggler-2.4.0~beta1/TestSuite/Makefile.in taskjuggler-2.4.0~beta1.new/TestSuite/Makefile.in
---- taskjuggler-2.4.0~beta1/TestSuite/Makefile.in 2007-05-23 13:29:15.000000000 +0200
-+++ taskjuggler-2.4.0~beta1.new/TestSuite/Makefile.in 2007-05-25 00:59:13.000000000 +0200
-@@ -83,7 +83,7 @@
- DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
-+DOCBOOK2X_MAN = @DOCBOOK2X_MAN@
- DVIPS = @DVIPS@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
+ rm -f *.1
Modified: kde-extras/taskjuggler/trunk/debian/patches/12_update_manpages.diff
===================================================================
--- kde-extras/taskjuggler/trunk/debian/patches/12_update_manpages.diff 2008-01-19 14:00:16 UTC (rev 9045)
+++ kde-extras/taskjuggler/trunk/debian/patches/12_update_manpages.diff 2008-01-19 18:00:18 UTC (rev 9046)
@@ -1,6 +1,5 @@
-diff -Nur taskjuggler-2.4.0~beta1/man/en/TaskJugglerUI.xml taskjuggler-2.4.0~beta1.new/man/en/TaskJugglerUI.xml
---- taskjuggler-2.4.0~beta1/man/en/TaskJugglerUI.xml 2007-05-23 13:28:56.000000000 +0200
-+++ taskjuggler-2.4.0~beta1.new/man/en/TaskJugglerUI.xml 2007-05-24 17:56:32.000000000 +0200
+--- a/man/en/TaskJugglerUI.xml
++++ b/man/en/TaskJugglerUI.xml
@@ -202,7 +202,7 @@
</title>
<para>
@@ -10,9 +9,8 @@
</filename>
, taskjuggler(1)
</para>
-diff -Nur taskjuggler-2.4.0~beta1/man/en/taskjuggler.xml taskjuggler-2.4.0~beta1.new/man/en/taskjuggler.xml
---- taskjuggler-2.4.0~beta1/man/en/taskjuggler.xml 2007-05-23 13:28:56.000000000 +0200
-+++ taskjuggler-2.4.0~beta1.new/man/en/taskjuggler.xml 2007-05-24 17:57:32.000000000 +0200
+--- a/man/en/taskjuggler.xml
++++ b/man/en/taskjuggler.xml
@@ -226,7 +226,7 @@
</title>
<para>
Added: kde-extras/taskjuggler/trunk/debian/patches/98_buildprep.diff
===================================================================
Added: kde-extras/taskjuggler/trunk/debian/patches/series
===================================================================
--- kde-extras/taskjuggler/trunk/debian/patches/series (rev 0)
+++ kde-extras/taskjuggler/trunk/debian/patches/series 2008-01-19 18:00:18 UTC (rev 9046)
@@ -0,0 +1,9 @@
+01_update_admin_dir.diff
+02_autotools_update.diff
+03_libtool_update.diff
+04_am_maintainer_mode.diff
+05_pedantic-errors.diff
+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 2008-01-19 14:00:16 UTC (rev 9045)
+++ kde-extras/taskjuggler/trunk/debian/rules 2008-01-19 18:00:18 UTC (rev 9046)
@@ -6,12 +6,17 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
DEB_BUILDDIR = .
DEB_CONFIGURE_EXTRA_FLAGS := --with-docdir=/usr/share/doc/kde/HTML/en/taskjuggler/
+DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--no-undefined -Wl,--as-needed"
+update-config::
+ # workaround to change file permission after applying patches
+ chmod 0755 admin/detect-autoconf.pl
+
install/taskjuggler::
install -D -p -m644 debian/taskjuggler.lintian-overrides \
debian/taskjuggler/usr/share/lintian/overrides/taskjuggler
@@ -23,3 +28,4 @@
@@wget -N -nv -T10 -t3 -O ../tarballs/$(UPFILENAME) $(URL)
@@echo Converting $(UPFILENAME) to $(FILENAME)
@@bzcat ../tarballs/$(UPFILENAME) | gzip -9 > ../tarballs/$(FILENAME)
+
More information about the pkg-kde-commits
mailing list