--- kdeutils-3.5.8.orig/ark/pics/Makefile.in +++ kdeutils-3.5.8/ark/pics/Makefile.in @@ -172,6 +172,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -317,7 +318,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -355,9 +356,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/ark/Makefile.in +++ kdeutils-3.5.8/ark/Makefile.in @@ -309,6 +309,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -503,7 +504,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -541,9 +542,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdeutils-3.5.8.orig/acinclude.m4 +++ kdeutils-3.5.8/acinclude.m4 @@ -1689,15 +1689,6 @@ KDE_USE_CLOSURE_TRUE="#" KDE_USE_CLOSURE_FALSE="" KDE_NO_UNDEFINED="" - case $host in - *-*-linux-gnu) - KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined], - [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined], - [KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"], - [KDE_NO_UNDEFINED=""])], - [KDE_NO_UNDEFINED=""]) - ;; - esac fi AC_SUBST(KDE_USE_CLOSURE_TRUE) AC_SUBST(KDE_USE_CLOSURE_FALSE) @@ -2144,9 +2135,6 @@ save_CXXFLAGS="$CXXFLAGS" kde_safe_LIBS="$LIBS" LIBS="$LIBS $X_EXTRA_LIBS" -if test "$GXX" = "yes"; then -CXXFLAGS="$CXXFLAGS -pedantic-errors" -fi AC_TRY_COMPILE([ $2 ], @@ -5971,30 +5959,15 @@ fi ]) # 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 ## Free Software Foundation, Inc. ## Originally by Gordon Matzigkeit , 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. +## This file is free software; the Free Software Foundation gives +## unlimited permission to copy and/or distribute it, with or without +## modifications, as long as this notice is preserved. -# serial 47 AC_PROG_LIBTOOL +# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) @@ -6054,7 +6027,7 @@ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" # Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent' +LIBTOOL='$(SHELL) $(top_builddir)/libtool' AC_SUBST(LIBTOOL)dnl # Prevent multiple expansion @@ -6104,7 +6077,7 @@ # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. -Xsed='sed -e s/^X//' +Xsed='sed -e 1s/^X//' [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] # Same as above, but do not quote variable references. @@ -6124,7 +6097,7 @@ default_ofile=libtool can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except M$VC, +# All known linkers require a `.a' archive for static linking (except MSVC, # which needs '.lib'). libext=a ltmain="$ac_aux_dir/ltmain.sh" @@ -6144,6 +6117,7 @@ test -z "$AS" && AS=as test -z "$CC" && CC=cc test -z "$LTCC" && LTCC=$CC +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS test -z "$DLLTOOL" && DLLTOOL=dlltool test -z "$LD" && LD=ld test -z "$LN_S" && LN_S="ln -s" @@ -6163,15 +6137,17 @@ if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ;; *) - old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ;; esac old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" fi +_LT_CC_BASENAME([$compiler]) + # Only perform the check for file, if the check method requires it case $deplibs_check_method in file_magic*) @@ -6212,11 +6188,56 @@ # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + # Allow CC to be a program name with arguments. compiler=$CC ])# _LT_AC_SYS_COMPILER +# _LT_CC_BASENAME(CC) +# ------------------- +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +AC_DEFUN([_LT_CC_BASENAME], +[for cc_temp in $1""; do + case $cc_temp in + compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; + distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +]) + + +# _LT_COMPILER_BOILERPLATE +# ------------------------ +# 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 +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$rm conftest* +])# _LT_COMPILER_BOILERPLATE + + +# _LT_LINKER_BOILERPLATE +# ---------------------- +# 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 +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$rm conftest* +])# _LT_LINKER_BOILERPLATE + + # _LT_AC_SYS_LIBPATH_AIX # ---------------------- # Links a minimal program and checks the executable @@ -6289,15 +6310,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 +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH if test -z "$ECHO"; then 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`" && + 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 @@ -6466,14 +6487,13 @@ # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case "`/usr/bin/file conftest.o`" in + case `/usr/bin/file conftest.o` in *32-bit*) - LINUX_64_MODE="32" case $host in x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; - ppc64-*linux*) + ppc64-*linux*|powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -6485,7 +6505,6 @@ esac ;; *64-bit*) - LINUX_64_MODE="64" case $host in x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" @@ -6519,6 +6538,22 @@ CFLAGS="$SAVE_CFLAGS" fi ;; +sparc*-*solaris*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) LD="${LD-ld} -m elf64_sparc" ;; + *) LD="${LD-ld} -64" ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; + AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], [*-*-cygwin* | *-*-mingw* | *-*-pw32*) AC_CHECK_TOOL(DLLTOOL, dlltool, false) @@ -6550,7 +6585,7 @@ # with a dollar sign (not a hyphen), so the echo should work correctly. # The option is referenced via a variable to avoid confusing sed. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) @@ -6560,8 +6595,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 - # So say no if there are warnings - if test ! -s conftest.err; then + # So say no if there are warnings other than the usual output. + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then $2=yes fi fi @@ -6587,11 +6624,16 @@ LDFLAGS="$LDFLAGS $3" printf "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The compiler can only warn and ignore the option if not recognized + # The linker can only warn and ignore the option if not recognized # So say no if there are warnings if test -s conftest.err; then # Append any errors to the config.log. cat conftest.err 1>&AS_MESSAGE_LOG_FD + $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + $2=yes + fi else $2=yes fi @@ -6615,7 +6657,7 @@ AC_MSG_CHECKING([the maximum length of command line arguments]) AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl i=0 - testring="ABCD" + teststring="ABCD" case $build_os in msdosdjgpp*) @@ -6644,20 +6686,70 @@ lt_cv_sys_max_cmd_len=8192; ;; - *) + amigaos*) + # On AmigaOS with pdksh, this test takes hours, literally. + # So we just punt and use a minimum line length of 8192. + lt_cv_sys_max_cmd_len=8192; + ;; + + netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + # This has been around since 386BSD, at least. Likely further. + if test -x /sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` + elif test -x /usr/sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` + else + lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs + fi + # And add a safety zone + 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` + ;; + + interix*) + # We know the value 262144 and hardcode it with a safety zone (like BSD) + lt_cv_sys_max_cmd_len=196608 + ;; + + osf*) + # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure + # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not + # nice to cause kernel panics so lets avoid the loop below. + # First set a reasonable default. + lt_cv_sys_max_cmd_len=16384 + # + if test -x /sbin/sysconfig; then + case `/sbin/sysconfig -q proc exec_disable_arg_limit` in + *1*) lt_cv_sys_max_cmd_len=-1 ;; + esac + fi + ;; + sco3.2v5*) + lt_cv_sys_max_cmd_len=102400 + ;; + sysv5* | sco5v6* | sysv4.2uw2*) + kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` + if test -n "$kargmax"; then + lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` + else + lt_cv_sys_max_cmd_len=32768 + 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` \ + = "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. @@ -6674,7 +6766,7 @@ # _LT_AC_CHECK_DLFCN -# -------------------- +# ------------------ AC_DEFUN([_LT_AC_CHECK_DLFCN], [AC_CHECK_HEADERS(dlfcn.h)dnl ])# _LT_AC_CHECK_DLFCN @@ -6682,7 +6774,7 @@ # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, # ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) -# ------------------------------------------------------------------ +# --------------------------------------------------------------------- AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl if test "$cross_compiling" = yes; then : @@ -6748,17 +6840,19 @@ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; /* dlclose (self); */ } + else + puts (dlerror ()); exit (status); }] EOF if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) 2>/dev/null + (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null lt_status=$? case x$lt_status in x$lt_dlno_uscore) $1 ;; x$lt_dlneed_uscore) $2 ;; - x$lt_unknown|x*) $3 ;; + x$lt_dlunknown|x*) $3 ;; esac else : # compilation failed @@ -6770,7 +6864,7 @@ # AC_LIBTOOL_DLOPEN_SELF -# ------------------- +# ---------------------- AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl if test "x$enable_dlopen" != xyes; then @@ -6807,7 +6901,7 @@ lt_cv_dlopen_self=yes ]) ;; - + *) AC_CHECK_FUNC([shl_load], [lt_cv_dlopen="shl_load"], @@ -6841,7 +6935,7 @@ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" save_LDFLAGS="$LDFLAGS" - eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" @@ -6854,7 +6948,7 @@ ]) if test "x$lt_cv_dlopen_self" = xyes; then - LDFLAGS="$LDFLAGS $link_static_flag" + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" AC_CACHE_CHECK([whether a statically linked program can dlopen itself], lt_cv_dlopen_self_static, [dnl _LT_AC_TRY_DLOPEN_SELF( @@ -6896,20 +6990,13 @@ mkdir out 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 . - 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. # Note that $ac_compile itself does not contain backslashes and begins # with a dollar sign (not a hyphen), so the echo should work correctly. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) @@ -6921,13 +7008,18 @@ 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 + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes fi fi - chmod u+w . - $rm conftest* out/* - rmdir out + chmod u+w . 2>&AS_MESSAGE_LOG_FD + $rm conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files + $rm out/* && rmdir out cd .. rmdir conftest $rm conftest* @@ -6986,8 +7078,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)" || \ - test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \ - test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then + test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \ + test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then # We can hardcode non-existant directories. if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && @@ -7044,7 +7136,7 @@ *) AC_MSG_RESULT([no]) ;; - esac + esac fi ])# AC_LIBTOOL_SYS_LIB_STRIP @@ -7057,7 +7149,7 @@ library_names_spec= libname_spec='lib$name' soname_spec= -shrext=".so" +shrext_cmds=".so" postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -7067,7 +7159,20 @@ 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" +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 + # 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'` + else + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi +else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +fi need_lib_prefix=unknown hardcode_into_libs=no @@ -7132,7 +7237,7 @@ 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' + 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*) @@ -7141,7 +7246,7 @@ shlibpath_var=LIBRARY_PATH ;; -bsdi4*) +bsdi[[45]]*) version_type=linux need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -7157,7 +7262,7 @@ cygwin* | mingw* | pw32*) version_type=windows - shrext=".dll" + shrext_cmds=".dll" need_version=no need_lib_prefix=no @@ -7169,7 +7274,8 @@ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname' + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname' postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ dlpath=$dir/\$dldll~ $rm \$dlpath' @@ -7199,7 +7305,7 @@ ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ;; esac ;; @@ -7222,7 +7328,7 @@ soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH - shrext='$(test .$module = .yes && echo .so || echo .dylib)' + 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"` @@ -7245,20 +7351,17 @@ dynamic_linker=no ;; -kfreebsd*-gnu*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - -freebsd*) - objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then + objformat=`/usr/bin/objformat` + else + case $host_os in + freebsd[[123]]*) objformat=aout ;; + *) objformat=elf ;; + esac + fi version_type=freebsd-$objformat case $version_type in freebsd-elf*) @@ -7276,14 +7379,19 @@ freebsd2*) shlibpath_overrides_runpath=yes ;; - freebsd3.[01]* | freebsdelf3.[01]*) + freebsd3.[[01]]* | freebsdelf3.[[01]]*) shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; - *) # from 3.2 on + freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ + freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; + freebsd*) # from 4.6 on + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; esac ;; @@ -7303,9 +7411,9 @@ version_type=sunos need_lib_prefix=no need_version=no - case "$host_cpu" in + case $host_cpu in ia64*) - shrext='.so' + shrext_cmds='.so' hardcode_into_libs=yes dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH @@ -7320,7 +7428,7 @@ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) - shrext='.sl' + shrext_cmds='.sl' hardcode_into_libs=yes dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH @@ -7331,7 +7439,7 @@ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; *) - shrext='.sl' + shrext_cmds='.sl' dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH @@ -7343,6 +7451,18 @@ postinstall_cmds='chmod 555 $lib' ;; +interix3*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; @@ -7386,29 +7506,26 @@ ;; # This must be Linux ELF. -linux*) +linux* | k*bsd*-gnu) version_type=linux need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - 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 -a ! -h /lib64; then - libsuff=64 - fi - fi shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" # 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 + # 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' ' '` + 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, @@ -7418,6 +7535,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -7427,7 +7556,7 @@ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' dynamic_linker='NetBSD ld.elf_so' fi @@ -7455,8 +7584,13 @@ openbsd*) version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no - need_version=no + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. + case $host_os in + openbsd3.3 | openbsd3.3.*) need_version=yes ;; + *) need_version=no ;; + esac 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 @@ -7476,7 +7610,7 @@ os2*) libname_spec='$name' - shrext=".dll" + shrext_cmds=".dll" need_lib_prefix=no library_names_spec='$libname${shared_ext} $libname.a' dynamic_linker='OS/2 ld.exe' @@ -7494,13 +7628,6 @@ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; -sco3.2v5*) - version_type=osf - 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 - ;; - solaris*) version_type=linux need_lib_prefix=no @@ -7526,7 +7653,7 @@ need_version=yes ;; -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) +sysv4 | sysv4.3*) 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' @@ -7559,6 +7686,29 @@ fi ;; +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=freebsd-elf + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + hardcode_into_libs=yes + if test "$with_gnu_ld" = yes; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + shlibpath_overrides_runpath=no + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + shlibpath_overrides_runpath=yes + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; + esac + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; + uts4*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -7572,6 +7722,11 @@ esac AC_MSG_RESULT([$dynamic_linker]) test "$dynamic_linker" = no && can_build_shared=no + +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi ])# AC_LIBTOOL_SYS_DYNAMIC_LINKER @@ -7596,6 +7751,9 @@ AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile']) fi fi + if test -z "$LTCFLAGS"; then + eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" + fi # Extract list of available tagged configurations in $ofile. # Note that this assumes the entire list is on one line. @@ -7622,7 +7780,9 @@ case $tagname in CXX) - if test -n "$CXX" && test "X$CXX" != "Xno"; then + if test -n "$CXX" && ( test "X$CXX" != "Xno" && + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + (test "X$CXX" != "Xg++"))) ; then AC_LIBTOOL_LANG_CXX_CONFIG else tagname="" @@ -7684,7 +7844,7 @@ # AC_LIBTOOL_WIN32_DLL # -------------------- -# declare package support for building win32 dll's +# declare package support for building win32 DLLs AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP]) ])# AC_LIBTOOL_WIN32_DLL @@ -7722,7 +7882,7 @@ # AC_DISABLE_SHARED # ----------------- -#- set the default shared flag to --disable-shared +# set the default shared flag to --disable-shared AC_DEFUN([AC_DISABLE_SHARED], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl AC_ENABLE_SHARED(no) @@ -7858,7 +8018,7 @@ if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) - file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then @@ -7968,7 +8128,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, - # but apparently some GNU ld's only accept -v. + # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 &1 /dev/null; then case $host_cpu in i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library' + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; @@ -8113,7 +8274,7 @@ hpux10.20* | hpux11*) lt_cv_file_magic_cmd=/usr/bin/file - case "$host_cpu" in + case $host_cpu in 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 @@ -8129,43 +8290,27 @@ esac ;; +interix3*) + # 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)$' + ;; + irix5* | irix6* | nonstopux*) - case $host_os in - irix5* | nonstopux*) - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" - ;; - *) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; - *-n32|*"-n32 ") libmagic=N32;; - *-64|*"-64 ") libmagic=64-bit;; - *) libmagic=never-match;; - esac - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1" - ;; + case $LD in + *-32|*"-32 ") libmagic=32-bit;; + *-n32|*"-n32 ") libmagic=N32;; + *-64|*"-64 ") libmagic=64-bit;; + *) libmagic=never-match;; esac - lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*` lt_cv_deplibs_check_method=pass_all ;; # This must be Linux ELF. -linux*) - case $host_cpu in - alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390* | sh* | x86_64* ) - lt_cv_deplibs_check_method=pass_all ;; - # the debian people say, arm and glibc 2.3.1 works for them with pass_all - arm* ) - lt_cv_deplibs_check_method=pass_all ;; - *) - # glibc up to 2.1.1 does not perform some relocations on ARM - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;; - esac - lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` +linux* | k*bsd*-gnu) + lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) 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 @@ -8184,32 +8329,22 @@ ;; openbsd*) - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object' + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' else - lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' fi ;; osf3* | osf4* | osf5*) - # 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 - ;; - -sco3.2v5*) lt_cv_deplibs_check_method=pass_all ;; solaris*) lt_cv_deplibs_check_method=pass_all - lt_cv_file_magic_test_file=/lib/libc.so ;; -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) +sysv4 | sysv4.3*) 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]]' @@ -8230,10 +8365,13 @@ siemens) lt_cv_deplibs_check_method=pass_all ;; + pc) + lt_cv_deplibs_check_method=pass_all + ;; esac ;; -sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*) +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) lt_cv_deplibs_check_method=pass_all ;; esac @@ -8253,36 +8391,43 @@ # Let the user override the test. lt_cv_path_NM="$NM" else - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/${ac_tool_prefix}nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) - lt_cv_path_NM="$tmp_nm -B" - break - ;; - *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in - */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 + lt_nm_to_check="$lt_nm_to_check nm" + fi + for lt_tmp_nm in $lt_nm_to_check; do + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + tmp_nm="$ac_dir/$lt_tmp_nm" + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + # Check to see if the nm accepts a BSD-compat flag. + # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # nm: unknown option "B" ignored + # Tru64's nm complains that /dev/null is an invalid object file + case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in + */dev/null* | *'Invalid file or object type'*) + lt_cv_path_NM="$tmp_nm -B" break ;; *) - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + */dev/null*) + lt_cv_path_NM="$tmp_nm -p" + break + ;; + *) + lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but + continue # so that we can try to find one that supports BSD flags + ;; + esac ;; esac - esac - fi + fi + done + IFS="$lt_save_ifs" done - IFS="$lt_save_ifs" test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm fi]) NM="$lt_cv_path_NM" @@ -8314,13 +8459,13 @@ # ----------------------------------- # sets LIBLTDL to the link flags for the libltdl convenience library and # LTDLINCL to the include flags for the libltdl header and adds -# --enable-ltdl-convenience to the configure arguments. Note that LIBLTDL -# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If -# DIRECTORY is not provided, it is assumed to be `libltdl'. LIBLTDL will -# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with -# '${top_srcdir}/' (note the single quotes!). If your package is not -# flat and you're not using automake, define top_builddir and -# top_srcdir appropriately in the Makefiles. +# --enable-ltdl-convenience to the configure arguments. Note that +# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, +# it is assumed to be `libltdl'. LIBLTDL will be prefixed with +# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/' +# (note the single quotes!). If your package is not flat and you're not +# using automake, define top_builddir and top_srcdir appropriately in +# the Makefiles. AC_DEFUN([AC_LIBLTDL_CONVENIENCE], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl case $enable_ltdl_convenience in @@ -8339,13 +8484,13 @@ # ----------------------------------- # sets LIBLTDL to the link flags for the libltdl installable library and # LTDLINCL to the include flags for the libltdl header and adds -# --enable-ltdl-install to the configure arguments. Note that LIBLTDL -# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If -# DIRECTORY is not provided and an installed libltdl is not found, it is -# assumed to be `libltdl'. LIBLTDL will be prefixed with '${top_builddir}/' -# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single -# quotes!). If your package is not flat and you're not using automake, -# define top_builddir and top_srcdir appropriately in the Makefiles. +# --enable-ltdl-install to the configure arguments. Note that +# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, +# and an installed libltdl is not found, it is assumed to be `libltdl'. +# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with +# '${top_srcdir}/' (note the single quotes!). If your package is not +# flat and you're not using automake, define top_builddir and top_srcdir +# appropriately in the Makefiles. # 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 @@ -8383,10 +8528,21 @@ # --------------- AC_DEFUN([_LT_AC_LANG_CXX], [AC_REQUIRE([AC_PROG_CXX]) -AC_REQUIRE([AC_PROG_CXXCPP]) +AC_REQUIRE([_LT_AC_PROG_CXXCPP]) _LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX]) ])# _LT_AC_LANG_CXX +# _LT_AC_PROG_CXXCPP +# ------------------ +AC_DEFUN([_LT_AC_PROG_CXXCPP], +[ +AC_REQUIRE([AC_PROG_CXX]) +if test -n "$CXX" && ( test "X$CXX" != "Xno" && + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + (test "X$CXX" != "Xg++"))) ; then + AC_PROG_CXXCPP +fi +])# _LT_AC_PROG_CXXCPP # AC_LIBTOOL_F77 # -------------- @@ -8426,7 +8582,7 @@ # AC_LIBTOOL_RC -# -------------- +# ------------- # enable support for Windows resource files AC_DEFUN([AC_LIBTOOL_RC], [AC_REQUIRE([LT_AC_PROG_RC]) @@ -8459,36 +8615,9 @@ _LT_AC_SYS_COMPILER -# -# Check for any special shared library compilation flags. -# -_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)= -if test "$GCC" = no; then - case $host_os in - sco3.2v5*) - _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf' - ;; - esac -fi -if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then - AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries]) - if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$]_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[[ ]]" >/dev/null; then : - else - AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure]) - _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no - fi -fi - - -# -# Check to make sure the static flag actually works. -# -AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works], - _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), - $_LT_AC_TAGVAR(lt_prog_compiler_static, $1), - [], - [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) - +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -8502,9 +8631,9 @@ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) AC_LIBTOOL_SYS_LIB_STRIP -AC_LIBTOOL_DLOPEN_SELF($1) +AC_LIBTOOL_DLOPEN_SELF -# Report which librarie types wil actually be built +# Report which library types will actually be built AC_MSG_CHECKING([if libtool supports shared libraries]) AC_MSG_RESULT([$can_build_shared]) @@ -8513,7 +8642,7 @@ # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. -case "$host_os" in +case $host_os in aix3*) test "$enable_shared" = yes && enable_static=no if test -n "$RANLIB"; then @@ -8522,48 +8651,11 @@ fi ;; -aix4*) +aix4* | aix5*) if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then test "$enable_shared" = yes && enable_static=no fi - ;; - darwin* | rhapsody*) - if test "$GCC" = yes; then - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - case "$host_os" in - rhapsody* | darwin1.[[012]]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress' - ;; - *) # Darwin 1.3 on - 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' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring' - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $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 $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_automatic, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; + ;; esac AC_MSG_RESULT([$enable_shared]) @@ -8588,7 +8680,7 @@ AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], [AC_LANG_PUSH(C++) AC_REQUIRE([AC_PROG_CXX]) -AC_REQUIRE([AC_PROG_CXXCPP]) +AC_REQUIRE([_LT_AC_PROG_CXXCPP]) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no _LT_AC_TAGVAR(allow_undefined_flag, $1)= @@ -8600,6 +8692,7 @@ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= _LT_AC_TAGVAR(hardcode_minus_L, $1)=no +_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported _LT_AC_TAGVAR(hardcode_automatic, $1)=no _LT_AC_TAGVAR(module_cmds, $1)= _LT_AC_TAGVAR(module_expsym_cmds, $1)= @@ -8617,7 +8710,7 @@ _LT_AC_TAGVAR(compiler_lib_search_path, $1)= # Source file extension for C++ test sources. -ac_ext=cc +ac_ext=cpp # Object file extension for compiled C++ test sources. objext=o @@ -8627,11 +8720,15 @@ lt_simple_compile_test_code="int some_variable = 0;\n" # 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' # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_AC_SYS_COMPILER +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + # Allow CC to be a program name with arguments. lt_save_CC=$CC lt_save_LD=$LD @@ -8642,18 +8739,18 @@ if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx else - unset lt_cv_prog_gnu_ld + $as_unset lt_cv_prog_gnu_ld fi if test -n "${lt_cv_path_LDCXX+set}"; then lt_cv_path_LD=$lt_cv_path_LDCXX else - unset lt_cv_path_LD + $as_unset lt_cv_path_LD fi test -z "${LDCXX+set}" || LD=$LDCXX CC=${CXX-"c++"} compiler=$CC _LT_AC_TAGVAR(compiler, $1)=$CC -cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` +_LT_CC_BASENAME([$compiler]) # We don't want -fno-exception wen compiling C++ code, so set the # no_builtin_flag separately @@ -8671,8 +8768,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 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' @@ -8698,7 +8795,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. - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' fi # Commands to make compiler produce verbose output that lists @@ -8728,8 +8825,23 @@ exp_sym_flag='-Bexport' no_entry_flag="" else - # KDE requires run time linking. Make it the default. - aix_use_runtimelinking=yes + aix_use_runtimelinking=no + + # 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. + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) + for ld_flag in $LDFLAGS; do + case $ld_flag in + *-brtl*) + aix_use_runtimelinking=yes + break + ;; + esac + done + ;; + esac + exp_sym_flag='-bexport' no_entry_flag='-bnoentry' fi @@ -8746,7 +8858,7 @@ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes if test "$GXX" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) + 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` @@ -8765,8 +8877,12 @@ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= fi + ;; esac shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi else # not using gcc if test "$host_cpu" = ia64; then @@ -8775,15 +8891,16 @@ shared_flag='-G' else if test "$aix_use_runtimelinking" = yes; then - shared_flag='-qmkshrobj ${wl}-G' + shared_flag='${wl}-G' else - shared_flag='-qmkshrobj' + shared_flag='${wl}-bM:SRE' fi fi fi - # Let the compiler handle the export list. - _LT_AC_TAGVAR(always_export_symbols, $1)=no + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + _LT_AC_TAGVAR(always_export_symbols, $1)=yes 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. @@ -8792,13 +8909,12 @@ _LT_AC_SYS_LIBPATH_AIX _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an empty executable. _LT_AC_SYS_LIBPATH_AIX @@ -8807,22 +8923,32 @@ # -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' - # -bexpall does not export symbols beginning with underscore (_) - _LT_AC_TAGVAR(always_export_symbols, $1)=yes # Exported symbols can be pulled into shared objects from archives - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' ' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds it's shared libraries. - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + # This is similar to how AIX traditionally builds its shared libraries. + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${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 - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; + + beos*) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + chorus*) + case $cc_basename in + *) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; esac ;; @@ -8830,12 +8956,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' - _LT_AC_TAGVAR(allow_undefined_flag, $1)=no + _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_AC_TAGVAR(always_export_symbols, $1)=no _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' # 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 @@ -8844,70 +8970,81 @@ echo EXPORTS > $output_objdir/$soname.def; cat $export_symbols >> $output_objdir/$soname.def; fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else _LT_AC_TAGVAR(ld_shlibs, $1)=no fi ;; + darwin* | rhapsody*) + case $host_os in + rhapsody* | darwin1.[[012]]) + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' + ;; + *) # Darwin 1.3 on + 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_AC_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_automatic, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - darwin* | rhapsody*) - if test "$GXX" = yes; then - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - case "$host_os" in - rhapsody* | darwin1.[[012]]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress' - ;; - *) # Darwin 1.3 on - 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 + 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 - ;; - esac - lt_int_apple_cc_single_mod=no - output_verbose_link_cmd='echo' - if $CC -dumpspecs 2>&1 | grep '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 $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring' - fi - _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs' - - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's - 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 $compiler_flags $libobjs $deplibs -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 ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -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 $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_automatic, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - 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*) case $cc_basename in - ec++) + ec++*) # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; - ghcx) + ghcx*) # Green Hills C++ Compiler # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no @@ -8918,14 +9055,14 @@ ;; esac ;; - freebsd[12]*) + freebsd[[12]]*) # C++ shared libraries reported to be fairly broken before switch to ELF _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; freebsd-elf*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; - 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 @@ -8942,12 +9079,12 @@ # location of the library. case $cc_basename in - CC) + CC*) # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; - aCC) - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + aCC*) + _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. @@ -8956,11 +9093,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. - output_verbose_link_cmd='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' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]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 "$GXX" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -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' else # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no @@ -8970,34 +9107,23 @@ ;; 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, $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' ;; *) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ;; esac fi - case "$host_cpu" in - hppa*64*) + case $host_cpu in + hppa*64*|ia64*) _LT_AC_TAGVAR(hardcode_direct, $1)=no _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ;; - ia64*) - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, - # but as the default - # location of the library. - ;; *) _LT_AC_TAGVAR(hardcode_direct, $1)=yes _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, @@ -9007,17 +9133,20 @@ esac case $cc_basename in - CC) + CC*) # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; - aCC) - case "$host_cpu" in - hppa*64*|ia64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' + aCC*) + case $host_cpu in + hppa*64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac # Commands to make compiler produce verbose output that lists @@ -9033,12 +9162,15 @@ *) if test "$GXX" = yes; then if test $with_gnu_ld = no; then - case "$host_cpu" in - ia64*|hppa*64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' + case $host_cpu in + hppa*64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac fi @@ -9049,11 +9181,25 @@ ;; esac ;; + interix3*) + _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' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _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' + ;; irix5* | irix6*) case $cc_basename in - CC) + CC*) # SGI C++ - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_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 @@ -9064,9 +9210,9 @@ *) if test "$GXX" = yes; then if test "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' fi fi _LT_AC_TAGVAR(link_all_deplibs, $1)=yes @@ -9075,16 +9221,16 @@ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ;; - linux*) + linux* | k*bsd*-gnu) case $cc_basename in - KCC) + 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. - _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; 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. @@ -9102,20 +9248,44 @@ # "CC -Bstatic", where "CC" is the KAI C++ compiler. _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;; - icpc) + icpc*) # Intel C++ with_gnu_ld=yes + # version 8.0 and above of icpc choke on multiply defined symbols + # if we add $predep_objects and $postdep_objects, however 7.1 and + # earlier do not add the objects themselves. + case `$CC -V 2>&1` in + *"Version 7."*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + ;; + *) # Version 8.0 or newer + tmp_idyn= + case $host_cpu in + ia64*) tmp_idyn=' -i_dynamic';; + esac + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + ;; + esac _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' ;; - cxx) + pgCC*) + # Portland Group C++ compiler + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + ;; + cxx*) # Compaq C++ - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' runpath_var=LD_RUN_PATH _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' @@ -9143,7 +9313,7 @@ ;; mvs*) case $cc_basename in - cxx) + cxx*) # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; @@ -9153,7 +9323,7 @@ ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) 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= @@ -9164,15 +9334,31 @@ # Workaround some broken pre-1.5 toolchains output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' ;; + openbsd2*) + # C++ shared libraries are fairly broken + _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' + fi + output_verbose_link_cmd='echo' + ;; osf3*) case $cc_basename in - KCC) + 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. - _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: @@ -9182,14 +9368,14 @@ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;; - RCC) + RCC*) # Rational C++ 2.4.1 # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; - cxx) + cxx*) _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$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 ${output_objdir}/so_locations -o $lib' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: @@ -9207,7 +9393,7 @@ *) if test "$GXX" = yes && test "$with_gnu_ld" = no; then _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$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}${output_objdir}/so_locations -o $lib' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: @@ -9226,13 +9412,13 @@ ;; osf4* | osf5*) case $cc_basename in - KCC) + 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. - _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: @@ -9241,17 +9427,17 @@ # the KAI C++ compiler. _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;; - RCC) + RCC*) # Rational C++ 2.4.1 # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; - cxx) + cxx*) _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~ $rm $lib.exp' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' @@ -9270,7 +9456,7 @@ *) if test "$GXX" = yes && test "$with_gnu_ld" = no; then _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$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}${output_objdir}/so_locations -o $lib' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: @@ -9291,27 +9477,14 @@ # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; - sco*) - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - case $cc_basename in - CC) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; sunos4*) case $cc_basename in - CC) + CC*) # Sun C++ 4.x # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; - lcc) + lcc*) # Lucid # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no @@ -9324,36 +9497,33 @@ ;; solaris*) case $cc_basename in - CC) + CC*) # Sun C++ 4.2, 5.x and Centerline C++ + _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects' + _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)='$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 $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp' + $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no case $host_os in - 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 - # 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. # 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' ;; esac _LT_AC_TAGVAR(link_all_deplibs, $1)=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_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + 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 @@ -9361,9 +9531,9 @@ # in the archive. _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' ;; - gcx) + gcx*) # Green Hills C++ Compiler - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$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. _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' @@ -9373,9 +9543,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 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$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 $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $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 @@ -9384,9 +9554,9 @@ else # g++ 2.7 appears to require `-G' NOT `-shared' on this # platform. - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$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 $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $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 @@ -9399,12 +9569,63 @@ ;; 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(hardcode_shlibpath_var, $1)=no + runpath_var='LD_RUN_PATH' + + case $cc_basename in + CC*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + # For security reasons, it is highly recommended that you always + # use absolute paths for naming shared libraries, and exclude the + # DT_RUNPATH tag from executables and libraries. But doing so + # requires that you compile everything twice, which is a pain. + # So that behaviour is only enabled if SCOABSPATH is set to a + # non-empty value in the environment. Most likely only useful for + # creating official distributions of packages. + # This is a hack until libtool officially supports absolute path + # 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(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)=':' + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + runpath_var='LD_RUN_PATH' + + case $cc_basename in + CC*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac ;; tandem*) case $cc_basename in - NCC) + NCC*) # NonStop-UX NCC 3.20 # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no @@ -9441,8 +9662,6 @@ AC_LIBTOOL_PROG_LD_SHLIBS($1) AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) -AC_LIBTOOL_SYS_LIB_STRIP -AC_LIBTOOL_DLOPEN_SELF($1) AC_LIBTOOL_CONFIG($1) @@ -9460,7 +9679,7 @@ ])# AC_LIBTOOL_LANG_CXX_CONFIG # AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME]) -# ------------------------ +# ------------------------------------ # Figure out "hidden" library dependencies from verbose # compiler output when linking a shared library. # Parse the compiler output and extract the necessary @@ -9514,7 +9733,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. - output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`" + output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"` for p in `eval $output_verbose_link_cmd`; do case $p in @@ -9554,7 +9773,7 @@ fi ;; - *.$objext|*.$libext) + *.$objext) # This assumes that the test object file only shows up # once in the compiler output. if test "$p" = "conftest.$objext"; then @@ -9590,13 +9809,37 @@ $rm -f confest.$objext +# PORTME: override above test on systems where it is broken +ifelse([$1],[CXX], +[case $host_os in +interix3*) + # 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)= + _LT_AC_TAGVAR(postdep_objects,$1)= + _LT_AC_TAGVAR(postdeps,$1)= + ;; + +solaris*) + case $cc_basename in + CC*) + # 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' + ;; + esac + ;; +esac +]) + case " $_LT_AC_TAGVAR(postdeps, $1) " in *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; esac ])# AC_LIBTOOL_POSTDEP_PREDEP # AC_LIBTOOL_LANG_F77_CONFIG -# ------------------------ +# -------------------------- # 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'. @@ -9640,12 +9883,16 @@ # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_AC_SYS_COMPILER +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + # Allow CC to be a program name with arguments. lt_save_CC="$CC" CC=${F77-"f77"} compiler=$CC _LT_AC_TAGVAR(compiler, $1)=$CC -cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` +_LT_CC_BASENAME([$compiler]) AC_MSG_CHECKING([if libtool supports shared libraries]) AC_MSG_RESULT([$can_build_shared]) @@ -9655,7 +9902,7 @@ # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. -case "$host_os" in +case $host_os in aix3*) test "$enable_shared" = yes && enable_static=no if test -n "$RANLIB"; then @@ -9663,8 +9910,10 @@ postinstall_cmds='$RANLIB $lib' fi ;; -aix4*) - test "$enable_shared" = yes && enable_static=no +aix4* | aix5*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi ;; esac AC_MSG_RESULT([$enable_shared]) @@ -9674,8 +9923,6 @@ test "$enable_shared" = yes || enable_static=yes AC_MSG_RESULT([$enable_static]) -test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - _LT_AC_TAGVAR(GCC, $1)="$G77" _LT_AC_TAGVAR(LD, $1)="$LD" @@ -9685,8 +9932,6 @@ AC_LIBTOOL_PROG_LD_SHLIBS($1) AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) -AC_LIBTOOL_SYS_LIB_STRIP - AC_LIBTOOL_CONFIG($1) @@ -9715,20 +9960,27 @@ lt_simple_compile_test_code="class foo {}\n" # 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' # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_AC_SYS_COMPILER +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + # Allow CC to be a program name with arguments. lt_save_CC="$CC" CC=${GCJ-"gcj"} compiler=$CC _LT_AC_TAGVAR(compiler, $1)=$CC +_LT_CC_BASENAME([$compiler]) # GCJ did not exist at the time GCC didn't implicitly link libc in. _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds + ## 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 @@ -9740,8 +9992,6 @@ AC_LIBTOOL_PROG_LD_SHLIBS($1) AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) -AC_LIBTOOL_SYS_LIB_STRIP -AC_LIBTOOL_DLOPEN_SELF($1) AC_LIBTOOL_CONFIG($1) @@ -9751,7 +10001,7 @@ # AC_LIBTOOL_LANG_RC_CONFIG -# -------------------------- +# ------------------------- # Ensure that the configuration vars for the Windows resource compiler are # suitably defined. Those variables are subsequently used by # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. @@ -9775,11 +10025,16 @@ # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_AC_SYS_COMPILER +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + # Allow CC to be a program name with arguments. lt_save_CC="$CC" CC=${RC-"windres"} compiler=$CC _LT_AC_TAGVAR(compiler, $1)=$CC +_LT_CC_BASENAME([$compiler]) _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes AC_LIBTOOL_CONFIG($1) @@ -9805,11 +10060,12 @@ # without removal of \ escapes. if test -n "${ZSH_VERSION+set}" ; then setopt NO_GLOB_SUBST - fi + fi # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \ + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ + SED SHELL STRIP \ 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 \ @@ -9859,7 +10115,7 @@ _LT_AC_TAGVAR(archive_cmds, $1) | \ _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \ _LT_AC_TAGVAR(module_cmds, $1) | \ - _LT_AC_TAGVAR(module_expsym_cmds, $1) | \ + _LT_AC_TAGVAR(module_expsym_cmds, $1) | \ _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \ _LT_AC_TAGVAR(export_symbols_cmds, $1) | \ extract_expsyms_cmds | reload_cmds | finish_cmds | \ @@ -9925,11 +10181,11 @@ SED=$lt_SED # Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="$SED -e s/^X//" +Xsed="$SED -e 1s/^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 +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH # The names of the tagged configurations supported by this script. available_tags= @@ -9960,6 +10216,12 @@ # The host system. host_alias=$host_alias host=$host +host_os=$host_os + +# The build system. +build_alias=$build_alias +build=$build +build_os=$build_os # An echo program that does not interpret backslashes. echo=$lt_echo @@ -9971,6 +10233,9 @@ # A C compiler. LTCC=$lt_LTCC +# LTCC compiler flags. +LTCFLAGS=$lt_LTCFLAGS + # A language-specific compiler. CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) @@ -9990,7 +10255,7 @@ NM=$lt_NM # A symbol stripping program -STRIP=$STRIP +STRIP=$lt_STRIP # Used to examine libraries when file_magic_cmd begins "file" MAGIC_CMD=$MAGIC_CMD @@ -10021,7 +10286,7 @@ libext="$libext" # Shared library suffix (normally ".so"). -shrext='$shrext' +shrext_cmds='$shrext_cmds' # Executable file suffix (normally ""). exeext="$exeext" @@ -10036,7 +10301,7 @@ # Does compiler simultaneously support -c and -o options? compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) -# Must we lock files when doing compilation ? +# Must we lock files when doing compilation? need_locks=$lt_need_locks # Do we need the lib prefix for modules? @@ -10265,7 +10530,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. - test -f Makefile && make "$ltmain" + ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` + if test -f "$ltmain_in"; then + test -f Makefile && make "$ltmain" + fi fi ])# AC_LIBTOOL_CONFIG @@ -10307,9 +10575,6 @@ # 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 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" @@ -10331,14 +10596,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'" ;; +linux* | k*bsd*-gnu) + if test "$host_cpu" = ia64; then + symcode='[[ABCDGIRSTW]]' + 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'" + fi + ;; irix* | nonstopux*) symcode='[[BCDEGRST]]' ;; osf*) symcode='[[BCDEGQRST]]' ;; -solaris* | sysv5*) - symcode='[[BDT]]' +solaris*) + symcode='[[BDRT]]' + ;; +sco3.2v5*) + symcode='[[DT]]' + ;; +sysv4.2uw2*) + symcode='[[DT]]' + ;; +sysv5* | sco5v6* | unixware* | OpenUNIX*) + symcode='[[ABDT]]' ;; sysv4) symcode='[[DFNSTU]]' @@ -10356,14 +10637,17 @@ # If we're using GNU nm, then use its standard symbol codes. case `$NM -V 2>&1` in *GNU* | *'with BFD'*) - symcode='[[ABCDGISTW]]' ;; + symcode='[[ABCDGIRSTW]]' ;; esac # Try without a prefix undercore, then with it. for ac_symprfx in "" "_"; do + # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. + symxfrm="\\1 $ac_symprfx\\2 \\2" + # Write the raw and C identifiers. - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'" + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" # Check to see that the pipe works correctly. pipe_works=no @@ -10519,6 +10803,10 @@ # DJGPP does not support shared libraries at all _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ;; + interix3*) + # 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 @@ -10527,7 +10815,7 @@ hpux*) # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. - case "$host_cpu" in + case $host_cpu in hppa*64*|ia64*) ;; *) @@ -10552,18 +10840,28 @@ ;; chorus*) case $cc_basename in - cxch68) + cxch68*) # Green Hills C++ Compiler # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--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 ;; + darwin*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + case $cc_basename in + xlc*) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + ;; + esac + ;; dgux*) case $cc_basename in - ec++) + ec++*) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ;; - ghcx) + ghcx*) # Green Hills C++ Compiler _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ;; @@ -10571,22 +10869,22 @@ ;; esac ;; - freebsd* | kfreebsd*-gnu) + freebsd* | dragonfly*) # FreeBSD uses GNU C++ ;; hpux9* | hpux10* | hpux11*) case $cc_basename in - CC) + CC*) _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' if test "$host_cpu" != ia64; then _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' fi ;; - aCC) + aCC*) _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" - case "$host_cpu" in + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + case $host_cpu in hppa*64*|ia64*) # +Z the default ;; @@ -10599,9 +10897,13 @@ ;; esac ;; + interix*) + # This is c89, which is MS Visual C++ (no shared libs) + # Anyone wants to do a port? + ;; irix5* | irix6* | nonstopux*) case $cc_basename in - CC) + CC*) _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. @@ -10610,20 +10912,26 @@ ;; esac ;; - linux*) + linux* | k*bsd*-gnu) case $cc_basename in - KCC) + KCC*) # KAI C++ Compiler _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; - icpc) + icpc* | ecpc*) # Intel C++ _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)='-static' - ;; - cxx) + ;; + pgCC*) + # Portland Group C++ compiler. + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + cxx*) # Compaq C++ # Make sure the PIC flag is empty. It appears that all Alpha # Linux and Compaq Tru64 Unix objects are PIC. @@ -10640,25 +10948,25 @@ ;; mvs*) case $cc_basename in - cxx) + cxx*) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' ;; *) ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) ;; osf3* | osf4* | osf5*) case $cc_basename in - KCC) + KCC*) _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' ;; - RCC) + RCC*) # Rational C++ 2.4.1 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ;; - cxx) + cxx*) # Digital/Compaq C++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' # Make sure the PIC flag is empty. It appears that all Alpha @@ -10672,24 +10980,15 @@ ;; psos*) ;; - sco*) - case $cc_basename in - CC) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - *) - ;; - esac - ;; solaris*) case $cc_basename in - CC) + CC*) # Sun C++ 4.2, 5.x and Centerline C++ _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 ' ;; - gcx) + gcx*) # Green Hills C++ Compiler _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' ;; @@ -10699,12 +10998,12 @@ ;; sunos4*) case $cc_basename in - CC) + CC*) # Sun C++ 4.x _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ;; - lcc) + lcc*) # Lucid _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ;; @@ -10714,7 +11013,7 @@ ;; tandem*) case $cc_basename in - NCC) + NCC*) # NonStop-UX NCC 3.20 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ;; @@ -10722,7 +11021,14 @@ ;; esac ;; - unixware*) + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + case $cc_basename in + CC*) + _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' + ;; + esac ;; vxworks*) ;; @@ -10769,6 +11075,11 @@ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' ;; + interix3*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + msdosdjgpp*) # Just because we use GCC doesn't mean we suddenly get shared libraries # on systems that don't support them. @@ -10785,7 +11096,7 @@ hpux*) # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. - case "$host_cpu" in + case $host_cpu in hppa*64*|ia64*) # +Z the default ;; @@ -10811,6 +11122,16 @@ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' fi ;; + darwin*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + case $cc_basename in + xlc*) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + ;; + esac + ;; mingw* | pw32* | os2*) # This hack is so that the source file can tell whether it is being @@ -10822,7 +11143,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. - case "$host_cpu" in + case $host_cpu in hppa*64*|ia64*) # +Z the default ;; @@ -10845,13 +11166,20 @@ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ;; - linux*) - case $CC in + linux* | k*bsd*-gnu) + case $cc_basename in icc* | ecc*) _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)='-static' ;; + pgcc* | pgf77* | pgf90* | pgf95*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; ccc*) _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' # All Alpha code is PIC. @@ -10866,15 +11194,15 @@ _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' - ;; - solaris*) - _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' + case $cc_basename in + f77* | f90* | f95*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; + *) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; + esac ;; sunos4*) @@ -10883,7 +11211,7 @@ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ;; - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + sysv4 | sysv4.2uw2* | sysv4.3*) _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' @@ -10896,6 +11224,17 @@ fi ;; + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + _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' + ;; + + unicos*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; + uts4*) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' @@ -10923,7 +11262,7 @@ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) fi -case "$host_os" in +case $host_os in # For platforms which do not support PIC, -DPIC is meaningless: *djgpp*) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= @@ -10932,6 +11271,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 + +# +# Check to make sure the static flag actually works. +# +wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" +AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], + _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), + $lt_tmp_static_flag, + [], + [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) ]) @@ -10956,7 +11305,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' + ;; + 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' @@ -10982,7 +11334,7 @@ _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown _LT_AC_TAGVAR(hardcode_automatic, $1)=no _LT_AC_TAGVAR(module_cmds, $1)= - _LT_AC_TAGVAR(module_expsym_cmds, $1)= + _LT_AC_TAGVAR(module_expsym_cmds, $1)= _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* @@ -10999,7 +11351,8 @@ # rely on this symbol name, it's probably fine to never include it in # preloaded symbol tables. extract_expsyms_cmds= - + # Just being paranoid about ensuring that cc_basename is set. + _LT_CC_BASENAME([$compiler]) case $host_os in cygwin* | mingw* | pw32*) # FIXME: the MSVC++ port hasn't been tested in a loooong time @@ -11009,6 +11362,10 @@ with_gnu_ld=no fi ;; + interix*) + # we just hope/assume this is gcc and not c89 (= MSVC++) + with_gnu_ld=yes + ;; openbsd*) with_gnu_ld=no ;; @@ -11019,6 +11376,27 @@ # If archive_cmds runs LD, not CC, wlarc should be empty wlarc='${wl}' + # Set some defaults for GNU ld with shared library support. These + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + runpath_var=LD_RUN_PATH + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= + fi + supports_anon_versioning=no + case `$LD -v 2>/dev/null` in + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + # See if GNU ld supports shared libraries. case $host_os in aix3* | aix4* | aix5*) @@ -11056,7 +11434,7 @@ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' else _LT_AC_TAGVAR(ld_shlibs, $1)=no fi @@ -11066,13 +11444,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' - _LT_AC_TAGVAR(allow_undefined_flag, $1)=no + _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_AC_TAGVAR(always_export_symbols, $1)=no _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _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' 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' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' # 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 @@ -11081,23 +11459,70 @@ 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 - ld_shlibs=no + _LT_AC_TAGVAR(ld_shlibs, $1)=no fi ;; - netbsd*) + interix3*) + _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' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _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) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_addflag= + case $cc_basename,$host_cpu in + pgcc*) # Portland Group C compiler + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag' + ;; + pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag -Mnomain' ;; + ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; + efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 + tmp_addflag=' -i_dynamic -nofor_main' ;; + 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' + + 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' + fi + _LT_AC_TAGVAR(link_all_deplibs, $1)=no + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + 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' wlarc= else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' fi ;; - solaris* | sysv5*) + solaris*) if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then _LT_AC_TAGVAR(ld_shlibs, $1)=no cat <&2 @@ -11111,13 +11536,40 @@ EOF elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else _LT_AC_TAGVAR(ld_shlibs, $1)=no fi ;; + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) + _LT_AC_TAGVAR(ld_shlibs, $1)=no + cat <<_LT_EOF 1>&2 + +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** reliably create shared libraries on SCO systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +_LT_EOF + ;; + *) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + sunos4*) _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' wlarc= @@ -11127,24 +11579,19 @@ *) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else _LT_AC_TAGVAR(ld_shlibs, $1)=no fi ;; esac - if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then - runpath_var=LD_RUN_PATH - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= - fi + if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then + runpath_var= + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= fi else # PORTME fill in a description of your system's linker (not GNU ld) @@ -11156,7 +11603,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 - if test "$GCC" = yes && test -z "$link_static_flag"; then + if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported @@ -11178,9 +11625,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 + aix_use_runtimelinking=no + + # 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. + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes + break + fi + done + ;; + esac - # KDE requires run time linking. Make it the default. - aix_use_runtimelinking=yes exp_sym_flag='-bexport' no_entry_flag='-bnoentry' fi @@ -11197,7 +11656,7 @@ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes if test "$GCC" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) + 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` @@ -11216,8 +11675,12 @@ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= fi + ;; esac shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi else # not using gcc if test "$host_cpu" = ia64; then @@ -11225,30 +11688,30 @@ # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='-qmkshrobj ${wl}-G' + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' else - shared_flag='-qmkshrobj' - fi + shared_flag='${wl}-bM:SRE' + fi fi fi - # Let the compiler handle the export list. - _LT_AC_TAGVAR(always_export_symbols, $1)=no + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + _LT_AC_TAGVAR(always_export_symbols, $1)=yes 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. _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' # Determine the default libpath from the value encoded in an empty executable. - _LT_AC_SYS_LIBPATH_AIX - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_AC_SYS_LIBPATH_AIX + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an empty executable. _LT_AC_SYS_LIBPATH_AIX @@ -11257,13 +11720,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' - # -bexpall does not export symbols beginning with underscore (_) - _LT_AC_TAGVAR(always_export_symbols, $1)=yes # Exported symbols can be pulled into shared objects from archives - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' ' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds it's shared libraries. - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + # This is similar to how AIX traditionally builds its shared libraries. + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' fi fi ;; @@ -11276,7 +11737,7 @@ _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; - bsdi4*) + bsdi[[45]]*) _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic ;; @@ -11286,69 +11747,69 @@ # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' - _LT_AC_TAGVAR(allow_undefined_flag, $1)=no + _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext=".dll" + shrext_cmds=".dll" # FIXME: Setting linknames here is a bad hack. - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' + _LT_AC_TAGVAR(archive_cmds, $1)='$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. _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' - fix_srcfile_path='`cygpath -w "$srcfile"`' + _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ;; darwin* | rhapsody*) - if test "$GXX" = yes ; then - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - case "$host_os" in - rhapsody* | darwin1.[[012]]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress' - ;; - *) # Darwin 1.3 on - 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]]) + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' + ;; + *) # Darwin 1.3 on + 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 - output_verbose_link_cmd='echo' - if $CC -dumpspecs 2>&1 | grep '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 $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring' - fi - _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's - 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 $compiler_flags $libobjs $deplibs -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 ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -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 $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no _LT_AC_TAGVAR(hardcode_direct, $1)=no _LT_AC_TAGVAR(hardcode_automatic, $1)=yes _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi + if test "$GCC" = yes ; then + output_verbose_link_cmd='echo' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $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 -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $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}' + else + 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(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(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*) @@ -11381,8 +11842,8 @@ ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - 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 @@ -11390,7 +11851,7 @@ hpux9*) if test "$GCC" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' 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 @@ -11404,47 +11865,62 @@ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ;; - hpux10* | hpux11*) + hpux10*) if test "$GCC" = yes -a "$with_gnu_ld" = no; then - case "$host_cpu" in - hppa*64*|ia64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi + if test "$with_gnu_ld" = no; then + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes + fi + ;; + + hpux11*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + case $host_cpu in + hppa*64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else - case "$host_cpu" in - hppa*64*|ia64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' + case $host_cpu in + hppa*64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac fi 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, $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)=: _LT_AC_TAGVAR(hardcode_direct, $1)=no _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ;; - ia64*) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - ;; *) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: _LT_AC_TAGVAR(hardcode_direct, $1)=yes _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' @@ -11458,7 +11934,7 @@ irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' 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' @@ -11468,7 +11944,7 @@ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) 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 @@ -11491,7 +11967,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 - _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' else @@ -11501,7 +11978,7 @@ _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 @@ -11512,14 +11989,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 - _LT_AC_TAGVAR(archive_cmds, $1)='$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 $compiler_flags $libobjs $deplibs$output_objdir/$libname.def' + _LT_AC_TAGVAR(archive_cmds, $1)='$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' _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ;; osf3*) if test "$GCC" = yes; then _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$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}${output_objdir}/so_locations -o $lib' 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' @@ -11531,13 +12008,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}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$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}${output_objdir}/so_locations -o $lib' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' 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 -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ - $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' + $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' # Both c and cxx compiler support -rpath directly _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' @@ -11545,21 +12022,15 @@ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ;; - sco3.2v5*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - ;; - solaris*) _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' if test "$GCC" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' + wlarc='${wl}' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_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~ - $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp' + $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' else + wlarc='' _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' @@ -11568,8 +12039,18 @@ _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. + # 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 ;; esac _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ;; @@ -11578,7 +12059,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. - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' else _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' fi @@ -11626,36 +12107,45 @@ fi ;; - sysv4.2uw2*) - _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*) + _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 - hardcode_runpath_var=yes - runpath_var=LD_RUN_PATH - ;; + runpath_var='LD_RUN_PATH' - sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*) - _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text' if test "$GCC" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi - runpath_var='LD_RUN_PATH' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ;; - sysv5*) - _LT_AC_TAGVAR(no_undefined_flag, $1)=' -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 - _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' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + _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(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)=':' + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + fi ;; uts4*) @@ -11673,11 +12163,6 @@ AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - # # Do we need to explicitly link libc? # @@ -11698,13 +12183,14 @@ AC_MSG_CHECKING([whether -lc should be explicitly linked in]) $rm conftest* printf "$lt_simple_compile_test_code" > conftest.$ac_ext - + if AC_TRY_EVAL(ac_compile) 2>conftest.err; then soname=conftest lib=conftest libobjs=conftest.$ac_objext deplibs= wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) + pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) compiler_flags=-v linker_flags=-v verstring= @@ -11832,7 +12318,7 @@ # Add /usr/xpg4/bin/sed as it is typically found on Solaris # along with /bin/sed that truncates output. for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && break + test ! -f $lt_ac_sed && continue cat /dev/null > conftest.in lt_ac_count=0 echo $ECHO_N "0123456789$ECHO_C" >conftest.in --- kdeutils-3.5.8.orig/aclocal.m4 +++ kdeutils-3.5.8/aclocal.m4 @@ -537,6 +537,35 @@ rmdir .tst 2>/dev/null AC_SUBST([am__leading_dot])]) +# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- +# From Jim Meyering + +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 4 + +AC_DEFUN([AM_MAINTAINER_MODE], +[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) + dnl maintainer-mode is disabled by default + AC_ARG_ENABLE(maintainer-mode, +[ --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer], + USE_MAINTAINER_MODE=$enableval, + USE_MAINTAINER_MODE=no) + AC_MSG_RESULT([$USE_MAINTAINER_MODE]) + AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) + MAINT=$MAINTAINER_MODE_TRUE + AC_SUBST(MAINT)dnl +] +) + +AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) + # Check to see how 'make' treats includes. -*- Autoconf -*- # Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. --- kdeutils-3.5.8.orig/kwallet/icons/Makefile.in +++ kdeutils-3.5.8/kwallet/icons/Makefile.in @@ -172,6 +172,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -318,7 +319,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -356,9 +357,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/kwallet/konfigurator/Makefile.in +++ kdeutils-3.5.8/kwallet/konfigurator/Makefile.in @@ -228,6 +228,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -382,7 +383,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -420,9 +421,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdeutils-3.5.8.orig/kwallet/Makefile.in +++ kdeutils-3.5.8/kwallet/Makefile.in @@ -254,6 +254,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -420,7 +421,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -458,9 +459,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) --- kdeutils-3.5.8.orig/kdf/pics/Makefile.in +++ kdeutils-3.5.8/kdf/pics/Makefile.in @@ -182,6 +182,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -328,7 +329,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -366,9 +367,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/kdf/Makefile.in +++ kdeutils-3.5.8/kdf/Makefile.in @@ -286,6 +286,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -453,7 +454,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -491,9 +492,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdeutils-3.5.8.orig/configure +++ kdeutils-3.5.8/configure @@ -586,15 +586,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 +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH if test -z "$ECHO"; then 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`" && + 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 @@ -839,6 +839,9 @@ AMTAR am__tar am__untar +MAINTAINER_MODE_TRUE +MAINTAINER_MODE_FALSE +MAINT KDECONFIG kde_libs_prefix kde_libs_htmldir @@ -1683,6 +1686,8 @@ Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer --disable-fast-perl disable fast Makefile generation (needs perl) --enable-debug=ARG enables debug symbols (yes|no|full) default=no --disable-debug disables debug output and debug symbols default=no @@ -2822,6 +2827,29 @@ +{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; } + # Check whether --enable-maintainer-mode was given. +if test "${enable_maintainer_mode+set}" = set; then + enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval +else + USE_MAINTAINER_MODE=no +fi + + { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 +echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; } + if test $USE_MAINTAINER_MODE = yes; then + MAINTAINER_MODE_TRUE= + MAINTAINER_MODE_FALSE='#' +else + MAINTAINER_MODE_TRUE='#' + MAINTAINER_MODE_FALSE= +fi + + MAINT=$MAINTAINER_MODE_TRUE + + + unset CDPATH @@ -7494,179 +7522,6 @@ KDE_USE_CLOSURE_TRUE="#" KDE_USE_CLOSURE_FALSE="" KDE_NO_UNDEFINED="" - case $host in - *-*-linux-gnu) - -{ echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--no-undefined" >&5 -echo $ECHO_N "checking whether $CXX supports -Wl,--no-undefined... $ECHO_C" >&6; } -kde_cache=`echo Wl,--no-undefined | sed 'y% .=/+-,%____p__%'` -if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - - - save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -Wl,--no-undefined" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "kde_cv_prog_cxx_$kde_cache=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - CXXFLAGS="$save_CXXFLAGS" - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -fi - -if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - : - -{ echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--allow-shlib-undefined" >&5 -echo $ECHO_N "checking whether $CXX supports -Wl,--allow-shlib-undefined... $ECHO_C" >&6; } -kde_cache=`echo Wl,--allow-shlib-undefined | sed 'y% .=/+-,%____p__%'` -if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - - - save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -Wl,--allow-shlib-undefined" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "kde_cv_prog_cxx_$kde_cache=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - CXXFLAGS="$save_CXXFLAGS" - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -fi - -if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - : - KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined" -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - : - KDE_NO_UNDEFINED="" -fi - -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - : - KDE_NO_UNDEFINED="" -fi - - ;; - esac fi @@ -7842,7 +7697,7 @@ # Add /usr/xpg4/bin/sed as it is typically found on Solaris # along with /bin/sed that truncates output. for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && break + test ! -f $lt_ac_sed && continue cat /dev/null > conftest.in lt_ac_count=0 echo $ECHO_N "0123456789$ECHO_C" >conftest.in @@ -8094,7 +7949,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, - # but apparently some GNU ld's only accept -v. + # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 &6 else - # I'd rather use --version here, but apparently some GNU ld's only accept -v. + # I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 &5 echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; } @@ -8168,36 +8032,43 @@ # Let the user override the test. lt_cv_path_NM="$NM" else - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/${ac_tool_prefix}nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) - lt_cv_path_NM="$tmp_nm -B" - break - ;; - *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in - */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 + lt_nm_to_check="$lt_nm_to_check nm" + fi + for lt_tmp_nm in $lt_nm_to_check; do + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + tmp_nm="$ac_dir/$lt_tmp_nm" + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + # Check to see if the nm accepts a BSD-compat flag. + # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # nm: unknown option "B" ignored + # Tru64's nm complains that /dev/null is an invalid object file + case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in + */dev/null* | *'Invalid file or object type'*) + lt_cv_path_NM="$tmp_nm -B" break ;; *) - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + */dev/null*) + lt_cv_path_NM="$tmp_nm -p" + break + ;; + *) + lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but + continue # so that we can try to find one that supports BSD flags + ;; + esac ;; esac - esac - fi + fi + done + IFS="$lt_save_ifs" done - IFS="$lt_save_ifs" test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm fi fi @@ -8244,44 +8115,36 @@ lt_cv_deplibs_check_method=pass_all ;; -bsdi4*) +bsdi[45]*) lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' lt_cv_file_magic_cmd='/usr/bin/file -L' lt_cv_file_magic_test_file=/shlib/libc.so ;; cygwin*) - lt_cv_deplibs_check_method=pass_all + # func_win32_libid is a shell function defined in ltmain.sh + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' ;; mingw* | pw32*) - # win32_libid is a shell function defined in ltmain.sh - 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' ;; darwin* | rhapsody*) - # this will be overwritten by pass_all, but leave it in just in case - lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library' - lt_cv_file_magic_cmd='/usr/bin/file -L' - case "$host_os" in - rhapsody* | darwin1.[012]) - lt_cv_file_magic_test_file=`/System/Library/Frameworks/System.framework/System` - ;; - *) # Darwin 1.3 on - lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib' - ;; - esac lt_cv_deplibs_check_method=pass_all ;; -freebsd* | kfreebsd*-gnu) +freebsd* | dragonfly*) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then case $host_cpu in i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library' + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; @@ -8297,7 +8160,7 @@ hpux10.20* | hpux11*) lt_cv_file_magic_cmd=/usr/bin/file - case "$host_cpu" in + case $host_cpu in 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 @@ -8313,43 +8176,27 @@ esac ;; +interix3*) + # 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)$' + ;; + irix5* | irix6* | nonstopux*) - case $host_os in - irix5* | nonstopux*) - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" - ;; - *) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; - *-n32|*"-n32 ") libmagic=N32;; - *-64|*"-64 ") libmagic=64-bit;; - *) libmagic=never-match;; - esac - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1" - ;; + case $LD in + *-32|*"-32 ") libmagic=32-bit;; + *-n32|*"-n32 ") libmagic=N32;; + *-64|*"-64 ") libmagic=64-bit;; + *) libmagic=never-match;; esac - lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*` lt_cv_deplibs_check_method=pass_all ;; # This must be Linux ELF. -linux*) - case $host_cpu in - alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390* | sh* | x86_64* ) - lt_cv_deplibs_check_method=pass_all ;; - # the debian people say, arm and glibc 2.3.1 works for them with pass_all - arm* ) - lt_cv_deplibs_check_method=pass_all ;; - *) - # glibc up to 2.1.1 does not perform some relocations on ARM - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;; - esac - lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` +linux* | k*bsd*-gnu) + lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) 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 @@ -8368,32 +8215,22 @@ ;; openbsd*) - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object' + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' else - lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' fi ;; osf3* | osf4* | osf5*) - # 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 - ;; - -sco3.2v5*) lt_cv_deplibs_check_method=pass_all ;; solaris*) lt_cv_deplibs_check_method=pass_all - lt_cv_file_magic_test_file=/lib/libc.so ;; -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) +sysv4 | sysv4.3*) 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]' @@ -8414,10 +8251,13 @@ siemens) lt_cv_deplibs_check_method=pass_all ;; + pc) + lt_cv_deplibs_check_method=pass_all + ;; esac ;; -sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7* | sysv4*uw2*) +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) lt_cv_deplibs_check_method=pass_all ;; esac @@ -8433,6 +8273,9 @@ # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + # Allow CC to be a program name with arguments. compiler=$CC @@ -8467,7 +8310,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 8470 "configure"' > conftest.$ac_ext + echo '#line 8313 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8510,14 +8353,13 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - case "`/usr/bin/file conftest.o`" in + case `/usr/bin/file conftest.o` in *32-bit*) - LINUX_64_MODE="32" case $host in x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; - ppc64-*linux*) + ppc64-*linux*|powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -8529,7 +8371,6 @@ esac ;; *64-bit*) - LINUX_64_MODE="64" case $host in x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" @@ -8622,6 +8463,26 @@ CFLAGS="$SAVE_CFLAGS" fi ;; +sparc*-*solaris*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) LD="${LD-ld} -m elf64_sparc" ;; + *) LD="${LD-ld} -64" ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; + esac @@ -9012,6 +8873,239 @@ done + + +if test -n "$CXX" && ( test "X$CXX" != "Xno" && + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + (test "X$CXX" != "Xg++"))) ; then + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 +echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; } +if test -z "$CXXCPP"; then + if test "${ac_cv_prog_CXXCPP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # Double quotes because CXXCPP needs to be expanded + for CXXCPP in "$CXX -E" "/lib/cpp" + do + ac_preproc_ok=false +for ac_cxx_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Broken: fails on valid input. +continue +fi + +rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then + # Broken: success on invalid input. +continue +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Passes both tests. +ac_preproc_ok=: +break +fi + +rm -f conftest.err conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + break +fi + + done + ac_cv_prog_CXXCPP=$CXXCPP + +fi + CXXCPP=$ac_cv_prog_CXXCPP +else + ac_cv_prog_CXXCPP=$CXXCPP +fi +{ echo "$as_me:$LINENO: result: $CXXCPP" >&5 +echo "${ECHO_T}$CXXCPP" >&6; } +ac_preproc_ok=false +for ac_cxx_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Broken: fails on valid input. +continue +fi + +rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then + # Broken: success on invalid input. +continue +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Passes both tests. +ac_preproc_ok=: +break +fi + +rm -f conftest.err conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + : +else + { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check +See \`config.log' for more details." >&5 +echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +fi + +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +fi + ac_ext=f ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -9283,7 +9377,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else i=0 - testring="ABCD" + teststring="ABCD" case $build_os in msdosdjgpp*) @@ -9312,20 +9406,70 @@ lt_cv_sys_max_cmd_len=8192; ;; - *) + amigaos*) + # On AmigaOS with pdksh, this test takes hours, literally. + # So we just punt and use a minimum line length of 8192. + lt_cv_sys_max_cmd_len=8192; + ;; + + netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + # This has been around since 386BSD, at least. Likely further. + if test -x /sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` + elif test -x /usr/sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` + else + lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs + fi + # And add a safety zone + 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` + ;; + + interix*) + # We know the value 262144 and hardcode it with a safety zone (like BSD) + lt_cv_sys_max_cmd_len=196608 + ;; + + osf*) + # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure + # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not + # nice to cause kernel panics so lets avoid the loop below. + # First set a reasonable default. + lt_cv_sys_max_cmd_len=16384 + # + if test -x /sbin/sysconfig; then + case `/sbin/sysconfig -q proc exec_disable_arg_limit` in + *1*) lt_cv_sys_max_cmd_len=-1 ;; + esac + fi + ;; + sco3.2v5*) + lt_cv_sys_max_cmd_len=102400 + ;; + sysv5* | sco5v6* | sysv4.2uw2*) + kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` + if test -n "$kargmax"; then + lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` + else + lt_cv_sys_max_cmd_len=32768 + 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` \ + = "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. @@ -9362,9 +9506,6 @@ # 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 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" @@ -9386,14 +9527,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'" ;; +linux* | k*bsd*-gnu) + if test "$host_cpu" = ia64; then + symcode='[ABCDGIRSTW]' + 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'" + fi + ;; irix* | nonstopux*) symcode='[BCDEGRST]' ;; osf*) symcode='[BCDEGQRST]' ;; -solaris* | sysv5*) - symcode='[BDT]' +solaris*) + symcode='[BDRT]' + ;; +sco3.2v5*) + symcode='[DT]' + ;; +sysv4.2uw2*) + symcode='[DT]' + ;; +sysv5* | sco5v6* | unixware* | OpenUNIX*) + symcode='[ABDT]' ;; sysv4) symcode='[DFNSTU]' @@ -9411,14 +9568,17 @@ # If we're using GNU nm, then use its standard symbol codes. case `$NM -V 2>&1` in *GNU* | *'with BFD'*) - symcode='[ABCDGISTW]' ;; + symcode='[ABCDGIRSTW]' ;; esac # Try without a prefix undercore, then with it. for ac_symprfx in "" "_"; do + # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. + symxfrm="\\1 $ac_symprfx\\2 \\2" + # Write the raw and C identifiers. - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'" + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" # Check to see that the pipe works correctly. pipe_works=no @@ -9580,7 +9740,7 @@ # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. -Xsed='sed -e s/^X//' +Xsed='sed -e 1s/^X//' sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g' # Same as above, but do not quote variable references. @@ -9600,7 +9760,7 @@ default_ofile=libtool can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except M$VC, +# All known linkers require a `.a' archive for static linking (except MSVC, # which needs '.lib'). libext=a ltmain="$ac_aux_dir/ltmain.sh" @@ -9905,6 +10065,7 @@ test -z "$AS" && AS=as test -z "$CC" && CC=cc test -z "$LTCC" && LTCC=$CC +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS test -z "$DLLTOOL" && DLLTOOL=dlltool test -z "$LD" && LD=ld test -z "$LN_S" && LN_S="ln -s" @@ -9924,15 +10085,26 @@ if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ;; *) - old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ;; esac old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" fi +for cc_temp in $compiler""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` + + # Only perform the check for file, if the check method requires it case $deplibs_check_method in file_magic*) @@ -9958,7 +10130,7 @@ if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) - file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then @@ -10020,7 +10192,7 @@ if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) - file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then @@ -10115,68 +10287,25 @@ # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + # Allow CC to be a program name with arguments. compiler=$CC -# -# Check for any special shared library compilation flags. -# -lt_prog_cc_shlib= -if test "$GCC" = no; then - case $host_os in - sco3.2v5*) - lt_prog_cc_shlib='-belf' - ;; - esac -fi -if test -n "$lt_prog_cc_shlib"; then - { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&5 -echo "$as_me: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&2;} - if echo "$old_CC $old_CFLAGS " | grep "[ ]$lt_prog_cc_shlib[ ]" >/dev/null; then : - else - { echo "$as_me:$LINENO: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5 -echo "$as_me: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;} - lt_cv_prog_cc_can_build_shared=no - fi -fi - - -# -# Check to make sure the static flag actually works. -# -{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_prog_compiler_static works" >&5 -echo $ECHO_N "checking if $compiler static flag $lt_prog_compiler_static works... $ECHO_C" >&6; } -if test "${lt_prog_compiler_static_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_prog_compiler_static_works=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_prog_compiler_static" - printf "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # 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 - # Append any errors to the config.log. - cat conftest.err 1>&5 - else - lt_prog_compiler_static_works=yes - fi - fi - $rm conftest* - LDFLAGS="$save_LDFLAGS" - -fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; } - -if test x"$lt_prog_compiler_static_works" = xyes; then - : -else - lt_prog_compiler_static= -fi - +# save warnings/boilerplate of simple test code +ac_outfile=conftest.$ac_objext +printf "$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* + +ac_outfile=conftest.$ac_objext +printf "$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* ## CAVEAT EMPTOR: @@ -10205,18 +10334,20 @@ # with a dollar sign (not a hyphen), so the echo should work correctly. # The option is referenced via a variable to avoid confusing sed. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10211: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10340: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10215: \$? = $ac_status" >&5 + echo "$as_me:10344: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - if test ! -s conftest.err; then + # So say no if there are warnings other than the usual output. + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then lt_cv_prog_compiler_rtti_exceptions=yes fi fi @@ -10277,6 +10408,11 @@ lt_prog_compiler_pic='-fno-common' ;; + interix3*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + msdosdjgpp*) # Just because we use GCC doesn't mean we suddenly get shared libraries # on systems that don't support them. @@ -10293,7 +10429,7 @@ hpux*) # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. - case "$host_cpu" in + case $host_cpu in hppa*64*|ia64*) # +Z the default ;; @@ -10319,6 +10455,16 @@ lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' fi ;; + darwin*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + case $cc_basename in + xlc*) + lt_prog_compiler_pic='-qnocommon' + lt_prog_compiler_wl='-Wl,' + ;; + esac + ;; mingw* | pw32* | os2*) # This hack is so that the source file can tell whether it is being @@ -10330,7 +10476,7 @@ lt_prog_compiler_wl='-Wl,' # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. - case "$host_cpu" in + case $host_cpu in hppa*64*|ia64*) # +Z the default ;; @@ -10353,13 +10499,20 @@ lt_prog_compiler_static='-Bstatic' ;; - linux*) - case $CC in + linux* | k*bsd*-gnu) + case $cc_basename in icc* | ecc*) lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-static' ;; + pgcc* | pgf77* | pgf90* | pgf95*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fpic' + lt_prog_compiler_static='-Bstatic' + ;; ccc*) lt_prog_compiler_wl='-Wl,' # All Alpha code is PIC. @@ -10374,15 +10527,15 @@ lt_prog_compiler_static='-non_shared' ;; - sco3.2v5*) - lt_prog_compiler_pic='-Kpic' - lt_prog_compiler_static='-dn' - ;; - solaris*) - lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' + case $cc_basename in + f77* | f90* | f95*) + lt_prog_compiler_wl='-Qoption ld ';; + *) + lt_prog_compiler_wl='-Wl,';; + esac ;; sunos4*) @@ -10391,7 +10544,7 @@ lt_prog_compiler_static='-Bstatic' ;; - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + sysv4 | sysv4.2uw2* | sysv4.3*) lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' @@ -10404,6 +10557,17 @@ fi ;; + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + ;; + + unicos*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_can_build_shared=no + ;; + uts4*) lt_prog_compiler_pic='-pic' lt_prog_compiler_static='-Bstatic' @@ -10438,18 +10602,20 @@ # with a dollar sign (not a hyphen), so the echo should work correctly. # The option is referenced via a variable to avoid confusing sed. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10444: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10608: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10448: \$? = $ac_status" >&5 + echo "$as_me:10612: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - if test ! -s conftest.err; then + # So say no if there are warnings other than the usual output. + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then lt_prog_compiler_pic_works=yes fi fi @@ -10470,7 +10636,7 @@ fi fi -case "$host_os" in +case $host_os in # For platforms which do not support PIC, -DPIC is meaningless: *djgpp*) lt_prog_compiler_pic= @@ -10480,6 +10646,48 @@ ;; esac +# +# Check to make sure the static flag actually works. +# +wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } +if test "${lt_prog_compiler_static_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_prog_compiler_static_works=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + printf "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_prog_compiler_static_works=yes + fi + else + lt_prog_compiler_static_works=yes + fi + fi + $rm conftest* + LDFLAGS="$save_LDFLAGS" + +fi +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 +echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; } + +if test x"$lt_prog_compiler_static_works" = xyes; then + : +else + lt_prog_compiler_static= +fi + + { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } if test "${lt_cv_prog_compiler_c_o+set}" = set; then @@ -10492,38 +10700,36 @@ mkdir out 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 . - 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. # Note that $ac_compile itself does not contain backslashes and begins # with a dollar sign (not a hyphen), so the echo should work correctly. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10511: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10712: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10515: \$? = $ac_status" >&5 + echo "$as_me:10716: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - if test ! -s out/conftest.err; then + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then lt_cv_prog_compiler_c_o=yes fi fi - chmod u+w . - $rm conftest* out/* - rmdir out + chmod u+w . 2>&5 + $rm conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files + $rm out/* && rmdir out cd .. rmdir conftest $rm conftest* @@ -10594,6 +10800,16 @@ # rely on this symbol name, it's probably fine to never include it in # preloaded symbol tables. extract_expsyms_cmds= + # Just being paranoid about ensuring that cc_basename is set. + for cc_temp in $compiler""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` case $host_os in cygwin* | mingw* | pw32*) @@ -10604,6 +10820,10 @@ with_gnu_ld=no fi ;; + interix*) + # we just hope/assume this is gcc and not c89 (= MSVC++) + with_gnu_ld=yes + ;; openbsd*) with_gnu_ld=no ;; @@ -10614,6 +10834,27 @@ # If archive_cmds runs LD, not CC, wlarc should be empty wlarc='${wl}' + # Set some defaults for GNU ld with shared library support. These + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + runpath_var=LD_RUN_PATH + hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' + export_dynamic_flag_spec='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then + whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + whole_archive_flag_spec= + fi + supports_anon_versioning=no + case `$LD -v 2>/dev/null` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + # See if GNU ld supports shared libraries. case $host_os in aix3* | aix4* | aix5*) @@ -10651,7 +10892,7 @@ allow_undefined_flag=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - archive_cmds='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' else ld_shlibs=no fi @@ -10661,13 +10902,13 @@ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' - allow_undefined_flag=no + allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is; otherwise, prepend... archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then @@ -10676,23 +10917,70 @@ 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 + ld_shlibs=no + fi + ;; + + interix3*) + hardcode_direct=no + hardcode_shlibpath_var=no + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + export_dynamic_flag_spec='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds='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) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_addflag= + case $cc_basename,$host_cpu in + pgcc*) # Portland Group C compiler + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag' + ;; + pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag -Mnomain' ;; + ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; + efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 + tmp_addflag=' -i_dynamic -nofor_main' ;; + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + esac + archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + + if test $supports_anon_versioning = yes; then + archive_expsym_cmds='$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' + fi + link_all_deplibs=no else ld_shlibs=no fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) 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 $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + 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*) + solaris*) if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then ld_shlibs=no cat <&2 @@ -10706,13 +10994,40 @@ EOF elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + 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 ;; + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) + ld_shlibs=no + cat <<_LT_EOF 1>&2 + +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** reliably create shared libraries on SCO systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +_LT_EOF + ;; + *) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' + else + ld_shlibs=no + fi + ;; + esac + ;; + sunos4*) archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' wlarc= @@ -10722,24 +11037,19 @@ *) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + 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' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec= - fi + if test "$ld_shlibs" = no; then + runpath_var= + hardcode_libdir_flag_spec= + export_dynamic_flag_spec= + whole_archive_flag_spec= fi else # PORTME fill in a description of your system's linker (not GNU ld) @@ -10751,7 +11061,7 @@ # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. hardcode_minus_L=yes - if test "$GCC" = yes && test -z "$link_static_flag"; then + if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. hardcode_direct=unsupported @@ -10773,9 +11083,21 @@ 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 + aix_use_runtimelinking=no + + # 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. + case $host_os in aix4.[23]|aix4.[23].*|aix5*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes + break + fi + done + ;; + esac - # KDE requires run time linking. Make it the default. - aix_use_runtimelinking=yes exp_sym_flag='-bexport' no_entry_flag='-bnoentry' fi @@ -10792,7 +11114,7 @@ link_all_deplibs=yes if test "$GCC" = yes; then - case $host_os in aix4.012|aix4.012.*) + 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` @@ -10811,8 +11133,12 @@ hardcode_libdir_flag_spec='-L$libdir' hardcode_libdir_separator= fi + ;; esac shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi else # not using gcc if test "$host_cpu" = ia64; then @@ -10820,22 +11146,23 @@ # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='-qmkshrobj ${wl}-G' + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' else - shared_flag='-qmkshrobj' - fi + shared_flag='${wl}-bM:SRE' + fi fi fi - # Let the compiler handle the export list. - always_export_symbols=no + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + always_export_symbols=yes 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. allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an empty executable. - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -10885,14 +11212,13 @@ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_cmds="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag" - archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" 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 $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF @@ -10950,13 +11276,11 @@ # -berok will link without error, but may produce a broken library. no_undefined_flag=' ${wl}-bernotok' 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=' ' + whole_archive_flag_spec='$convenience' archive_cmds_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 $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + # This is similar to how AIX traditionally builds its shared libraries. + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' fi fi ;; @@ -10969,7 +11293,7 @@ ld_shlibs=no ;; - bsdi4*) + bsdi[45]*) export_dynamic_flag_spec=-rdynamic ;; @@ -10979,13 +11303,13 @@ # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. hardcode_libdir_flag_spec=' ' - allow_undefined_flag=no + allow_undefined_flag=unsupported # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext=".dll" + shrext_cmds=".dll" # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' + 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. @@ -10995,52 +11319,52 @@ ;; darwin* | rhapsody*) - if test "$GXX" = yes ; then - archive_cmds_need_lc=no - case "$host_os" in - rhapsody* | darwin1.[012]) - allow_undefined_flag='-Wl,-undefined -Wl,suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.012) - allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' - ;; - 10.*) - allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup' - ;; - esac - fi - ;; + case $host_os in + rhapsody* | darwin1.[012]) + allow_undefined_flag='${wl}-undefined ${wl}suppress' + ;; + *) # Darwin 1.3 on + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[012]) + allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' + ;; + 10.*) + allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup' + ;; + esac + fi + ;; esac - lt_int_apple_cc_single_mod=no - output_verbose_link_cmd='echo' - if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then - lt_int_apple_cc_single_mod=yes - fi - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_cmds='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring' - else - archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring' - fi - module_cmds='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_cmds_need_lc=no hardcode_direct=no hardcode_automatic=yes hardcode_shlibpath_var=unsupported - whole_archive_flag_spec='-all_load $convenience' + whole_archive_flag_spec='' link_all_deplibs=yes + if test "$GCC" = yes ; then + output_verbose_link_cmd='echo' + archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + module_cmds='$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 + archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + module_expsym_cmds='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 - ld_shlibs=no + case $cc_basename in + xlc*) + output_verbose_link_cmd='echo' + archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + module_cmds='$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 + archive_expsym_cmds='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}' + module_expsym_cmds='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}' + ;; + *) + ld_shlibs=no + ;; + esac fi ;; @@ -11074,8 +11398,8 @@ ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | kfreebsd*-gnu) - archive_cmds='$CC -shared -o $lib $compiler_flags $libobjs $deplibs' + freebsd* | dragonfly*) + archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no @@ -11083,7 +11407,7 @@ hpux9*) if test "$GCC" = yes; then - archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' else archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi @@ -11097,47 +11421,62 @@ export_dynamic_flag_spec='${wl}-E' ;; - hpux10* | hpux11*) + hpux10*) if test "$GCC" = yes -a "$with_gnu_ld" = no; then - case "$host_cpu" in - hppa*64*|ia64*) - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' + archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + + hardcode_direct=yes + export_dynamic_flag_spec='${wl}-E' + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + fi + ;; + + hpux11*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + case $host_cpu in + hppa*64*) + archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs' + archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else - case "$host_cpu" in - hppa*64*|ia64*) - archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' + case $host_cpu in + hppa*64*) + archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac fi if test "$with_gnu_ld" = no; then - case "$host_cpu" in - hppa*64*) - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + + case $host_cpu in + hppa*64*|ia64*) hardcode_libdir_flag_spec_ld='+b $libdir' - hardcode_libdir_separator=: - hardcode_direct=no - hardcode_shlibpath_var=no - ;; - ia64*) - hardcode_libdir_flag_spec='-L$libdir' hardcode_direct=no hardcode_shlibpath_var=no - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes ;; *) - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: hardcode_direct=yes export_dynamic_flag_spec='${wl}-E' @@ -11151,7 +11490,7 @@ irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then - archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + 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}${output_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 ${output_objdir}/so_locations -o $lib' hardcode_libdir_flag_spec_ld='-rpath $libdir' @@ -11161,7 +11500,7 @@ link_all_deplibs=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -11184,7 +11523,8 @@ hardcode_direct=yes hardcode_shlibpath_var=no if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs' + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' hardcode_libdir_flag_spec='${wl}-rpath,$libdir' export_dynamic_flag_spec='${wl}-E' else @@ -11194,7 +11534,7 @@ hardcode_libdir_flag_spec='-R$libdir' ;; *) - archive_cmds='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs' + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ;; esac @@ -11205,14 +11545,14 @@ 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 $compiler_flags $libobjs $deplibs$output_objdir/$libname.def' + 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 "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + 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}${output_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 ${output_objdir}/so_locations -o $lib' @@ -11224,13 +11564,13 @@ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + 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}${output_objdir}/so_locations -o $lib' hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 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 ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$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' + $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' # Both c and cxx compiler support -rpath directly hardcode_libdir_flag_spec='-rpath $libdir' @@ -11238,21 +11578,15 @@ hardcode_libdir_separator=: ;; - sco3.2v5*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var=no - export_dynamic_flag_spec='${wl}-Bexport' - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - ;; - solaris*) no_undefined_flag=' -z text' if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' + wlarc='${wl}' + archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp' + $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' else + wlarc='' 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' @@ -11261,8 +11595,18 @@ 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' ;; + *) + # 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. + # Supported since Solaris 2.6 (maybe 2.5.1?) + case $wlarc in + '') + whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; + *) + whole_archive_flag_spec='${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 ;; esac link_all_deplibs=yes ;; @@ -11271,7 +11615,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. - archive_cmds='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs' + archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' fi @@ -11319,36 +11663,45 @@ fi ;; - sysv4.2uw2*) - archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes - hardcode_minus_L=no + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) + no_undefined_flag='${wl}-z,text' + archive_cmds_need_lc=no hardcode_shlibpath_var=no - hardcode_runpath_var=yes - runpath_var=LD_RUN_PATH - ;; + runpath_var='LD_RUN_PATH' - sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) - no_undefined_flag='${wl}-z ${wl}text' if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' + archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' + archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi - runpath_var='LD_RUN_PATH' - hardcode_shlibpath_var=no ;; - 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= + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + no_undefined_flag='${wl}-z,text' + allow_undefined_flag='${wl}-z,nodefs' + archive_cmds_need_lc=no hardcode_shlibpath_var=no + hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' + hardcode_libdir_separator=':' + link_all_deplibs=yes + export_dynamic_flag_spec='${wl}-Bexport' runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then + archive_cmds='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + fi ;; uts4*) @@ -11367,11 +11720,6 @@ echo "${ECHO_T}$ld_shlibs" >&6; } test "$ld_shlibs" = no && can_build_shared=no -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - # # Do we need to explicitly link libc? # @@ -11404,6 +11752,7 @@ libobjs=conftest.$ac_objext deplibs= wl=$lt_prog_compiler_wl + pic_flag=$lt_prog_compiler_pic compiler_flags=-v linker_flags=-v verstring= @@ -11439,7 +11788,7 @@ library_names_spec= libname_spec='lib$name' soname_spec= -shrext=".so" +shrext_cmds=".so" postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -11449,7 +11798,20 @@ 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" +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 + # 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'` + else + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi +else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +fi need_lib_prefix=unknown hardcode_into_libs=no @@ -11514,7 +11876,7 @@ 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' + 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*) @@ -11523,7 +11885,7 @@ shlibpath_var=LIBRARY_PATH ;; -bsdi4*) +bsdi[45]*) version_type=linux need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -11539,7 +11901,7 @@ cygwin* | mingw* | pw32*) version_type=windows - shrext=".dll" + shrext_cmds=".dll" need_version=no need_lib_prefix=no @@ -11551,7 +11913,8 @@ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname' + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname' postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ dlpath=$dir/\$dldll~ $rm \$dlpath' @@ -11581,7 +11944,7 @@ ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac ;; @@ -11604,7 +11967,7 @@ soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH - shrext='$(test .$module = .yes && echo .so || echo .dylib)' + 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"` @@ -11627,20 +11990,17 @@ dynamic_linker=no ;; -kfreebsd*-gnu*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - -freebsd*) - objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then + objformat=`/usr/bin/objformat` + else + case $host_os in + freebsd[123]*) objformat=aout ;; + *) objformat=elf ;; + esac + fi version_type=freebsd-$objformat case $version_type in freebsd-elf*) @@ -11658,14 +12018,19 @@ freebsd2*) shlibpath_overrides_runpath=yes ;; - freebsd3.01* | freebsdelf3.01*) + freebsd3.[01]* | freebsdelf3.[01]*) shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; - *) # from 3.2 on + freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ + freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; + freebsd*) # from 4.6 on + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; esac ;; @@ -11685,9 +12050,9 @@ version_type=sunos need_lib_prefix=no need_version=no - case "$host_cpu" in + case $host_cpu in ia64*) - shrext='.so' + shrext_cmds='.so' hardcode_into_libs=yes dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH @@ -11702,7 +12067,7 @@ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) - shrext='.sl' + shrext_cmds='.sl' hardcode_into_libs=yes dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH @@ -11713,7 +12078,7 @@ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; *) - shrext='.sl' + shrext_cmds='.sl' dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH @@ -11725,6 +12090,18 @@ postinstall_cmds='chmod 555 $lib' ;; +interix3*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; @@ -11768,29 +12145,26 @@ ;; # This must be Linux ELF. -linux*) +linux* | k*bsd*-gnu) version_type=linux need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - 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 -a ! -h /lib64; then - libsuff=64 - fi - fi shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" # 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 + # 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' ' '` + 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, @@ -11800,6 +12174,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -11809,7 +12195,7 @@ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' dynamic_linker='NetBSD ld.elf_so' fi @@ -11837,8 +12223,13 @@ openbsd*) version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no - need_version=no + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. + case $host_os in + openbsd3.3 | openbsd3.3.*) need_version=yes ;; + *) need_version=no ;; + esac 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 @@ -11858,7 +12249,7 @@ os2*) libname_spec='$name' - shrext=".dll" + shrext_cmds=".dll" need_lib_prefix=no library_names_spec='$libname${shared_ext} $libname.a' dynamic_linker='OS/2 ld.exe' @@ -11876,13 +12267,6 @@ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; -sco3.2v5*) - version_type=osf - 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 - ;; - solaris*) version_type=linux need_lib_prefix=no @@ -11908,7 +12292,7 @@ need_version=yes ;; -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) +sysv4 | sysv4.3*) 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' @@ -11941,6 +12325,29 @@ fi ;; +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=freebsd-elf + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + hardcode_into_libs=yes + if test "$with_gnu_ld" = yes; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + shlibpath_overrides_runpath=no + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + shlibpath_overrides_runpath=yes + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; + esac + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; + uts4*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -11956,12 +12363,17 @@ echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + { echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } hardcode_action= if test -n "$hardcode_libdir_flag_spec" || \ - test -n "$runpath_var " || \ - test "X$hardcode_automatic"="Xyes" ; then + test -n "$runpath_var" || \ + test "X$hardcode_automatic" = "Xyes" ; then # We can hardcode non-existant directories. if test "$hardcode_direct" != no && @@ -12578,7 +12990,7 @@ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" save_LDFLAGS="$LDFLAGS" - eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" @@ -12594,7 +13006,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5 (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) 2>/dev/null + (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; - x$lt_unknown|x*) lt_cv_dlopen_self=no ;; + x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;; esac else : # compilation failed @@ -12680,7 +13094,7 @@ echo "${ECHO_T}$lt_cv_dlopen_self" >&6; } if test "x$lt_cv_dlopen_self" = xyes; then - LDFLAGS="$LDFLAGS $link_static_flag" + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; } if test "${lt_cv_dlopen_self_static+set}" = set; then @@ -12692,7 +13106,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5 (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) 2>/dev/null + (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;; + x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;; esac else : # compilation failed @@ -12796,7 +13212,7 @@ fi -# Report which librarie types wil actually be built +# Report which library types will actually be built { echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } { echo "$as_me:$LINENO: result: $can_build_shared" >&5 @@ -12808,7 +13224,7 @@ # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. -case "$host_os" in +case $host_os in aix3*) test "$enable_shared" = yes && enable_static=no if test -n "$RANLIB"; then @@ -12817,47 +13233,10 @@ fi ;; -aix4*) +aix4* | aix5*) if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then test "$enable_shared" = yes && enable_static=no fi - ;; - darwin* | rhapsody*) - if test "$GCC" = yes; then - archive_cmds_need_lc=no - case "$host_os" in - rhapsody* | darwin1.[012]) - allow_undefined_flag='-Wl,-undefined -Wl,suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.012) - allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' - ;; - 10.*) - allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup' - ;; - esac - fi - ;; - esac - output_verbose_link_cmd='echo' - archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring' - module_cmds='$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's - archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - hardcode_direct=no - hardcode_automatic=yes - hardcode_shlibpath_var=unsupported - whole_archive_flag_spec='-all_load $convenience' - link_all_deplibs=yes - else - ld_shlibs=no - fi ;; esac { echo "$as_me:$LINENO: result: $enable_shared" >&5 @@ -12883,7 +13262,8 @@ # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \ + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ + SED SHELL STRIP \ 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 \ @@ -12997,11 +13377,11 @@ SED=$lt_SED # Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="$SED -e s/^X//" +Xsed="$SED -e 1s/^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 +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH # The names of the tagged configurations supported by this script. available_tags= @@ -13031,6 +13411,12 @@ # The host system. host_alias=$host_alias host=$host +host_os=$host_os + +# The build system. +build_alias=$build_alias +build=$build +build_os=$build_os # An echo program that does not interpret backslashes. echo=$lt_echo @@ -13042,6 +13428,9 @@ # A C compiler. LTCC=$lt_LTCC +# LTCC compiler flags. +LTCFLAGS=$lt_LTCFLAGS + # A language-specific compiler. CC=$lt_compiler @@ -13061,7 +13450,7 @@ NM=$lt_NM # A symbol stripping program -STRIP=$STRIP +STRIP=$lt_STRIP # Used to examine libraries when file_magic_cmd begins "file" MAGIC_CMD=$MAGIC_CMD @@ -13092,7 +13481,7 @@ libext="$libext" # Shared library suffix (normally ".so"). -shrext='$shrext' +shrext_cmds='$shrext_cmds' # Executable file suffix (normally ""). exeext="$exeext" @@ -13107,7 +13496,7 @@ # Does compiler simultaneously support -c and -o options? compiler_c_o=$lt_lt_cv_prog_compiler_c_o -# Must we lock files when doing compilation ? +# Must we lock files when doing compilation? need_locks=$lt_need_locks # Do we need the lib prefix for modules? @@ -13334,7 +13723,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. - test -f Makefile && make "$ltmain" + ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` + if test -f "$ltmain_in"; then + test -f Makefile && make "$ltmain" + fi fi @@ -13369,6 +13761,9 @@ echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;} fi fi + if test -z "$LTCFLAGS"; then + eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" + fi # Extract list of available tagged configurations in $ofile. # Note that this assumes the entire list is on one line. @@ -13399,7 +13794,9 @@ case $tagname in CXX) - if test -n "$CXX" && test "X$CXX" != "Xno"; then + if test -n "$CXX" && ( test "X$CXX" != "Xno" && + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + (test "X$CXX" != "Xg++"))) ; then ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -13419,6 +13816,7 @@ hardcode_libdir_flag_spec_ld_CXX= hardcode_libdir_separator_CXX= hardcode_minus_L_CXX=no +hardcode_shlibpath_var_CXX=unsupported hardcode_automatic_CXX=no module_cmds_CXX= module_expsym_cmds_CXX= @@ -13436,7 +13834,7 @@ compiler_lib_search_path_CXX= # Source file extension for C++ test sources. -ac_ext=cc +ac_ext=cpp # Object file extension for compiled C++ test sources. objext=o @@ -13446,17 +13844,34 @@ lt_simple_compile_test_code="int some_variable = 0;\n" # 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' # ltmain only uses $CC for tagged configurations so make sure $CC is set. # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + # Allow CC to be a program name with arguments. compiler=$CC +# save warnings/boilerplate of simple test code +ac_outfile=conftest.$ac_objext +printf "$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* + +ac_outfile=conftest.$ac_objext +printf "$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* + + # Allow CC to be a program name with arguments. lt_save_CC=$CC lt_save_LD=$LD @@ -13467,18 +13882,27 @@ if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx else - unset lt_cv_prog_gnu_ld + $as_unset lt_cv_prog_gnu_ld fi if test -n "${lt_cv_path_LDCXX+set}"; then lt_cv_path_LD=$lt_cv_path_LDCXX else - unset lt_cv_path_LD + $as_unset lt_cv_path_LD fi test -z "${LDCXX+set}" || LD=$LDCXX CC=${CXX-"c++"} compiler=$CC compiler_CXX=$CC -cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` +for cc_temp in $compiler""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` + # We don't want -fno-exception wen compiling C++ code, so set the # no_builtin_flag separately @@ -13549,7 +13973,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, - # but apparently some GNU ld's only accept -v. + # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 &6 else - # I'd rather use --version here, but apparently some GNU ld's only accept -v. + # I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 conftest.$ac_ext <<_ACEOF @@ -13837,16 +14280,26 @@ # -berok will link without error, but may produce a broken library. no_undefined_flag_CXX=' ${wl}-bernotok' allow_undefined_flag_CXX=' ${wl}-berok' - # -bexpall does not export symbols beginning with underscore (_) - always_export_symbols_CXX=yes # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec_CXX=' ' + whole_archive_flag_spec_CXX='$convenience' archive_cmds_need_lc_CXX=yes - # This is similar to how AIX traditionally builds it's shared libraries. - archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + # This is similar to how AIX traditionally builds its shared libraries. + archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' fi fi ;; + + beos*) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + allow_undefined_flag_CXX=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + ld_shlibs_CXX=no + fi + ;; + chorus*) case $cc_basename in *) @@ -13860,12 +14313,12 @@ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec_CXX='-L$libdir' - allow_undefined_flag_CXX=no + allow_undefined_flag_CXX=unsupported always_export_symbols_CXX=no enable_shared_with_static_runtimes_CXX=yes if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - archive_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is; otherwise, prepend... archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then @@ -13874,70 +14327,81 @@ echo EXPORTS > $output_objdir/$soname.def; cat $export_symbols >> $output_objdir/$soname.def; fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else ld_shlibs_CXX=no fi ;; + darwin* | rhapsody*) + case $host_os in + rhapsody* | darwin1.[012]) + allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress' + ;; + *) # Darwin 1.3 on + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[012]) + allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' + ;; + 10.*) + allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup' + ;; + esac + fi + ;; + esac + archive_cmds_need_lc_CXX=no + hardcode_direct_CXX=no + hardcode_automatic_CXX=yes + hardcode_shlibpath_var_CXX=unsupported + whole_archive_flag_spec_CXX='' + link_all_deplibs_CXX=yes - darwin* | rhapsody*) - if test "$GXX" = yes; then - archive_cmds_need_lc_CXX=no - case "$host_os" in - rhapsody* | darwin1.[012]) - allow_undefined_flag_CXX='-Wl,-undefined -Wl,suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - allow_undefined_flag_CXX='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.012) - allow_undefined_flag_CXX='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' - ;; - 10.*) - allow_undefined_flag_CXX='-Wl,-undefined -Wl,dynamic_lookup' - ;; - esac + 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 - ;; - esac - lt_int_apple_cc_single_mod=no - output_verbose_link_cmd='echo' - if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then - lt_int_apple_cc_single_mod=yes - fi - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring' - else - archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring' - fi - module_cmds_CXX='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs' - - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - hardcode_direct_CXX=no - hardcode_automatic_CXX=yes - hardcode_shlibpath_var_CXX=unsupported - whole_archive_flag_spec_CXX='-all_load $convenience' - link_all_deplibs_CXX=yes - else - ld_shlibs_CXX=no - fi - ;; + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + else + archive_cmds_CXX='$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 + module_cmds_CXX='$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 + archive_expsym_cmds_CXX='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 + archive_expsym_cmds_CXX='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 + module_expsym_cmds_CXX='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' + archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + module_cmds_CXX='$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 + archive_expsym_cmds_CXX='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}' + module_expsym_cmds_CXX='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}' + ;; + *) + ld_shlibs_CXX=no + ;; + esac + fi + ;; dgux*) case $cc_basename in - ec++) + ec++*) # FIXME: insert proper C++ library support ld_shlibs_CXX=no ;; - ghcx) + ghcx*) # Green Hills C++ Compiler # FIXME: insert proper C++ library support ld_shlibs_CXX=no @@ -13948,14 +14412,14 @@ ;; esac ;; - freebsd12*) + freebsd[12]*) # C++ shared libraries reported to be fairly broken before switch to ELF ld_shlibs_CXX=no ;; freebsd-elf*) archive_cmds_need_lc_CXX=no ;; - freebsd* | kfreebsd*-gnu) + freebsd* | dragonfly*) # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF # conventions ld_shlibs_CXX=yes @@ -13972,12 +14436,12 @@ # location of the library. case $cc_basename in - CC) + CC*) # FIXME: insert proper C++ library support ld_shlibs_CXX=no ;; - aCC) - archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + aCC*) + archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. @@ -13986,11 +14450,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. - output_verbose_link_cmd='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' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]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 "$GXX" = yes; then - archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -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' else # FIXME: insert proper C++ library support ld_shlibs_CXX=no @@ -14000,33 +14464,22 @@ ;; hpux10*|hpux11*) if test $with_gnu_ld = no; then - case "$host_cpu" in - hppa*64*) - hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' + hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_CXX=: + + case $host_cpu in + hppa*64*|ia64*) hardcode_libdir_flag_spec_ld_CXX='+b $libdir' - hardcode_libdir_separator_CXX=: - ;; - ia64*) - hardcode_libdir_flag_spec_CXX='-L$libdir' ;; *) - hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_CXX=: export_dynamic_flag_spec_CXX='${wl}-E' ;; esac fi - case "$host_cpu" in - hppa*64*) - hardcode_direct_CXX=no - hardcode_shlibpath_var_CXX=no - ;; - ia64*) + case $host_cpu in + hppa*64*|ia64*) hardcode_direct_CXX=no hardcode_shlibpath_var_CXX=no - hardcode_minus_L_CXX=yes # Not in the search PATH, - # but as the default - # location of the library. ;; *) hardcode_direct_CXX=yes @@ -14037,17 +14490,20 @@ esac case $cc_basename in - CC) + CC*) # FIXME: insert proper C++ library support ld_shlibs_CXX=no ;; - aCC) - case "$host_cpu" in - hppa*64*|ia64*) - archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' + aCC*) + case $host_cpu in + hppa*64*) + archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects' + archive_cmds_CXX='$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 @@ -14063,12 +14519,15 @@ *) if test "$GXX" = yes; then if test $with_gnu_ld = no; then - case "$host_cpu" in - ia64*|hppa*64*) - archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' + case $host_cpu in + hppa*64*) + archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects' + archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac fi @@ -14079,11 +14538,25 @@ ;; esac ;; + interix3*) + hardcode_direct_CXX=no + hardcode_shlibpath_var_CXX=no + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + export_dynamic_flag_spec_CXX='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds_CXX='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' + ;; irix5* | irix6*) case $cc_basename in - CC) + CC*) # SGI C++ - archive_cmds_CXX='$CC -shared -all -multigot $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_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 @@ -14094,9 +14567,9 @@ *) if test "$GXX" = yes; then if test "$with_gnu_ld" = no; then - archive_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared -nostdlib $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}${output_objdir}/so_locations -o $lib' else - archive_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' fi fi link_all_deplibs_CXX=yes @@ -14105,16 +14578,16 @@ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator_CXX=: ;; - linux*) + linux* | k*bsd*-gnu) case $cc_basename in - KCC) + 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_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib' - archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' + archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; 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. @@ -14132,20 +14605,44 @@ # "CC -Bstatic", where "CC" is the KAI C++ compiler. old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ;; - icpc) + icpc*) # Intel C++ with_gnu_ld=yes + # version 8.0 and above of icpc choke on multiply defined symbols + # if we add $predep_objects and $postdep_objects, however 7.1 and + # earlier do not add the objects themselves. + case `$CC -V 2>&1` in + *"Version 7."*) + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + ;; + *) # Version 8.0 or newer + tmp_idyn= + case $host_cpu in + ia64*) tmp_idyn=' -i_dynamic';; + esac + archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + ;; + esac archive_cmds_need_lc_CXX=no - archive_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' export_dynamic_flag_spec_CXX='${wl}--export-dynamic' whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' ;; - cxx) + pgCC*) + # Portland Group C++ compiler + archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + + hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + ;; + cxx*) # Compaq C++ - archive_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$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_CXX='-rpath $libdir' @@ -14173,7 +14670,7 @@ ;; mvs*) case $cc_basename in - cxx) + cxx*) # FIXME: insert proper C++ library support ld_shlibs_CXX=no ;; @@ -14183,7 +14680,7 @@ ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' wlarc= @@ -14194,15 +14691,31 @@ # Workaround some broken pre-1.5 toolchains output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' ;; + openbsd2*) + # C++ shared libraries are fairly broken + ld_shlibs_CXX=no + ;; + openbsd*) + hardcode_direct_CXX=yes + hardcode_shlibpath_var_CXX=no + archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' + export_dynamic_flag_spec_CXX='${wl}-E' + whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + fi + output_verbose_link_cmd='echo' + ;; osf3*) case $cc_basename in - KCC) + 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_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib' + archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' hardcode_libdir_separator_CXX=: @@ -14212,14 +14725,14 @@ old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ;; - RCC) + RCC*) # Rational C++ 2.4.1 # FIXME: insert proper C++ library support ld_shlibs_CXX=no ;; - cxx) + cxx*) allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' + archive_cmds_CXX='$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 ${output_objdir}/so_locations -o $lib' hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator_CXX=: @@ -14237,7 +14750,7 @@ *) if test "$GXX" = yes && test "$with_gnu_ld" = no; then allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' + archive_cmds_CXX='$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}${output_objdir}/so_locations -o $lib' hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator_CXX=: @@ -14256,13 +14769,13 @@ ;; osf4* | osf5*) case $cc_basename in - KCC) + 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_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib' + archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' hardcode_libdir_separator_CXX=: @@ -14271,17 +14784,17 @@ # the KAI C++ compiler. old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' ;; - RCC) + RCC*) # Rational C++ 2.4.1 # FIXME: insert proper C++ library support ld_shlibs_CXX=no ;; - cxx) + cxx*) allow_undefined_flag_CXX=' -expect_unresolved \*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~ $rm $lib.exp' hardcode_libdir_flag_spec_CXX='-rpath $libdir' @@ -14300,7 +14813,7 @@ *) if test "$GXX" = yes && test "$with_gnu_ld" = no; then allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' + archive_cmds_CXX='$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}${output_objdir}/so_locations -o $lib' hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator_CXX=: @@ -14321,27 +14834,14 @@ # FIXME: insert proper C++ library support ld_shlibs_CXX=no ;; - sco*) - archive_cmds_need_lc_CXX=no - case $cc_basename in - CC) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; sunos4*) case $cc_basename in - CC) + CC*) # Sun C++ 4.x # FIXME: insert proper C++ library support ld_shlibs_CXX=no ;; - lcc) + lcc*) # Lucid # FIXME: insert proper C++ library support ld_shlibs_CXX=no @@ -14354,36 +14854,33 @@ ;; solaris*) case $cc_basename in - CC) + CC*) # Sun C++ 4.2, 5.x and Centerline C++ + archive_cmds_need_lc_CXX=yes no_undefined_flag_CXX=' -zdefs' - archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects' + archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' archive_expsym_cmds_CXX='$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 $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp' + $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' hardcode_libdir_flag_spec_CXX='-R$libdir' hardcode_shlibpath_var_CXX=no case $host_os in - 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 - # 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. # Supported since Solaris 2.6 (maybe 2.5.1?) - whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + whole_archive_flag_spec_CXX='${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 link_all_deplibs_CXX=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_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[LR]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + 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 @@ -14391,9 +14888,9 @@ # in the archive. old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' ;; - gcx) + gcx*) # Green Hills C++ Compiler - archive_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib' + archive_cmds_CXX='$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_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs' @@ -14403,9 +14900,9 @@ if test "$GXX" = yes && test "$with_gnu_ld" = no; then no_undefined_flag_CXX=' ${wl}-z ${wl}defs' if $CC --version | grep -v '^2\.7' > /dev/null; then - archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib' + archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' archive_expsym_cmds_CXX='$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 $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $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 @@ -14414,9 +14911,9 @@ else # g++ 2.7 appears to require `-G' NOT `-shared' on this # platform. - archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib' + archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' archive_expsym_cmds_CXX='$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 $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $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 @@ -14429,12 +14926,63 @@ ;; esac ;; - sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) + no_undefined_flag_CXX='${wl}-z,text' + archive_cmds_need_lc_CXX=no + hardcode_shlibpath_var_CXX=no + runpath_var='LD_RUN_PATH' + + case $cc_basename in + CC*) + archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + # For security reasons, it is highly recommended that you always + # use absolute paths for naming shared libraries, and exclude the + # DT_RUNPATH tag from executables and libraries. But doing so + # requires that you compile everything twice, which is a pain. + # So that behaviour is only enabled if SCOABSPATH is set to a + # non-empty value in the environment. Most likely only useful for + # creating official distributions of packages. + # This is a hack until libtool officially supports absolute path + # names for shared libraries. + no_undefined_flag_CXX='${wl}-z,text' + allow_undefined_flag_CXX='${wl}-z,nodefs' archive_cmds_need_lc_CXX=no + hardcode_shlibpath_var_CXX=no + hardcode_libdir_flag_spec_CXX='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' + hardcode_libdir_separator_CXX=':' + link_all_deplibs_CXX=yes + export_dynamic_flag_spec_CXX='${wl}-Bexport' + runpath_var='LD_RUN_PATH' + + case $cc_basename in + CC*) + archive_cmds_CXX='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + archive_cmds_CXX='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac ;; tandem*) case $cc_basename in - NCC) + NCC*) # NonStop-UX NCC 3.20 # FIXME: insert proper C++ library support ld_shlibs_CXX=no @@ -14491,7 +15039,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. - output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`" + output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"` for p in `eval $output_verbose_link_cmd`; do case $p in @@ -14531,7 +15079,7 @@ fi ;; - *.$objext|*.$libext) + *.$objext) # This assumes that the test object file only shows up # once in the compiler output. if test "$p" = "conftest.$objext"; then @@ -14567,6 +15115,29 @@ $rm -f confest.$objext +# PORTME: override above test on systems where it is broken +case $host_os in +interix3*) + # Interix 3.5 installs completely hosed .la files for C++, so rather than + # hack all around it, let's just trust "g++" to DTRT. + predep_objects_CXX= + postdep_objects_CXX= + postdeps_CXX= + ;; + +solaris*) + case $cc_basename in + CC*) + # 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. + postdeps_CXX='-lCstd -lCrun' + ;; + esac + ;; +esac + + case " $postdeps_CXX " in *" -lc "*) archive_cmds_need_lc_CXX=no ;; esac @@ -14614,6 +15185,10 @@ # DJGPP does not support shared libraries at all lt_prog_compiler_pic_CXX= ;; + interix3*) + # 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_prog_compiler_pic_CXX=-Kconform_pic @@ -14622,7 +15197,7 @@ hpux*) # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. - case "$host_cpu" in + case $host_cpu in hppa*64*|ia64*) ;; *) @@ -14647,18 +15222,28 @@ ;; chorus*) case $cc_basename in - cxch68) + cxch68*) # Green Hills C++ Compiler # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--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 ;; + darwin*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + case $cc_basename in + xlc*) + lt_prog_compiler_pic_CXX='-qnocommon' + lt_prog_compiler_wl_CXX='-Wl,' + ;; + esac + ;; dgux*) case $cc_basename in - ec++) + ec++*) lt_prog_compiler_pic_CXX='-KPIC' ;; - ghcx) + ghcx*) # Green Hills C++ Compiler lt_prog_compiler_pic_CXX='-pic' ;; @@ -14666,22 +15251,22 @@ ;; esac ;; - freebsd* | kfreebsd*-gnu) + freebsd* | dragonfly*) # FreeBSD uses GNU C++ ;; hpux9* | hpux10* | hpux11*) case $cc_basename in - CC) + CC*) lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" + lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' if test "$host_cpu" != ia64; then lt_prog_compiler_pic_CXX='+Z' fi ;; - aCC) + aCC*) lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" - case "$host_cpu" in + lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' + case $host_cpu in hppa*64*|ia64*) # +Z the default ;; @@ -14694,9 +15279,13 @@ ;; esac ;; + interix*) + # This is c89, which is MS Visual C++ (no shared libs) + # Anyone wants to do a port? + ;; irix5* | irix6* | nonstopux*) case $cc_basename in - CC) + CC*) lt_prog_compiler_wl_CXX='-Wl,' lt_prog_compiler_static_CXX='-non_shared' # CC pic flag -KPIC is the default. @@ -14705,20 +15294,26 @@ ;; esac ;; - linux*) + linux* | k*bsd*-gnu) case $cc_basename in - KCC) + KCC*) # KAI C++ Compiler lt_prog_compiler_wl_CXX='--backend -Wl,' lt_prog_compiler_pic_CXX='-fPIC' ;; - icpc) + icpc* | ecpc*) # Intel C++ lt_prog_compiler_wl_CXX='-Wl,' lt_prog_compiler_pic_CXX='-KPIC' lt_prog_compiler_static_CXX='-static' ;; - cxx) + pgCC*) + # Portland Group C++ compiler. + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_pic_CXX='-fpic' + lt_prog_compiler_static_CXX='-Bstatic' + ;; + cxx*) # Compaq C++ # Make sure the PIC flag is empty. It appears that all Alpha # Linux and Compaq Tru64 Unix objects are PIC. @@ -14735,25 +15330,25 @@ ;; mvs*) case $cc_basename in - cxx) + cxx*) lt_prog_compiler_pic_CXX='-W c,exportall' ;; *) ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) ;; osf3* | osf4* | osf5*) case $cc_basename in - KCC) + KCC*) lt_prog_compiler_wl_CXX='--backend -Wl,' ;; - RCC) + RCC*) # Rational C++ 2.4.1 lt_prog_compiler_pic_CXX='-pic' ;; - cxx) + cxx*) # Digital/Compaq C++ lt_prog_compiler_wl_CXX='-Wl,' # Make sure the PIC flag is empty. It appears that all Alpha @@ -14767,24 +15362,15 @@ ;; psos*) ;; - sco*) - case $cc_basename in - CC) - lt_prog_compiler_pic_CXX='-fPIC' - ;; - *) - ;; - esac - ;; solaris*) case $cc_basename in - CC) + CC*) # Sun C++ 4.2, 5.x and Centerline C++ lt_prog_compiler_pic_CXX='-KPIC' lt_prog_compiler_static_CXX='-Bstatic' lt_prog_compiler_wl_CXX='-Qoption ld ' ;; - gcx) + gcx*) # Green Hills C++ Compiler lt_prog_compiler_pic_CXX='-PIC' ;; @@ -14794,12 +15380,12 @@ ;; sunos4*) case $cc_basename in - CC) + CC*) # Sun C++ 4.x lt_prog_compiler_pic_CXX='-pic' lt_prog_compiler_static_CXX='-Bstatic' ;; - lcc) + lcc*) # Lucid lt_prog_compiler_pic_CXX='-pic' ;; @@ -14809,7 +15395,7 @@ ;; tandem*) case $cc_basename in - NCC) + NCC*) # NonStop-UX NCC 3.20 lt_prog_compiler_pic_CXX='-KPIC' ;; @@ -14817,7 +15403,14 @@ ;; esac ;; - unixware*) + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + case $cc_basename in + CC*) + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_pic_CXX='-KPIC' + lt_prog_compiler_static_CXX='-Bstatic' + ;; + esac ;; vxworks*) ;; @@ -14850,18 +15443,20 @@ # with a dollar sign (not a hyphen), so the echo should work correctly. # The option is referenced via a variable to avoid confusing sed. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14856: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15449: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14860: \$? = $ac_status" >&5 + echo "$as_me:15453: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - if test ! -s conftest.err; then + # So say no if there are warnings other than the usual output. + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then lt_prog_compiler_pic_works_CXX=yes fi fi @@ -14882,7 +15477,7 @@ fi fi -case "$host_os" in +case $host_os in # For platforms which do not support PIC, -DPIC is meaningless: *djgpp*) lt_prog_compiler_pic_CXX= @@ -14892,6 +15487,48 @@ ;; esac +# +# Check to make sure the static flag actually works. +# +wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } +if test "${lt_prog_compiler_static_works_CXX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_prog_compiler_static_works_CXX=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + printf "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_prog_compiler_static_works_CXX=yes + fi + else + lt_prog_compiler_static_works_CXX=yes + fi + fi + $rm conftest* + LDFLAGS="$save_LDFLAGS" + +fi +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5 +echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; } + +if test x"$lt_prog_compiler_static_works_CXX" = xyes; then + : +else + lt_prog_compiler_static_CXX= +fi + + { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then @@ -14904,38 +15541,36 @@ mkdir out 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 . - 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. # Note that $ac_compile itself does not contain backslashes and begins # with a dollar sign (not a hyphen), so the echo should work correctly. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14923: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15553: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14927: \$? = $ac_status" >&5 + echo "$as_me:15557: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - if test ! -s out/conftest.err; then + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then lt_cv_prog_compiler_c_o_CXX=yes fi fi - chmod u+w . - $rm conftest* out/* - rmdir out + chmod u+w . 2>&5 + $rm conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files + $rm out/* && rmdir out cd .. rmdir conftest $rm conftest* @@ -14985,7 +15620,10 @@ export_symbols_cmds_CXX="$ltdll_cmds" ;; cygwin* | mingw*) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + export_symbols_cmds_CXX='$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) + link_all_deplibs_CXX=no ;; *) export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' @@ -14996,11 +15634,6 @@ echo "${ECHO_T}$ld_shlibs_CXX" >&6; } test "$ld_shlibs_CXX" = no && can_build_shared=no -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - # # Do we need to explicitly link libc? # @@ -15033,6 +15666,7 @@ libobjs=conftest.$ac_objext deplibs= wl=$lt_prog_compiler_wl_CXX + pic_flag=$lt_prog_compiler_pic_CXX compiler_flags=-v linker_flags=-v verstring= @@ -15068,7 +15702,7 @@ library_names_spec= libname_spec='lib$name' soname_spec= -shrext=".so" +shrext_cmds=".so" postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -15078,7 +15712,20 @@ 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" +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 + # 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'` + else + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi +else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +fi need_lib_prefix=unknown hardcode_into_libs=no @@ -15143,7 +15790,7 @@ 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' + 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*) @@ -15152,7 +15799,7 @@ shlibpath_var=LIBRARY_PATH ;; -bsdi4*) +bsdi[45]*) version_type=linux need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -15168,7 +15815,7 @@ cygwin* | mingw* | pw32*) version_type=windows - shrext=".dll" + shrext_cmds=".dll" need_version=no need_lib_prefix=no @@ -15180,7 +15827,8 @@ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname' + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname' postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ dlpath=$dir/\$dldll~ $rm \$dlpath' @@ -15210,7 +15858,7 @@ ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac ;; @@ -15233,7 +15881,7 @@ soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH - shrext='$(test .$module = .yes && echo .so || echo .dylib)' + 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"` @@ -15256,20 +15904,17 @@ dynamic_linker=no ;; -kfreebsd*-gnu*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - -freebsd*) - objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then + objformat=`/usr/bin/objformat` + else + case $host_os in + freebsd[123]*) objformat=aout ;; + *) objformat=elf ;; + esac + fi version_type=freebsd-$objformat case $version_type in freebsd-elf*) @@ -15287,14 +15932,19 @@ freebsd2*) shlibpath_overrides_runpath=yes ;; - freebsd3.01* | freebsdelf3.01*) + freebsd3.[01]* | freebsdelf3.[01]*) shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; - *) # from 3.2 on + freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ + freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; + freebsd*) # from 4.6 on + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; esac ;; @@ -15314,9 +15964,9 @@ version_type=sunos need_lib_prefix=no need_version=no - case "$host_cpu" in + case $host_cpu in ia64*) - shrext='.so' + shrext_cmds='.so' hardcode_into_libs=yes dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH @@ -15331,7 +15981,7 @@ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) - shrext='.sl' + shrext_cmds='.sl' hardcode_into_libs=yes dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH @@ -15342,7 +15992,7 @@ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; *) - shrext='.sl' + shrext_cmds='.sl' dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH @@ -15354,6 +16004,18 @@ postinstall_cmds='chmod 555 $lib' ;; +interix3*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; @@ -15397,29 +16059,26 @@ ;; # This must be Linux ELF. -linux*) +linux* | k*bsd*-gnu) version_type=linux need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - 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 -a ! -h /lib64; then - libsuff=64 - fi - fi shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" # 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 + # 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' ' '` + 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, @@ -15429,6 +16088,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -15438,7 +16109,7 @@ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' dynamic_linker='NetBSD ld.elf_so' fi @@ -15466,8 +16137,13 @@ openbsd*) version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no - need_version=no + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. + case $host_os in + openbsd3.3 | openbsd3.3.*) need_version=yes ;; + *) need_version=no ;; + esac 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 @@ -15487,7 +16163,7 @@ os2*) libname_spec='$name' - shrext=".dll" + shrext_cmds=".dll" need_lib_prefix=no library_names_spec='$libname${shared_ext} $libname.a' dynamic_linker='OS/2 ld.exe' @@ -15505,13 +16181,6 @@ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; -sco3.2v5*) - version_type=osf - 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 - ;; - solaris*) version_type=linux need_lib_prefix=no @@ -15537,7 +16206,7 @@ need_version=yes ;; -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) +sysv4 | sysv4.3*) 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' @@ -15570,6 +16239,29 @@ fi ;; +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=freebsd-elf + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + hardcode_into_libs=yes + if test "$with_gnu_ld" = yes; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + shlibpath_overrides_runpath=no + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + shlibpath_overrides_runpath=yes + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; + esac + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; + uts4*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -15585,12 +16277,17 @@ echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + { echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } hardcode_action_CXX= if test -n "$hardcode_libdir_flag_spec_CXX" || \ - test -n "$runpath_var CXX" || \ - test "X$hardcode_automatic_CXX"="Xyes" ; then + test -n "$runpath_var_CXX" || \ + test "X$hardcode_automatic_CXX" = "Xyes" ; then # We can hardcode non-existant directories. if test "$hardcode_direct_CXX" != no && @@ -15622,1125 +16319,333 @@ enable_fast_install=needless fi -striplib= -old_striplib= -{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&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 "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - ;; - *) - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + +# The else clause should only fire when bootstrapping the +# libtool distribution, otherwise you forgot to ship ltmain.sh +# with your package, and you will get complaints that there are +# no rules to generate ltmain.sh. +if test -f "$ltmain"; then + # 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 + setopt NO_GLOB_SUBST + fi + # Now quote all the things that may contain metacharacters while being + # careful not to overquote the AC_SUBSTed values. We take copies of the + # variables and quote the copies for generation of the libtool script. + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ + SED SHELL STRIP \ + 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 \ + lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ + lt_cv_sys_global_symbol_to_c_name_address \ + sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ + old_postinstall_cmds old_postuninstall_cmds \ + compiler_CXX \ + CC_CXX \ + LD_CXX \ + lt_prog_compiler_wl_CXX \ + lt_prog_compiler_pic_CXX \ + lt_prog_compiler_static_CXX \ + lt_prog_compiler_no_builtin_flag_CXX \ + export_dynamic_flag_spec_CXX \ + thread_safe_flag_spec_CXX \ + whole_archive_flag_spec_CXX \ + enable_shared_with_static_runtimes_CXX \ + old_archive_cmds_CXX \ + old_archive_from_new_cmds_CXX \ + predep_objects_CXX \ + postdep_objects_CXX \ + predeps_CXX \ + postdeps_CXX \ + compiler_lib_search_path_CXX \ + archive_cmds_CXX \ + archive_expsym_cmds_CXX \ + postinstall_cmds_CXX \ + postuninstall_cmds_CXX \ + old_archive_from_expsyms_cmds_CXX \ + allow_undefined_flag_CXX \ + no_undefined_flag_CXX \ + export_symbols_cmds_CXX \ + hardcode_libdir_flag_spec_CXX \ + hardcode_libdir_flag_spec_ld_CXX \ + hardcode_libdir_separator_CXX \ + hardcode_automatic_CXX \ + module_cmds_CXX \ + module_expsym_cmds_CXX \ + lt_cv_prog_compiler_c_o_CXX \ + exclude_expsyms_CXX \ + include_expsyms_CXX; do + + case $var in + old_archive_cmds_CXX | \ + old_archive_from_new_cmds_CXX | \ + archive_cmds_CXX | \ + archive_expsym_cmds_CXX | \ + module_cmds_CXX | \ + module_expsym_cmds_CXX | \ + old_archive_from_expsyms_cmds_CXX | \ + export_symbols_cmds_CXX | \ + extract_expsyms_cmds | reload_cmds | finish_cmds | \ + postinstall_cmds | postuninstall_cmds | \ + old_postinstall_cmds | old_postuninstall_cmds | \ + sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) + # Double-quote double-evaled strings. + eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" + ;; + *) + eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" + ;; + esac + done + + case $lt_echo in + *'\$0 --fallback-echo"') + lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` ;; esac -fi -if test "x$enable_dlopen" != xyes; then - enable_dlopen=unknown - enable_dlopen_self=unknown - enable_dlopen_self_static=unknown -else - lt_cv_dlopen=no - lt_cv_dlopen_libs= +cfgfile="$ofile" - case $host_os in - beos*) - lt_cv_dlopen="load_add_on" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ;; + cat <<__EOF__ >> "$cfgfile" +# ### BEGIN LIBTOOL TAG CONFIG: $tagname - mingw* | pw32*) - lt_cv_dlopen="LoadLibrary" - lt_cv_dlopen_libs= - ;; +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: - cygwin*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; +# Shell to use when invoking shell scripts. +SHELL=$lt_SHELL - darwin*) - # if libdl is installed we need to link against it - { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +# Whether or not to build shared libraries. +build_libtool_libs=$enable_shared -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_dl_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +# Whether or not to build static libraries. +build_old_libs=$enable_static - ac_cv_lib_dl_dlopen=no -fi +# Whether or not to add -lc for building shared libraries. +build_libtool_need_lc=$archive_cmds_need_lc_CXX -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } -if test $ac_cv_lib_dl_dlopen = yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else +# Whether or not to disallow shared libs when runtime libs are static +allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX - lt_cv_dlopen="dyld" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes +# Whether or not to optimize for fast installation. +fast_install=$enable_fast_install -fi +# The host system. +host_alias=$host_alias +host=$host +host_os=$host_os - ;; +# The build system. +build_alias=$build_alias +build=$build +build_os=$build_os - *) - { echo "$as_me:$LINENO: checking for shl_load" >&5 -echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; } -if test "${ac_cv_func_shl_load+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define shl_load to an innocuous variant, in case declares shl_load. - For example, HP-UX 11i declares gettimeofday. */ -#define shl_load innocuous_shl_load +# An echo program that does not interpret backslashes. +echo=$lt_echo -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shl_load (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ +# The archiver. +AR=$lt_AR +AR_FLAGS=$lt_AR_FLAGS -#ifdef __STDC__ -# include -#else -# include -#endif +# A C compiler. +LTCC=$lt_LTCC -#undef shl_load +# LTCC compiler flags. +LTCFLAGS=$lt_LTCFLAGS -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char shl_load (); -/* 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 -#endif +# A language-specific compiler. +CC=$lt_compiler_CXX -int -main () -{ -return shl_load (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func_shl_load=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +# Is the compiler the GNU C compiler? +with_gcc=$GCC_CXX - ac_cv_func_shl_load=no -fi +# An ERE matcher. +EGREP=$lt_EGREP -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 -echo "${ECHO_T}$ac_cv_func_shl_load" >&6; } -if test $ac_cv_func_shl_load = yes; then - lt_cv_dlopen="shl_load" -else - { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 -echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; } -if test "${ac_cv_lib_dld_shl_load+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +# The linker used to build libraries. +LD=$lt_LD_CXX -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char shl_load (); -int -main () -{ -return shl_load (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_dld_shl_load=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +# Whether we need hard or soft links. +LN_S=$lt_LN_S - ac_cv_lib_dld_shl_load=no -fi +# A BSD-compatible nm program. +NM=$lt_NM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } -if test $ac_cv_lib_dld_shl_load = yes; then - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" -else - { echo "$as_me:$LINENO: checking for dlopen" >&5 -echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } -if test "${ac_cv_func_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define dlopen to an innocuous variant, in case declares dlopen. - For example, HP-UX 11i declares gettimeofday. */ -#define dlopen innocuous_dlopen +# A symbol stripping program +STRIP=$lt_STRIP -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char dlopen (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ +# Used to examine libraries when file_magic_cmd begins "file" +MAGIC_CMD=$MAGIC_CMD -#ifdef __STDC__ -# include -#else -# include -#endif +# Used on cygwin: DLL creation program. +DLLTOOL="$DLLTOOL" -#undef dlopen +# Used on cygwin: object dumper. +OBJDUMP="$OBJDUMP" -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -/* 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 -#endif +# Used on cygwin: assembler. +AS="$AS" -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_dlopen=no -fi +# The name of the directory that contains temporary libtool files. +objdir=$objdir -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 -echo "${ECHO_T}$ac_cv_func_dlopen" >&6; } -if test $ac_cv_func_dlopen = yes; then - lt_cv_dlopen="dlopen" -else - { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +# How to create reloadable object files. +reload_flag=$lt_reload_flag +reload_cmds=$lt_reload_cmds -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_dl_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +# How to pass a linker flag through the compiler. +wl=$lt_lt_prog_compiler_wl_CXX - ac_cv_lib_dl_dlopen=no -fi +# Object file suffix (normally "o"). +objext="$ac_objext" -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } -if test $ac_cv_lib_dl_dlopen = yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else - { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 -echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; } -if test "${ac_cv_lib_svld_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsvld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +# Old archive suffix (normally "a"). +libext="$libext" -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_svld_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +# Shared library suffix (normally ".so"). +shrext_cmds='$shrext_cmds' - ac_cv_lib_svld_dlopen=no -fi +# Executable file suffix (normally ""). +exeext="$exeext" -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; } -if test $ac_cv_lib_svld_dlopen = yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" -else - { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 -echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; } -if test "${ac_cv_lib_dld_dld_link+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +# Additional compiler flags for building library objects. +pic_flag=$lt_lt_prog_compiler_pic_CXX +pic_mode=$pic_mode -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dld_link (); -int -main () -{ -return dld_link (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_dld_dld_link=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +# What is the maximum length of a command? +max_cmd_len=$lt_cv_sys_max_cmd_len - ac_cv_lib_dld_dld_link=no -fi +# Does compiler simultaneously support -c and -o options? +compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; } -if test $ac_cv_lib_dld_dld_link = yes; then - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" -fi +# Must we lock files when doing compilation? +need_locks=$lt_need_locks +# Do we need the lib prefix for modules? +need_lib_prefix=$need_lib_prefix -fi +# Do we need a version for libraries? +need_version=$need_version +# Whether dlopen is supported. +dlopen_support=$enable_dlopen -fi +# 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 -fi +# Compiler flag to prevent dynamic linking. +link_static_flag=$lt_lt_prog_compiler_static_CXX +# Compiler flag to turn off builtin functions. +no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX -fi +# Compiler flag to allow reflexive dlopens. +export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX +# Compiler flag to generate shared objects directly from archives. +whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX -fi +# Compiler flag to generate thread-safe objects. +thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX - ;; - esac +# Library versioning type. +version_type=$version_type - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else - enable_dlopen=no - fi +# Format of library name prefix. +libname_spec=$lt_libname_spec - case $lt_cv_dlopen in - dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" +# 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=$lt_library_names_spec - save_LDFLAGS="$LDFLAGS" - eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" +# The coded name of the library, if different from the real name. +soname_spec=$lt_soname_spec - save_LIBS="$LIBS" - LIBS="$lt_cv_dlopen_libs $LIBS" +# Commands used to build and install an old-style archive. +RANLIB=$lt_RANLIB +old_archive_cmds=$lt_old_archive_cmds_CXX +old_postinstall_cmds=$lt_old_postinstall_cmds +old_postuninstall_cmds=$lt_old_postuninstall_cmds - { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 -echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; } -if test "${lt_cv_dlopen_self+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self=cross -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext < -#endif +# Create a temporary old-style archive to link instead of a shared archive. +old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX -#include +# Commands used to build and install a shared archive. +archive_cmds=$lt_archive_cmds_CXX +archive_expsym_cmds=$lt_archive_expsym_cmds_CXX +postinstall_cmds=$lt_postinstall_cmds +postuninstall_cmds=$lt_postuninstall_cmds -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif +# Commands used to build a loadable module (assumed same as above if empty) +module_cmds=$lt_module_cmds_CXX +module_expsym_cmds=$lt_module_expsym_cmds_CXX -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif +# Commands to strip libraries. +old_striplib=$lt_old_striplib +striplib=$lt_striplib -#ifdef __cplusplus -extern "C" void exit (int); -#endif +# Dependencies to place before the objects being linked to create a +# shared library. +predep_objects=$lt_predep_objects_CXX -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; +# Dependencies to place after the objects being linked to create a +# shared library. +postdep_objects=$lt_postdep_objects_CXX - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } +# Dependencies to place before the objects being linked to create a +# shared library. +predeps=$lt_predeps_CXX - exit (status); -} -EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; - x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; - x$lt_unknown|x*) lt_cv_dlopen_self=no ;; - esac - else : - # compilation failed - lt_cv_dlopen_self=no - fi -fi -rm -fr conftest* +# Dependencies to place after the objects being linked to create a +# shared library. +postdeps=$lt_postdeps_CXX +# The library search path used internally by the compiler when linking +# a shared library. +compiler_lib_search_path=$lt_compiler_lib_search_path_CXX -fi -{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 -echo "${ECHO_T}$lt_cv_dlopen_self" >&6; } +# Method to check whether dependent libraries are shared objects. +deplibs_check_method=$lt_deplibs_check_method - if test "x$lt_cv_dlopen_self" = xyes; then - LDFLAGS="$LDFLAGS $link_static_flag" - { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 -echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; } -if test "${lt_cv_dlopen_self_static+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self_static=cross -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext < -#endif +# Flag that allows shared libraries with undefined symbols to be built. +allow_undefined_flag=$lt_allow_undefined_flag_CXX -#include +# Flag that forces no undefined symbols. +no_undefined_flag=$lt_no_undefined_flag_CXX -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif +# Commands used to finish a libtool library installation in a directory. +finish_cmds=$lt_finish_cmds -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif +# Same as above, but a single script fragment to be evaled but not shown. +finish_eval=$lt_finish_eval -#ifdef __cplusplus -extern "C" void exit (int); -#endif +# Take the output of nm and produce a listing of raw symbols and C names. +global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; +# Transform the output of nm in a proper C declaration +global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } +# Transform the output of nm in a C name address pair +global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address - exit (status); -} -EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;; - esac - else : - # compilation failed - lt_cv_dlopen_self_static=no - fi -fi -rm -fr conftest* +# This is the shared library runtime path variable. +runpath_var=$runpath_var +# This is the shared library path variable. +shlibpath_var=$shlibpath_var -fi -{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 -echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; } - fi - - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - ;; - 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 - - -# The else clause should only fire when bootstrapping the -# libtool distribution, otherwise you forgot to ship ltmain.sh -# with your package, and you will get complaints that there are -# no rules to generate ltmain.sh. -if test -f "$ltmain"; then - # 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 - setopt NO_GLOB_SUBST - fi - # Now quote all the things that may contain metacharacters while being - # careful not to overquote the AC_SUBSTed values. We take copies of the - # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \ - 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 \ - lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ - old_postinstall_cmds old_postuninstall_cmds \ - compiler_CXX \ - CC_CXX \ - LD_CXX \ - lt_prog_compiler_wl_CXX \ - lt_prog_compiler_pic_CXX \ - lt_prog_compiler_static_CXX \ - lt_prog_compiler_no_builtin_flag_CXX \ - export_dynamic_flag_spec_CXX \ - thread_safe_flag_spec_CXX \ - whole_archive_flag_spec_CXX \ - enable_shared_with_static_runtimes_CXX \ - old_archive_cmds_CXX \ - old_archive_from_new_cmds_CXX \ - predep_objects_CXX \ - postdep_objects_CXX \ - predeps_CXX \ - postdeps_CXX \ - compiler_lib_search_path_CXX \ - archive_cmds_CXX \ - archive_expsym_cmds_CXX \ - postinstall_cmds_CXX \ - postuninstall_cmds_CXX \ - old_archive_from_expsyms_cmds_CXX \ - allow_undefined_flag_CXX \ - no_undefined_flag_CXX \ - export_symbols_cmds_CXX \ - hardcode_libdir_flag_spec_CXX \ - hardcode_libdir_flag_spec_ld_CXX \ - hardcode_libdir_separator_CXX \ - hardcode_automatic_CXX \ - module_cmds_CXX \ - module_expsym_cmds_CXX \ - lt_cv_prog_compiler_c_o_CXX \ - exclude_expsyms_CXX \ - include_expsyms_CXX; do - - case $var in - old_archive_cmds_CXX | \ - old_archive_from_new_cmds_CXX | \ - archive_cmds_CXX | \ - archive_expsym_cmds_CXX | \ - module_cmds_CXX | \ - module_expsym_cmds_CXX | \ - old_archive_from_expsyms_cmds_CXX | \ - export_symbols_cmds_CXX | \ - extract_expsyms_cmds | reload_cmds | finish_cmds | \ - postinstall_cmds | postuninstall_cmds | \ - old_postinstall_cmds | old_postuninstall_cmds | \ - sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) - # Double-quote double-evaled strings. - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" - ;; - *) - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" - ;; - esac - done - - case $lt_echo in - *'\$0 --fallback-echo"') - lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` - ;; - esac - -cfgfile="$ofile" - - cat <<__EOF__ >> "$cfgfile" -# ### BEGIN LIBTOOL TAG CONFIG: $tagname - -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: - -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL - -# Whether or not to build shared libraries. -build_libtool_libs=$enable_shared - -# Whether or not to build static libraries. -build_old_libs=$enable_static - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$archive_cmds_need_lc_CXX - -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX - -# 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=$lt_echo - -# The archiver. -AR=$lt_AR -AR_FLAGS=$lt_AR_FLAGS - -# A C compiler. -LTCC=$lt_LTCC - -# A language-specific compiler. -CC=$lt_compiler_CXX - -# Is the compiler the GNU C compiler? -with_gcc=$GCC_CXX - -# An ERE matcher. -EGREP=$lt_EGREP - -# The linker used to build libraries. -LD=$lt_LD_CXX - -# Whether we need hard or soft links. -LN_S=$lt_LN_S - -# A BSD-compatible nm program. -NM=$lt_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=$lt_reload_flag -reload_cmds=$lt_reload_cmds - -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl_CXX - -# Object file suffix (normally "o"). -objext="$ac_objext" - -# Old archive suffix (normally "a"). -libext="$libext" - -# Shared library suffix (normally ".so"). -shrext='$shrext' - -# Executable file suffix (normally ""). -exeext="$exeext" - -# Additional compiler flags for building library objects. -pic_flag=$lt_lt_prog_compiler_pic_CXX -pic_mode=$pic_mode - -# What is the maximum length of a command? -max_cmd_len=$lt_cv_sys_max_cmd_len - -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX - -# Must we lock files when doing compilation ? -need_locks=$lt_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=$lt_lt_prog_compiler_static_CXX - -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX - -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX - -# Library versioning type. -version_type=$version_type - -# Format of library name prefix. -libname_spec=$lt_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=$lt_library_names_spec - -# The coded name of the library, if different from the real name. -soname_spec=$lt_soname_spec - -# Commands used to build and install an old-style archive. -RANLIB=$lt_RANLIB -old_archive_cmds=$lt_old_archive_cmds_CXX -old_postinstall_cmds=$lt_old_postinstall_cmds -old_postuninstall_cmds=$lt_old_postuninstall_cmds - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX - -# Commands used to build and install a shared archive. -archive_cmds=$lt_archive_cmds_CXX -archive_expsym_cmds=$lt_archive_expsym_cmds_CXX -postinstall_cmds=$lt_postinstall_cmds -postuninstall_cmds=$lt_postuninstall_cmds - -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds=$lt_module_cmds_CXX -module_expsym_cmds=$lt_module_expsym_cmds_CXX - -# Commands to strip libraries. -old_striplib=$lt_old_striplib -striplib=$lt_striplib - -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects=$lt_predep_objects_CXX - -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects=$lt_postdep_objects_CXX - -# Dependencies to place before the objects being linked to create a -# shared library. -predeps=$lt_predeps_CXX - -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps=$lt_postdeps_CXX - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_CXX - -# Method to check whether dependent libraries are shared objects. -deplibs_check_method=$lt_deplibs_check_method - -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd=$lt_file_magic_cmd - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_allow_undefined_flag_CXX - -# Flag that forces no undefined symbols. -no_undefined_flag=$lt_no_undefined_flag_CXX - -# Commands used to finish a libtool library installation in a directory. -finish_cmds=$lt_finish_cmds - -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval=$lt_finish_eval - -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe - -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl - -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address - -# 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 +# 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_CXX @@ -16816,7 +16721,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. - test -f Makefile && make "$ltmain" + ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` + if test -f "$ltmain_in"; then + test -f Makefile && make "$ltmain" + fi fi @@ -16888,16 +16796,42 @@ # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + # Allow CC to be a program name with arguments. compiler=$CC +# save warnings/boilerplate of simple test code +ac_outfile=conftest.$ac_objext +printf "$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* + +ac_outfile=conftest.$ac_objext +printf "$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* + + # Allow CC to be a program name with arguments. lt_save_CC="$CC" CC=${F77-"f77"} compiler=$CC compiler_F77=$CC -cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` +for cc_temp in $compiler""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` + { echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } @@ -16910,7 +16844,7 @@ # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. -case "$host_os" in +case $host_os in aix3*) test "$enable_shared" = yes && enable_static=no if test -n "$RANLIB"; then @@ -16918,8 +16852,10 @@ postinstall_cmds='$RANLIB $lib' fi ;; -aix4*) - test "$enable_shared" = yes && enable_static=no +aix4* | aix5*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi ;; esac { echo "$as_me:$LINENO: result: $enable_shared" >&5 @@ -16932,8 +16868,6 @@ { echo "$as_me:$LINENO: result: $enable_static" >&5 echo "${ECHO_T}$enable_static" >&6; } -test "$ld_shlibs_F77" = no && can_build_shared=no - GCC_F77="$G77" LD_F77="$LD" @@ -16980,6 +16914,11 @@ lt_prog_compiler_pic_F77='-fno-common' ;; + interix3*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + msdosdjgpp*) # Just because we use GCC doesn't mean we suddenly get shared libraries # on systems that don't support them. @@ -16996,7 +16935,7 @@ hpux*) # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. - case "$host_cpu" in + case $host_cpu in hppa*64*|ia64*) # +Z the default ;; @@ -17022,6 +16961,16 @@ lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp' fi ;; + darwin*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + case $cc_basename in + xlc*) + lt_prog_compiler_pic_F77='-qnocommon' + lt_prog_compiler_wl_F77='-Wl,' + ;; + esac + ;; mingw* | pw32* | os2*) # This hack is so that the source file can tell whether it is being @@ -17033,7 +16982,7 @@ lt_prog_compiler_wl_F77='-Wl,' # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. - case "$host_cpu" in + case $host_cpu in hppa*64*|ia64*) # +Z the default ;; @@ -17056,13 +17005,20 @@ lt_prog_compiler_static_F77='-Bstatic' ;; - linux*) - case $CC in + linux* | k*bsd*-gnu) + case $cc_basename in icc* | ecc*) lt_prog_compiler_wl_F77='-Wl,' lt_prog_compiler_pic_F77='-KPIC' lt_prog_compiler_static_F77='-static' ;; + pgcc* | pgf77* | pgf90* | pgf95*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) + lt_prog_compiler_wl_F77='-Wl,' + lt_prog_compiler_pic_F77='-fpic' + lt_prog_compiler_static_F77='-Bstatic' + ;; ccc*) lt_prog_compiler_wl_F77='-Wl,' # All Alpha code is PIC. @@ -17077,15 +17033,15 @@ lt_prog_compiler_static_F77='-non_shared' ;; - sco3.2v5*) - lt_prog_compiler_pic_F77='-Kpic' - lt_prog_compiler_static_F77='-dn' - ;; - solaris*) - lt_prog_compiler_wl_F77='-Wl,' lt_prog_compiler_pic_F77='-KPIC' lt_prog_compiler_static_F77='-Bstatic' + case $cc_basename in + f77* | f90* | f95*) + lt_prog_compiler_wl_F77='-Qoption ld ';; + *) + lt_prog_compiler_wl_F77='-Wl,';; + esac ;; sunos4*) @@ -17094,7 +17050,7 @@ lt_prog_compiler_static_F77='-Bstatic' ;; - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + sysv4 | sysv4.2uw2* | sysv4.3*) lt_prog_compiler_wl_F77='-Wl,' lt_prog_compiler_pic_F77='-KPIC' lt_prog_compiler_static_F77='-Bstatic' @@ -17107,6 +17063,17 @@ fi ;; + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + lt_prog_compiler_wl_F77='-Wl,' + lt_prog_compiler_pic_F77='-KPIC' + lt_prog_compiler_static_F77='-Bstatic' + ;; + + unicos*) + lt_prog_compiler_wl_F77='-Wl,' + lt_prog_compiler_can_build_shared_F77=no + ;; + uts4*) lt_prog_compiler_pic_F77='-pic' lt_prog_compiler_static_F77='-Bstatic' @@ -17141,18 +17108,20 @@ # with a dollar sign (not a hyphen), so the echo should work correctly. # The option is referenced via a variable to avoid confusing sed. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17147: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17114: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17151: \$? = $ac_status" >&5 + echo "$as_me:17118: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - if test ! -s conftest.err; then + # So say no if there are warnings other than the usual output. + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then lt_prog_compiler_pic_works_F77=yes fi fi @@ -17173,7 +17142,7 @@ fi fi -case "$host_os" in +case $host_os in # For platforms which do not support PIC, -DPIC is meaningless: *djgpp*) lt_prog_compiler_pic_F77= @@ -17183,6 +17152,48 @@ ;; esac +# +# Check to make sure the static flag actually works. +# +wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } +if test "${lt_prog_compiler_static_works_F77+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_prog_compiler_static_works_F77=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + printf "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_prog_compiler_static_works_F77=yes + fi + else + lt_prog_compiler_static_works_F77=yes + fi + fi + $rm conftest* + LDFLAGS="$save_LDFLAGS" + +fi +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5 +echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; } + +if test x"$lt_prog_compiler_static_works_F77" = xyes; then + : +else + lt_prog_compiler_static_F77= +fi + + { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then @@ -17195,38 +17206,36 @@ mkdir out 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 . - 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. # Note that $ac_compile itself does not contain backslashes and begins # with a dollar sign (not a hyphen), so the echo should work correctly. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17214: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17218: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17218: \$? = $ac_status" >&5 + echo "$as_me:17222: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - if test ! -s out/conftest.err; then + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then lt_cv_prog_compiler_c_o_F77=yes fi fi - chmod u+w . - $rm conftest* out/* - rmdir out + chmod u+w . 2>&5 + $rm conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files + $rm out/* && rmdir out cd .. rmdir conftest $rm conftest* @@ -17297,6 +17306,16 @@ # rely on this symbol name, it's probably fine to never include it in # preloaded symbol tables. extract_expsyms_cmds= + # Just being paranoid about ensuring that cc_basename is set. + for cc_temp in $compiler""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` case $host_os in cygwin* | mingw* | pw32*) @@ -17307,6 +17326,10 @@ with_gnu_ld=no fi ;; + interix*) + # we just hope/assume this is gcc and not c89 (= MSVC++) + with_gnu_ld=yes + ;; openbsd*) with_gnu_ld=no ;; @@ -17317,6 +17340,27 @@ # If archive_cmds runs LD, not CC, wlarc should be empty wlarc='${wl}' + # Set some defaults for GNU ld with shared library support. These + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + runpath_var=LD_RUN_PATH + hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir' + export_dynamic_flag_spec_F77='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then + whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + whole_archive_flag_spec_F77= + fi + supports_anon_versioning=no + case `$LD -v 2>/dev/null` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + # See if GNU ld supports shared libraries. case $host_os in aix3* | aix4* | aix5*) @@ -17354,7 +17398,7 @@ allow_undefined_flag_F77=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - archive_cmds_F77='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' + archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' else ld_shlibs_F77=no fi @@ -17364,13 +17408,13 @@ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec_F77='-L$libdir' - allow_undefined_flag_F77=no + allow_undefined_flag_F77=unsupported always_export_symbols_F77=no enable_shared_with_static_runtimes_F77=yes - export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is; otherwise, prepend... archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then @@ -17379,23 +17423,70 @@ 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 - ld_shlibs=no + ld_shlibs_F77=no + fi + ;; + + interix3*) + hardcode_direct_F77=no + hardcode_shlibpath_var_F77=no + hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' + export_dynamic_flag_spec_F77='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds_F77='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) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_addflag= + case $cc_basename,$host_cpu in + pgcc*) # Portland Group C compiler + whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag' + ;; + pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers + whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag -Mnomain' ;; + ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; + efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 + tmp_addflag=' -i_dynamic -nofor_main' ;; + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + esac + archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + + if test $supports_anon_versioning = yes; then + archive_expsym_cmds_F77='$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' + fi + link_all_deplibs_F77=no + else + ld_shlibs_F77=no fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' fi ;; - solaris* | sysv5*) + solaris*) if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then ld_shlibs_F77=no cat <&2 @@ -17409,13 +17500,40 @@ EOF elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs_F77=no fi ;; + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) + ld_shlibs_F77=no + cat <<_LT_EOF 1>&2 + +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** reliably create shared libraries on SCO systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +_LT_EOF + ;; + *) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' + archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' + archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' + else + ld_shlibs_F77=no + fi + ;; + esac + ;; + sunos4*) archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' wlarc= @@ -17425,24 +17543,19 @@ *) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs_F77=no fi ;; esac - if test "$ld_shlibs_F77" = yes; then - runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec_F77='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec_F77= - fi + if test "$ld_shlibs_F77" = no; then + runpath_var= + hardcode_libdir_flag_spec_F77= + export_dynamic_flag_spec_F77= + whole_archive_flag_spec_F77= fi else # PORTME fill in a description of your system's linker (not GNU ld) @@ -17454,7 +17567,7 @@ # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. hardcode_minus_L_F77=yes - if test "$GCC" = yes && test -z "$link_static_flag"; then + if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. hardcode_direct_F77=unsupported @@ -17476,9 +17589,21 @@ else export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' fi + aix_use_runtimelinking=no + + # 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. + case $host_os in aix4.[23]|aix4.[23].*|aix5*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes + break + fi + done + ;; + esac - # KDE requires run time linking. Make it the default. - aix_use_runtimelinking=yes exp_sym_flag='-bexport' no_entry_flag='-bnoentry' fi @@ -17495,7 +17620,7 @@ link_all_deplibs_F77=yes if test "$GCC" = yes; then - case $host_os in aix4.012|aix4.012.*) + 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` @@ -17514,8 +17639,12 @@ hardcode_libdir_flag_spec_F77='-L$libdir' hardcode_libdir_separator_F77= fi + ;; esac shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi else # not using gcc if test "$host_cpu" = ia64; then @@ -17523,22 +17652,23 @@ # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='-qmkshrobj ${wl}-G' + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' else - shared_flag='-qmkshrobj' - fi + shared_flag='${wl}-bM:SRE' + fi fi fi - # Let the compiler handle the export list. - always_export_symbols_F77=no + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + always_export_symbols_F77=yes 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. allow_undefined_flag_F77='-berok' # Determine the default libpath from the value encoded in an empty executable. - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF program main end @@ -17578,14 +17708,13 @@ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_cmds_F77="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag" - archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" + archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib' allow_undefined_flag_F77="-z nodefs" - archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" + archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF @@ -17633,13 +17762,11 @@ # -berok will link without error, but may produce a broken library. no_undefined_flag_F77=' ${wl}-bernotok' allow_undefined_flag_F77=' ${wl}-berok' - # -bexpall does not export symbols beginning with underscore (_) - always_export_symbols_F77=yes # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec_F77=' ' + whole_archive_flag_spec_F77='$convenience' archive_cmds_need_lc_F77=yes - # This is similar to how AIX traditionally builds it's shared libraries. - archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + # This is similar to how AIX traditionally builds its shared libraries. + archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' fi fi ;; @@ -17652,7 +17779,7 @@ ld_shlibs_F77=no ;; - bsdi4*) + bsdi[45]*) export_dynamic_flag_spec_F77=-rdynamic ;; @@ -17662,68 +17789,68 @@ # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. hardcode_libdir_flag_spec_F77=' ' - allow_undefined_flag_F77=no + allow_undefined_flag_F77=unsupported # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext=".dll" + shrext_cmds=".dll" # FIXME: Setting linknames here is a bad hack. - archive_cmds_F77='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' + archive_cmds_F77='$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_F77='true' # FIXME: Should let the user specify the lib program. old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path='`cygpath -w "$srcfile"`' + fix_srcfile_path_F77='`cygpath -w "$srcfile"`' enable_shared_with_static_runtimes_F77=yes ;; darwin* | rhapsody*) - if test "$GXX" = yes ; then - archive_cmds_need_lc_F77=no - case "$host_os" in - rhapsody* | darwin1.[012]) - allow_undefined_flag_F77='-Wl,-undefined -Wl,suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - allow_undefined_flag_F77='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.012) - allow_undefined_flag_F77='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' - ;; - 10.*) - allow_undefined_flag_F77='-Wl,-undefined -Wl,dynamic_lookup' - ;; - esac - fi - ;; + case $host_os in + rhapsody* | darwin1.[012]) + allow_undefined_flag_F77='${wl}-undefined ${wl}suppress' + ;; + *) # Darwin 1.3 on + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[012]) + allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' + ;; + 10.*) + allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup' + ;; + esac + fi + ;; esac - lt_int_apple_cc_single_mod=no - output_verbose_link_cmd='echo' - if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then - lt_int_apple_cc_single_mod=yes - fi - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_cmds_F77='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring' - else - archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring' - fi - module_cmds_F77='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_cmds_need_lc_F77=no hardcode_direct_F77=no hardcode_automatic_F77=yes hardcode_shlibpath_var_F77=unsupported - whole_archive_flag_spec_F77='-all_load $convenience' + whole_archive_flag_spec_F77='' link_all_deplibs_F77=yes + if test "$GCC" = yes ; then + output_verbose_link_cmd='echo' + archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + module_cmds_F77='$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 + archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + module_expsym_cmds_F77='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 - ld_shlibs_F77=no + case $cc_basename in + xlc*) + output_verbose_link_cmd='echo' + archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + module_cmds_F77='$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 + archive_expsym_cmds_F77='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}' + module_expsym_cmds_F77='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}' + ;; + *) + ld_shlibs_F77=no + ;; + esac fi ;; @@ -17757,8 +17884,8 @@ ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | kfreebsd*-gnu) - archive_cmds_F77='$CC -shared -o $lib $compiler_flags $libobjs $deplibs' + freebsd* | dragonfly*) + archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec_F77='-R$libdir' hardcode_direct_F77=yes hardcode_shlibpath_var_F77=no @@ -17766,7 +17893,7 @@ hpux9*) if test "$GCC" = yes; then - archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' else archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi @@ -17780,47 +17907,62 @@ export_dynamic_flag_spec_F77='${wl}-E' ;; - hpux10* | hpux11*) + hpux10*) if test "$GCC" = yes -a "$with_gnu_ld" = no; then - case "$host_cpu" in - hppa*64*|ia64*) - archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' + archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_F77=: + + hardcode_direct_F77=yes + export_dynamic_flag_spec_F77='${wl}-E' + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L_F77=yes + fi + ;; + + hpux11*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + case $host_cpu in + hppa*64*) + archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs' + archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else - case "$host_cpu" in - hppa*64*|ia64*) - archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' + case $host_cpu in + hppa*64*) + archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac fi if test "$with_gnu_ld" = no; then - case "$host_cpu" in - hppa*64*) - hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' + hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_F77=: + + case $host_cpu in + hppa*64*|ia64*) hardcode_libdir_flag_spec_ld_F77='+b $libdir' - hardcode_libdir_separator_F77=: - hardcode_direct_F77=no - hardcode_shlibpath_var_F77=no - ;; - ia64*) - hardcode_libdir_flag_spec_F77='-L$libdir' hardcode_direct_F77=no hardcode_shlibpath_var_F77=no - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L_F77=yes ;; *) - hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_F77=: hardcode_direct_F77=yes export_dynamic_flag_spec_F77='${wl}-E' @@ -17834,7 +17976,7 @@ irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then - archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' hardcode_libdir_flag_spec_ld_F77='-rpath $libdir' @@ -17844,7 +17986,7 @@ link_all_deplibs_F77=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -17867,7 +18009,8 @@ hardcode_direct_F77=yes hardcode_shlibpath_var_F77=no if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds_F77='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs' + archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' export_dynamic_flag_spec_F77='${wl}-E' else @@ -17877,7 +18020,7 @@ hardcode_libdir_flag_spec_F77='-R$libdir' ;; *) - archive_cmds_F77='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs' + archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' ;; esac @@ -17888,14 +18031,14 @@ hardcode_libdir_flag_spec_F77='-L$libdir' hardcode_minus_L_F77=yes allow_undefined_flag_F77=unsupported - archive_cmds_F77='$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 $compiler_flags $libobjs $deplibs$output_objdir/$libname.def' + archive_cmds_F77='$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_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ;; osf3*) if test "$GCC" = yes; then allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_F77='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds_F77='$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}${output_objdir}/so_locations -o $lib' else allow_undefined_flag_F77=' -expect_unresolved \*' archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' @@ -17907,13 +18050,13 @@ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_F77='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds_F77='$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}${output_objdir}/so_locations -o $lib' hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' else allow_undefined_flag_F77=' -expect_unresolved \*' archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$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' + $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' # Both c and cxx compiler support -rpath directly hardcode_libdir_flag_spec_F77='-rpath $libdir' @@ -17921,21 +18064,15 @@ hardcode_libdir_separator_F77=: ;; - sco3.2v5*) - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var_F77=no - export_dynamic_flag_spec_F77='${wl}-Bexport' - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - ;; - solaris*) no_undefined_flag_F77=' -z text' if test "$GCC" = yes; then - archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' + wlarc='${wl}' + archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp' + $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' else + wlarc='' archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' @@ -17944,8 +18081,18 @@ hardcode_shlibpath_var_F77=no case $host_os in solaris2.[0-5] | solaris2.[0-5].*) ;; - *) # Supported since Solaris 2.6 (maybe 2.5.1?) - whole_archive_flag_spec_F77='-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. + # Supported since Solaris 2.6 (maybe 2.5.1?) + case $wlarc in + '') + whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;; + *) + whole_archive_flag_spec_F77='${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 ;; esac link_all_deplibs_F77=yes ;; @@ -17954,7 +18101,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. - archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs' + archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' fi @@ -18002,36 +18149,45 @@ fi ;; - sysv4.2uw2*) - archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_F77=yes - hardcode_minus_L_F77=no + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) + no_undefined_flag_F77='${wl}-z,text' + archive_cmds_need_lc_F77=no hardcode_shlibpath_var_F77=no - hardcode_runpath_var=yes - runpath_var=LD_RUN_PATH - ;; + runpath_var='LD_RUN_PATH' - sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) - no_undefined_flag_F77='${wl}-z ${wl}text' if test "$GCC" = yes; then - archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' + archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - archive_cmds_F77='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' + archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi - runpath_var='LD_RUN_PATH' - hardcode_shlibpath_var_F77=no ;; - sysv5*) - no_undefined_flag_F77=' -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_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' - hardcode_libdir_flag_spec_F77= + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + no_undefined_flag_F77='${wl}-z,text' + allow_undefined_flag_F77='${wl}-z,nodefs' + archive_cmds_need_lc_F77=no hardcode_shlibpath_var_F77=no + hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' + hardcode_libdir_separator_F77=':' + link_all_deplibs_F77=yes + export_dynamic_flag_spec_F77='${wl}-Bexport' runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then + archive_cmds_F77='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds_F77='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + fi ;; uts4*) @@ -18050,11 +18206,6 @@ echo "${ECHO_T}$ld_shlibs_F77" >&6; } test "$ld_shlibs_F77" = no && can_build_shared=no -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - # # Do we need to explicitly link libc? # @@ -18087,6 +18238,7 @@ libobjs=conftest.$ac_objext deplibs= wl=$lt_prog_compiler_wl_F77 + pic_flag=$lt_prog_compiler_pic_F77 compiler_flags=-v linker_flags=-v verstring= @@ -18122,7 +18274,7 @@ library_names_spec= libname_spec='lib$name' soname_spec= -shrext=".so" +shrext_cmds=".so" postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -18132,7 +18284,20 @@ 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" +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 + # 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'` + else + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi +else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +fi need_lib_prefix=unknown hardcode_into_libs=no @@ -18197,7 +18362,7 @@ 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' + 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*) @@ -18206,7 +18371,7 @@ shlibpath_var=LIBRARY_PATH ;; -bsdi4*) +bsdi[45]*) version_type=linux need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -18222,7 +18387,7 @@ cygwin* | mingw* | pw32*) version_type=windows - shrext=".dll" + shrext_cmds=".dll" need_version=no need_lib_prefix=no @@ -18234,7 +18399,8 @@ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname' + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname' postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ dlpath=$dir/\$dldll~ $rm \$dlpath' @@ -18264,7 +18430,7 @@ ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac ;; @@ -18287,7 +18453,7 @@ soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH - shrext='$(test .$module = .yes && echo .so || echo .dylib)' + 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"` @@ -18310,20 +18476,17 @@ dynamic_linker=no ;; -kfreebsd*-gnu*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - -freebsd*) - objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then + objformat=`/usr/bin/objformat` + else + case $host_os in + freebsd[123]*) objformat=aout ;; + *) objformat=elf ;; + esac + fi version_type=freebsd-$objformat case $version_type in freebsd-elf*) @@ -18341,14 +18504,19 @@ freebsd2*) shlibpath_overrides_runpath=yes ;; - freebsd3.01* | freebsdelf3.01*) + freebsd3.[01]* | freebsdelf3.[01]*) shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; - *) # from 3.2 on + freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ + freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; + freebsd*) # from 4.6 on + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; esac ;; @@ -18368,9 +18536,9 @@ version_type=sunos need_lib_prefix=no need_version=no - case "$host_cpu" in + case $host_cpu in ia64*) - shrext='.so' + shrext_cmds='.so' hardcode_into_libs=yes dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH @@ -18385,7 +18553,7 @@ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) - shrext='.sl' + shrext_cmds='.sl' hardcode_into_libs=yes dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH @@ -18396,7 +18564,7 @@ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; *) - shrext='.sl' + shrext_cmds='.sl' dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH @@ -18408,6 +18576,18 @@ postinstall_cmds='chmod 555 $lib' ;; +interix3*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; @@ -18451,29 +18631,26 @@ ;; # This must be Linux ELF. -linux*) +linux* | k*bsd*-gnu) version_type=linux need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - 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 -a ! -h /lib64; then - libsuff=64 - fi - fi shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" # 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 + # 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' ' '` + 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, @@ -18483,6 +18660,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -18492,7 +18681,7 @@ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' dynamic_linker='NetBSD ld.elf_so' fi @@ -18520,8 +18709,13 @@ openbsd*) version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no - need_version=no + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. + case $host_os in + openbsd3.3 | openbsd3.3.*) need_version=yes ;; + *) need_version=no ;; + esac 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 @@ -18541,7 +18735,7 @@ os2*) libname_spec='$name' - shrext=".dll" + shrext_cmds=".dll" need_lib_prefix=no library_names_spec='$libname${shared_ext} $libname.a' dynamic_linker='OS/2 ld.exe' @@ -18559,13 +18753,6 @@ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; -sco3.2v5*) - version_type=osf - 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 - ;; - solaris*) version_type=linux need_lib_prefix=no @@ -18591,7 +18778,7 @@ need_version=yes ;; -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) +sysv4 | sysv4.3*) 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' @@ -18624,6 +18811,29 @@ fi ;; +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=freebsd-elf + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + hardcode_into_libs=yes + if test "$with_gnu_ld" = yes; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + shlibpath_overrides_runpath=no + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + shlibpath_overrides_runpath=yes + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; + esac + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; + uts4*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -18639,12 +18849,17 @@ echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + { echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } hardcode_action_F77= if test -n "$hardcode_libdir_flag_spec_F77" || \ - test -n "$runpath_var F77" || \ - test "X$hardcode_automatic_F77"="Xyes" ; then + test -n "$runpath_var_F77" || \ + test "X$hardcode_automatic_F77" = "Xyes" ; then # We can hardcode non-existant directories. if test "$hardcode_direct_F77" != no && @@ -18676,36 +18891,6 @@ enable_fast_install=needless fi -striplib= -old_striplib= -{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&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 "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - ;; - *) - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - ;; - esac -fi - - # The else clause should only fire when bootstrapping the # libtool distribution, otherwise you forgot to ship ltmain.sh @@ -18720,7 +18905,8 @@ # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \ + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ + SED SHELL STRIP \ 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 \ @@ -18820,6 +19006,12 @@ # The host system. host_alias=$host_alias host=$host +host_os=$host_os + +# The build system. +build_alias=$build_alias +build=$build +build_os=$build_os # An echo program that does not interpret backslashes. echo=$lt_echo @@ -18831,6 +19023,9 @@ # A C compiler. LTCC=$lt_LTCC +# LTCC compiler flags. +LTCFLAGS=$lt_LTCFLAGS + # A language-specific compiler. CC=$lt_compiler_F77 @@ -18850,7 +19045,7 @@ NM=$lt_NM # A symbol stripping program -STRIP=$STRIP +STRIP=$lt_STRIP # Used to examine libraries when file_magic_cmd begins "file" MAGIC_CMD=$MAGIC_CMD @@ -18881,7 +19076,7 @@ libext="$libext" # Shared library suffix (normally ".so"). -shrext='$shrext' +shrext_cmds='$shrext_cmds' # Executable file suffix (normally ""). exeext="$exeext" @@ -18896,7 +19091,7 @@ # Does compiler simultaneously support -c and -o options? compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77 -# Must we lock files when doing compilation ? +# Must we lock files when doing compilation? need_locks=$lt_need_locks # Do we need the lib prefix for modules? @@ -19098,7 +19293,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. - test -f Makefile && make "$ltmain" + ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` + if test -f "$ltmain_in"; then + test -f Makefile && make "$ltmain" + fi fi @@ -19130,26 +19328,55 @@ lt_simple_compile_test_code="class foo {}\n" # 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' # ltmain only uses $CC for tagged configurations so make sure $CC is set. # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + # Allow CC to be a program name with arguments. compiler=$CC +# save warnings/boilerplate of simple test code +ac_outfile=conftest.$ac_objext +printf "$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* + +ac_outfile=conftest.$ac_objext +printf "$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* + + # Allow CC to be a program name with arguments. lt_save_CC="$CC" CC=${GCJ-"gcj"} compiler=$CC compiler_GCJ=$CC +for cc_temp in $compiler""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` + # GCJ did not exist at the time GCC didn't implicitly link libc in. archive_cmds_need_lc_GCJ=no +old_archive_cmds_GCJ=$old_archive_cmds + ## 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 @@ -19176,18 +19403,20 @@ # with a dollar sign (not a hyphen), so the echo should work correctly. # The option is referenced via a variable to avoid confusing sed. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:19182: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19409: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:19186: \$? = $ac_status" >&5 + echo "$as_me:19413: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - if test ! -s conftest.err; then + # So say no if there are warnings other than the usual output. + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then lt_cv_prog_compiler_rtti_exceptions=yes fi fi @@ -19248,6 +19477,11 @@ lt_prog_compiler_pic_GCJ='-fno-common' ;; + interix3*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + msdosdjgpp*) # Just because we use GCC doesn't mean we suddenly get shared libraries # on systems that don't support them. @@ -19264,7 +19498,7 @@ hpux*) # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. - case "$host_cpu" in + case $host_cpu in hppa*64*|ia64*) # +Z the default ;; @@ -19290,6 +19524,16 @@ lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp' fi ;; + darwin*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + case $cc_basename in + xlc*) + lt_prog_compiler_pic_GCJ='-qnocommon' + lt_prog_compiler_wl_GCJ='-Wl,' + ;; + esac + ;; mingw* | pw32* | os2*) # This hack is so that the source file can tell whether it is being @@ -19301,7 +19545,7 @@ lt_prog_compiler_wl_GCJ='-Wl,' # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. - case "$host_cpu" in + case $host_cpu in hppa*64*|ia64*) # +Z the default ;; @@ -19324,13 +19568,20 @@ lt_prog_compiler_static_GCJ='-Bstatic' ;; - linux*) - case $CC in + linux* | k*bsd*-gnu) + case $cc_basename in icc* | ecc*) lt_prog_compiler_wl_GCJ='-Wl,' lt_prog_compiler_pic_GCJ='-KPIC' lt_prog_compiler_static_GCJ='-static' ;; + pgcc* | pgf77* | pgf90* | pgf95*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) + lt_prog_compiler_wl_GCJ='-Wl,' + lt_prog_compiler_pic_GCJ='-fpic' + lt_prog_compiler_static_GCJ='-Bstatic' + ;; ccc*) lt_prog_compiler_wl_GCJ='-Wl,' # All Alpha code is PIC. @@ -19345,15 +19596,15 @@ lt_prog_compiler_static_GCJ='-non_shared' ;; - sco3.2v5*) - lt_prog_compiler_pic_GCJ='-Kpic' - lt_prog_compiler_static_GCJ='-dn' - ;; - solaris*) - lt_prog_compiler_wl_GCJ='-Wl,' lt_prog_compiler_pic_GCJ='-KPIC' lt_prog_compiler_static_GCJ='-Bstatic' + case $cc_basename in + f77* | f90* | f95*) + lt_prog_compiler_wl_GCJ='-Qoption ld ';; + *) + lt_prog_compiler_wl_GCJ='-Wl,';; + esac ;; sunos4*) @@ -19362,7 +19613,7 @@ lt_prog_compiler_static_GCJ='-Bstatic' ;; - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + sysv4 | sysv4.2uw2* | sysv4.3*) lt_prog_compiler_wl_GCJ='-Wl,' lt_prog_compiler_pic_GCJ='-KPIC' lt_prog_compiler_static_GCJ='-Bstatic' @@ -19375,6 +19626,17 @@ fi ;; + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + lt_prog_compiler_wl_GCJ='-Wl,' + lt_prog_compiler_pic_GCJ='-KPIC' + lt_prog_compiler_static_GCJ='-Bstatic' + ;; + + unicos*) + lt_prog_compiler_wl_GCJ='-Wl,' + lt_prog_compiler_can_build_shared_GCJ=no + ;; + uts4*) lt_prog_compiler_pic_GCJ='-pic' lt_prog_compiler_static_GCJ='-Bstatic' @@ -19409,18 +19671,20 @@ # with a dollar sign (not a hyphen), so the echo should work correctly. # The option is referenced via a variable to avoid confusing sed. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:19415: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19677: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:19419: \$? = $ac_status" >&5 + echo "$as_me:19681: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - if test ! -s conftest.err; then + # So say no if there are warnings other than the usual output. + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then lt_prog_compiler_pic_works_GCJ=yes fi fi @@ -19441,7 +19705,7 @@ fi fi -case "$host_os" in +case $host_os in # For platforms which do not support PIC, -DPIC is meaningless: *djgpp*) lt_prog_compiler_pic_GCJ= @@ -19451,6 +19715,48 @@ ;; esac +# +# Check to make sure the static flag actually works. +# +wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } +if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_prog_compiler_static_works_GCJ=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + printf "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_prog_compiler_static_works_GCJ=yes + fi + else + lt_prog_compiler_static_works_GCJ=yes + fi + fi + $rm conftest* + LDFLAGS="$save_LDFLAGS" + +fi +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5 +echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; } + +if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then + : +else + lt_prog_compiler_static_GCJ= +fi + + { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then @@ -19463,38 +19769,36 @@ mkdir out 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 . - 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. # Note that $ac_compile itself does not contain backslashes and begins # with a dollar sign (not a hyphen), so the echo should work correctly. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:19482: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19781: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:19486: \$? = $ac_status" >&5 + echo "$as_me:19785: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - if test ! -s out/conftest.err; then + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then lt_cv_prog_compiler_c_o_GCJ=yes fi fi - chmod u+w . - $rm conftest* out/* - rmdir out + chmod u+w . 2>&5 + $rm conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files + $rm out/* && rmdir out cd .. rmdir conftest $rm conftest* @@ -19565,6 +19869,16 @@ # rely on this symbol name, it's probably fine to never include it in # preloaded symbol tables. extract_expsyms_cmds= + # Just being paranoid about ensuring that cc_basename is set. + for cc_temp in $compiler""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` case $host_os in cygwin* | mingw* | pw32*) @@ -19575,6 +19889,10 @@ with_gnu_ld=no fi ;; + interix*) + # we just hope/assume this is gcc and not c89 (= MSVC++) + with_gnu_ld=yes + ;; openbsd*) with_gnu_ld=no ;; @@ -19585,6 +19903,27 @@ # If archive_cmds runs LD, not CC, wlarc should be empty wlarc='${wl}' + # Set some defaults for GNU ld with shared library support. These + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + runpath_var=LD_RUN_PATH + hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir' + export_dynamic_flag_spec_GCJ='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then + whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + whole_archive_flag_spec_GCJ= + fi + supports_anon_versioning=no + case `$LD -v 2>/dev/null` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + # See if GNU ld supports shared libraries. case $host_os in aix3* | aix4* | aix5*) @@ -19622,7 +19961,7 @@ allow_undefined_flag_GCJ=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - archive_cmds_GCJ='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' + archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' else ld_shlibs_GCJ=no fi @@ -19632,13 +19971,13 @@ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec_GCJ='-L$libdir' - allow_undefined_flag_GCJ=no + allow_undefined_flag_GCJ=unsupported always_export_symbols_GCJ=no enable_shared_with_static_runtimes_GCJ=yes - export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - archive_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is; otherwise, prepend... archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then @@ -19647,23 +19986,70 @@ 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 - ld_shlibs=no + ld_shlibs_GCJ=no + fi + ;; + + interix3*) + hardcode_direct_GCJ=no + hardcode_shlibpath_var_GCJ=no + hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' + export_dynamic_flag_spec_GCJ='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds_GCJ='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) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_addflag= + case $cc_basename,$host_cpu in + pgcc*) # Portland Group C compiler + whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag' + ;; + pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers + whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag -Mnomain' ;; + ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; + efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 + tmp_addflag=' -i_dynamic -nofor_main' ;; + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + esac + archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + + if test $supports_anon_versioning = yes; then + archive_expsym_cmds_GCJ='$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' + fi + link_all_deplibs_GCJ=no + else + ld_shlibs_GCJ=no fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - archive_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' fi ;; - solaris* | sysv5*) + solaris*) if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then ld_shlibs_GCJ=no cat <&2 @@ -19677,13 +20063,40 @@ EOF elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - archive_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs_GCJ=no fi ;; + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) + ld_shlibs_GCJ=no + cat <<_LT_EOF 1>&2 + +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** reliably create shared libraries on SCO systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +_LT_EOF + ;; + *) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' + archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' + archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' + else + ld_shlibs_GCJ=no + fi + ;; + esac + ;; + sunos4*) archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' wlarc= @@ -19693,24 +20106,19 @@ *) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - archive_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs_GCJ=no fi ;; esac - if test "$ld_shlibs_GCJ" = yes; then - runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec_GCJ='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec_GCJ= - fi + if test "$ld_shlibs_GCJ" = no; then + runpath_var= + hardcode_libdir_flag_spec_GCJ= + export_dynamic_flag_spec_GCJ= + whole_archive_flag_spec_GCJ= fi else # PORTME fill in a description of your system's linker (not GNU ld) @@ -19722,7 +20130,7 @@ # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. hardcode_minus_L_GCJ=yes - if test "$GCC" = yes && test -z "$link_static_flag"; then + if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. hardcode_direct_GCJ=unsupported @@ -19744,9 +20152,21 @@ else export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' fi + aix_use_runtimelinking=no + + # 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. + case $host_os in aix4.[23]|aix4.[23].*|aix5*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes + break + fi + done + ;; + esac - # KDE requires run time linking. Make it the default. - aix_use_runtimelinking=yes exp_sym_flag='-bexport' no_entry_flag='-bnoentry' fi @@ -19763,7 +20183,7 @@ link_all_deplibs_GCJ=yes if test "$GCC" = yes; then - case $host_os in aix4.012|aix4.012.*) + 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` @@ -19782,8 +20202,12 @@ hardcode_libdir_flag_spec_GCJ='-L$libdir' hardcode_libdir_separator_GCJ= fi + ;; esac shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi else # not using gcc if test "$host_cpu" = ia64; then @@ -19791,22 +20215,23 @@ # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='-qmkshrobj ${wl}-G' + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' else - shared_flag='-qmkshrobj' - fi + shared_flag='${wl}-bM:SRE' + fi fi fi - # Let the compiler handle the export list. - always_export_symbols_GCJ=no + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + always_export_symbols_GCJ=yes 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. allow_undefined_flag_GCJ='-berok' # Determine the default libpath from the value encoded in an empty executable. - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -19856,14 +20281,13 @@ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_cmds_GCJ="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag" - archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath" + archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib' allow_undefined_flag_GCJ="-z nodefs" - archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" + archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF @@ -19921,13 +20345,11 @@ # -berok will link without error, but may produce a broken library. no_undefined_flag_GCJ=' ${wl}-bernotok' allow_undefined_flag_GCJ=' ${wl}-berok' - # -bexpall does not export symbols beginning with underscore (_) - always_export_symbols_GCJ=yes # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec_GCJ=' ' + whole_archive_flag_spec_GCJ='$convenience' archive_cmds_need_lc_GCJ=yes - # This is similar to how AIX traditionally builds it's shared libraries. - archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + # This is similar to how AIX traditionally builds its shared libraries. + archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' fi fi ;; @@ -19940,7 +20362,7 @@ ld_shlibs_GCJ=no ;; - bsdi4*) + bsdi[45]*) export_dynamic_flag_spec_GCJ=-rdynamic ;; @@ -19950,68 +20372,68 @@ # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. hardcode_libdir_flag_spec_GCJ=' ' - allow_undefined_flag_GCJ=no + allow_undefined_flag_GCJ=unsupported # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext=".dll" + shrext_cmds=".dll" # FIXME: Setting linknames here is a bad hack. - archive_cmds_GCJ='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' + archive_cmds_GCJ='$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_GCJ='true' # FIXME: Should let the user specify the lib program. old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path='`cygpath -w "$srcfile"`' + fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`' enable_shared_with_static_runtimes_GCJ=yes ;; darwin* | rhapsody*) - if test "$GXX" = yes ; then - archive_cmds_need_lc_GCJ=no - case "$host_os" in - rhapsody* | darwin1.[012]) - allow_undefined_flag_GCJ='-Wl,-undefined -Wl,suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - allow_undefined_flag_GCJ='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.012) - allow_undefined_flag_GCJ='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' - ;; - 10.*) - allow_undefined_flag_GCJ='-Wl,-undefined -Wl,dynamic_lookup' - ;; - esac - fi - ;; + case $host_os in + rhapsody* | darwin1.[012]) + allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress' + ;; + *) # Darwin 1.3 on + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[012]) + allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' + ;; + 10.*) + allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup' + ;; + esac + fi + ;; esac - lt_int_apple_cc_single_mod=no - output_verbose_link_cmd='echo' - if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then - lt_int_apple_cc_single_mod=yes - fi - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_cmds_GCJ='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring' - else - archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring' - fi - module_cmds_GCJ='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_cmds_need_lc_GCJ=no hardcode_direct_GCJ=no hardcode_automatic_GCJ=yes hardcode_shlibpath_var_GCJ=unsupported - whole_archive_flag_spec_GCJ='-all_load $convenience' + whole_archive_flag_spec_GCJ='' link_all_deplibs_GCJ=yes + if test "$GCC" = yes ; then + output_verbose_link_cmd='echo' + archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + module_cmds_GCJ='$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 + archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + module_expsym_cmds_GCJ='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 - ld_shlibs_GCJ=no + case $cc_basename in + xlc*) + output_verbose_link_cmd='echo' + archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + module_cmds_GCJ='$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 + archive_expsym_cmds_GCJ='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}' + module_expsym_cmds_GCJ='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}' + ;; + *) + ld_shlibs_GCJ=no + ;; + esac fi ;; @@ -20045,8 +20467,8 @@ ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | kfreebsd*-gnu) - archive_cmds_GCJ='$CC -shared -o $lib $compiler_flags $libobjs $deplibs' + freebsd* | dragonfly*) + archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec_GCJ='-R$libdir' hardcode_direct_GCJ=yes hardcode_shlibpath_var_GCJ=no @@ -20054,7 +20476,7 @@ hpux9*) if test "$GCC" = yes; then - archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' else archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi @@ -20068,47 +20490,62 @@ export_dynamic_flag_spec_GCJ='${wl}-E' ;; - hpux10* | hpux11*) + hpux10*) if test "$GCC" = yes -a "$with_gnu_ld" = no; then - case "$host_cpu" in - hppa*64*|ia64*) - archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' + archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_GCJ=: + + hardcode_direct_GCJ=yes + export_dynamic_flag_spec_GCJ='${wl}-E' + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L_GCJ=yes + fi + ;; + + hpux11*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + case $host_cpu in + hppa*64*) + archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs' + archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else - case "$host_cpu" in - hppa*64*|ia64*) - archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' + case $host_cpu in + hppa*64*) + archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac fi if test "$with_gnu_ld" = no; then - case "$host_cpu" in - hppa*64*) - hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' + hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_GCJ=: + + case $host_cpu in + hppa*64*|ia64*) hardcode_libdir_flag_spec_ld_GCJ='+b $libdir' - hardcode_libdir_separator_GCJ=: - hardcode_direct_GCJ=no - hardcode_shlibpath_var_GCJ=no - ;; - ia64*) - hardcode_libdir_flag_spec_GCJ='-L$libdir' hardcode_direct_GCJ=no hardcode_shlibpath_var_GCJ=no - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L_GCJ=yes ;; *) - hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_GCJ=: hardcode_direct_GCJ=yes export_dynamic_flag_spec_GCJ='${wl}-E' @@ -20122,7 +20559,7 @@ irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then - archive_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir' @@ -20132,7 +20569,7 @@ link_all_deplibs_GCJ=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -20155,7 +20592,8 @@ hardcode_direct_GCJ=yes hardcode_shlibpath_var_GCJ=no if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs' + archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' export_dynamic_flag_spec_GCJ='${wl}-E' else @@ -20165,7 +20603,7 @@ hardcode_libdir_flag_spec_GCJ='-R$libdir' ;; *) - archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs' + archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' ;; esac @@ -20176,14 +20614,14 @@ hardcode_libdir_flag_spec_GCJ='-L$libdir' hardcode_minus_L_GCJ=yes allow_undefined_flag_GCJ=unsupported - archive_cmds_GCJ='$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 $compiler_flags $libobjs $deplibs$output_objdir/$libname.def' + archive_cmds_GCJ='$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_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ;; osf3*) if test "$GCC" = yes; then allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds_GCJ='$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}${output_objdir}/so_locations -o $lib' else allow_undefined_flag_GCJ=' -expect_unresolved \*' archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' @@ -20195,13 +20633,13 @@ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds_GCJ='$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}${output_objdir}/so_locations -o $lib' hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' else allow_undefined_flag_GCJ=' -expect_unresolved \*' archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$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' + $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' # Both c and cxx compiler support -rpath directly hardcode_libdir_flag_spec_GCJ='-rpath $libdir' @@ -20209,21 +20647,15 @@ hardcode_libdir_separator_GCJ=: ;; - sco3.2v5*) - archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var_GCJ=no - export_dynamic_flag_spec_GCJ='${wl}-Bexport' - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - ;; - solaris*) no_undefined_flag_GCJ=' -z text' if test "$GCC" = yes; then - archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' + wlarc='${wl}' + archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp' + $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' else + wlarc='' archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' @@ -20232,8 +20664,18 @@ hardcode_shlibpath_var_GCJ=no case $host_os in solaris2.[0-5] | solaris2.[0-5].*) ;; - *) # Supported since Solaris 2.6 (maybe 2.5.1?) - whole_archive_flag_spec_GCJ='-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. + # Supported since Solaris 2.6 (maybe 2.5.1?) + case $wlarc in + '') + whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;; + *) + whole_archive_flag_spec_GCJ='${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 ;; esac link_all_deplibs_GCJ=yes ;; @@ -20242,7 +20684,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. - archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs' + archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' fi @@ -20290,36 +20732,45 @@ fi ;; - sysv4.2uw2*) - archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_GCJ=yes - hardcode_minus_L_GCJ=no + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) + no_undefined_flag_GCJ='${wl}-z,text' + archive_cmds_need_lc_GCJ=no hardcode_shlibpath_var_GCJ=no - hardcode_runpath_var=yes - runpath_var=LD_RUN_PATH - ;; + runpath_var='LD_RUN_PATH' - sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) - no_undefined_flag_GCJ='${wl}-z ${wl}text' if test "$GCC" = yes; then - archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' + archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - archive_cmds_GCJ='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' + archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi - runpath_var='LD_RUN_PATH' - hardcode_shlibpath_var_GCJ=no ;; - sysv5*) - no_undefined_flag_GCJ=' -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_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' - hardcode_libdir_flag_spec_GCJ= + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + no_undefined_flag_GCJ='${wl}-z,text' + allow_undefined_flag_GCJ='${wl}-z,nodefs' + archive_cmds_need_lc_GCJ=no hardcode_shlibpath_var_GCJ=no + hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' + hardcode_libdir_separator_GCJ=':' + link_all_deplibs_GCJ=yes + export_dynamic_flag_spec_GCJ='${wl}-Bexport' runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then + archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + fi ;; uts4*) @@ -20338,11 +20789,6 @@ echo "${ECHO_T}$ld_shlibs_GCJ" >&6; } test "$ld_shlibs_GCJ" = no && can_build_shared=no -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - # # Do we need to explicitly link libc? # @@ -20375,6 +20821,7 @@ libobjs=conftest.$ac_objext deplibs= wl=$lt_prog_compiler_wl_GCJ + pic_flag=$lt_prog_compiler_pic_GCJ compiler_flags=-v linker_flags=-v verstring= @@ -20410,7 +20857,7 @@ library_names_spec= libname_spec='lib$name' soname_spec= -shrext=".so" +shrext_cmds=".so" postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -20420,7 +20867,20 @@ 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" +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 + # 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'` + else + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi +else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +fi need_lib_prefix=unknown hardcode_into_libs=no @@ -20485,7 +20945,7 @@ 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' + 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*) @@ -20494,7 +20954,7 @@ shlibpath_var=LIBRARY_PATH ;; -bsdi4*) +bsdi[45]*) version_type=linux need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -20510,7 +20970,7 @@ cygwin* | mingw* | pw32*) version_type=windows - shrext=".dll" + shrext_cmds=".dll" need_version=no need_lib_prefix=no @@ -20522,7 +20982,8 @@ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname' + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname' postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ dlpath=$dir/\$dldll~ $rm \$dlpath' @@ -20552,7 +21013,7 @@ ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac ;; @@ -20575,7 +21036,7 @@ soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH - shrext='$(test .$module = .yes && echo .so || echo .dylib)' + 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"` @@ -20598,20 +21059,17 @@ dynamic_linker=no ;; -kfreebsd*-gnu*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - -freebsd*) - objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then + objformat=`/usr/bin/objformat` + else + case $host_os in + freebsd[123]*) objformat=aout ;; + *) objformat=elf ;; + esac + fi version_type=freebsd-$objformat case $version_type in freebsd-elf*) @@ -20629,14 +21087,19 @@ freebsd2*) shlibpath_overrides_runpath=yes ;; - freebsd3.01* | freebsdelf3.01*) + freebsd3.[01]* | freebsdelf3.[01]*) shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; - *) # from 3.2 on + freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ + freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; + freebsd*) # from 4.6 on + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; esac ;; @@ -20656,9 +21119,9 @@ version_type=sunos need_lib_prefix=no need_version=no - case "$host_cpu" in + case $host_cpu in ia64*) - shrext='.so' + shrext_cmds='.so' hardcode_into_libs=yes dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH @@ -20673,7 +21136,7 @@ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) - shrext='.sl' + shrext_cmds='.sl' hardcode_into_libs=yes dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH @@ -20684,1086 +21147,331 @@ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; *) - shrext='.sl' + shrext_cmds='.sl' dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - ;; - esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. - postinstall_cmds='chmod 555 $lib' - ;; - -irix5* | irix6* | nonstopux*) - case $host_os in - nonstopux*) version_type=nonstopux ;; - *) - if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux - else - version_type=irix - fi ;; - esac - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' - case $host_os in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") - libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") - libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") - 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}" - hardcode_into_libs=yes - ;; - -# No shared lib support for Linux oldld, aout, or coff. -linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; - -# This must be Linux ELF. -linux*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - 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 -a ! -h /lib64; then - libsuff=64 - fi - fi - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" - # 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 - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$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}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; - -nto-qnx*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; - -openbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - 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 - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac - else - shlibpath_overrides_runpath=yes - fi - ;; - -os2*) - libname_spec='$name' - shrext=".dll" - need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; - -osf3* | osf4* | osf5*) - version_type=osf - need_lib_prefix=no - need_version=no - 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 - 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}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - ;; - -solaris*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$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}${shared_ext}$versuffix ${libname}${shared_ext}$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}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) - shlibpath_overrides_runpath=no - need_lib_prefix=no - export_dynamic_flag_spec='${wl}-Blargedynsym' - runpath_var=LD_RUN_PATH - ;; - siemens) - need_lib_prefix=no - ;; - motorola) - need_lib_prefix=no - need_version=no - shlibpath_overrides_runpath=no - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' - ;; - esac - ;; - -sysv4*MP*) - if test -d /usr/nec ;then - version_type=linux - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; - -uts4*) - 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' - shlibpath_var=LD_LIBRARY_PATH - ;; - -*) - dynamic_linker=no - ;; -esac -{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6; } -test "$dynamic_linker" = no && can_build_shared=no - -{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } -hardcode_action_GCJ= -if test -n "$hardcode_libdir_flag_spec_GCJ" || \ - test -n "$runpath_var GCJ" || \ - test "X$hardcode_automatic_GCJ"="Xyes" ; then - - # We can hardcode non-existant directories. - if test "$hardcode_direct_GCJ" != 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 "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no && - test "$hardcode_minus_L_GCJ" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action_GCJ=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action_GCJ=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action_GCJ=unsupported -fi -{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 -echo "${ECHO_T}$hardcode_action_GCJ" >&6; } - -if test "$hardcode_action_GCJ" = 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 - -striplib= -old_striplib= -{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&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 "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - ;; - *) - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - ;; - esac -fi - -if test "x$enable_dlopen" != xyes; then - enable_dlopen=unknown - enable_dlopen_self=unknown - enable_dlopen_self_static=unknown -else - lt_cv_dlopen=no - lt_cv_dlopen_libs= - - case $host_os in - beos*) - lt_cv_dlopen="load_add_on" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ;; - - mingw* | pw32*) - lt_cv_dlopen="LoadLibrary" - lt_cv_dlopen_libs= - ;; - - cygwin*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; - - darwin*) - # if libdl is installed we need to link against it - { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_dl_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dl_dlopen=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } -if test $ac_cv_lib_dl_dlopen = yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else - - lt_cv_dlopen="dyld" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - -fi - - ;; - - *) - { echo "$as_me:$LINENO: checking for shl_load" >&5 -echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; } -if test "${ac_cv_func_shl_load+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define shl_load to an innocuous variant, in case declares shl_load. - For example, HP-UX 11i declares gettimeofday. */ -#define shl_load innocuous_shl_load - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shl_load (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef shl_load - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char shl_load (); -/* 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 -#endif - -int -main () -{ -return shl_load (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func_shl_load=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_shl_load=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 -echo "${ECHO_T}$ac_cv_func_shl_load" >&6; } -if test $ac_cv_func_shl_load = yes; then - lt_cv_dlopen="shl_load" -else - { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 -echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; } -if test "${ac_cv_lib_dld_shl_load+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char shl_load (); -int -main () -{ -return shl_load (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_dld_shl_load=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dld_shl_load=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } -if test $ac_cv_lib_dld_shl_load = yes; then - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" -else - { echo "$as_me:$LINENO: checking for dlopen" >&5 -echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } -if test "${ac_cv_func_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define dlopen to an innocuous variant, in case declares dlopen. - For example, HP-UX 11i declares gettimeofday. */ -#define dlopen innocuous_dlopen - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char dlopen (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef dlopen - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -/* 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 -#endif - -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_dlopen=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 -echo "${ECHO_T}$ac_cv_func_dlopen" >&6; } -if test $ac_cv_func_dlopen = yes; then - lt_cv_dlopen="dlopen" -else - { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_dl_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dl_dlopen=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } -if test $ac_cv_lib_dl_dlopen = yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else - { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 -echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; } -if test "${ac_cv_lib_svld_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsvld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_svld_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_svld_dlopen=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; } -if test $ac_cv_lib_svld_dlopen = yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" -else - { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 -echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; } -if test "${ac_cv_lib_dld_dld_link+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dld_link (); -int -main () -{ -return dld_link (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_dld_dld_link=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dld_dld_link=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; } -if test $ac_cv_lib_dld_dld_link = yes; then - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" -fi + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + ;; + esac + # HP-UX runs *really* slowly unless shared libraries are mode 555. + postinstall_cmds='chmod 555 $lib' + ;; +interix3*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; -fi +irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; + *) + if test "$lt_cv_prog_gnu_ld" = yes; then + version_type=linux + else + version_type=irix + fi ;; + esac + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + case $host_os in + irix5* | nonstopux*) + libsuff= shlibsuff= + ;; + *) + case $LD in # libtool.m4 will add one of these switches to LD + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") + libsuff= shlibsuff= libmagic=32-bit;; + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") + libsuff=32 shlibsuff=N32 libmagic=N32;; + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") + 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}" + hardcode_into_libs=yes + ;; +# No shared lib support for Linux oldld, aout, or coff. +linux*oldld* | linux*aout* | linux*coff*) + dynamic_linker=no + ;; -fi +# This must be Linux ELF. +linux* | k*bsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + 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 + # 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' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi -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, + # 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' + ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; -fi +netbsd*) + version_type=sunos + need_lib_prefix=no + need_version=no + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + dynamic_linker='NetBSD (a.out) ld.so' + else + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$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}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; -fi +nto-qnx*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; - ;; +openbsd*) + version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" + need_lib_prefix=no + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. + case $host_os in + openbsd3.3 | openbsd3.3.*) need_version=yes ;; + *) need_version=no ;; esac - - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes + 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 + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case $host_os in + openbsd2.[89] | openbsd2.[89].*) + shlibpath_overrides_runpath=no + ;; + *) + shlibpath_overrides_runpath=yes + ;; + esac else - enable_dlopen=no + shlibpath_overrides_runpath=yes fi + ;; - case $lt_cv_dlopen in - dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - - save_LDFLAGS="$LDFLAGS" - eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - - save_LIBS="$LIBS" - LIBS="$lt_cv_dlopen_libs $LIBS" - - { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 -echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; } -if test "${lt_cv_dlopen_self+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self=cross -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext < -#endif - -#include +os2*) + libname_spec='$name' + shrext_cmds=".dll" + need_lib_prefix=no + library_names_spec='$libname${shared_ext} $libname.a' + dynamic_linker='OS/2 ld.exe' + shlibpath_var=LIBPATH + ;; -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif +osf3* | osf4* | osf5*) + version_type=osf + need_lib_prefix=no + need_version=no + 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 + 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" + ;; -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif +solaris*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$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' + ;; -#ifdef __cplusplus -extern "C" void exit (int); -#endif +sunos4*) + version_type=sunos + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$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 + ;; -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; +sysv4 | sysv4.3*) + 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' + shlibpath_var=LD_LIBRARY_PATH + case $host_vendor in + sni) + shlibpath_overrides_runpath=no + need_lib_prefix=no + export_dynamic_flag_spec='${wl}-Blargedynsym' + runpath_var=LD_RUN_PATH + ;; + siemens) + need_lib_prefix=no + ;; + motorola) + need_lib_prefix=no + need_version=no + shlibpath_overrides_runpath=no + sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' + ;; + esac + ;; - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } +sysv4*MP*) + if test -d /usr/nec ;then + version_type=linux + library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' + soname_spec='$libname${shared_ext}.$major' + shlibpath_var=LD_LIBRARY_PATH + fi + ;; - exit (status); -} -EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; - x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; - x$lt_unknown|x*) lt_cv_dlopen_self=no ;; +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=freebsd-elf + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + hardcode_into_libs=yes + if test "$with_gnu_ld" = yes; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + shlibpath_overrides_runpath=no + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + shlibpath_overrides_runpath=yes + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; esac - else : - # compilation failed - lt_cv_dlopen_self=no fi -fi -rm -fr conftest* - - -fi -{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 -echo "${ECHO_T}$lt_cv_dlopen_self" >&6; } - - if test "x$lt_cv_dlopen_self" = xyes; then - LDFLAGS="$LDFLAGS $link_static_flag" - { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 -echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; } -if test "${lt_cv_dlopen_self_static+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self_static=cross -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext < -#endif - -#include - -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif - -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif - -#ifdef __cplusplus -extern "C" void exit (int); -#endif + sys_lib_dlsearch_path_spec='/usr/lib' + ;; -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; +uts4*) + 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' + shlibpath_var=LD_LIBRARY_PATH + ;; - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } +*) + dynamic_linker=no + ;; +esac +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +echo "${ECHO_T}$dynamic_linker" >&6; } +test "$dynamic_linker" = no && can_build_shared=no - exit (status); -} -EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;; - esac - else : - # compilation failed - lt_cv_dlopen_self_static=no - fi +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -rm -fr conftest* +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } +hardcode_action_GCJ= +if test -n "$hardcode_libdir_flag_spec_GCJ" || \ + test -n "$runpath_var_GCJ" || \ + test "X$hardcode_automatic_GCJ" = "Xyes" ; then + # We can hardcode non-existant directories. + if test "$hardcode_direct_GCJ" != 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 "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no && + test "$hardcode_minus_L_GCJ" != no; then + # Linking always hardcodes the temporary library directory. + hardcode_action_GCJ=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action_GCJ=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action_GCJ=unsupported fi -{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 -echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; } - fi - - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - ;; - esac - - case $lt_cv_dlopen_self in - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; - *) enable_dlopen_self=unknown ;; - esac +{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 +echo "${ECHO_T}$hardcode_action_GCJ" >&6; } - case $lt_cv_dlopen_self_static in - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; - *) enable_dlopen_self_static=unknown ;; - esac +if test "$hardcode_action_GCJ" = 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 @@ -21780,7 +21488,8 @@ # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \ + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ + SED SHELL STRIP \ 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 \ @@ -21880,6 +21589,12 @@ # The host system. host_alias=$host_alias host=$host +host_os=$host_os + +# The build system. +build_alias=$build_alias +build=$build +build_os=$build_os # An echo program that does not interpret backslashes. echo=$lt_echo @@ -21891,6 +21606,9 @@ # A C compiler. LTCC=$lt_LTCC +# LTCC compiler flags. +LTCFLAGS=$lt_LTCFLAGS + # A language-specific compiler. CC=$lt_compiler_GCJ @@ -21910,7 +21628,7 @@ NM=$lt_NM # A symbol stripping program -STRIP=$STRIP +STRIP=$lt_STRIP # Used to examine libraries when file_magic_cmd begins "file" MAGIC_CMD=$MAGIC_CMD @@ -21941,7 +21659,7 @@ libext="$libext" # Shared library suffix (normally ".so"). -shrext='$shrext' +shrext_cmds='$shrext_cmds' # Executable file suffix (normally ""). exeext="$exeext" @@ -21956,7 +21674,7 @@ # Does compiler simultaneously support -c and -o options? compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ -# Must we lock files when doing compilation ? +# Must we lock files when doing compilation? need_locks=$lt_need_locks # Do we need the lib prefix for modules? @@ -22158,7 +21876,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. - test -f Makefile && make "$ltmain" + ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` + if test -f "$ltmain_in"; then + test -f Makefile && make "$ltmain" + fi fi @@ -22196,15 +21917,42 @@ # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + # Allow CC to be a program name with arguments. compiler=$CC +# save warnings/boilerplate of simple test code +ac_outfile=conftest.$ac_objext +printf "$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* + +ac_outfile=conftest.$ac_objext +printf "$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* + + # Allow CC to be a program name with arguments. lt_save_CC="$CC" CC=${RC-"windres"} compiler=$CC compiler_RC=$CC +for cc_temp in $compiler""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` + lt_cv_prog_compiler_c_o_RC=yes # The else clause should only fire when bootstrapping the @@ -22220,7 +21968,8 @@ # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \ + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ + SED SHELL STRIP \ 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 \ @@ -22320,6 +22069,12 @@ # The host system. host_alias=$host_alias host=$host +host_os=$host_os + +# The build system. +build_alias=$build_alias +build=$build +build_os=$build_os # An echo program that does not interpret backslashes. echo=$lt_echo @@ -22331,6 +22086,9 @@ # A C compiler. LTCC=$lt_LTCC +# LTCC compiler flags. +LTCFLAGS=$lt_LTCFLAGS + # A language-specific compiler. CC=$lt_compiler_RC @@ -22350,7 +22108,7 @@ NM=$lt_NM # A symbol stripping program -STRIP=$STRIP +STRIP=$lt_STRIP # Used to examine libraries when file_magic_cmd begins "file" MAGIC_CMD=$MAGIC_CMD @@ -22381,7 +22139,7 @@ libext="$libext" # Shared library suffix (normally ".so"). -shrext='$shrext' +shrext_cmds='$shrext_cmds' # Executable file suffix (normally ""). exeext="$exeext" @@ -22396,7 +22154,7 @@ # Does compiler simultaneously support -c and -o options? compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC -# Must we lock files when doing compilation ? +# Must we lock files when doing compilation? need_locks=$lt_need_locks # Do we need the lib prefix for modules? @@ -22598,7 +22356,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. - test -f Makefile && make "$ltmain" + ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` + if test -f "$ltmain_in"; then + test -f Makefile && make "$ltmain" + fi fi @@ -22645,7 +22406,7 @@ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" # Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent' +LIBTOOL='$(SHELL) $(top_builddir)/libtool' # Prevent multiple expansion @@ -22956,9 +22717,6 @@ save_CXXFLAGS="$CXXFLAGS" kde_safe_LIBS="$LIBS" LIBS="$LIBS $X_EXTRA_LIBS" -if test "$GXX" = "yes"; then -CXXFLAGS="$CXXFLAGS -pedantic-errors" -fi cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -23168,9 +22926,6 @@ save_CXXFLAGS="$CXXFLAGS" kde_safe_LIBS="$LIBS" LIBS="$LIBS $X_EXTRA_LIBS" -if test "$GXX" = "yes"; then -CXXFLAGS="$CXXFLAGS -pedantic-errors" -fi cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -25246,9 +25001,6 @@ save_CXXFLAGS="$CXXFLAGS" kde_safe_LIBS="$LIBS" LIBS="$LIBS $X_EXTRA_LIBS" -if test "$GXX" = "yes"; then -CXXFLAGS="$CXXFLAGS -pedantic-errors" -fi cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -30151,7 +29903,7 @@ do for j in jpeglib.h; do - echo "configure: 30154: $i/$j" >&5 + echo "configure: 29906: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 jpeg_incdir=$i @@ -30449,7 +30201,7 @@ do for j in $kde_qt_header; do - echo "configure: 30452: $i/$j" >&5 + echo "configure: 30204: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 qt_incdir=$i @@ -31280,7 +31032,7 @@ do for j in $kde_check_header; do - echo "configure: 31283: $i/$j" >&5 + echo "configure: 31035: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 kde_incdir=$i @@ -31310,7 +31062,7 @@ do for j in $kde_check_lib; do - echo "configure: 31313: $i/$j" >&5 + echo "configure: 31065: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 kde_libdir=$i @@ -31328,7 +31080,7 @@ do for j in "kde3/plugins/designer/kdewidgets.la"; do - echo "configure: 31331: $i/$j" >&5 + echo "configure: 31083: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 kde_widgetdir=$i @@ -32847,7 +32599,7 @@ do for j in apps/ksgmltools2/customization/kde-chunk.xsl; do - echo "configure: 32850: $i/$j" >&5 + echo "configure: 32602: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 KDE_XSL_STYLESHEET=$i @@ -33355,7 +33107,7 @@ do for j in qsql.html; do - echo "configure: 33358: $i/$j" >&5 + echo "configure: 33110: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 QTDOCDIR=$i @@ -34098,9 +33850,6 @@ save_CXXFLAGS="$CXXFLAGS" kde_safe_LIBS="$LIBS" LIBS="$LIBS $X_EXTRA_LIBS" -if test "$GXX" = "yes"; then -CXXFLAGS="$CXXFLAGS -pedantic-errors" -fi cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -34304,9 +34053,6 @@ save_CXXFLAGS="$CXXFLAGS" kde_safe_LIBS="$LIBS" LIBS="$LIBS $X_EXTRA_LIBS" -if test "$GXX" = "yes"; then -CXXFLAGS="$CXXFLAGS -pedantic-errors" -fi cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -34559,9 +34305,6 @@ save_CXXFLAGS="$CXXFLAGS" kde_safe_LIBS="$LIBS" LIBS="$LIBS $X_EXTRA_LIBS" -if test "$GXX" = "yes"; then -CXXFLAGS="$CXXFLAGS -pedantic-errors" -fi cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -38609,7 +38352,7 @@ do for j in Python.h; do - echo "configure: 38612: $i/$j" >&5 + echo "configure: 38355: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 python_incdir=$i @@ -38625,7 +38368,7 @@ do for j in python$version/Python.h; do - echo "configure: 38628: $i/$j" >&5 + echo "configure: 38371: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 python_incdir=$i @@ -38649,7 +38392,7 @@ do for j in libpython$version.so; do - echo "configure: 38652: $i/$j" >&5 + echo "configure: 38395: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 python_libdir=$i @@ -38665,7 +38408,7 @@ do for j in libpython$version.a; do - echo "configure: 38668: $i/$j" >&5 + echo "configure: 38411: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 python_libdir=$i @@ -38681,7 +38424,7 @@ do for j in python$version/config/libpython$version.a; do - echo "configure: 38684: $i/$j" >&5 + echo "configure: 38427: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 python_libdir=$i @@ -38709,7 +38452,7 @@ do for j in python$version/copy.py; do - echo "configure: 38712: $i/$j" >&5 + echo "configure: 38455: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 python_moddir=$i @@ -38753,7 +38496,7 @@ do for j in Python.h; do - echo "configure: 38756: $i/$j" >&5 + echo "configure: 38499: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 python_incdir=$i @@ -38769,7 +38512,7 @@ do for j in python$version/Python.h; do - echo "configure: 38772: $i/$j" >&5 + echo "configure: 38515: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 python_incdir=$i @@ -38793,7 +38536,7 @@ do for j in libpython$version.so; do - echo "configure: 38796: $i/$j" >&5 + echo "configure: 38539: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 python_libdir=$i @@ -38809,7 +38552,7 @@ do for j in libpython$version.a; do - echo "configure: 38812: $i/$j" >&5 + echo "configure: 38555: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 python_libdir=$i @@ -38825,7 +38568,7 @@ do for j in python$version/config/libpython$version.a; do - echo "configure: 38828: $i/$j" >&5 + echo "configure: 38571: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 python_libdir=$i @@ -38853,7 +38596,7 @@ do for j in python$version/copy.py; do - echo "configure: 38856: $i/$j" >&5 + echo "configure: 38599: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 python_moddir=$i @@ -38897,7 +38640,7 @@ do for j in Python.h; do - echo "configure: 38900: $i/$j" >&5 + echo "configure: 38643: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 python_incdir=$i @@ -38913,7 +38656,7 @@ do for j in python$version/Python.h; do - echo "configure: 38916: $i/$j" >&5 + echo "configure: 38659: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 python_incdir=$i @@ -38937,7 +38680,7 @@ do for j in libpython$version.so; do - echo "configure: 38940: $i/$j" >&5 + echo "configure: 38683: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 python_libdir=$i @@ -38953,7 +38696,7 @@ do for j in libpython$version.a; do - echo "configure: 38956: $i/$j" >&5 + echo "configure: 38699: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 python_libdir=$i @@ -38969,7 +38712,7 @@ do for j in python$version/config/libpython$version.a; do - echo "configure: 38972: $i/$j" >&5 + echo "configure: 38715: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 python_libdir=$i @@ -38997,7 +38740,7 @@ do for j in python$version/copy.py; do - echo "configure: 39000: $i/$j" >&5 + echo "configure: 38743: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 python_moddir=$i @@ -39041,7 +38784,7 @@ do for j in Python.h; do - echo "configure: 39044: $i/$j" >&5 + echo "configure: 38787: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 python_incdir=$i @@ -39057,7 +38800,7 @@ do for j in python$version/Python.h; do - echo "configure: 39060: $i/$j" >&5 + echo "configure: 38803: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 python_incdir=$i @@ -39081,7 +38824,7 @@ do for j in libpython$version.so; do - echo "configure: 39084: $i/$j" >&5 + echo "configure: 38827: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 python_libdir=$i @@ -39097,7 +38840,7 @@ do for j in libpython$version.a; do - echo "configure: 39100: $i/$j" >&5 + echo "configure: 38843: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 python_libdir=$i @@ -39113,7 +38856,7 @@ do for j in python$version/config/libpython$version.a; do - echo "configure: 39116: $i/$j" >&5 + echo "configure: 38859: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 python_libdir=$i @@ -39141,7 +38884,7 @@ do for j in python$version/copy.py; do - echo "configure: 39144: $i/$j" >&5 + echo "configure: 38887: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 python_moddir=$i @@ -39185,7 +38928,7 @@ do for j in Python.h; do - echo "configure: 39188: $i/$j" >&5 + echo "configure: 38931: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 python_incdir=$i @@ -39201,7 +38944,7 @@ do for j in python$version/Python.h; do - echo "configure: 39204: $i/$j" >&5 + echo "configure: 38947: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 python_incdir=$i @@ -39225,7 +38968,7 @@ do for j in libpython$version.so; do - echo "configure: 39228: $i/$j" >&5 + echo "configure: 38971: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 python_libdir=$i @@ -39241,7 +38984,7 @@ do for j in libpython$version.a; do - echo "configure: 39244: $i/$j" >&5 + echo "configure: 38987: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 python_libdir=$i @@ -39257,7 +39000,7 @@ do for j in python$version/config/libpython$version.a; do - echo "configure: 39260: $i/$j" >&5 + echo "configure: 39003: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 python_libdir=$i @@ -39285,7 +39028,7 @@ do for j in python$version/copy.py; do - echo "configure: 39288: $i/$j" >&5 + echo "configure: 39031: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 python_moddir=$i @@ -39329,7 +39072,7 @@ do for j in Python.h; do - echo "configure: 39332: $i/$j" >&5 + echo "configure: 39075: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 python_incdir=$i @@ -39345,7 +39088,7 @@ do for j in python$version/Python.h; do - echo "configure: 39348: $i/$j" >&5 + echo "configure: 39091: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 python_incdir=$i @@ -39369,7 +39112,7 @@ do for j in libpython$version.so; do - echo "configure: 39372: $i/$j" >&5 + echo "configure: 39115: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 python_libdir=$i @@ -39385,7 +39128,7 @@ do for j in libpython$version.a; do - echo "configure: 39388: $i/$j" >&5 + echo "configure: 39131: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 python_libdir=$i @@ -39401,7 +39144,7 @@ do for j in python$version/config/libpython$version.a; do - echo "configure: 39404: $i/$j" >&5 + echo "configure: 39147: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 python_libdir=$i @@ -39429,7 +39172,7 @@ do for j in python$version/copy.py; do - echo "configure: 39432: $i/$j" >&5 + echo "configure: 39175: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 python_moddir=$i @@ -39473,7 +39216,7 @@ do for j in Python.h; do - echo "configure: 39476: $i/$j" >&5 + echo "configure: 39219: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 python_incdir=$i @@ -39489,7 +39232,7 @@ do for j in python$version/Python.h; do - echo "configure: 39492: $i/$j" >&5 + echo "configure: 39235: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 python_incdir=$i @@ -39513,7 +39256,7 @@ do for j in libpython$version.so; do - echo "configure: 39516: $i/$j" >&5 + echo "configure: 39259: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 python_libdir=$i @@ -39529,7 +39272,7 @@ do for j in libpython$version.a; do - echo "configure: 39532: $i/$j" >&5 + echo "configure: 39275: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 python_libdir=$i @@ -39545,7 +39288,7 @@ do for j in python$version/config/libpython$version.a; do - echo "configure: 39548: $i/$j" >&5 + echo "configure: 39291: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 python_libdir=$i @@ -39573,7 +39316,7 @@ do for j in python$version/copy.py; do - echo "configure: 39576: $i/$j" >&5 + echo "configure: 39319: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 python_moddir=$i @@ -49082,6 +48825,13 @@ LTLIBOBJS=$ac_ltlibobjs +if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -50023,6 +49773,9 @@ AMTAR!$AMTAR$ac_delim am__tar!$am__tar$ac_delim am__untar!$am__untar$ac_delim +MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim +MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim +MAINT!$MAINT$ac_delim KDECONFIG!$KDECONFIG$ac_delim kde_libs_prefix!$kde_libs_prefix$ac_delim kde_libs_htmldir!$kde_libs_htmldir$ac_delim @@ -50046,9 +49799,6 @@ CPP!$CPP$ac_delim CXX!$CXX$ac_delim CXXFLAGS!$CXXFLAGS$ac_delim -ac_ct_CXX!$ac_ct_CXX$ac_delim -CXXDEPMODE!$CXXDEPMODE$ac_delim -am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -50090,6 +49840,9 @@ ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +ac_ct_CXX!$ac_ct_CXX$ac_delim +CXXDEPMODE!$CXXDEPMODE$ac_delim +am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim WOVERLOADED_VIRTUAL!$WOVERLOADED_VIRTUAL$ac_delim HAVE_GCC_VISIBILITY!$HAVE_GCC_VISIBILITY$ac_delim @@ -50184,9 +49937,6 @@ include_ARTS_FALSE!$include_ARTS_FALSE$ac_delim MAKEKDEWIDGETS!$MAKEKDEWIDGETS$ac_delim KCONFIG_COMPILER!$KCONFIG_COMPILER$ac_delim -KCFG_DEPENDENCIES!$KCFG_DEPENDENCIES$ac_delim -DCOPIDLNG!$DCOPIDLNG$ac_delim -DCOPIDL!$DCOPIDL$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -50228,6 +49978,9 @@ ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +KCFG_DEPENDENCIES!$KCFG_DEPENDENCIES$ac_delim +DCOPIDLNG!$DCOPIDLNG$ac_delim +DCOPIDL!$DCOPIDL$ac_delim DCOPIDL2CPP!$DCOPIDL2CPP$ac_delim DCOP_DEPENDENCIES!$DCOP_DEPENDENCIES$ac_delim MCOPIDL!$MCOPIDL$ac_delim @@ -50322,9 +50075,6 @@ kcalc_SUBDIR_included_FALSE!$kcalc_SUBDIR_included_FALSE$ac_delim kcharselect_SUBDIR_included_TRUE!$kcharselect_SUBDIR_included_TRUE$ac_delim kcharselect_SUBDIR_included_FALSE!$kcharselect_SUBDIR_included_FALSE$ac_delim -kdelirc_SUBDIR_included_TRUE!$kdelirc_SUBDIR_included_TRUE$ac_delim -kdelirc_SUBDIR_included_FALSE!$kdelirc_SUBDIR_included_FALSE$ac_delim -kdessh_SUBDIR_included_TRUE!$kdessh_SUBDIR_included_TRUE$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -50366,6 +50116,9 @@ ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +kdelirc_SUBDIR_included_TRUE!$kdelirc_SUBDIR_included_TRUE$ac_delim +kdelirc_SUBDIR_included_FALSE!$kdelirc_SUBDIR_included_FALSE$ac_delim +kdessh_SUBDIR_included_TRUE!$kdessh_SUBDIR_included_TRUE$ac_delim kdessh_SUBDIR_included_FALSE!$kdessh_SUBDIR_included_FALSE$ac_delim kdf_SUBDIR_included_TRUE!$kdf_SUBDIR_included_TRUE$ac_delim kdf_SUBDIR_included_FALSE!$kdf_SUBDIR_included_FALSE$ac_delim @@ -50397,7 +50150,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 29; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 32; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 --- kdeutils-3.5.8.orig/kfloppy/Makefile.in +++ kdeutils-3.5.8/kfloppy/Makefile.in @@ -232,6 +232,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -386,7 +387,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -424,9 +425,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) --- kdeutils-3.5.8.orig/kcharselect/Makefile.in +++ kdeutils-3.5.8/kcharselect/Makefile.in @@ -231,6 +231,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -386,7 +387,7 @@ .SUFFIXES: .SUFFIXES: .cc .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -424,9 +425,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) --- kdeutils-3.5.8.orig/kdelirc/profiles/Makefile.in +++ kdeutils-3.5.8/kdelirc/profiles/Makefile.in @@ -182,6 +182,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -328,7 +329,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -366,9 +367,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/kdelirc/irkick/icons/Makefile.in +++ kdeutils-3.5.8/kdelirc/irkick/icons/Makefile.in @@ -172,6 +172,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -317,7 +318,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -355,9 +356,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/kdelirc/irkick/Makefile.in +++ kdeutils-3.5.8/kdelirc/irkick/Makefile.in @@ -281,6 +281,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -456,7 +457,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -494,9 +495,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdeutils-3.5.8.orig/kdelirc/kcmlirc/Makefile.in +++ kdeutils-3.5.8/kdelirc/kcmlirc/Makefile.in @@ -233,6 +233,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -389,7 +390,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -427,9 +428,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdeutils-3.5.8.orig/kdelirc/icons/Makefile.in +++ kdeutils-3.5.8/kdelirc/icons/Makefile.in @@ -172,6 +172,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -317,7 +318,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -355,9 +356,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/kdelirc/kdelirc/Makefile.in +++ kdeutils-3.5.8/kdelirc/kdelirc/Makefile.in @@ -222,6 +222,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -401,7 +402,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -439,9 +440,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh clean-noinstLTLIBRARIES: --- kdeutils-3.5.8.orig/kdelirc/Makefile.in +++ kdeutils-3.5.8/kdelirc/Makefile.in @@ -193,6 +193,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -337,7 +338,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -375,9 +376,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/kdelirc/remotes/Makefile.in +++ kdeutils-3.5.8/kdelirc/remotes/Makefile.in @@ -182,6 +182,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -330,7 +331,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -368,9 +369,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/kjots/icons/Makefile.in +++ kdeutils-3.5.8/kjots/icons/Makefile.in @@ -182,6 +182,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -328,7 +329,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -366,9 +367,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/kjots/Makefile.in +++ kdeutils-3.5.8/kjots/Makefile.in @@ -246,6 +246,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -417,7 +418,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -455,9 +456,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) --- kdeutils-3.5.8.orig/ktimer/Makefile.in +++ kdeutils-3.5.8/ktimer/Makefile.in @@ -224,6 +224,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -379,7 +380,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -417,9 +418,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) --- kdeutils-3.5.8.orig/Makefile.in +++ kdeutils-3.5.8/Makefile.in @@ -210,6 +210,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -360,7 +361,7 @@ .SUFFIXES: am--refresh: @: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(srcdir)/admin/Doxyfile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(srcdir)/admin/Doxyfile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -402,12 +403,12 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) #>- cd $(srcdir) && $(AUTOCONF) #>+ 2 cd $(srcdir) && rm -f configure cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) config.h: stamp-h1 @@ -419,7 +420,7 @@ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status config.h -$(srcdir)/config.h.in: $(am__configure_deps) +$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_srcdir) && $(AUTOHEADER) rm -f stamp-h1 touch $@ @@ -937,7 +938,7 @@ .NOEXPORT: #>+ 2 -KDE_DIST=Mainpage.dox COPYING-DOCS subdirs Makefile.in configure.files config.h.in kdeutils.lsm configure.in Makefile.cvs aclocal.m4 configure.in.in Makefile.am acinclude.m4 Makefile.am.in +KDE_DIST=stamp-h.in Mainpage.dox COPYING-DOCS subdirs Makefile.in configure.files config.h.in kdeutils.lsm configure.in Makefile.cvs aclocal.m4 configure.in.in Makefile.am configure acinclude.m4 Makefile.am.in #>+ 2 docs-am: --- kdeutils-3.5.8.orig/doc/ark/Makefile.in +++ kdeutils-3.5.8/doc/ark/Makefile.in @@ -172,6 +172,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -318,7 +319,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -356,9 +357,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/doc/kwallet/Makefile.in +++ kdeutils-3.5.8/doc/kwallet/Makefile.in @@ -172,6 +172,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -317,7 +318,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -355,9 +356,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/doc/kdf/Makefile.in +++ kdeutils-3.5.8/doc/kdf/Makefile.in @@ -172,6 +172,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -317,7 +318,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -355,9 +356,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/doc/kfloppy/Makefile.in +++ kdeutils-3.5.8/doc/kfloppy/Makefile.in @@ -172,6 +172,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -317,7 +318,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -355,9 +356,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/doc/kcharselect/Makefile.in +++ kdeutils-3.5.8/doc/kcharselect/Makefile.in @@ -172,6 +172,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -317,7 +318,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -355,9 +356,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/doc/kdelirc/irkick/Makefile.in +++ kdeutils-3.5.8/doc/kdelirc/irkick/Makefile.in @@ -172,6 +172,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -317,7 +318,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -355,9 +356,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/doc/kdelirc/kcmlirc/Makefile.in +++ kdeutils-3.5.8/doc/kdelirc/kcmlirc/Makefile.in @@ -172,6 +172,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -317,7 +318,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -355,9 +356,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/doc/kdelirc/Makefile.in +++ kdeutils-3.5.8/doc/kdelirc/Makefile.in @@ -192,6 +192,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -340,7 +341,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -378,9 +379,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/doc/kjots/Makefile.in +++ kdeutils-3.5.8/doc/kjots/Makefile.in @@ -172,6 +172,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -317,7 +318,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -355,9 +356,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/doc/ktimer/Makefile.in +++ kdeutils-3.5.8/doc/ktimer/Makefile.in @@ -172,6 +172,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -317,7 +318,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -355,9 +356,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/doc/Makefile.in +++ kdeutils-3.5.8/doc/Makefile.in @@ -192,6 +192,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -340,7 +341,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -378,9 +379,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/doc/kedit/Makefile.in +++ kdeutils-3.5.8/doc/kedit/Makefile.in @@ -172,6 +172,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -317,7 +318,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -355,9 +356,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/doc/kinfocenter/Makefile.in +++ kdeutils-3.5.8/doc/kinfocenter/Makefile.in @@ -192,6 +192,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -340,7 +341,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -378,9 +379,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/doc/kinfocenter/blockdevices/Makefile.in +++ kdeutils-3.5.8/doc/kinfocenter/blockdevices/Makefile.in @@ -172,6 +172,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -317,7 +318,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -355,9 +356,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/doc/ksim/Makefile.in +++ kdeutils-3.5.8/doc/ksim/Makefile.in @@ -172,6 +172,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -317,7 +318,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -355,9 +356,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/doc/kcontrol/kcmlowbatwarn/Makefile.in +++ kdeutils-3.5.8/doc/kcontrol/kcmlowbatwarn/Makefile.in @@ -172,6 +172,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -317,7 +318,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -355,9 +356,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/doc/kcontrol/laptop/Makefile.in +++ kdeutils-3.5.8/doc/kcontrol/laptop/Makefile.in @@ -172,6 +172,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -317,7 +318,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -355,9 +356,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/doc/kcontrol/powerctrl/Makefile.in +++ kdeutils-3.5.8/doc/kcontrol/powerctrl/Makefile.in @@ -172,6 +172,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -317,7 +318,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -355,9 +356,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/doc/kcontrol/Makefile.in +++ kdeutils-3.5.8/doc/kcontrol/Makefile.in @@ -192,6 +192,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -340,7 +341,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -378,9 +379,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/doc/kcontrol/kcmlowbatcrit/Makefile.in +++ kdeutils-3.5.8/doc/kcontrol/kcmlowbatcrit/Makefile.in @@ -172,6 +172,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -317,7 +318,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -355,9 +356,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/doc/khexedit/Makefile.in +++ kdeutils-3.5.8/doc/khexedit/Makefile.in @@ -172,6 +172,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -317,7 +318,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -355,9 +356,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/doc/kcalc/Makefile.in +++ kdeutils-3.5.8/doc/kcalc/Makefile.in @@ -172,6 +172,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -317,7 +318,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -355,9 +356,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/doc/KRegExpEditor/Makefile.in +++ kdeutils-3.5.8/doc/KRegExpEditor/Makefile.in @@ -172,6 +172,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -317,7 +318,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -355,9 +356,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/doc/superkaramba/Makefile.in +++ kdeutils-3.5.8/doc/superkaramba/Makefile.in @@ -172,6 +172,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -317,7 +318,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -355,9 +356,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/doc/kgpg/Makefile.in +++ kdeutils-3.5.8/doc/kgpg/Makefile.in @@ -172,6 +172,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -317,7 +318,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -355,9 +356,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/kedit/Makefile.in +++ kdeutils-3.5.8/kedit/Makefile.in @@ -271,6 +271,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -438,7 +439,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -476,9 +477,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdeutils-3.5.8.orig/kedit/pixmaps/Makefile.in +++ kdeutils-3.5.8/kedit/pixmaps/Makefile.in @@ -172,6 +172,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -316,7 +317,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -354,9 +355,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/configure.in +++ kdeutils-3.5.8/configure.in @@ -42,6 +42,8 @@ dnl Automake doc recommends to do this only here. (Janos) AM_INIT_AUTOMAKE(kdeutils, "3.5.8") dnl searches for some needed programs +AM_MAINTAINER_MODE + KDE_SET_PREFIX dnl generate the config header --- kdeutils-3.5.8.orig/ksim/themes/Makefile.in +++ kdeutils-3.5.8/ksim/themes/Makefile.in @@ -192,6 +192,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -336,7 +337,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -374,9 +375,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/ksim/themes/ksim/host/Makefile.in +++ kdeutils-3.5.8/ksim/themes/ksim/host/Makefile.in @@ -182,6 +182,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -328,7 +329,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -366,9 +367,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/ksim/themes/ksim/Makefile.in +++ kdeutils-3.5.8/ksim/themes/ksim/Makefile.in @@ -203,6 +203,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -367,7 +368,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -405,9 +406,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/ksim/themes/ksim/mail/Makefile.in +++ kdeutils-3.5.8/ksim/themes/ksim/mail/Makefile.in @@ -182,6 +182,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -327,7 +328,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -365,9 +366,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/ksim/pics/misc/Makefile.in +++ kdeutils-3.5.8/ksim/pics/misc/Makefile.in @@ -182,6 +182,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -329,7 +330,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -367,9 +368,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/ksim/pics/Makefile.in +++ kdeutils-3.5.8/ksim/pics/Makefile.in @@ -192,6 +192,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -337,7 +338,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -375,9 +376,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/ksim/monitors/lm_sensors/Makefile.in +++ kdeutils-3.5.8/ksim/monitors/lm_sensors/Makefile.in @@ -248,6 +248,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -413,7 +414,7 @@ .SUFFIXES: .SUFFIXES: .c .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -451,9 +452,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdeutils-3.5.8.orig/ksim/monitors/net/Makefile.in +++ kdeutils-3.5.8/ksim/monitors/net/Makefile.in @@ -227,6 +227,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -380,7 +381,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -418,9 +419,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdeutils-3.5.8.orig/ksim/monitors/Makefile.in +++ kdeutils-3.5.8/ksim/monitors/Makefile.in @@ -192,6 +192,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -338,7 +339,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -376,9 +377,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/ksim/monitors/filesystem/Makefile.in +++ kdeutils-3.5.8/ksim/monitors/filesystem/Makefile.in @@ -227,6 +227,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -387,7 +388,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -425,9 +426,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdeutils-3.5.8.orig/ksim/monitors/snmp/Makefile.in +++ kdeutils-3.5.8/ksim/monitors/snmp/Makefile.in @@ -235,6 +235,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -398,7 +399,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -436,9 +437,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdeutils-3.5.8.orig/ksim/monitors/cpu/Makefile.in +++ kdeutils-3.5.8/ksim/monitors/cpu/Makefile.in @@ -222,6 +222,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -378,7 +379,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -416,9 +417,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdeutils-3.5.8.orig/ksim/monitors/mail/Makefile.in +++ kdeutils-3.5.8/ksim/monitors/mail/Makefile.in @@ -224,6 +224,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -379,7 +380,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -417,9 +418,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdeutils-3.5.8.orig/ksim/monitors/i8k/Makefile.in +++ kdeutils-3.5.8/ksim/monitors/i8k/Makefile.in @@ -222,6 +222,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -377,7 +378,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -415,9 +416,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdeutils-3.5.8.orig/ksim/monitors/disk/Makefile.in +++ kdeutils-3.5.8/ksim/monitors/disk/Makefile.in @@ -224,6 +224,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -379,7 +380,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -417,9 +418,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdeutils-3.5.8.orig/ksim/Makefile.in +++ kdeutils-3.5.8/ksim/Makefile.in @@ -266,6 +266,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -437,7 +438,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -475,9 +476,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdeutils-3.5.8.orig/ksim/library/Makefile.in +++ kdeutils-3.5.8/ksim/library/Makefile.in @@ -231,6 +231,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -394,7 +395,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -432,9 +433,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdeutils-3.5.8.orig/kregexpeditor/predefined/General/Makefile.in +++ kdeutils-3.5.8/kregexpeditor/predefined/General/Makefile.in @@ -182,6 +182,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -328,7 +329,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -366,9 +367,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/kregexpeditor/predefined/Makefile.in +++ kdeutils-3.5.8/kregexpeditor/predefined/Makefile.in @@ -192,6 +192,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -336,7 +337,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -374,9 +375,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/kregexpeditor/KMultiFormListBox/Makefile.in +++ kdeutils-3.5.8/kregexpeditor/KMultiFormListBox/Makefile.in @@ -227,6 +227,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -386,7 +387,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -424,9 +425,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh clean-noinstLTLIBRARIES: --- kdeutils-3.5.8.orig/kregexpeditor/test-without-dl/Makefile.in +++ kdeutils-3.5.8/kregexpeditor/test-without-dl/Makefile.in @@ -212,6 +212,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -362,7 +363,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -400,9 +401,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh clean-checkPROGRAMS: --- kdeutils-3.5.8.orig/kregexpeditor/Makefile.in +++ kdeutils-3.5.8/kregexpeditor/Makefile.in @@ -317,6 +317,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -507,7 +508,7 @@ .SUFFIXES: .SUFFIXES: .cc .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -545,9 +546,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdeutils-3.5.8.orig/kregexpeditor/picts/Makefile.in +++ kdeutils-3.5.8/kregexpeditor/picts/Makefile.in @@ -182,6 +182,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -327,7 +328,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -365,9 +366,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/kregexpeditor/KWidgetStreamer/Makefile.in +++ kdeutils-3.5.8/kregexpeditor/KWidgetStreamer/Makefile.in @@ -215,6 +215,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -365,7 +366,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -403,9 +404,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh clean-noinstLTLIBRARIES: --- kdeutils-3.5.8.orig/kmilo/thinkpad/kcmthinkpad/Makefile.in +++ kdeutils-3.5.8/kmilo/thinkpad/kcmthinkpad/Makefile.in @@ -227,6 +227,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -380,7 +381,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -418,9 +419,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdeutils-3.5.8.orig/kmilo/thinkpad/Makefile.in +++ kdeutils-3.5.8/kmilo/thinkpad/Makefile.in @@ -264,6 +264,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -418,7 +419,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -456,9 +457,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdeutils-3.5.8.orig/kmilo/asus/Makefile.in +++ kdeutils-3.5.8/kmilo/asus/Makefile.in @@ -249,6 +249,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -402,7 +403,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -440,9 +441,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdeutils-3.5.8.orig/kmilo/Makefile.in +++ kdeutils-3.5.8/kmilo/Makefile.in @@ -193,6 +193,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -341,7 +342,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -379,9 +380,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/kmilo/delli8k/Makefile.in +++ kdeutils-3.5.8/kmilo/delli8k/Makefile.in @@ -247,6 +247,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -400,7 +401,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -438,9 +439,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdeutils-3.5.8.orig/kmilo/powerbook2/Makefile.in +++ kdeutils-3.5.8/kmilo/powerbook2/Makefile.in @@ -246,6 +246,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -399,7 +400,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -437,9 +438,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdeutils-3.5.8.orig/kmilo/kmilod/Makefile.in +++ kdeutils-3.5.8/kmilo/kmilod/Makefile.in @@ -265,6 +265,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -429,7 +430,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -467,9 +468,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdeutils-3.5.8.orig/kmilo/generic/Makefile.in +++ kdeutils-3.5.8/kmilo/generic/Makefile.in @@ -246,6 +246,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -399,7 +400,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -437,9 +438,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdeutils-3.5.8.orig/kmilo/powerbook/Makefile.in +++ kdeutils-3.5.8/kmilo/powerbook/Makefile.in @@ -246,6 +246,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -399,7 +400,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -437,9 +438,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdeutils-3.5.8.orig/kmilo/kmilo_kvaio/kcmkvaio/Makefile.in +++ kdeutils-3.5.8/kmilo/kmilo_kvaio/kcmkvaio/Makefile.in @@ -228,6 +228,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -381,7 +382,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -419,9 +420,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdeutils-3.5.8.orig/kmilo/kmilo_kvaio/Makefile.in +++ kdeutils-3.5.8/kmilo/kmilo_kvaio/Makefile.in @@ -267,6 +267,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -422,7 +423,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -460,9 +461,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdeutils-3.5.8.orig/kmilo/demo/Makefile.in +++ kdeutils-3.5.8/kmilo/demo/Makefile.in @@ -246,6 +246,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -399,7 +400,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -437,9 +438,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdeutils-3.5.8.orig/klaptopdaemon/pics/Makefile.in +++ kdeutils-3.5.8/klaptopdaemon/pics/Makefile.in @@ -192,6 +192,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -340,7 +341,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -378,9 +379,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/klaptopdaemon/pics/actions/Makefile.in +++ kdeutils-3.5.8/klaptopdaemon/pics/actions/Makefile.in @@ -172,6 +172,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -317,7 +318,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -355,9 +356,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/klaptopdaemon/Makefile.in +++ kdeutils-3.5.8/klaptopdaemon/Makefile.in @@ -315,6 +315,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -488,7 +489,7 @@ .SUFFIXES: .SUFFIXES: .c .cc .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -526,9 +527,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdeutils-3.5.8.orig/klaptopdaemon/applnk/Makefile.in +++ kdeutils-3.5.8/klaptopdaemon/applnk/Makefile.in @@ -183,6 +183,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -329,7 +330,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -367,9 +368,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/khexedit/pics/Makefile.in +++ kdeutils-3.5.8/khexedit/pics/Makefile.in @@ -182,6 +182,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -327,7 +328,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -365,9 +366,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/khexedit/lib/codecs/Makefile.in +++ kdeutils-3.5.8/khexedit/lib/codecs/Makefile.in @@ -216,6 +216,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -376,7 +377,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -414,9 +415,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh clean-noinstLTLIBRARIES: --- kdeutils-3.5.8.orig/khexedit/lib/controller/Makefile.in +++ kdeutils-3.5.8/khexedit/lib/controller/Makefile.in @@ -212,6 +212,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -369,7 +370,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -407,9 +408,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh clean-noinstLTLIBRARIES: --- kdeutils-3.5.8.orig/khexedit/lib/Makefile.in +++ kdeutils-3.5.8/khexedit/lib/Makefile.in @@ -263,6 +263,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -446,7 +447,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -484,9 +485,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdeutils-3.5.8.orig/khexedit/parts/Makefile.in +++ kdeutils-3.5.8/khexedit/parts/Makefile.in @@ -192,6 +192,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -336,7 +337,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -374,9 +375,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/khexedit/parts/kpart/Makefile.in +++ kdeutils-3.5.8/khexedit/parts/kpart/Makefile.in @@ -234,6 +234,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -389,7 +390,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -427,9 +428,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdeutils-3.5.8.orig/khexedit/parts/kbytesedit/Makefile.in +++ kdeutils-3.5.8/khexedit/parts/kbytesedit/Makefile.in @@ -228,6 +228,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -381,7 +382,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -419,9 +420,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdeutils-3.5.8.orig/khexedit/Makefile.in +++ kdeutils-3.5.8/khexedit/Makefile.in @@ -272,6 +272,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -440,7 +441,7 @@ .SUFFIXES: .SUFFIXES: .cc .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -478,9 +479,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) --- kdeutils-3.5.8.orig/kcalc/knumber/tests/Makefile.in +++ kdeutils-3.5.8/kcalc/knumber/tests/Makefile.in @@ -235,6 +235,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -385,7 +386,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -423,9 +424,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh clean-checkPROGRAMS: --- kdeutils-3.5.8.orig/kcalc/knumber/Makefile.in +++ kdeutils-3.5.8/kcalc/knumber/Makefile.in @@ -241,6 +241,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -393,7 +394,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/../../admin/Doxyfile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../admin/Doxyfile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -431,9 +432,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdeutils-3.5.8.orig/kcalc/Makefile.in +++ kdeutils-3.5.8/kcalc/Makefile.in @@ -269,6 +269,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -447,7 +448,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -485,9 +486,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdeutils-3.5.8.orig/charselectapplet/Makefile.in +++ kdeutils-3.5.8/charselectapplet/Makefile.in @@ -229,6 +229,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -383,7 +384,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -421,9 +422,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdeutils-3.5.8.orig/kdessh/Makefile.in +++ kdeutils-3.5.8/kdessh/Makefile.in @@ -221,6 +221,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -372,7 +373,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -410,9 +411,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) --- kdeutils-3.5.8.orig/superkaramba/icons/Makefile.in +++ kdeutils-3.5.8/superkaramba/icons/Makefile.in @@ -172,6 +172,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -316,7 +317,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -354,9 +355,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/superkaramba/Makefile.in +++ kdeutils-3.5.8/superkaramba/Makefile.in @@ -194,6 +194,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -338,7 +339,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -376,9 +377,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/superkaramba/doc/Makefile.in +++ kdeutils-3.5.8/superkaramba/doc/Makefile.in @@ -195,6 +195,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -343,7 +344,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -381,9 +382,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/superkaramba/src/Makefile.in +++ kdeutils-3.5.8/superkaramba/src/Makefile.in @@ -109,7 +109,7 @@ am__DEPENDENCIES_1 = superkaramba_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) #>- superkaramba_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ #>- $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ #>- $(CXXFLAGS) $(superkaramba_LDFLAGS) $(LDFLAGS) -o $@ @@ -290,6 +290,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -430,7 +431,7 @@ xdg_menudir = @xdg_menudir@ # set the include path for X, qt and KDE -INCLUDES = $(all_includes) $(XMMS_INCLUDES) $(PYTHONINC) +INCLUDES = $(all_includes) $(PYTHONINC) # these are the headers for your project noinst_HEADERS = karamba.h karambaapp.h karamba_python.h lineparser.h \ @@ -475,9 +476,9 @@ # kde_cfg_DATA = superkaramba.kcfg -superkaramba_LDFLAGS = -Wl,-export-dynamic $(KDE_RPATH) $(all_libraries) $(PYTHONLIB) $(XMMS_LDFLAGS) -#superkaramba_LDADD = -lkio $(LIB_KDEUI) $(XMMS_LDADD) $(LIBPYTHON) $(LIBKVM) $(MY_LIBKNEWSTUFF) -superkaramba_LDADD = -lkio $(LIB_KDEUI) $(XMMS_LIBS) $(LIBPYTHON) $(LIBKVM) $(MY_LIBKNEWSTUFF) +superkaramba_LDFLAGS = -Wl,-export-dynamic $(KDE_RPATH) $(all_libraries) $(PYTHONLIB) +#superkaramba_LDADD = -lkio $(LIB_KDEUI) $(LIBPYTHON) $(LIBKVM) $(MY_LIBKNEWSTUFF) +superkaramba_LDADD = -lkio $(LIB_KDEUI) $(LIBPYTHON) $(LIBKVM) $(MY_LIBKNEWSTUFF) # this is where the desktop file will go shelldesktopdir = $(kde_appsdir)/Utilities @@ -492,7 +493,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -530,9 +531,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) --- kdeutils-3.5.8.orig/superkaramba/mimetypes/Makefile.in +++ kdeutils-3.5.8/superkaramba/mimetypes/Makefile.in @@ -182,6 +182,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -327,7 +328,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -365,9 +366,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/kgpg/icons/Makefile.in +++ kdeutils-3.5.8/kgpg/icons/Makefile.in @@ -172,6 +172,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -317,7 +318,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -355,9 +356,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdeutils-3.5.8.orig/kgpg/Makefile.in +++ kdeutils-3.5.8/kgpg/Makefile.in @@ -265,6 +265,7 @@ LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -441,7 +442,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -479,9 +480,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) --- kdeutils-3.5.8.orig/debian/patches/common/03_libtool_update.diff +++ kdeutils-3.5.8/debian/patches/common/03_libtool_update.diff @@ -0,0 +1,7857 @@ +diff -Nrua a/admin/libtool.m4.in b/admin/libtool.m4.in +--- a/admin/libtool.m4.in 2007-05-14 12:58:18.000000000 +0200 ++++ b/admin/libtool.m4.in 2007-05-14 23:36:38.000000000 +0200 +@@ -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 + ## Free Software Foundation, Inc. + ## Originally by Gordon Matzigkeit , 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. ++## This file is free software; the Free Software Foundation gives ++## unlimited permission to copy and/or distribute it, with or without ++## modifications, as long as this notice is preserved. + +-# serial 47 AC_PROG_LIBTOOL ++# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL + + + # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) +@@ -82,7 +67,7 @@ + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" + + # Always use our own libtool. +-LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent' ++LIBTOOL='$(SHELL) $(top_builddir)/libtool' + AC_SUBST(LIBTOOL)dnl + + # Prevent multiple expansion +@@ -132,7 +117,7 @@ + + # Sed substitution that helps us do robust quoting. It backslashifies + # metacharacters that are still active within double-quoted strings. +-Xsed='sed -e s/^X//' ++Xsed='sed -e 1s/^X//' + [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] + + # Same as above, but do not quote variable references. +@@ -152,7 +137,7 @@ + default_ofile=libtool + can_build_shared=yes + +-# All known linkers require a `.a' archive for static linking (except M$VC, ++# All known linkers require a `.a' archive for static linking (except MSVC, + # which needs '.lib'). + libext=a + ltmain="$ac_aux_dir/ltmain.sh" +@@ -172,6 +157,7 @@ + test -z "$AS" && AS=as + test -z "$CC" && CC=cc + test -z "$LTCC" && LTCC=$CC ++test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS + test -z "$DLLTOOL" && DLLTOOL=dlltool + test -z "$LD" && LD=ld + test -z "$LN_S" && LN_S="ln -s" +@@ -191,15 +177,17 @@ + if test -n "$RANLIB"; then + case $host_os in + openbsd*) +- old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" ++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + ;; + *) +- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" ++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + ;; + esac + old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + fi + ++_LT_CC_BASENAME([$compiler]) ++ + # Only perform the check for file, if the check method requires it + case $deplibs_check_method in + file_magic*) +@@ -240,11 +228,56 @@ + # If no C compiler was specified, use CC. + LTCC=${LTCC-"$CC"} + ++# If no C compiler flags were specified, use CFLAGS. ++LTCFLAGS=${LTCFLAGS-"$CFLAGS"} ++ + # Allow CC to be a program name with arguments. + compiler=$CC + ])# _LT_AC_SYS_COMPILER + + ++# _LT_CC_BASENAME(CC) ++# ------------------- ++# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. ++AC_DEFUN([_LT_CC_BASENAME], ++[for cc_temp in $1""; do ++ case $cc_temp in ++ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; ++ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; ++ \-*) ;; ++ *) break;; ++ esac ++done ++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` ++]) ++ ++ ++# _LT_COMPILER_BOILERPLATE ++# ------------------------ ++# 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 ++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err ++_lt_compiler_boilerplate=`cat conftest.err` ++$rm conftest* ++])# _LT_COMPILER_BOILERPLATE ++ ++ ++# _LT_LINKER_BOILERPLATE ++# ---------------------- ++# 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 ++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err ++_lt_linker_boilerplate=`cat conftest.err` ++$rm conftest* ++])# _LT_LINKER_BOILERPLATE ++ ++ + # _LT_AC_SYS_LIBPATH_AIX + # ---------------------- + # Links a minimal program and checks the executable +@@ -317,15 +350,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 ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + if test -z "$ECHO"; then + 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`" && ++ 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 +@@ -494,14 +527,13 @@ + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then +- case "`/usr/bin/file conftest.o`" in ++ case `/usr/bin/file conftest.o` in + *32-bit*) +- LINUX_64_MODE="32" + case $host in + x86_64-*linux*) + LD="${LD-ld} -m elf_i386" + ;; +- ppc64-*linux*) ++ ppc64-*linux*|powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" + ;; + s390x-*linux*) +@@ -513,7 +545,6 @@ + esac + ;; + *64-bit*) +- LINUX_64_MODE="64" + case $host in + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" +@@ -547,6 +578,22 @@ + CFLAGS="$SAVE_CFLAGS" + fi + ;; ++sparc*-*solaris*) ++ # Find out which ABI we are using. ++ echo 'int i;' > conftest.$ac_ext ++ if AC_TRY_EVAL(ac_compile); then ++ case `/usr/bin/file conftest.o` in ++ *64-bit*) ++ case $lt_cv_prog_gnu_ld in ++ yes*) LD="${LD-ld} -m elf64_sparc" ;; ++ *) LD="${LD-ld} -64" ;; ++ esac ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; ++ + AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], + [*-*-cygwin* | *-*-mingw* | *-*-pw32*) + AC_CHECK_TOOL(DLLTOOL, dlltool, false) +@@ -578,7 +625,7 @@ + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ +- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ ++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -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 @@ + 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 +- # So say no if there are warnings +- if test ! -s conftest.err; then ++ # So say no if there are warnings other than the usual output. ++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + $2=yes + fi + fi +@@ -615,11 +664,16 @@ + LDFLAGS="$LDFLAGS $3" + printf "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then +- # The compiler can only warn and ignore the option if not recognized ++ # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&AS_MESSAGE_LOG_FD ++ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if diff conftest.exp conftest.er2 >/dev/null; then ++ $2=yes ++ fi + else + $2=yes + fi +@@ -643,7 +697,7 @@ + AC_MSG_CHECKING([the maximum length of command line arguments]) + AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl + i=0 +- testring="ABCD" ++ teststring="ABCD" + + case $build_os in + msdosdjgpp*) +@@ -672,20 +726,70 @@ + lt_cv_sys_max_cmd_len=8192; + ;; + +- *) ++ amigaos*) ++ # On AmigaOS with pdksh, this test takes hours, literally. ++ # So we just punt and use a minimum line length of 8192. ++ lt_cv_sys_max_cmd_len=8192; ++ ;; ++ ++ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) ++ # This has been around since 386BSD, at least. Likely further. ++ if test -x /sbin/sysctl; then ++ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` ++ elif test -x /usr/sbin/sysctl; then ++ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` ++ else ++ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs ++ fi ++ # And add a safety zone ++ 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` ++ ;; ++ ++ interix*) ++ # We know the value 262144 and hardcode it with a safety zone (like BSD) ++ lt_cv_sys_max_cmd_len=196608 ++ ;; ++ ++ osf*) ++ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure ++ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not ++ # nice to cause kernel panics so lets avoid the loop below. ++ # First set a reasonable default. ++ lt_cv_sys_max_cmd_len=16384 ++ # ++ if test -x /sbin/sysconfig; then ++ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in ++ *1*) lt_cv_sys_max_cmd_len=-1 ;; ++ esac ++ fi ++ ;; ++ sco3.2v5*) ++ lt_cv_sys_max_cmd_len=102400 ++ ;; ++ sysv5* | sco5v6* | sysv4.2uw2*) ++ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` ++ if test -n "$kargmax"; then ++ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` ++ else ++ lt_cv_sys_max_cmd_len=32768 ++ 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` \ ++ = "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 @@ + + + # _LT_AC_CHECK_DLFCN +-# -------------------- ++# ------------------ + AC_DEFUN([_LT_AC_CHECK_DLFCN], + [AC_CHECK_HEADERS(dlfcn.h)dnl + ])# _LT_AC_CHECK_DLFCN +@@ -710,7 +814,7 @@ + + # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, + # ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) +-# ------------------------------------------------------------------ ++# --------------------------------------------------------------------- + AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], + [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl + if test "$cross_compiling" = yes; then : +@@ -776,17 +880,19 @@ + else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + /* dlclose (self); */ + } ++ else ++ puts (dlerror ()); + + exit (status); + }] + EOF + if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then +- (./conftest; exit; ) 2>/dev/null ++ (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) $1 ;; + x$lt_dlneed_uscore) $2 ;; +- x$lt_unknown|x*) $3 ;; ++ x$lt_dlunknown|x*) $3 ;; + esac + else : + # compilation failed +@@ -798,7 +904,7 @@ + + + # AC_LIBTOOL_DLOPEN_SELF +-# ------------------- ++# ---------------------- + AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], + [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl + if test "x$enable_dlopen" != xyes; then +@@ -835,7 +941,7 @@ + lt_cv_dlopen_self=yes + ]) + ;; +- ++ + *) + AC_CHECK_FUNC([shl_load], + [lt_cv_dlopen="shl_load"], +@@ -869,7 +975,7 @@ + test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + + save_LDFLAGS="$LDFLAGS" +- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" ++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + + save_LIBS="$LIBS" + LIBS="$lt_cv_dlopen_libs $LIBS" +@@ -882,7 +988,7 @@ + ]) + + if test "x$lt_cv_dlopen_self" = xyes; then +- LDFLAGS="$LDFLAGS $link_static_flag" ++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" + 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 @@ + mkdir out + 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 . +- + 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. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ +- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ ++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -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 @@ + 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 ++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp ++ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 ++ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes + fi + fi +- chmod u+w . +- $rm conftest* out/* +- rmdir out ++ chmod u+w . 2>&AS_MESSAGE_LOG_FD ++ $rm conftest* ++ # SGI C++ compiler will create directory out/ii_files/ for ++ # template instantiation ++ test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files ++ $rm out/* && rmdir out + cd .. + rmdir conftest + $rm conftest* +@@ -1014,8 +1118,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)" || \ +- test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \ +- test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then ++ test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \ ++ test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then + + # We can hardcode non-existant directories. + if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && +@@ -1072,7 +1176,7 @@ + *) + AC_MSG_RESULT([no]) + ;; +- esac ++ esac + fi + ])# AC_LIBTOOL_SYS_LIB_STRIP + +@@ -1085,7 +1189,7 @@ + library_names_spec= + libname_spec='lib$name' + soname_spec= +-shrext=".so" ++shrext_cmds=".so" + postinstall_cmds= + postuninstall_cmds= + finish_cmds= +@@ -1095,7 +1199,20 @@ + 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" ++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 ++ # 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'` ++ else ++ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ fi ++else ++ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" ++fi + need_lib_prefix=unknown + hardcode_into_libs=no + +@@ -1160,7 +1277,7 @@ + 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' ++ 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*) +@@ -1169,7 +1286,7 @@ + shlibpath_var=LIBRARY_PATH + ;; + +-bsdi4*) ++bsdi[[45]]*) + 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 @@ + + cygwin* | mingw* | pw32*) + version_type=windows +- shrext=".dll" ++ shrext_cmds=".dll" + need_version=no + need_lib_prefix=no + +@@ -1197,7 +1314,8 @@ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ +- $install_prog $dir/$dlname \$dldir/$dlname' ++ $install_prog $dir/$dlname \$dldir/$dlname~ ++ chmod a+x \$dldir/$dlname' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $rm \$dlpath' +@@ -1227,7 +1345,7 @@ + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' +- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ++ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + ;; + esac + ;; +@@ -1250,7 +1368,7 @@ + soname_spec='${libname}${release}${major}$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH +- shrext='$(test .$module = .yes && echo .so || echo .dylib)' ++ 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 @@ + dynamic_linker=no + ;; + +-kfreebsd*-gnu*) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' +- ;; +- +-freebsd*) +- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` ++freebsd* | dragonfly*) ++ # DragonFly does not have aout. When/if they implement a new ++ # versioning mechanism, adjust this. ++ if test -x /usr/bin/objformat; then ++ objformat=`/usr/bin/objformat` ++ else ++ case $host_os in ++ freebsd[[123]]*) objformat=aout ;; ++ *) objformat=elf ;; ++ esac ++ fi + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) +@@ -1304,14 +1419,19 @@ + freebsd2*) + shlibpath_overrides_runpath=yes + ;; +- freebsd3.[01]* | freebsdelf3.[01]*) ++ freebsd3.[[01]]* | freebsdelf3.[[01]]*) + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; +- *) # from 3.2 on ++ freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ ++ freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; ++ freebsd*) # from 4.6 on ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; + esac + ;; + +@@ -1331,9 +1451,9 @@ + version_type=sunos + need_lib_prefix=no + need_version=no +- case "$host_cpu" in ++ case $host_cpu in + ia64*) +- shrext='.so' ++ shrext_cmds='.so' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH +@@ -1348,7 +1468,7 @@ + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + hppa*64*) +- shrext='.sl' ++ shrext_cmds='.sl' + 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 @@ + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + *) +- shrext='.sl' ++ shrext_cmds='.sl' + 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 @@ + postinstall_cmds='chmod 555 $lib' + ;; + ++interix3*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ ;; ++ + irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; +@@ -1414,29 +1546,26 @@ + ;; + + # This must be Linux ELF. +-linux*) ++linux* | k*bsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' +- 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 -a ! -h /lib64; then +- libsuff=64 +- fi +- fi + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no +- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" +- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" + # 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 + ++ # 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' ' '` ++ 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 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + ++netbsdelf*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='NetBSD ld.elf_so' ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -1455,7 +1596,7 @@ + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + dynamic_linker='NetBSD (a.out) ld.so' + else +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}' ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='NetBSD ld.elf_so' + fi +@@ -1483,8 +1624,13 @@ + + openbsd*) + version_type=sunos ++ sys_lib_dlsearch_path_spec="/usr/lib" + need_lib_prefix=no +- need_version=no ++ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. ++ case $host_os in ++ openbsd3.3 | openbsd3.3.*) need_version=yes ;; ++ *) need_version=no ;; ++ esac + 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 @@ + + os2*) + libname_spec='$name' +- shrext=".dll" ++ shrext_cmds=".dll" + need_lib_prefix=no + library_names_spec='$libname${shared_ext} $libname.a' + dynamic_linker='OS/2 ld.exe' +@@ -1522,13 +1668,6 @@ + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + +-sco3.2v5*) +- version_type=osf +- 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 +- ;; +- + solaris*) + version_type=linux + need_lib_prefix=no +@@ -1554,7 +1693,7 @@ + need_version=yes + ;; + +-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) ++sysv4 | sysv4.3*) + 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 @@ + fi + ;; + ++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) ++ version_type=freebsd-elf ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ hardcode_into_libs=yes ++ if test "$with_gnu_ld" = yes; then ++ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' ++ shlibpath_overrides_runpath=no ++ else ++ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' ++ shlibpath_overrides_runpath=yes ++ case $host_os in ++ sco3.2v5*) ++ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" ++ ;; ++ esac ++ fi ++ sys_lib_dlsearch_path_spec='/usr/lib' ++ ;; ++ + uts4*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +@@ -1600,6 +1762,11 @@ + esac + AC_MSG_RESULT([$dynamic_linker]) + test "$dynamic_linker" = no && can_build_shared=no ++ ++variables_saved_for_relink="PATH $shlibpath_var $runpath_var" ++if test "$GCC" = yes; then ++ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" ++fi + ])# AC_LIBTOOL_SYS_DYNAMIC_LINKER + + +@@ -1624,6 +1791,9 @@ + AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile']) + fi + fi ++ if test -z "$LTCFLAGS"; then ++ eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" ++ fi + + # Extract list of available tagged configurations in $ofile. + # Note that this assumes the entire list is on one line. +@@ -1650,7 +1820,9 @@ + + case $tagname in + CXX) +- if test -n "$CXX" && test "X$CXX" != "Xno"; then ++ if test -n "$CXX" && ( test "X$CXX" != "Xno" && ++ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || ++ (test "X$CXX" != "Xg++"))) ; then + AC_LIBTOOL_LANG_CXX_CONFIG + else + tagname="" +@@ -1712,7 +1884,7 @@ + + # AC_LIBTOOL_WIN32_DLL + # -------------------- +-# declare package support for building win32 dll's ++# declare package support for building win32 DLLs + AC_DEFUN([AC_LIBTOOL_WIN32_DLL], + [AC_BEFORE([$0], [AC_LIBTOOL_SETUP]) + ])# AC_LIBTOOL_WIN32_DLL +@@ -1750,7 +1922,7 @@ + + # AC_DISABLE_SHARED + # ----------------- +-#- set the default shared flag to --disable-shared ++# set the default shared flag to --disable-shared + AC_DEFUN([AC_DISABLE_SHARED], + [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl + AC_ENABLE_SHARED(no) +@@ -1886,7 +2058,7 @@ + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) +- file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" ++ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then +@@ -1996,7 +2168,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, +- # but apparently some GNU ld's only accept -v. ++ # but apparently some variants of GNU ld only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$lt_cv_path_LD" -v 2>&1 &1 /dev/null; then + case $host_cpu in + i*86 ) + # Not sure whether the presence of OpenBSD here was a mistake. + # Let's accept both of them until this is cleared up. +- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library' ++ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` + ;; +@@ -2141,7 +2314,7 @@ + + hpux10.20* | hpux11*) + lt_cv_file_magic_cmd=/usr/bin/file +- case "$host_cpu" in ++ case $host_cpu in + 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 @@ + esac + ;; + ++interix3*) ++ # 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)$' ++ ;; ++ + irix5* | irix6* | nonstopux*) +- case $host_os in +- irix5* | nonstopux*) +- # this will be overridden with pass_all, but let us keep it just in case +- lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" +- ;; +- *) +- case $LD in +- *-32|*"-32 ") libmagic=32-bit;; +- *-n32|*"-n32 ") libmagic=N32;; +- *-64|*"-64 ") libmagic=64-bit;; +- *) libmagic=never-match;; +- esac +- # this will be overridden with pass_all, but let us keep it just in case +- lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1" +- ;; ++ case $LD in ++ *-32|*"-32 ") libmagic=32-bit;; ++ *-n32|*"-n32 ") libmagic=N32;; ++ *-64|*"-64 ") libmagic=64-bit;; ++ *) libmagic=never-match;; + esac +- lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*` + lt_cv_deplibs_check_method=pass_all + ;; + + # This must be Linux ELF. +-linux*) +- case $host_cpu in +- alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390* | sh* | x86_64* ) +- lt_cv_deplibs_check_method=pass_all ;; +- # the debian people say, arm and glibc 2.3.1 works for them with pass_all +- arm* ) +- lt_cv_deplibs_check_method=pass_all ;; +- *) +- # glibc up to 2.1.1 does not perform some relocations on ARM +- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;; +- esac +- lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` ++linux* | k*bsd*-gnu) ++ lt_cv_deplibs_check_method=pass_all + ;; + +-netbsd*) ++netbsd* | netbsdelf*-gnu) + 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 @@ + ;; + + openbsd*) +- lt_cv_file_magic_cmd=/usr/bin/file +- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object' ++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' + else +- lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' ++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + fi + ;; + + osf3* | osf4* | osf5*) +- # 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 +- ;; +- +-sco3.2v5*) + lt_cv_deplibs_check_method=pass_all + ;; + + solaris*) + lt_cv_deplibs_check_method=pass_all +- lt_cv_file_magic_test_file=/lib/libc.so + ;; + +-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) ++sysv4 | sysv4.3*) + 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 @@ + siemens) + lt_cv_deplibs_check_method=pass_all + ;; ++ pc) ++ lt_cv_deplibs_check_method=pass_all ++ ;; + esac + ;; + +-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*) ++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + lt_cv_deplibs_check_method=pass_all + ;; + esac +@@ -2281,36 +2431,43 @@ + # Let the user override the test. + lt_cv_path_NM="$NM" + else +- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +- for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do +- IFS="$lt_save_ifs" +- test -z "$ac_dir" && ac_dir=. +- tmp_nm="$ac_dir/${ac_tool_prefix}nm" +- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then +- # Check to see if the nm accepts a BSD-compat flag. +- # Adding the `sed 1q' prevents false positives on HP-UX, which says: +- # nm: unknown option "B" ignored +- # Tru64's nm complains that /dev/null is an invalid object file +- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in +- */dev/null* | *'Invalid file or object type'*) +- lt_cv_path_NM="$tmp_nm -B" +- break +- ;; +- *) +- case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in +- */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 ++ lt_nm_to_check="$lt_nm_to_check nm" ++ fi ++ for lt_tmp_nm in $lt_nm_to_check; do ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do ++ IFS="$lt_save_ifs" ++ test -z "$ac_dir" && ac_dir=. ++ tmp_nm="$ac_dir/$lt_tmp_nm" ++ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then ++ # Check to see if the nm accepts a BSD-compat flag. ++ # Adding the `sed 1q' prevents false positives on HP-UX, which says: ++ # nm: unknown option "B" ignored ++ # Tru64's nm complains that /dev/null is an invalid object file ++ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in ++ */dev/null* | *'Invalid file or object type'*) ++ lt_cv_path_NM="$tmp_nm -B" + break + ;; + *) +- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but +- continue # so that we can try to find one that supports BSD flags ++ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in ++ */dev/null*) ++ lt_cv_path_NM="$tmp_nm -p" ++ break ++ ;; ++ *) ++ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but ++ continue # so that we can try to find one that supports BSD flags ++ ;; ++ esac + ;; + esac +- esac +- fi ++ fi ++ done ++ IFS="$lt_save_ifs" + done +- IFS="$lt_save_ifs" + test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm + fi]) + NM="$lt_cv_path_NM" +@@ -2342,13 +2499,13 @@ + # ----------------------------------- + # sets LIBLTDL to the link flags for the libltdl convenience library and + # LTDLINCL to the include flags for the libltdl header and adds +-# --enable-ltdl-convenience to the configure arguments. Note that LIBLTDL +-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If +-# DIRECTORY is not provided, it is assumed to be `libltdl'. LIBLTDL will +-# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with +-# '${top_srcdir}/' (note the single quotes!). If your package is not +-# flat and you're not using automake, define top_builddir and +-# top_srcdir appropriately in the Makefiles. ++# --enable-ltdl-convenience to the configure arguments. Note that ++# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, ++# it is assumed to be `libltdl'. LIBLTDL will be prefixed with ++# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/' ++# (note the single quotes!). If your package is not flat and you're not ++# using automake, define top_builddir and top_srcdir appropriately in ++# the Makefiles. + AC_DEFUN([AC_LIBLTDL_CONVENIENCE], + [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl + case $enable_ltdl_convenience in +@@ -2367,13 +2524,13 @@ + # ----------------------------------- + # sets LIBLTDL to the link flags for the libltdl installable library and + # LTDLINCL to the include flags for the libltdl header and adds +-# --enable-ltdl-install to the configure arguments. Note that LIBLTDL +-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If +-# DIRECTORY is not provided and an installed libltdl is not found, it is +-# assumed to be `libltdl'. LIBLTDL will be prefixed with '${top_builddir}/' +-# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single +-# quotes!). If your package is not flat and you're not using automake, +-# define top_builddir and top_srcdir appropriately in the Makefiles. ++# --enable-ltdl-install to the configure arguments. Note that ++# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, ++# and an installed libltdl is not found, it is assumed to be `libltdl'. ++# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with ++# '${top_srcdir}/' (note the single quotes!). If your package is not ++# flat and you're not using automake, define top_builddir and top_srcdir ++# appropriately in the Makefiles. + # 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 @@ + # --------------- + AC_DEFUN([_LT_AC_LANG_CXX], + [AC_REQUIRE([AC_PROG_CXX]) +-AC_REQUIRE([AC_PROG_CXXCPP]) ++AC_REQUIRE([_LT_AC_PROG_CXXCPP]) + _LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX]) + ])# _LT_AC_LANG_CXX + ++# _LT_AC_PROG_CXXCPP ++# ------------------ ++AC_DEFUN([_LT_AC_PROG_CXXCPP], ++[ ++AC_REQUIRE([AC_PROG_CXX]) ++if test -n "$CXX" && ( test "X$CXX" != "Xno" && ++ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || ++ (test "X$CXX" != "Xg++"))) ; then ++ AC_PROG_CXXCPP ++fi ++])# _LT_AC_PROG_CXXCPP + + # AC_LIBTOOL_F77 + # -------------- +@@ -2454,7 +2622,7 @@ + + + # AC_LIBTOOL_RC +-# -------------- ++# ------------- + # enable support for Windows resource files + AC_DEFUN([AC_LIBTOOL_RC], + [AC_REQUIRE([LT_AC_PROG_RC]) +@@ -2487,36 +2655,9 @@ + + _LT_AC_SYS_COMPILER + +-# +-# Check for any special shared library compilation flags. +-# +-_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)= +-if test "$GCC" = no; then +- case $host_os in +- sco3.2v5*) +- _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf' +- ;; +- esac +-fi +-if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then +- AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries]) +- if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$]_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[[ ]]" >/dev/null; then : +- else +- AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure]) +- _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no +- fi +-fi +- +- +-# +-# Check to make sure the static flag actually works. +-# +-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works], +- _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), +- $_LT_AC_TAGVAR(lt_prog_compiler_static, $1), +- [], +- [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) +- ++# save warnings/boilerplate of simple test code ++_LT_COMPILER_BOILERPLATE ++_LT_LINKER_BOILERPLATE + + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change +@@ -2530,9 +2671,9 @@ + AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) + AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) + AC_LIBTOOL_SYS_LIB_STRIP +-AC_LIBTOOL_DLOPEN_SELF($1) ++AC_LIBTOOL_DLOPEN_SELF + +-# Report which librarie types wil actually be built ++# Report which library types will actually be built + AC_MSG_CHECKING([if libtool supports shared libraries]) + AC_MSG_RESULT([$can_build_shared]) + +@@ -2541,7 +2682,7 @@ + + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. +-case "$host_os" in ++case $host_os in + aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then +@@ -2550,48 +2691,11 @@ + fi + ;; + +-aix4*) ++aix4* | aix5*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi +- ;; +- darwin* | rhapsody*) +- if test "$GCC" = yes; then +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- case "$host_os" in +- rhapsody* | darwin1.[[012]]) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress' +- ;; +- *) # Darwin 1.3 on +- 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' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring' +- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs' +- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $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 $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience' +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; ++ ;; + esac + AC_MSG_RESULT([$enable_shared]) + +@@ -2616,7 +2720,7 @@ + AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], + [AC_LANG_PUSH(C++) + AC_REQUIRE([AC_PROG_CXX]) +-AC_REQUIRE([AC_PROG_CXXCPP]) ++AC_REQUIRE([_LT_AC_PROG_CXXCPP]) + + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_AC_TAGVAR(allow_undefined_flag, $1)= +@@ -2628,6 +2732,7 @@ + _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= + _LT_AC_TAGVAR(hardcode_minus_L, $1)=no ++_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported + _LT_AC_TAGVAR(hardcode_automatic, $1)=no + _LT_AC_TAGVAR(module_cmds, $1)= + _LT_AC_TAGVAR(module_expsym_cmds, $1)= +@@ -2645,7 +2750,7 @@ + _LT_AC_TAGVAR(compiler_lib_search_path, $1)= + + # Source file extension for C++ test sources. +-ac_ext=cc ++ac_ext=cpp + + # Object file extension for compiled C++ test sources. + objext=o +@@ -2655,11 +2760,15 @@ + lt_simple_compile_test_code="int some_variable = 0;\n" + + # 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' + + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + _LT_AC_SYS_COMPILER + ++# save warnings/boilerplate of simple test code ++_LT_COMPILER_BOILERPLATE ++_LT_LINKER_BOILERPLATE ++ + # Allow CC to be a program name with arguments. + lt_save_CC=$CC + lt_save_LD=$LD +@@ -2670,18 +2779,18 @@ + if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then + lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx + else +- unset lt_cv_prog_gnu_ld ++ $as_unset lt_cv_prog_gnu_ld + fi + if test -n "${lt_cv_path_LDCXX+set}"; then + lt_cv_path_LD=$lt_cv_path_LDCXX + else +- unset lt_cv_path_LD ++ $as_unset lt_cv_path_LD + fi + test -z "${LDCXX+set}" || LD=$LDCXX + CC=${CXX-"c++"} + compiler=$CC + _LT_AC_TAGVAR(compiler, $1)=$CC +-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` ++_LT_CC_BASENAME([$compiler]) + + # We don't want -fno-exception wen compiling C++ code, so set the + # no_builtin_flag separately +@@ -2699,8 +2808,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 +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' +@@ -2726,7 +2835,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. +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + fi + + # Commands to make compiler produce verbose output that lists +@@ -2756,8 +2865,23 @@ + exp_sym_flag='-Bexport' + no_entry_flag="" + else +- # KDE requires run time linking. Make it the default. +- aix_use_runtimelinking=yes ++ aix_use_runtimelinking=no ++ ++ # 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. ++ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) ++ for ld_flag in $LDFLAGS; do ++ case $ld_flag in ++ *-brtl*) ++ aix_use_runtimelinking=yes ++ break ++ ;; ++ esac ++ done ++ ;; ++ esac ++ + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi +@@ -2774,7 +2898,7 @@ + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + + if test "$GXX" = yes; then +- case $host_os in aix4.[012]|aix4.[012].*) ++ 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` +@@ -2793,8 +2917,12 @@ + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= + fi ++ ;; + esac + shared_flag='-shared' ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag="$shared_flag "'${wl}-G' ++ fi + else + # not using gcc + if test "$host_cpu" = ia64; then +@@ -2803,15 +2931,16 @@ + shared_flag='-G' + else + if test "$aix_use_runtimelinking" = yes; then +- shared_flag='-qmkshrobj ${wl}-G' ++ shared_flag='${wl}-G' + else +- shared_flag='-qmkshrobj' ++ shared_flag='${wl}-bM:SRE' + fi + fi + fi + +- # Let the compiler handle the export list. +- _LT_AC_TAGVAR(always_export_symbols, $1)=no ++ # It seems that -bexpall does not export symbols beginning with ++ # underscore (_), so it is better to generate a list of symbols to export. ++ _LT_AC_TAGVAR(always_export_symbols, $1)=yes + 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. +@@ -2820,13 +2949,12 @@ + _LT_AC_SYS_LIBPATH_AIX + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + +- _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag" +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else + if test "$host_cpu" = ia64; then + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an empty executable. + _LT_AC_SYS_LIBPATH_AIX +@@ -2835,16 +2963,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' +- # -bexpall does not export symbols beginning with underscore (_) +- _LT_AC_TAGVAR(always_export_symbols, $1)=yes + # Exported symbols can be pulled into shared objects from archives +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' ' ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes +- # This is similar to how AIX traditionally builds it's shared libraries. +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' ++ # This is similar to how AIX traditionally builds its shared libraries. ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; ++ ++ beos*) ++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++ # Joseph Beckenbach says some releases of gcc ++ # support --undefined. This deserves some investigation. FIXME ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ else ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ + chorus*) + case $cc_basename in + *) +@@ -2858,12 +2996,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' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=no ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_AC_TAGVAR(always_export_symbols, $1)=no + _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + + if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # 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 +@@ -2872,70 +3010,81 @@ + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ +- $CC -shared -nostdlib $output_objdir/$soname.def $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' ++ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; ++ darwin* | rhapsody*) ++ case $host_os in ++ rhapsody* | darwin1.[[012]]) ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' ++ ;; ++ *) # Darwin 1.3 on ++ 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_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_AC_TAGVAR(hardcode_direct, $1)=no ++ _LT_AC_TAGVAR(hardcode_automatic, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + +- darwin* | rhapsody*) +- if test "$GXX" = yes; then +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- case "$host_os" in +- rhapsody* | darwin1.[[012]]) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress' +- ;; +- *) # Darwin 1.3 on +- 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 +- output_verbose_link_cmd='echo' +- if $CC -dumpspecs 2>&1 | grep '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 $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring' +- else +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring' +- fi +- _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs' +- +- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's +- 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 $compiler_flags $libobjs $deplibs -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 ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -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 $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience' +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- else +- _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*) + case $cc_basename in +- ec++) ++ ec++*) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; +- ghcx) ++ ghcx*) + # Green Hills C++ Compiler + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no +@@ -2946,14 +3095,14 @@ + ;; + esac + ;; +- freebsd[12]*) ++ freebsd[[12]]*) + # C++ shared libraries reported to be fairly broken before switch to ELF + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + freebsd-elf*) + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + ;; +- 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 +@@ -2970,12 +3119,12 @@ + # location of the library. + + case $cc_basename in +- CC) ++ CC*) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; +- aCC) +- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ aCC*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. +@@ -2984,11 +3133,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. +- output_verbose_link_cmd='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' ++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]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 "$GXX" = yes; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -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' + else + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no +@@ -2998,33 +3147,22 @@ + ;; + 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, $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' + ;; + *) +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + ;; + esac + fi +- case "$host_cpu" in +- hppa*64*) +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; +- ia64*) ++ case $host_cpu in ++ hppa*64*|ia64*) + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, +- # but as the default +- # location of the library. + ;; + *) + _LT_AC_TAGVAR(hardcode_direct, $1)=yes +@@ -3035,17 +3173,20 @@ + esac + + case $cc_basename in +- CC) ++ CC*) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; +- aCC) +- case "$host_cpu" in +- hppa*64*|ia64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' ++ aCC*) ++ case $host_cpu in ++ hppa*64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ ia64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + # Commands to make compiler produce verbose output that lists +@@ -3061,12 +3202,15 @@ + *) + if test "$GXX" = yes; then + if test $with_gnu_ld = no; then +- case "$host_cpu" in +- ia64*|hppa*64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' ++ case $host_cpu in ++ hppa*64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ ia64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + fi +@@ -3077,11 +3221,25 @@ + ;; + esac + ;; ++ interix3*) ++ _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' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. ++ # Instead, shared libraries are loaded at an image base (0x10000000 by ++ # default) and relocated if they conflict, which is a slow very memory ++ # consuming and fragmenting process. To avoid this, we pick a random, ++ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link ++ # time. Moving up from 0x10000000 also allows more sbrk(2) space. ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ _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' ++ ;; + irix5* | irix6*) + case $cc_basename in +- CC) ++ CC*) + # SGI C++ +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_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 +@@ -3092,9 +3250,9 @@ + *) + if test "$GXX" = yes; then + if test "$with_gnu_ld" = no; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' + fi + fi + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +@@ -3103,16 +3261,16 @@ + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + ;; +- linux*) ++ linux* | k*bsd*-gnu) + case $cc_basename in +- KCC) ++ 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. +- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; 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. +@@ -3130,20 +3288,44 @@ + # "CC -Bstatic", where "CC" is the KAI C++ compiler. + _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' + ;; +- icpc) ++ icpc*) + # Intel C++ + with_gnu_ld=yes ++ # version 8.0 and above of icpc choke on multiply defined symbols ++ # if we add $predep_objects and $postdep_objects, however 7.1 and ++ # earlier do not add the objects themselves. ++ case `$CC -V 2>&1` in ++ *"Version 7."*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ ;; ++ *) # Version 8.0 or newer ++ tmp_idyn= ++ case $host_cpu in ++ ia64*) tmp_idyn=' -i_dynamic';; ++ esac ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ ;; ++ esac + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + ;; +- cxx) ++ pgCC*) ++ # Portland Group C++ compiler ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ++ ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ ;; ++ cxx*) + # Compaq C++ +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' + + runpath_var=LD_RUN_PATH + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' +@@ -3171,7 +3353,7 @@ + ;; + mvs*) + case $cc_basename in +- cxx) ++ cxx*) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; +@@ -3181,7 +3363,7 @@ + ;; + esac + ;; +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + 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= +@@ -3192,15 +3374,31 @@ + # Workaround some broken pre-1.5 toolchains + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' + ;; ++ openbsd2*) ++ # C++ shared libraries are fairly broken ++ _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' ++ fi ++ output_verbose_link_cmd='echo' ++ ;; + osf3*) + case $cc_basename in +- KCC) ++ 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. +- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +@@ -3210,14 +3408,14 @@ + _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' + + ;; +- RCC) ++ RCC*) + # Rational C++ 2.4.1 + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; +- cxx) ++ cxx*) + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$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 ${output_objdir}/so_locations -o $lib' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +@@ -3235,7 +3433,7 @@ + *) + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$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}${output_objdir}/so_locations -o $lib' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +@@ -3254,13 +3452,13 @@ + ;; + osf4* | osf5*) + case $cc_basename in +- KCC) ++ 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. +- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +@@ -3269,17 +3467,17 @@ + # the KAI C++ compiler. + _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' + ;; +- RCC) ++ RCC*) + # Rational C++ 2.4.1 + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; +- cxx) ++ cxx*) + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ + echo "-hidden">> $lib.exp~ +- $CC -shared$allow_undefined_flag $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~ ++ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~ + $rm $lib.exp' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' +@@ -3298,7 +3496,7 @@ + *) + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$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}${output_objdir}/so_locations -o $lib' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +@@ -3319,27 +3517,14 @@ + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; +- sco*) +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- case $cc_basename in +- CC) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- *) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- esac +- ;; + sunos4*) + case $cc_basename in +- CC) ++ CC*) + # Sun C++ 4.x + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; +- lcc) ++ lcc*) + # Lucid + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no +@@ -3352,36 +3537,33 @@ + ;; + solaris*) + case $cc_basename in +- CC) ++ CC*) + # Sun C++ 4.2, 5.x and Centerline C++ ++ _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes + _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects' ++ _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)='$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 $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp' ++ $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + case $host_os in +- 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 +- # 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. + # 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' + ;; + esac + _LT_AC_TAGVAR(link_all_deplibs, $1)=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_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ++ 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 +@@ -3389,9 +3571,9 @@ + # in the archive. + _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' + ;; +- gcx) ++ gcx*) + # Green Hills C++ Compiler +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$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. + _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' +@@ -3401,9 +3583,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 +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$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 $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $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 +@@ -3412,9 +3594,9 @@ + else + # g++ 2.7 appears to require `-G' NOT `-shared' on this + # platform. +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$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 $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $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 +@@ -3427,12 +3609,63 @@ + ;; + 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(hardcode_shlibpath_var, $1)=no ++ runpath_var='LD_RUN_PATH' ++ ++ case $cc_basename in ++ CC*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ esac ++ ;; ++ sysv5* | sco3.2v5* | sco5v6*) ++ # Note: We can NOT use -z defs as we might desire, because we do not ++ # link with -lc, and that would cause any symbols used from libc to ++ # always be unresolved, which means just about no library would ++ # ever link correctly. If we're not using GNU ld we use -z text ++ # though, which does catch some bad symbols but isn't as heavy-handed ++ # as -z defs. ++ # For security reasons, it is highly recommended that you always ++ # use absolute paths for naming shared libraries, and exclude the ++ # DT_RUNPATH tag from executables and libraries. But doing so ++ # requires that you compile everything twice, which is a pain. ++ # So that behaviour is only enabled if SCOABSPATH is set to a ++ # non-empty value in the environment. Most likely only useful for ++ # creating official distributions of packages. ++ # This is a hack until libtool officially supports absolute path ++ # 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(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)=':' ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' ++ runpath_var='LD_RUN_PATH' ++ ++ case $cc_basename in ++ CC*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ esac + ;; + tandem*) + case $cc_basename in +- NCC) ++ NCC*) + # NonStop-UX NCC 3.20 + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no +@@ -3469,8 +3702,6 @@ + AC_LIBTOOL_PROG_LD_SHLIBS($1) + AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) + AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) +-AC_LIBTOOL_SYS_LIB_STRIP +-AC_LIBTOOL_DLOPEN_SELF($1) + + AC_LIBTOOL_CONFIG($1) + +@@ -3488,7 +3719,7 @@ + ])# AC_LIBTOOL_LANG_CXX_CONFIG + + # AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME]) +-# ------------------------ ++# ------------------------------------ + # Figure out "hidden" library dependencies from verbose + # compiler output when linking a shared library. + # Parse the compiler output and extract the necessary +@@ -3542,7 +3773,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. +- output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`" ++ output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"` + + for p in `eval $output_verbose_link_cmd`; do + case $p in +@@ -3582,7 +3813,7 @@ + fi + ;; + +- *.$objext|*.$libext) ++ *.$objext) + # This assumes that the test object file only shows up + # once in the compiler output. + if test "$p" = "conftest.$objext"; then +@@ -3618,13 +3849,37 @@ + + $rm -f confest.$objext + ++# PORTME: override above test on systems where it is broken ++ifelse([$1],[CXX], ++[case $host_os in ++interix3*) ++ # 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)= ++ _LT_AC_TAGVAR(postdep_objects,$1)= ++ _LT_AC_TAGVAR(postdeps,$1)= ++ ;; ++ ++solaris*) ++ case $cc_basename in ++ CC*) ++ # 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' ++ ;; ++ esac ++ ;; ++esac ++]) ++ + case " $_LT_AC_TAGVAR(postdeps, $1) " in + *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; + esac + ])# AC_LIBTOOL_POSTDEP_PREDEP + + # AC_LIBTOOL_LANG_F77_CONFIG +-# ------------------------ ++# -------------------------- + # 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'. +@@ -3668,12 +3923,16 @@ + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + _LT_AC_SYS_COMPILER + ++# save warnings/boilerplate of simple test code ++_LT_COMPILER_BOILERPLATE ++_LT_LINKER_BOILERPLATE ++ + # Allow CC to be a program name with arguments. + lt_save_CC="$CC" + CC=${F77-"f77"} + compiler=$CC + _LT_AC_TAGVAR(compiler, $1)=$CC +-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` ++_LT_CC_BASENAME([$compiler]) + + AC_MSG_CHECKING([if libtool supports shared libraries]) + AC_MSG_RESULT([$can_build_shared]) +@@ -3683,7 +3942,7 @@ + + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. +-case "$host_os" in ++case $host_os in + aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then +@@ -3691,8 +3950,10 @@ + postinstall_cmds='$RANLIB $lib' + fi + ;; +-aix4*) +- test "$enable_shared" = yes && enable_static=no ++aix4* | aix5*) ++ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then ++ test "$enable_shared" = yes && enable_static=no ++ fi + ;; + esac + AC_MSG_RESULT([$enable_shared]) +@@ -3702,8 +3963,6 @@ + test "$enable_shared" = yes || enable_static=yes + AC_MSG_RESULT([$enable_static]) + +-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no +- + _LT_AC_TAGVAR(GCC, $1)="$G77" + _LT_AC_TAGVAR(LD, $1)="$LD" + +@@ -3713,8 +3972,6 @@ + AC_LIBTOOL_PROG_LD_SHLIBS($1) + AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) + AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) +-AC_LIBTOOL_SYS_LIB_STRIP +- + + AC_LIBTOOL_CONFIG($1) + +@@ -3743,20 +4000,27 @@ + lt_simple_compile_test_code="class foo {}\n" + + # 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' + + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + _LT_AC_SYS_COMPILER + ++# save warnings/boilerplate of simple test code ++_LT_COMPILER_BOILERPLATE ++_LT_LINKER_BOILERPLATE ++ + # Allow CC to be a program name with arguments. + lt_save_CC="$CC" + CC=${GCJ-"gcj"} + compiler=$CC + _LT_AC_TAGVAR(compiler, $1)=$CC ++_LT_CC_BASENAME([$compiler]) + + # GCJ did not exist at the time GCC didn't implicitly link libc in. + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + ++_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds ++ + ## 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 +@@ -3768,8 +4032,6 @@ + AC_LIBTOOL_PROG_LD_SHLIBS($1) + AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) + AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) +-AC_LIBTOOL_SYS_LIB_STRIP +-AC_LIBTOOL_DLOPEN_SELF($1) + + AC_LIBTOOL_CONFIG($1) + +@@ -3779,7 +4041,7 @@ + + + # AC_LIBTOOL_LANG_RC_CONFIG +-# -------------------------- ++# ------------------------- + # Ensure that the configuration vars for the Windows resource compiler are + # suitably defined. Those variables are subsequently used by + # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. +@@ -3803,11 +4065,16 @@ + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + _LT_AC_SYS_COMPILER + ++# save warnings/boilerplate of simple test code ++_LT_COMPILER_BOILERPLATE ++_LT_LINKER_BOILERPLATE ++ + # Allow CC to be a program name with arguments. + lt_save_CC="$CC" + CC=${RC-"windres"} + compiler=$CC + _LT_AC_TAGVAR(compiler, $1)=$CC ++_LT_CC_BASENAME([$compiler]) + _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes + + AC_LIBTOOL_CONFIG($1) +@@ -3833,11 +4100,12 @@ + # without removal of \ escapes. + if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST +- fi ++ fi + # Now quote all the things that may contain metacharacters while being + # careful not to overquote the AC_SUBSTed values. We take copies of the + # variables and quote the copies for generation of the libtool script. +- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \ ++ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ ++ SED SHELL STRIP \ + 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 \ +@@ -3887,7 +4155,7 @@ + _LT_AC_TAGVAR(archive_cmds, $1) | \ + _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \ + _LT_AC_TAGVAR(module_cmds, $1) | \ +- _LT_AC_TAGVAR(module_expsym_cmds, $1) | \ ++ _LT_AC_TAGVAR(module_expsym_cmds, $1) | \ + _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \ + _LT_AC_TAGVAR(export_symbols_cmds, $1) | \ + extract_expsyms_cmds | reload_cmds | finish_cmds | \ +@@ -3953,11 +4221,11 @@ + SED=$lt_SED + + # Sed that helps us avoid accidentally triggering echo(1) options like -n. +-Xsed="$SED -e s/^X//" ++Xsed="$SED -e 1s/^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 ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + # The names of the tagged configurations supported by this script. + available_tags= +@@ -3988,6 +4256,12 @@ + # The host system. + host_alias=$host_alias + host=$host ++host_os=$host_os ++ ++# The build system. ++build_alias=$build_alias ++build=$build ++build_os=$build_os + + # An echo program that does not interpret backslashes. + echo=$lt_echo +@@ -3999,6 +4273,9 @@ + # A C compiler. + LTCC=$lt_LTCC + ++# LTCC compiler flags. ++LTCFLAGS=$lt_LTCFLAGS ++ + # A language-specific compiler. + CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) + +@@ -4018,7 +4295,7 @@ + NM=$lt_NM + + # A symbol stripping program +-STRIP=$STRIP ++STRIP=$lt_STRIP + + # Used to examine libraries when file_magic_cmd begins "file" + MAGIC_CMD=$MAGIC_CMD +@@ -4049,7 +4326,7 @@ + libext="$libext" + + # Shared library suffix (normally ".so"). +-shrext='$shrext' ++shrext_cmds='$shrext_cmds' + + # Executable file suffix (normally ""). + exeext="$exeext" +@@ -4064,7 +4341,7 @@ + # Does compiler simultaneously support -c and -o options? + compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) + +-# Must we lock files when doing compilation ? ++# Must we lock files when doing compilation? + need_locks=$lt_need_locks + + # Do we need the lib prefix for modules? +@@ -4293,7 +4570,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. +- test -f Makefile && make "$ltmain" ++ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` ++ if test -f "$ltmain_in"; then ++ test -f Makefile && make "$ltmain" ++ fi + fi + ])# AC_LIBTOOL_CONFIG + +@@ -4335,9 +4615,6 @@ + # 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 + lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" + +@@ -4359,14 +4636,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'" + ;; ++linux* | k*bsd*-gnu) ++ if test "$host_cpu" = ia64; then ++ symcode='[[ABCDGIRSTW]]' ++ 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'" ++ fi ++ ;; + irix* | nonstopux*) + symcode='[[BCDEGRST]]' + ;; + osf*) + symcode='[[BCDEGQRST]]' + ;; +-solaris* | sysv5*) +- symcode='[[BDT]]' ++solaris*) ++ symcode='[[BDRT]]' ++ ;; ++sco3.2v5*) ++ symcode='[[DT]]' ++ ;; ++sysv4.2uw2*) ++ symcode='[[DT]]' ++ ;; ++sysv5* | sco5v6* | unixware* | OpenUNIX*) ++ symcode='[[ABDT]]' + ;; + sysv4) + symcode='[[DFNSTU]]' +@@ -4384,14 +4677,17 @@ + # If we're using GNU nm, then use its standard symbol codes. + case `$NM -V 2>&1` in + *GNU* | *'with BFD'*) +- symcode='[[ABCDGISTW]]' ;; ++ symcode='[[ABCDGIRSTW]]' ;; + esac + + # Try without a prefix undercore, then with it. + for ac_symprfx in "" "_"; do + ++ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. ++ symxfrm="\\1 $ac_symprfx\\2 \\2" ++ + # Write the raw and C identifiers. +- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'" ++ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + + # Check to see that the pipe works correctly. + pipe_works=no +@@ -4547,6 +4843,10 @@ + # DJGPP does not support shared libraries at all + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= + ;; ++ interix3*) ++ # 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 +@@ -4555,7 +4855,7 @@ + hpux*) + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. +- case "$host_cpu" in ++ case $host_cpu in + hppa*64*|ia64*) + ;; + *) +@@ -4580,18 +4880,28 @@ + ;; + chorus*) + case $cc_basename in +- cxch68) ++ cxch68*) + # Green Hills C++ Compiler + # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--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 + ;; ++ darwin*) ++ # PIC is the default on this platform ++ # Common symbols not allowed in MH_DYLIB files ++ case $cc_basename in ++ xlc*) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ ;; ++ esac ++ ;; + dgux*) + case $cc_basename in +- ec++) ++ ec++*) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + ;; +- ghcx) ++ ghcx*) + # Green Hills C++ Compiler + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; +@@ -4599,22 +4909,22 @@ + ;; + esac + ;; +- freebsd* | kfreebsd*-gnu) ++ freebsd* | dragonfly*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) + case $cc_basename in +- CC) ++ CC*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + if test "$host_cpu" != ia64; then + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + fi + ;; +- aCC) ++ aCC*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" +- case "$host_cpu" in ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' ++ case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; +@@ -4627,9 +4937,13 @@ + ;; + esac + ;; ++ interix*) ++ # This is c89, which is MS Visual C++ (no shared libs) ++ # Anyone wants to do a port? ++ ;; + irix5* | irix6* | nonstopux*) + case $cc_basename in +- CC) ++ CC*) + _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. +@@ -4638,20 +4952,26 @@ + ;; + esac + ;; +- linux*) ++ linux* | k*bsd*-gnu) + case $cc_basename in +- KCC) ++ KCC*) + # KAI C++ Compiler + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; +- icpc) ++ icpc* | ecpc*) + # Intel C++ + _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)='-static' +- ;; +- cxx) ++ ;; ++ pgCC*) ++ # Portland Group C++ compiler. ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ cxx*) + # Compaq C++ + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. +@@ -4668,25 +4988,25 @@ + ;; + mvs*) + case $cc_basename in +- cxx) ++ cxx*) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' + ;; + *) + ;; + esac + ;; +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + ;; + osf3* | osf4* | osf5*) + case $cc_basename in +- KCC) ++ KCC*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' + ;; +- RCC) ++ RCC*) + # Rational C++ 2.4.1 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; +- cxx) ++ cxx*) + # Digital/Compaq C++ + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # Make sure the PIC flag is empty. It appears that all Alpha +@@ -4700,24 +5020,15 @@ + ;; + psos*) + ;; +- sco*) +- case $cc_basename in +- CC) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' +- ;; +- *) +- ;; +- esac +- ;; + solaris*) + case $cc_basename in +- CC) ++ CC*) + # Sun C++ 4.2, 5.x and Centerline C++ + _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 ' + ;; +- gcx) ++ gcx*) + # Green Hills C++ Compiler + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + ;; +@@ -4727,12 +5038,12 @@ + ;; + sunos4*) + case $cc_basename in +- CC) ++ CC*) + # Sun C++ 4.x + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; +- lcc) ++ lcc*) + # Lucid + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; +@@ -4742,7 +5053,7 @@ + ;; + tandem*) + case $cc_basename in +- NCC) ++ NCC*) + # NonStop-UX NCC 3.20 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + ;; +@@ -4750,7 +5061,14 @@ + ;; + esac + ;; +- unixware*) ++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) ++ case $cc_basename in ++ CC*) ++ _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' ++ ;; ++ esac + ;; + vxworks*) + ;; +@@ -4797,6 +5115,11 @@ + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + ;; + ++ interix3*) ++ # Interix 3.x gcc -fpic/-fPIC options generate broken code. ++ # Instead, we relocate shared libraries at runtime. ++ ;; ++ + msdosdjgpp*) + # Just because we use GCC doesn't mean we suddenly get shared libraries + # on systems that don't support them. +@@ -4813,7 +5136,7 @@ + hpux*) + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. +- case "$host_cpu" in ++ case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; +@@ -4839,6 +5162,16 @@ + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' + fi + ;; ++ darwin*) ++ # PIC is the default on this platform ++ # Common symbols not allowed in MH_DYLIB files ++ case $cc_basename in ++ xlc*) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ ;; ++ esac ++ ;; + + mingw* | pw32* | os2*) + # This hack is so that the source file can tell whether it is being +@@ -4850,7 +5183,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. +- case "$host_cpu" in ++ case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; +@@ -4873,13 +5206,20 @@ + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + +- linux*) +- case $CC in ++ linux* | k*bsd*-gnu) ++ case $cc_basename in + icc* | ecc*) + _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)='-static' + ;; ++ pgcc* | pgf77* | pgf90* | pgf95*) ++ # Portland Group compilers (*not* the Pentium gcc compiler, ++ # which looks to be a dead project) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; + ccc*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # All Alpha code is PIC. +@@ -4894,15 +5234,15 @@ + _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' +- ;; +- + solaris*) +- _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' ++ case $cc_basename in ++ f77* | f90* | f95*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; ++ *) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; ++ esac + ;; + + sunos4*) +@@ -4911,7 +5251,7 @@ + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + +- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) ++ sysv4 | sysv4.2uw2* | sysv4.3*) + _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' +@@ -4924,6 +5264,17 @@ + fi + ;; + ++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) ++ _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' ++ ;; ++ ++ unicos*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++ ;; ++ + uts4*) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +@@ -4951,7 +5302,7 @@ + [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) + fi +-case "$host_os" in ++case $host_os in + # For platforms which do not support PIC, -DPIC is meaningless: + *djgpp*) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= +@@ -4960,6 +5311,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 ++ ++# ++# Check to make sure the static flag actually works. ++# ++wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" ++AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], ++ _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), ++ $lt_tmp_static_flag, ++ [], ++ [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) + ]) + + +@@ -4984,7 +5345,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' ++ ;; ++ 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' +@@ -5010,7 +5374,7 @@ + _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown + _LT_AC_TAGVAR(hardcode_automatic, $1)=no + _LT_AC_TAGVAR(module_cmds, $1)= +- _LT_AC_TAGVAR(module_expsym_cmds, $1)= ++ _LT_AC_TAGVAR(module_expsym_cmds, $1)= + _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* +@@ -5027,7 +5391,8 @@ + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. + extract_expsyms_cmds= +- ++ # Just being paranoid about ensuring that cc_basename is set. ++ _LT_CC_BASENAME([$compiler]) + case $host_os in + cygwin* | mingw* | pw32*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time +@@ -5037,6 +5402,10 @@ + with_gnu_ld=no + fi + ;; ++ interix*) ++ # we just hope/assume this is gcc and not c89 (= MSVC++) ++ with_gnu_ld=yes ++ ;; + openbsd*) + with_gnu_ld=no + ;; +@@ -5047,6 +5416,27 @@ + # If archive_cmds runs LD, not CC, wlarc should be empty + wlarc='${wl}' + ++ # Set some defaults for GNU ld with shared library support. These ++ # are reset later if shared libraries are not supported. Putting them ++ # here allows them to be overridden if necessary. ++ runpath_var=LD_RUN_PATH ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++ # ancient GNU ld didn't support --whole-archive et. al. ++ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ else ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= ++ fi ++ supports_anon_versioning=no ++ case `$LD -v 2>/dev/null` in ++ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 ++ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... ++ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... ++ *\ 2.11.*) ;; # other 2.11 versions ++ *) supports_anon_versioning=yes ;; ++ esac ++ + # See if GNU ld supports shared libraries. + case $host_os in + aix3* | aix4* | aix5*) +@@ -5084,7 +5474,7 @@ + _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi +@@ -5094,13 +5484,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' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=no ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_AC_TAGVAR(always_export_symbols, $1)=no + _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes +- _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' + + 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' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # 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 +@@ -5109,23 +5499,70 @@ + 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 ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ ++ interix3*) ++ _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' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. ++ # Instead, shared libraries are loaded at an image base (0x10000000 by ++ # default) and relocated if they conflict, which is a slow very memory ++ # consuming and fragmenting process. To avoid this, we pick a random, ++ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link ++ # time. Moving up from 0x10000000 also allows more sbrk(2) space. ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ _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) ++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ tmp_addflag= ++ case $cc_basename,$host_cpu in ++ pgcc*) # Portland Group C compiler ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ tmp_addflag=' $pic_flag' ++ ;; ++ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ tmp_addflag=' $pic_flag -Mnomain' ;; ++ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 ++ tmp_addflag=' -i_dynamic' ;; ++ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 ++ tmp_addflag=' -i_dynamic -nofor_main' ;; ++ 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' ++ ++ 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' ++ fi ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=no + else +- ld_shlibs=no ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + +- netbsd*) ++ 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' + wlarc= + else +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; + +- solaris* | sysv5*) ++ solaris*) + if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then + _LT_AC_TAGVAR(ld_shlibs, $1)=no + cat <&2 +@@ -5139,13 +5576,40 @@ + + EOF + elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + ++ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) ++ case `$LD -v 2>&1` in ++ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ cat <<_LT_EOF 1>&2 ++ ++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not ++*** reliably create shared libraries on SCO systems. Therefore, libtool ++*** is disabling shared libraries support. We urge you to upgrade GNU ++*** binutils to release 2.16.91.0.3 or newer. Another option is to modify ++*** your PATH or compiler configuration so that the native linker is ++*** used, and then restart. ++ ++_LT_EOF ++ ;; ++ *) ++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' ++ else ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ esac ++ ;; ++ + sunos4*) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' + wlarc= +@@ -5155,24 +5619,19 @@ + + *) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + +- if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then +- runpath_var=LD_RUN_PATH +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' +- # ancient GNU ld didn't support --whole-archive et. al. +- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' +- else +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= +- fi ++ if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then ++ runpath_var= ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= + fi + else + # PORTME fill in a description of your system's linker (not GNU ld) +@@ -5184,7 +5643,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 +- if test "$GCC" = yes && test -z "$link_static_flag"; then ++ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + # Neither direct hardcoding nor static linking is supported with a + # broken collect2. + _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported +@@ -5206,9 +5665,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 ++ aix_use_runtimelinking=no ++ ++ # 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. ++ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) ++ for ld_flag in $LDFLAGS; do ++ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then ++ aix_use_runtimelinking=yes ++ break ++ fi ++ done ++ ;; ++ esac + +- # KDE requires run time linking. Make it the default. +- aix_use_runtimelinking=yes + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi +@@ -5225,7 +5696,7 @@ + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + + if test "$GCC" = yes; then +- case $host_os in aix4.[012]|aix4.[012].*) ++ 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` +@@ -5244,8 +5715,12 @@ + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= + fi ++ ;; + esac + shared_flag='-shared' ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag="$shared_flag "'${wl}-G' ++ fi + else + # not using gcc + if test "$host_cpu" = ia64; then +@@ -5253,30 +5728,30 @@ + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else +- if test "$aix_use_runtimelinking" = yes; then +- shared_flag='-qmkshrobj ${wl}-G' ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag='${wl}-G' + else +- shared_flag='-qmkshrobj' +- fi ++ shared_flag='${wl}-bM:SRE' ++ fi + fi + fi + +- # Let the compiler handle the export list. +- _LT_AC_TAGVAR(always_export_symbols, $1)=no ++ # It seems that -bexpall does not export symbols beginning with ++ # underscore (_), so it is better to generate a list of symbols to export. ++ _LT_AC_TAGVAR(always_export_symbols, $1)=yes + 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. + _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' + # Determine the default libpath from the value encoded in an empty executable. +- _LT_AC_SYS_LIBPATH_AIX +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" +- _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag" +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" ++ _LT_AC_SYS_LIBPATH_AIX ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else + if test "$host_cpu" = ia64; then + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an empty executable. + _LT_AC_SYS_LIBPATH_AIX +@@ -5285,13 +5760,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' +- # -bexpall does not export symbols beginning with underscore (_) +- _LT_AC_TAGVAR(always_export_symbols, $1)=yes + # Exported symbols can be pulled into shared objects from archives +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' ' ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes +- # This is similar to how AIX traditionally builds it's shared libraries. +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' ++ # This is similar to how AIX traditionally builds its shared libraries. ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; +@@ -5304,7 +5777,7 @@ + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + +- bsdi4*) ++ bsdi[[45]]*) + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic + ;; + +@@ -5314,69 +5787,69 @@ + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=no ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. +- shrext=".dll" ++ shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$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. + _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' +- fix_srcfile_path='`cygpath -w "$srcfile"`' ++ _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' + _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + + darwin* | rhapsody*) +- if test "$GXX" = yes ; then +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- case "$host_os" in +- rhapsody* | darwin1.[[012]]) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress' +- ;; +- *) # Darwin 1.3 on +- 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]]) ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' ++ ;; ++ *) # Darwin 1.3 on ++ 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 +- output_verbose_link_cmd='echo' +- if $CC -dumpspecs 2>&1 | grep '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 $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring' +- else +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring' +- fi +- _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs' +- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's +- 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 $compiler_flags $libobjs $deplibs -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 ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -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 $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_automatic, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience' ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi ++ if test "$GCC" = yes ; then ++ output_verbose_link_cmd='echo' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $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 -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $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}' ++ else ++ 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(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(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*) +@@ -5409,8 +5882,8 @@ + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. +- 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 +@@ -5418,7 +5891,7 @@ + + hpux9*) + if test "$GCC" = yes; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + 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 +@@ -5432,47 +5905,62 @@ + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + ;; + +- hpux10* | hpux11*) ++ hpux10*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then +- case "$host_cpu" in +- hppa*64*|ia64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ++ fi ++ if test "$with_gnu_ld" = no; then ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ ++ # hardcode_minus_L: Not really in the search PATH, ++ # but as the default location of the library. ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ fi ++ ;; ++ ++ hpux11*) ++ if test "$GCC" = yes -a "$with_gnu_ld" = no; then ++ case $host_cpu in ++ hppa*64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ ia64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + else +- case "$host_cpu" in +- hppa*64*|ia64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' ++ case $host_cpu in ++ hppa*64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ ia64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + fi + 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, $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)=: + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; +- ia64*) +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- +- # hardcode_minus_L: Not really in the search PATH, +- # but as the default location of the library. +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- ;; + *) +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + +@@ -5486,7 +5974,7 @@ + + irix5* | irix6* | nonstopux*) + if test "$GCC" = yes; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + 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' +@@ -5496,7 +5984,7 @@ + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + 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 +@@ -5519,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 +- _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' + else +@@ -5529,7 +6018,7 @@ + _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 +@@ -5540,14 +6029,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 +- _LT_AC_TAGVAR(archive_cmds, $1)='$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 $compiler_flags $libobjs $deplibs$output_objdir/$libname.def' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$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' + _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + ;; + + osf3*) + if test "$GCC" = yes; then + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$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}${output_objdir}/so_locations -o $lib' + 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' +@@ -5559,13 +6048,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}\*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$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}${output_objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + 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 -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ +- $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' ++ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' + + # Both c and cxx compiler support -rpath directly + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' +@@ -5573,21 +6062,15 @@ + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + ;; + +- sco3.2v5*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' +- runpath_var=LD_RUN_PATH +- hardcode_runpath_var=yes +- ;; +- + solaris*) + _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' + if test "$GCC" = yes; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' ++ wlarc='${wl}' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_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~ +- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp' ++ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' + else ++ wlarc='' + _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' +@@ -5596,8 +6079,18 @@ + _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. ++ # 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 ;; + esac + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + ;; +@@ -5606,7 +6099,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. +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' + fi +@@ -5654,36 +6147,45 @@ + fi + ;; + +- sysv4.2uw2*) +- _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*) ++ _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 +- hardcode_runpath_var=yes +- runpath_var=LD_RUN_PATH +- ;; ++ runpath_var='LD_RUN_PATH' + +- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*) +- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text' + if test "$GCC" = yes; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi +- runpath_var='LD_RUN_PATH' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + +- sysv5*) +- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -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 +- _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' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= ++ sysv5* | sco3.2v5* | sco5v6*) ++ # Note: We can NOT use -z defs as we might desire, because we do not ++ # link with -lc, and that would cause any symbols used from libc to ++ # always be unresolved, which means just about no library would ++ # ever link correctly. If we're not using GNU ld we use -z text ++ # though, which does catch some bad symbols but isn't as heavy-handed ++ # as -z defs. ++ _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(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)=':' ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + runpath_var='LD_RUN_PATH' ++ ++ if test "$GCC" = yes; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ fi + ;; + + uts4*) +@@ -5701,11 +6203,6 @@ + AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) + test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no + +-variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +-if test "$GCC" = yes; then +- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +-fi +- + # + # Do we need to explicitly link libc? + # +@@ -5726,13 +6223,14 @@ + AC_MSG_CHECKING([whether -lc should be explicitly linked in]) + $rm conftest* + printf "$lt_simple_compile_test_code" > conftest.$ac_ext +- ++ + if AC_TRY_EVAL(ac_compile) 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) ++ pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) + compiler_flags=-v + linker_flags=-v + verstring= +@@ -5860,7 +6358,7 @@ + # Add /usr/xpg4/bin/sed as it is typically found on Solaris + # along with /bin/sed that truncates output. + for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do +- test ! -f $lt_ac_sed && break ++ test ! -f $lt_ac_sed && continue + 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-05-14 12:58:18.000000000 +0200 ++++ b/admin/ltmain.sh 2007-05-14 23:36:38.000000000 +0200 +@@ -1,7 +1,7 @@ + # ltmain.sh - Provide generalized library-building support services. + # NOTE: Changing this file will not affect anything until you rerun configure. + # +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003 ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 + # Free Software Foundation, Inc. + # Originally by Gordon Matzigkeit , 1996 + # +@@ -24,6 +24,34 @@ + # configuration script generated by Autoconf, you may include it under + # the same distribution terms that you use for the rest of that program. + ++basename="s,^.*/,,g" ++ ++# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh ++# is ksh but when the shell is invoked as "sh" and the current value of ++# the _XPG environment variable is not equal to 1 (one), the special ++# positional parameter $0, within a function call, is the name of the ++# function. ++progpath="$0" ++ ++# The name of this program: ++progname=`echo "$progpath" | $SED $basename` ++modename="$progname" ++ ++# Global variables: ++EXIT_SUCCESS=0 ++EXIT_FAILURE=1 ++ ++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)" ++ ++# 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 ++ setopt NO_GLOB_SUBST ++fi ++ + # 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 @@ + : + else + # Restart under the correct shell, and then maybe $echo will work. +- exec $SHELL "$0" --no-reexec ${1+"$@"} ++ exec $SHELL "$progpath" --no-reexec ${1+"$@"} + fi + + if test "X$1" = X--fallback-echo; then +@@ -45,19 +73,9 @@ + cat <&2 + $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + # Global variables. +@@ -111,6 +132,8 @@ + show="$echo" + show_help= + execute_dlfiles= ++duplicate_deps=no ++preserve_args= + lo2o="s/\\.lo\$/.${objext}/" + o2lo="s/\\.${objext}\$/.lo/" + +@@ -118,10 +141,51 @@ + # Shell function definitions: + # This seems to be the best place for them + ++# func_mktempdir [string] ++# Make a temporary directory that won't clash with other running ++# libtool processes, and avoids race conditions if possible. If ++# given, STRING is the basename for that directory. ++func_mktempdir () ++{ ++ my_template="${TMPDIR-/tmp}/${1-$progname}" ++ ++ if test "$run" = ":"; then ++ # Return a directory name, but don't create it in dry-run mode ++ my_tmpdir="${my_template}-$$" ++ else ++ ++ # If mktemp works, use that first and foremost ++ my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` ++ ++ if test ! -d "$my_tmpdir"; then ++ # Failing that, at least try and use $RANDOM to avoid a race ++ my_tmpdir="${my_template}-${RANDOM-0}$$" ++ ++ save_mktempdir_umask=`umask` ++ umask 0077 ++ $mkdir "$my_tmpdir" ++ umask $save_mktempdir_umask ++ fi ++ ++ # If we're not in dry-run mode, bomb out on failure ++ test -d "$my_tmpdir" || { ++ $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2 ++ exit $EXIT_FAILURE ++ } ++ fi ++ ++ $echo "X$my_tmpdir" | $Xsed ++} ++ ++ ++# func_win32_libid arg ++# return the library type of file 'arg' ++# + # Need a lot of goo to handle *both* DLLs and import libs + # Has to be a shell function in order to 'eat' the argument + # that is supplied when $file_magic_command is called. +-win32_libid () { ++func_win32_libid () ++{ + win32_libid_type="unknown" + win32_fileres=`file -L $1 2>/dev/null` + case $win32_fileres in +@@ -130,17 +194,16 @@ + ;; + *ar\ archive*) # could be an import, or static + if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \ +- grep -E 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then ++ $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then + win32_nmres=`eval $NM -f posix -A $1 | \ +- sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'` +- if test "X$win32_nmres" = "Ximport" ; then +- win32_libid_type="x86 archive import" +- else +- win32_libid_type="x86 archive static" +- fi ++ $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";; ++ esac + fi + ;; +- *DLL*) ++ *DLL*) + win32_libid_type="x86 DLL" + ;; + *executable*) # but shell scripts are "executable" too... +@@ -154,9 +217,181 @@ + $echo $win32_libid_type + } + ++ ++# func_infer_tag arg ++# Infer tagged configuration to use if any are available and ++# if one wasn't chosen via the "--tag" command line option. ++# Only attempt this if the compiler in the base compile ++# command doesn't match the default compiler. ++# arg is usually of the form 'gcc ...' ++func_infer_tag () ++{ ++ if test -n "$available_tags" && test -z "$tagname"; then ++ CC_quoted= ++ for arg in $CC; do ++ case $arg in ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") ++ arg="\"$arg\"" ++ ;; ++ esac ++ CC_quoted="$CC_quoted $arg" ++ done ++ case $@ in ++ # Blanks in the command may have been stripped by the calling shell, ++ # but not from the CC environment variable when configure was run. ++ " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;; ++ # Blanks at the start of $base_compile will cause this to fail ++ # if we don't check for them as well. ++ *) ++ for z in $available_tags; do ++ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then ++ # Evaluate the configuration. ++ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" ++ CC_quoted= ++ for arg in $CC; do ++ # Double-quote args containing other shell metacharacters. ++ case $arg in ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") ++ arg="\"$arg\"" ++ ;; ++ esac ++ CC_quoted="$CC_quoted $arg" ++ done ++ case "$@ " in ++ " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ++ # The compiler in the base compile command matches ++ # the one in the tagged configuration. ++ # Assume this is the tagged configuration we want. ++ tagname=$z ++ break ++ ;; ++ esac ++ fi ++ done ++ # If $tagname still isn't set, then no tagged configuration ++ # was found and let the user know that the "--tag" command ++ # line option must be used. ++ if test -z "$tagname"; then ++ $echo "$modename: unable to infer tagged configuration" ++ $echo "$modename: specify a tag with \`--tag'" 1>&2 ++ exit $EXIT_FAILURE ++# else ++# $echo "$modename: using $tagname tagged configuration" ++ fi ++ ;; ++ esac ++ fi ++} ++ ++ ++# func_extract_an_archive dir oldlib ++func_extract_an_archive () ++{ ++ f_ex_an_ar_dir="$1"; shift ++ f_ex_an_ar_oldlib="$1" ++ ++ $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)" ++ $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $? ++ if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then ++ : ++ else ++ $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2 ++ exit $EXIT_FAILURE ++ fi ++} ++ ++# func_extract_archives gentop oldlib ... ++func_extract_archives () ++{ ++ my_gentop="$1"; shift ++ my_oldlibs=${1+"$@"} ++ my_oldobjs="" ++ my_xlib="" ++ my_xabs="" ++ my_xdir="" ++ my_status="" ++ ++ $show "${rm}r $my_gentop" ++ $run ${rm}r "$my_gentop" ++ $show "$mkdir $my_gentop" ++ $run $mkdir "$my_gentop" ++ my_status=$? ++ if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then ++ exit $my_status ++ fi ++ ++ for my_xlib in $my_oldlibs; do ++ # Extract the objects. ++ case $my_xlib in ++ [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; ++ *) my_xabs=`pwd`"/$my_xlib" ;; ++ esac ++ my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'` ++ my_xdir="$my_gentop/$my_xlib" ++ ++ $show "${rm}r $my_xdir" ++ $run ${rm}r "$my_xdir" ++ $show "$mkdir $my_xdir" ++ $run $mkdir "$my_xdir" ++ exit_status=$? ++ if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then ++ exit $exit_status ++ fi ++ case $host in ++ *-darwin*) ++ $show "Extracting $my_xabs" ++ # Do not bother doing anything if just a dry run ++ if test -z "$run"; then ++ darwin_orig_dir=`pwd` ++ cd $my_xdir || exit $? ++ darwin_archive=$my_xabs ++ darwin_curdir=`pwd` ++ darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'` ++ darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null` ++ if test -n "$darwin_arches"; then ++ darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'` ++ darwin_arch= ++ $show "$darwin_base_archive has multiple architectures $darwin_arches" ++ for darwin_arch in $darwin_arches ; do ++ mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}" ++ lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" ++ cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" ++ func_extract_an_archive "`pwd`" "${darwin_base_archive}" ++ cd "$darwin_curdir" ++ $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" ++ done # $darwin_arches ++ ## Okay now we have a bunch of thin objects, gotta fatten them up :) ++ darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP` ++ darwin_file= ++ darwin_files= ++ for darwin_file in $darwin_filelist; do ++ darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` ++ lipo -create -output "$darwin_file" $darwin_files ++ done # $darwin_filelist ++ ${rm}r unfat-$$ ++ cd "$darwin_orig_dir" ++ else ++ cd "$darwin_orig_dir" ++ func_extract_an_archive "$my_xdir" "$my_xabs" ++ fi # $darwin_arches ++ fi # $run ++ ;; ++ *) ++ func_extract_an_archive "$my_xdir" "$my_xabs" ++ ;; ++ esac ++ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` ++ done ++ func_extract_archives_result="$my_oldobjs" ++} + # End of Shell function definitions + ##################################### + ++# Darwin sucks ++eval std_shrext=\"$shrext_cmds\" ++ ++disable_libs=no ++ + # Parse our command line options once, thoroughly. + while test "$#" -gt 0 + do +@@ -176,12 +411,13 @@ + ;; + tag) + tagname="$arg" ++ preserve_args="${preserve_args}=$arg" + + # Check whether tagname contains only valid characters + case $tagname in + *[!-_A-Za-z0-9,/]*) + $echo "$progname: invalid tag name: $tagname" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + esac + +@@ -191,10 +427,10 @@ + # not specially marked. + ;; + *) +- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$0" > /dev/null; then ++ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then + taglist="$taglist $tagname" + # Evaluate the configuration. +- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`" ++ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`" + else + $echo "$progname: ignoring unknown tag $tagname" 1>&2 + fi +@@ -220,24 +456,25 @@ + --version) + $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." +- exit 0 ++ exit $? + ;; + + --config) +- ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0 ++ ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath + # Now print the configurations for the tags. + for tagname in $taglist; do +- ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$0" ++ ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath" + done +- exit 0 ++ exit $? + ;; + + --debug) + $echo "$progname: enabling shell trace mode" + set -x ++ preserve_args="$preserve_args $arg" + ;; + + --dry-run | -n) +@@ -256,7 +493,7 @@ + else + $echo "disable static libraries" + fi +- exit 0 ++ exit $? + ;; + + --finish) mode="finish" ;; +@@ -268,13 +505,19 @@ + + --quiet | --silent) + show=: ++ preserve_args="$preserve_args $arg" + ;; + +- --tag) prevopt="--tag" prev=tag ;; ++ --tag) ++ prevopt="--tag" ++ prev=tag ++ preserve_args="$preserve_args --tag" ++ ;; + --tag=*) + set tag "$optarg" ${1+"$@"} + shift + prev=tag ++ preserve_args="$preserve_args --tag" + ;; + + -dlopen) +@@ -285,7 +528,7 @@ + -*) + $echo "$modename: unrecognized option \`$arg'" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + + *) +@@ -298,9 +541,21 @@ + if test -n "$prevopt"; then + $echo "$modename: option \`$prevopt' requires an argument" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + ++case $disable_libs in ++no) ++ ;; ++shared) ++ build_libtool_libs=no ++ build_old_libs=yes ++ ;; ++static) ++ build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` ++ ;; ++esac ++ + # 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 @@ + # Infer the operation mode. + if test -z "$mode"; then + $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2 +- $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2 ++ $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2 + case $nonopt in + *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*) + mode=link +@@ -354,7 +609,7 @@ + if test -n "$execute_dlfiles" && test "$mode" != execute; then + $echo "$modename: unrecognized option \`-dlopen'" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + # Change the help message to a mode-specific one. +@@ -369,13 +624,15 @@ + # Get the compilation command and the source file. + base_compile= + srcfile="$nonopt" # always keep a non-empty value in "srcfile" ++ suppress_opt=yes + suppress_output= + arg_mode=normal + libobj= ++ later= + + for arg + do +- case "$arg_mode" in ++ case $arg_mode in + arg ) + # do not "continue". Instead, add this to base_compile + lastarg="$arg" +@@ -394,24 +651,19 @@ + -o) + if test -n "$libobj" ; then + $echo "$modename: you cannot specify \`-o' more than once" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + arg_mode=target + continue + ;; + +- -static) +- build_old_libs=yes ++ -static | -prefer-pic | -prefer-non-pic) ++ later="$later $arg" + continue + ;; + +- -prefer-pic) +- pic_mode=yes +- continue +- ;; +- +- -prefer-non-pic) +- pic_mode=no ++ -no-suppress) ++ suppress_opt=no + continue + ;; + +@@ -424,7 +676,7 @@ + args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"` + lastarg= + save_ifs="$IFS"; IFS=',' +- for arg in $args; do ++ for arg in $args; do + IFS="$save_ifs" + + # Double-quote args containing other shell metacharacters. +@@ -462,7 +714,10 @@ + case $lastarg in + # Double-quote args containing other shell metacharacters. + # Many Bourne shells cannot handle close brackets correctly +- # in scan sets, so we specify it separately. ++ # in scan sets, and some SunOS ksh mistreat backslash-escaping ++ # in scan sets (worked around with variable expansion), ++ # and furthermore cannot handle '|' '&' '(' ')' in scan sets ++ # at all, so we specify them separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + lastarg="\"$lastarg\"" + ;; +@@ -474,11 +729,11 @@ + case $arg_mode in + arg) + $echo "$modename: you must specify an argument for -Xcompile" +- exit 1 ++ exit $EXIT_FAILURE + ;; + target) + $echo "$modename: you must specify a target with \`-o'" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + *) + # Get the name of the library object. +@@ -511,51 +766,39 @@ + *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;; + *) + $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + esac + +- # Infer tagged configuration to use if any are available and +- # if one wasn't chosen via the "--tag" command line option. +- # Only attempt this if the compiler in the base compile +- # command doesn't match the default compiler. +- if test -n "$available_tags" && test -z "$tagname"; then +- case $base_compile in +- # Blanks in the command may have been stripped by the calling shell, +- # but not from the CC environment variable when configure was run. +- " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "*) ;; +- # Blanks at the start of $base_compile will cause this to fail +- # if we don't check for them as well. +- *) +- for z in $available_tags; do +- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then +- # Evaluate the configuration. +- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`" +- case "$base_compile " in +- "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) +- # The compiler in the base compile command matches +- # the one in the tagged configuration. +- # Assume this is the tagged configuration we want. +- tagname=$z +- break +- ;; +- esac +- fi +- done +- # If $tagname still isn't set, then no tagged configuration +- # was found and let the user know that the "--tag" command +- # line option must be used. +- if test -z "$tagname"; then +- $echo "$modename: unable to infer tagged configuration" +- $echo "$modename: specify a tag with \`--tag'" 1>&2 +- exit 1 +-# else +-# $echo "$modename: using $tagname tagged configuration" +- fi ++ func_infer_tag $base_compile ++ ++ for arg in $later; do ++ case $arg in ++ -static) ++ build_old_libs=yes ++ continue ++ ;; ++ ++ -prefer-pic) ++ pic_mode=yes ++ continue ++ ;; ++ ++ -prefer-non-pic) ++ pic_mode=no ++ continue + ;; + esac +- fi ++ done + ++ qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"` ++ case $qlibobj in ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") ++ qlibobj="\"$qlibobj\"" ;; ++ esac ++ test "X$libobj" != "X$qlibobj" \ ++ && $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' &()|`$[]' \ ++ && $echo "$modename: libobj name \`$libobj' may not contain shell special characters." + 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 @@ + if test -z "$base_compile"; then + $echo "$modename: you must specify a compilation command" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + # Delete any leftover library objects. +@@ -579,7 +822,7 @@ + fi + + $run $rm $removelist +- trap "$run $rm $removelist; exit 1" 1 2 15 ++ trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15 + + # On Cygwin there's no "real" PIC flag so we must build both object types + case $host_os in +@@ -598,7 +841,7 @@ + output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext} + lockfile="$output_obj.lock" + removelist="$removelist $output_obj $lockfile" +- trap "$run $rm $removelist; exit 1" 1 2 15 ++ trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15 + else + output_obj= + need_locks=no +@@ -608,7 +851,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 +- until $run ln "$0" "$lockfile" 2>/dev/null; do ++ until $run ln "$progpath" "$lockfile" 2>/dev/null; do + $show "Waiting for $lockfile to be removed" + sleep 2 + done +@@ -626,14 +869,19 @@ + compiler." + + $run $rm $removelist +- exit 1 ++ exit $EXIT_FAILURE + fi +- $echo $srcfile > "$lockfile" ++ $echo "$srcfile" > "$lockfile" + fi + + if test -n "$fix_srcfile_path"; then + eval srcfile=\"$fix_srcfile_path\" + fi ++ qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"` ++ case $qsrcfile in ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") ++ qsrcfile="\"$qsrcfile\"" ;; ++ esac + + $run $rm "$libobj" "${libobj}T" + +@@ -655,18 +903,18 @@ + fbsd_hideous_sh_bug=$base_compile + + if test "$pic_mode" != no; then +- command="$base_compile $srcfile $pic_flag" ++ command="$base_compile $qsrcfile $pic_flag" + else + # Don't build PIC code +- command="$base_compile $srcfile" ++ command="$base_compile $qsrcfile" + fi + + if test ! -d "${xdir}$objdir"; then + $show "$mkdir ${xdir}$objdir" + $run $mkdir ${xdir}$objdir +- status=$? +- if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then +- exit $status ++ exit_status=$? ++ if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then ++ exit $exit_status + fi + fi + +@@ -681,7 +929,7 @@ + if $run eval "$command"; then : + else + test -n "$output_obj" && $run $rm $removelist +- exit 1 ++ exit $EXIT_FAILURE + fi + + if test "$need_locks" = warn && +@@ -701,7 +949,7 @@ + compiler." + + $run $rm $removelist +- exit 1 ++ exit $EXIT_FAILURE + fi + + # Just move the object if needed, then go on to compile the next one +@@ -722,7 +970,9 @@ + EOF + + # Allow error messages only from the first compilation. +- suppress_output=' >/dev/null 2>&1' ++ if test "$suppress_opt" = yes; then ++ suppress_output=' >/dev/null 2>&1' ++ fi + else + # No PIC object so indicate it doesn't exist in the libtool + # object file. +@@ -736,9 +986,9 @@ + if test "$build_old_libs" = yes; then + if test "$pic_mode" != yes; then + # Don't build PIC code +- command="$base_compile $srcfile" ++ command="$base_compile $qsrcfile" + else +- command="$base_compile $srcfile $pic_flag" ++ command="$base_compile $qsrcfile $pic_flag" + fi + if test "$compiler_c_o" = yes; then + command="$command -o $obj" +@@ -751,7 +1001,7 @@ + if $run eval "$command"; then : + else + $run $rm $removelist +- exit 1 ++ exit $EXIT_FAILURE + fi + + if test "$need_locks" = warn && +@@ -771,7 +1021,7 @@ + compiler." + + $run $rm $removelist +- exit 1 ++ exit $EXIT_FAILURE + fi + + # Just move the object if needed +@@ -809,7 +1059,7 @@ + $run $rm "$lockfile" + fi + +- exit 0 ++ exit $EXIT_SUCCESS + ;; + + # libtool link mode +@@ -835,7 +1085,7 @@ + ;; + esac + libtool_args="$nonopt" +- base_compile="$nonopt" ++ base_compile="$nonopt $@" + compile_command="$nonopt" + finalize_command="$nonopt" + +@@ -847,7 +1097,6 @@ + old_convenience= + deplibs= + old_deplibs= +- add_flags= + compiler_flags= + linker_flags= + dllsearchpath= +@@ -868,6 +1117,8 @@ + no_install=no + objs= + non_pic_objects= ++ notinst_path= # paths that contain not-installed libtool libraries ++ precious_files_regex= + prefer_static_libs=no + preload=no + prev= +@@ -881,6 +1132,8 @@ + vinfo= + vinfo_number=no + ++ func_infer_tag $base_compile ++ + # We need to know -static, to get the right output filenames. + for arg + do +@@ -893,14 +1146,15 @@ + if test -n "$link_static_flag"; then + dlopen_self=$dlopen_self_static + fi ++ prefer_static_libs=yes + else + if test -z "$pic_flag" && test -n "$link_static_flag"; then + dlopen_self=$dlopen_self_static + fi ++ prefer_static_libs=built + fi + build_libtool_libs=no + build_old_libs=yes +- prefer_static_libs=yes + break + ;; + esac +@@ -912,7 +1166,6 @@ + # Go through the arguments, transforming them on the way. + while test "$#" -gt 0; do + arg="$1" +- base_compile="$base_compile $arg" + shift + case $arg in + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") +@@ -976,7 +1229,7 @@ + export_symbols="$arg" + if test ! -f "$arg"; then + $echo "$modename: symbol file \`$arg' does not exist" +- exit 1 ++ exit $EXIT_FAILURE + fi + prev= + continue +@@ -991,6 +1244,11 @@ + prev= + continue + ;; ++ precious_regex) ++ precious_files_regex="$arg" ++ prev= ++ continue ++ ;; + release) + release="-$arg" + prev= +@@ -1023,7 +1281,7 @@ + test "$pic_object" = none && \ + test "$non_pic_object" = none; then + $echo "$modename: cannot find name of object for \`$arg'" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + # Extract subdirectory from the argument. +@@ -1071,12 +1329,17 @@ + if test -z "$pic_object" || test "$pic_object" = none ; then + arg="$non_pic_object" + fi ++ else ++ # If the PIC object exists, use it instead. ++ # $xdir was prepended to $pic_object above. ++ non_pic_object="$pic_object" ++ non_pic_objects="$non_pic_objects $non_pic_object" + fi + else + # Only an error if not doing a dry-run. + if test -z "$run"; then + $echo "$modename: \`$arg' is not a valid libtool object" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + else + # Dry-run case. + +@@ -1097,7 +1360,7 @@ + done + else + $echo "$modename: link input file \`$save_arg' does not exist" +- exit 1 ++ exit $EXIT_FAILURE + fi + arg=$save_arg + prev= +@@ -1109,7 +1372,7 @@ + [\\/]* | [A-Za-z]:[\\/]*) ;; + *) + $echo "$modename: only absolute run-paths are allowed" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + esac + if test "$prev" = rpath; then +@@ -1149,16 +1412,15 @@ + finalize_command="$finalize_command $qarg" + continue + ;; +- framework) +- case $host in +- *-*-darwin*) +- case "$deplibs " in +- *" $qarg.ltframework "*) ;; +- *) deplibs="$deplibs $qarg.ltframework" # this is fixed later +- ;; +- esac +- ;; +- esac ++ shrext) ++ shrext_cmds="$arg" ++ prev= ++ continue ++ ;; ++ darwin_framework|darwin_framework_skip) ++ test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg" ++ compile_command="$compile_command $arg" ++ finalize_command="$finalize_command $arg" + prev= + continue + ;; +@@ -1210,7 +1472,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" +- exit 1 ++ exit $EXIT_FAILURE + fi + if test "X$arg" = "X-export-symbols"; then + prev=expsyms +@@ -1220,6 +1482,18 @@ + continue + ;; + ++ -framework|-arch|-isysroot) ++ case " $CC " in ++ *" ${arg} ${1} "* | *" ${arg} ${1} "*) ++ prev=darwin_framework_skip ;; ++ *) compiler_flags="$compiler_flags $arg" ++ prev=darwin_framework ;; ++ esac ++ compile_command="$compile_command $arg" ++ finalize_command="$finalize_command $arg" ++ continue ++ ;; ++ + -inst-prefix-dir) + prev=inst_prefix + continue +@@ -1246,7 +1520,8 @@ + absdir=`cd "$dir" && pwd` + if test -z "$absdir"; then + $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 +- exit 1 ++ absdir="$dir" ++ notinst_path="$notinst_path $dir" + fi + dir="$absdir" + ;; +@@ -1260,10 +1535,15 @@ + esac + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) ++ testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'` + case :$dllsearchpath: in + *":$dir:"*) ;; + *) dllsearchpath="$dllsearchpath:$dir";; + esac ++ case :$dllsearchpath: in ++ *":$testbindir:"*) ;; ++ *) dllsearchpath="$dllsearchpath:$testbindir";; ++ esac + ;; + esac + continue +@@ -1272,26 +1552,35 @@ + -l*) + if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then + case $host in +- *-*-cygwin* | *-*-pw32* | *-*-beos*) ++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*) + # These systems don't actually have a C or math library (as such) + continue + ;; +- *-*-mingw* | *-*-os2*) ++ *-*-os2*) + # These systems don't actually have a C library (as such) + test "X$arg" = "X-lc" && continue + ;; +- *-*-openbsd* | *-*-freebsd*) ++ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + # Do not include libc due to us having libc/libc_r. + test "X$arg" = "X-lc" && continue + ;; + *-*-rhapsody* | *-*-darwin1.[012]) + # Rhapsody C and math libraries are in the System framework +- deplibs="$deplibs System.ltframework" ++ deplibs="$deplibs -framework System" + continue ++ ;; ++ *-*-sco3.2v5* | *-*-sco5v6*) ++ # Causes problems with __ctype ++ test "X$arg" = "X-lc" && continue ++ ;; ++ *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) ++ # Compiler inserts libc in the correct place for threads to work ++ test "X$arg" = "X-lc" && continue ++ ;; + esac + elif test "X$arg" = "X-lc_r"; then + case $host in +- *-*-openbsd*) ++ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + # Do not include libc_r directly, use -pthread flag. + continue + ;; +@@ -1301,18 +1590,41 @@ + continue + ;; + ++ # Tru64 UNIX uses -model [arg] to determine the layout of C++ ++ # classes, name mangling, and exception handling. ++ -model) ++ compile_command="$compile_command $arg" ++ compiler_flags="$compiler_flags $arg" ++ finalize_command="$finalize_command $arg" ++ prev=xcompiler ++ continue ++ ;; ++ ++ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) ++ compiler_flags="$compiler_flags $arg" ++ compile_command="$compile_command $arg" ++ finalize_command="$finalize_command $arg" ++ continue ++ ;; ++ + -module) + module=yes + continue + ;; + +- # gcc -m* arguments should be passed to the linker via $compiler_flags +- # in order to pass architecture information to the linker +- # (e.g. 32 vs 64-bit). This may also be accomplished via -Wl,-mfoo +- # but this is not reliable with gcc because gcc may use -mfoo to +- # select a different linker, different libraries, etc, while +- # -Wl,-mfoo simply passes -mfoo to the linker. +- -m*) ++ # -64, -mips[0-9] enable 64-bit mode on the SGI compiler ++ # -r[0-9][0-9]* specifies the processor on the SGI compiler ++ # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler ++ # +DA*, +DD* enable 64-bit mode on the HP compiler ++ # -q* pass through compiler args for the IBM compiler ++ # -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 ++ # @file GCC response files ++ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ ++ -t[45]*|-txscale*|@*) ++ + # 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"` +@@ -1323,9 +1635,7 @@ + esac + compile_command="$compile_command $arg" + finalize_command="$finalize_command $arg" +- if test "$with_gcc" = "yes" ; then +- compiler_flags="$compiler_flags $arg" +- fi ++ compiler_flags="$compiler_flags $arg" + continue + ;; + +@@ -1365,6 +1675,11 @@ + + -o) prev=output ;; + ++ -precious-files-regex) ++ prev=precious_regex ++ continue ++ ;; ++ + -release) + prev=release + continue +@@ -1387,7 +1702,7 @@ + [\\/]* | [A-Za-z]:[\\/]*) ;; + *) + $echo "$modename: only absolute run-paths are allowed" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + esac + case "$xrpath " in +@@ -1473,11 +1788,6 @@ + continue + ;; + +- -framework) +- prev=framework +- continue +- ;; +- + # Some other compiler flag. + -* | +*) + # Unknown arguments in both finalize_command and compile_command need +@@ -1488,7 +1798,6 @@ + arg="\"$arg\"" + ;; + esac +- add_flags="$add_flags $arg" + ;; + + *.$objext) +@@ -1516,7 +1825,7 @@ + test "$pic_object" = none && \ + test "$non_pic_object" = none; then + $echo "$modename: cannot find name of object for \`$arg'" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + # Extract subdirectory from the argument. +@@ -1564,12 +1873,17 @@ + if test -z "$pic_object" || test "$pic_object" = none ; then + arg="$non_pic_object" + fi ++ else ++ # If the PIC object exists, use it instead. ++ # $xdir was prepended to $pic_object above. ++ non_pic_object="$pic_object" ++ non_pic_objects="$non_pic_objects $non_pic_object" + fi + else + # Only an error if not doing a dry-run. + if test -z "$run"; then + $echo "$modename: \`$arg' is not a valid libtool object" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + else + # Dry-run case. + +@@ -1623,7 +1937,6 @@ + arg="\"$arg\"" + ;; + esac +- add_flags="$add_flags $arg" + ;; + esac # arg + +@@ -1637,48 +1950,7 @@ + if test -n "$prev"; then + $echo "$modename: the \`$prevarg' option requires an argument" 1>&2 + $echo "$help" 1>&2 +- exit 1 +- fi +- +- # Infer tagged configuration to use if any are available and +- # if one wasn't chosen via the "--tag" command line option. +- # Only attempt this if the compiler in the base link +- # command doesn't match the default compiler. +- if test -n "$available_tags" && test -z "$tagname"; then +- case $base_compile in +- # Blanks in the command may have been stripped by the calling shell, +- # but not from the CC environment variable when configure was run. +- "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;; +- # Blanks at the start of $base_compile will cause this to fail +- # if we don't check for them as well. +- *) +- for z in $available_tags; do +- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then +- # Evaluate the configuration. +- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`" +- case $base_compile in +- "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) +- # The compiler in $compile_command matches +- # the one in the tagged configuration. +- # Assume this is the tagged configuration we want. +- tagname=$z +- break +- ;; +- esac +- fi +- done +- # If $tagname still isn't set, then no tagged configuration +- # was found and let the user know that the "--tag" command +- # line option must be used. +- if test -z "$tagname"; then +- $echo "$modename: unable to infer tagged configuration" +- $echo "$modename: specify a tag with \`--tag'" 1>&2 +- exit 1 +-# else +-# $echo "$modename: using $tagname tagged configuration" +- fi +- ;; +- esac ++ exit $EXIT_FAILURE + fi + + if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then +@@ -1711,9 +1983,9 @@ + if test ! -d "$output_objdir"; then + $show "$mkdir $output_objdir" + $run $mkdir $output_objdir +- status=$? +- if test "$status" -ne 0 && test ! -d "$output_objdir"; then +- exit $status ++ exit_status=$? ++ if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then ++ exit $exit_status + fi + fi + +@@ -1722,7 +1994,7 @@ + "") + $echo "$modename: you must specify an output file" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + *.$libext) linkmode=oldlib ;; + *.lo | *.$objext) linkmode=obj ;; +@@ -1732,7 +2004,7 @@ + + case $host in + *cygwin* | *mingw* | *pw32*) +- # don't eliminate duplcations in $postdeps and $predeps ++ # don't eliminate duplications in $postdeps and $predeps + duplicate_compiler_generated_deps=yes + ;; + *) +@@ -1776,7 +2048,6 @@ + newlib_search_path= + need_relink=no # whether we're linking any uninstalled libtool libraries + notinst_deplibs= # not-installed libtool libraries +- notinst_path= # paths that contain not-installed libtool libraries + case $linkmode in + lib) + passes="conv link" +@@ -1785,7 +2056,7 @@ + *.la) ;; + *) + $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + esac + done +@@ -1811,7 +2082,10 @@ + case $pass in + dlopen) libs="$dlfiles" ;; + dlpreopen) libs="$dlprefiles" ;; +- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; ++ link) ++ libs="$deplibs %DEPLIBS%" ++ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" ++ ;; + esac + fi + if test "$pass" = dlopen; then +@@ -1823,18 +2097,23 @@ + lib= + found=no + case $deplib in ++ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) ++ if test "$linkmode,$pass" = "prog,link"; then ++ compile_deplibs="$deplib $compile_deplibs" ++ finalize_deplibs="$deplib $finalize_deplibs" ++ else ++ compiler_flags="$compiler_flags $deplib" ++ fi ++ continue ++ ;; + -l*) + if test "$linkmode" != lib && test "$linkmode" != prog; then + $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2 + continue + fi +- if test "$pass" = conv && test "$allow_undefined" = yes; then +- deplibs="$deplib $deplibs" +- continue +- fi + name=`$echo "X$deplib" | $Xsed -e 's/^-l//'` + for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do +- for search_ext in .la $shrext .so .a; do ++ for search_ext in .la $std_shrext .so .a; do + # Search the libtool library + lib="$searchdir/lib${name}${search_ext}" + if test -f "$lib"; then +@@ -1895,18 +2174,6 @@ + fi + fi + ;; # -l +- *.ltframework) +- if test "$linkmode,$pass" = "prog,link"; then +- compile_deplibs="$deplib $compile_deplibs" +- finalize_deplibs="$deplib $finalize_deplibs" +- else +- deplibs="$deplib $deplibs" +- if test "$linkmode" = lib ; then +- newdependency_libs="$deplib $newdependency_libs" +- fi +- fi +- continue +- ;; + -L*) + case $linkmode in + lib) +@@ -1922,11 +2189,11 @@ + fi + if test "$pass" = scan; then + deplibs="$deplib $deplibs" +- newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` + else + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + fi ++ newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` + ;; + *) + $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2 +@@ -1954,7 +2221,22 @@ + fi + case $linkmode in + lib) +- if test "$deplibs_check_method" != pass_all; then ++ valid_a_lib=no ++ case $deplibs_check_method in ++ match_pattern*) ++ set dummy $deplibs_check_method ++ match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` ++ if eval $echo \"$deplib\" 2>/dev/null \ ++ | $SED 10q \ ++ | $EGREP "$match_pattern_regex" > /dev/null; then ++ valid_a_lib=yes ++ fi ++ ;; ++ pass_all) ++ valid_a_lib=yes ++ ;; ++ esac ++ if test "$valid_a_lib" != yes; then + $echo + $echo "*** Warning: Trying to link with static lib archive $deplib." + $echo "*** I have the capability to make that library automatically link in when" +@@ -2004,15 +2286,15 @@ + esac # case $deplib + if test "$found" = yes || test -f "$lib"; then : + else +- $echo "$modename: cannot find the library \`$lib'" 1>&2 +- exit 1 ++ $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2 ++ exit $EXIT_FAILURE + fi + + # Check to see that this really is a libtool archive. + if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : + else + $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'` +@@ -2028,6 +2310,8 @@ + # it will not redefine variables installed, or shouldnotlink + installed=yes + shouldnotlink=no ++ avoidtemprpath= ++ + + # Read the .la file + case $lib in +@@ -2035,13 +2319,6 @@ + *) . ./$lib ;; + esac + +- case $host in +- *-*-darwin*) +- # Convert "-framework foo" to "foo.ltframework" in dependency_libs +- test -n "$dependency_libs" && dependency_libs=`$echo "X$dependency_libs" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'` +- ;; +- esac +- + if test "$linkmode,$pass" = "lib,link" || + test "$linkmode,$pass" = "prog,scan" || + { test "$linkmode" != prog && test "$linkmode" != lib; }; then +@@ -2052,33 +2329,32 @@ + if test "$pass" = conv; then + # Only check for convenience libraries + deplibs="$lib $deplibs" +- tmp_libs= +- for deplib in $dependency_libs; do +- #echo "Adding $deplib to \$deplibs" +- deplibs="$deplib $deplibs" +- if test "X$duplicate_deps" = "Xyes" ; then +- case "$tmp_libs " in +- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; +- esac +- fi +- tmp_libs="$tmp_libs $deplib" +- done + if test -z "$libdir"; then + if test -z "$old_library"; then + $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + # It is a libtool convenience library, so add in its objects. + convenience="$convenience $ladir/$objdir/$old_library" + old_convenience="$old_convenience $ladir/$objdir/$old_library" ++ tmp_libs= ++ for deplib in $dependency_libs; do ++ deplibs="$deplib $deplibs" ++ if test "X$duplicate_deps" = "Xyes" ; then ++ case "$tmp_libs " in ++ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ++ esac ++ fi ++ tmp_libs="$tmp_libs $deplib" ++ done + elif test "$linkmode" != prog && test "$linkmode" != lib; then + $echo "$modename: \`$lib' is not a convenience library" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + continue + fi # $pass = conv + +- ++ + # Get the name of the library we link against. + linklib= + for l in $old_library $library_names; do +@@ -2086,16 +2362,18 @@ + done + if test -z "$linklib"; then + $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + # This library was specified with -dlopen. + if test "$pass" = dlopen; then + if test -z "$libdir"; then + $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi +- if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then ++ if test -z "$dlname" || ++ test "$dlopen_support" != yes || ++ test "$build_libtool_libs" = no; then + # 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 +@@ -2132,11 +2410,19 @@ + dir="$libdir" + absdir="$libdir" + fi ++ test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes + else +- dir="$ladir/$objdir" +- absdir="$abs_ladir/$objdir" +- # Remove this search path later +- notinst_path="$notinst_path $abs_ladir" ++ if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then ++ dir="$ladir" ++ absdir="$abs_ladir" ++ # Remove this search path later ++ notinst_path="$notinst_path $abs_ladir" ++ else ++ dir="$ladir/$objdir" ++ absdir="$abs_ladir/$objdir" ++ # Remove this search path later ++ notinst_path="$notinst_path $abs_ladir" ++ fi + fi # $installed = yes + name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` + +@@ -2144,7 +2430,7 @@ + if test "$pass" = dlpreopen; then + if test -z "$libdir"; then + $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + # Prefer using a static library (so that no silly _DYNAMIC symbols + # are required to link). +@@ -2171,7 +2457,7 @@ + continue + fi + +- ++ + if test "$linkmode" = prog && test "$pass" != link; then + newlib_search_path="$newlib_search_path $ladir" + deplibs="$lib $deplibs" +@@ -2209,12 +2495,12 @@ + if test -n "$library_names" && + { test "$prefer_static_libs" = no || 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 + # Make sure the rpath contains only unique directories. + case "$temp_rpath " in + *" $dir "*) ;; + *" $absdir "*) ;; +- *) temp_rpath="$temp_rpath $dir" ;; ++ *) temp_rpath="$temp_rpath $absdir" ;; + esac + fi + +@@ -2251,24 +2537,29 @@ + fi + + link_static=no # Whether the deplib will be linked statically ++ use_static_libs=$prefer_static_libs ++ if test "$use_static_libs" = built && test "$installed" = yes ; then ++ use_static_libs=no ++ fi + if test -n "$library_names" && +- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then ++ { test "$use_static_libs" = no || test -z "$old_library"; }; then + if test "$installed" = no; then + notinst_deplibs="$notinst_deplibs $lib" + need_relink=yes + fi + # This is a shared library +- +- # Warn about portability, can't link against -module's on some systems (darwin) +- if test "$shouldnotlink" = yes && test "$pass" = link ; then ++ ++ # Warn about portability, can't link against -module's on ++ # some systems (darwin) ++ if test "$shouldnotlink" = yes && test "$pass" = link ; then + $echo + if test "$linkmode" = prog; then + $echo "*** Warning: Linking the executable $output against the loadable module" + else + $echo "*** Warning: Linking the shared library $output against the loadable module" + fi +- $echo "*** $linklib is not portable!" +- fi ++ $echo "*** $linklib is not portable!" ++ fi + if test "$linkmode" = lib && + test "$hardcode_into_libs" = yes; then + # Hardcode the library path. +@@ -2326,9 +2617,10 @@ + else + $show "extracting exported symbol list from \`$soname'" + save_ifs="$IFS"; IFS='~' +- eval cmds=\"$extract_expsyms_cmds\" ++ cmds=$extract_expsyms_cmds + for cmd in $cmds; do + IFS="$save_ifs" ++ eval cmd=\"$cmd\" + $show "$cmd" + $run eval "$cmd" || exit $? + done +@@ -2339,9 +2631,10 @@ + if test -f "$output_objdir/$newlib"; then :; else + $show "generating import library for \`$soname'" + save_ifs="$IFS"; IFS='~' +- eval cmds=\"$old_archive_from_expsyms_cmds\" ++ cmds=$old_archive_from_expsyms_cmds + for cmd in $cmds; do + IFS="$save_ifs" ++ eval cmd=\"$cmd\" + $show "$cmd" + $run eval "$cmd" || exit $? + done +@@ -2362,11 +2655,15 @@ + if test "$hardcode_direct" = no; then + add="$dir/$linklib" + case $host in +- *-*-sco3.2v5* ) add_dir="-L$dir" ;; ++ *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; ++ *-*-sysv4*uw2*) add_dir="-L$dir" ;; ++ *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ ++ *-*-unixware7*) add_dir="-L$dir" ;; + *-*-darwin* ) +- # if the lib is a module then we can not link against it, someone +- # is ignoring the new warnings I added +- if /usr/bin/file -L $add 2> /dev/null | grep "bundle" >/dev/null ; then ++ # if the lib is a module then we can not link against ++ # it, someone is ignoring the new warnings I added ++ if /usr/bin/file -L $add 2> /dev/null | ++ $EGREP ": [^:]* bundle" >/dev/null ; then + $echo "** Warning, lib $linklib is a module, not a shared library" + if test -z "$old_library" ; then + $echo +@@ -2374,7 +2671,7 @@ + $echo "** The link will probably fail, sorry" + else + add="$dir/$old_library" +- fi ++ fi + fi + esac + elif test "$hardcode_minus_L" = no; then +@@ -2397,9 +2694,9 @@ + add_dir="-L$dir" + # Try looking first in the location we're being installed to. + if test -n "$inst_prefix_dir"; then +- case "$libdir" in ++ case $libdir in + [\\/]*) +- add_dir="-L$inst_prefix_dir$libdir $add_dir" ++ add_dir="$add_dir -L$inst_prefix_dir$libdir" + ;; + esac + fi +@@ -2416,7 +2713,7 @@ + + if test "$lib_linked" != yes; then + $echo "$modename: configuration error: unsupported hardcode properties" +- exit 1 ++ exit $EXIT_FAILURE + fi + + if test -n "$add_shlibpath"; then +@@ -2459,7 +2756,8 @@ + esac + add="-l$name" + elif test "$hardcode_automatic" = yes; then +- if test -n "$inst_prefix_dir" && test -f "$inst_prefix_dir$libdir/$linklib" ; then ++ if test -n "$inst_prefix_dir" && ++ test -f "$inst_prefix_dir$libdir/$linklib" ; then + add="$inst_prefix_dir$libdir/$linklib" + else + add="$libdir/$linklib" +@@ -2469,9 +2767,9 @@ + add_dir="-L$libdir" + # Try looking first in the location we're being installed to. + if test -n "$inst_prefix_dir"; then +- case "$libdir" in ++ case $libdir in + [\\/]*) +- add_dir="-L$inst_prefix_dir$libdir $add_dir" ++ add_dir="$add_dir -L$inst_prefix_dir$libdir" + ;; + esac + fi +@@ -2530,17 +2828,16 @@ + fi + fi + else +- convenience="$convenience $dir/$old_library" +- old_convenience="$old_convenience $dir/$old_library" + deplibs="$dir/$old_library $deplibs" + link_static=yes + fi + fi # link shared/static library? + + if test "$linkmode" = lib; then +- #if test -n "$dependency_libs" && +- # { test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes || +- # test "$link_static" = yes; }; then ++ if test -n "$dependency_libs" && ++ { test "$hardcode_into_libs" != yes || ++ test "$build_old_libs" = yes || ++ test "$link_static" = yes; }; then + # Extract -R from dependency_libs + temp_deplibs= + for libdir in $dependency_libs; do +@@ -2554,7 +2851,7 @@ + esac + done + dependency_libs="$temp_deplibs" +- #fi ++ fi + + newlib_search_path="$newlib_search_path $absdir" + # Link against this library +@@ -2596,20 +2893,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 +- exit 1 ++ exit $EXIT_FAILURE + fi + if test "$absdir" != "$libdir"; then +- # Sure, some shells/systems don't implement the -ef. +- # Those will have to live with the warning. +- test "$absdir" -ef "$libdir" > /dev/null 2>&1 || +- $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2 ++ $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2 + fi + path="$absdir" + fi + depdepl= + case $host in + *-*-darwin*) +- # we do not want to link against static libs, but need to link against shared ++ # we do not want to link against static libs, ++ # but need to link against shared + eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` + if test -n "$deplibrary_names" ; then + for tmp in $deplibrary_names ; do +@@ -2617,55 +2912,45 @@ + done + if test -f "$path/$depdepl" ; then + depdepl="$path/$depdepl" +- fi ++ fi + # do not add paths which are already there + case " $newlib_search_path " in + *" $path "*) ;; + *) newlib_search_path="$newlib_search_path $path";; + esac +- path="" + fi ++ path="" + ;; + *) +- path="-L$path" +- ;; +- esac +- ++ path="-L$path" ++ ;; ++ esac + ;; +- -l*) ++ -l*) + case $host in + *-*-darwin*) +- # Again, we only want to link against shared libraries +- eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"` +- for tmp in $newlib_search_path ; do +- if test -f "$tmp/lib$tmp_libs.dylib" ; then +- eval depdepl="$tmp/lib$tmp_libs.dylib" +- break +- fi +- done +- path="" ++ # Again, we only want to link against shared libraries ++ eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"` ++ for tmp in $newlib_search_path ; do ++ if test -f "$tmp/lib$tmp_libs.dylib" ; then ++ eval depdepl="$tmp/lib$tmp_libs.dylib" ++ break ++ fi ++ done ++ path="" + ;; + *) continue ;; +- esac +- ;; +- +- *.ltframework) +- case $host in +- *-*-darwin*) +- depdepl="$deplib" +- ;; + esac + ;; +- + *) continue ;; + esac + case " $deplibs " in +- *" $depdepl "*) ;; +- *) deplibs="$deplibs $depdepl" ;; +- esac +- case " $deplibs " in + *" $path "*) ;; +- *) deplibs="$deplibs $path" ;; ++ *) deplibs="$path $deplibs" ;; ++ esac ++ case " $deplibs " in ++ *" $depdepl "*) ;; ++ *) deplibs="$depdepl $deplibs" ;; + esac + done + fi # link_all_deplibs != no +@@ -2752,7 +3037,8 @@ + eval $var=\"$tmp_libs\" + done # for var + fi +- # Last step: remove runtime libs from dependency_libs (they stay in deplibs) ++ # Last step: remove runtime libs from dependency_libs ++ # (they stay in deplibs) + tmp_libs= + for i in $dependency_libs ; do + case " $predeps $postdeps $compiler_lib_search_path " in +@@ -2812,19 +3098,19 @@ + case $outputname in + lib*) + name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` +- eval shared_ext=\"$shrext\" ++ eval shared_ext=\"$shrext_cmds\" + eval libname=\"$libname_spec\" + ;; + *) + if test "$module" = no; then + $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + if test "$need_lib_prefix" != no; then + # Add the "lib" prefix for modules if required + name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` +- eval shared_ext=\"$shrext\" ++ eval shared_ext=\"$shrext_cmds\" + eval libname=\"$libname_spec\" + else + libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` +@@ -2835,7 +3121,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 +- exit 1 ++ exit $EXIT_FAILURE + else + $echo + $echo "*** Warning: Linking the shared library $output against the non-libtool" +@@ -2883,13 +3169,13 @@ + if test -n "$8"; then + $echo "$modename: too many parameters to \`-version-info'" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + # convert absolute version numbers to libtool ages + # this retains compatibility with .la files and attempts + # to make the code below a bit more comprehensible +- ++ + case $vinfo_number in + yes) + number_major="$2" +@@ -2918,6 +3204,11 @@ + age="$number_minor" + revision="$number_minor" + ;; ++ *) ++ $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) +@@ -2929,36 +3220,36 @@ + + # Check that each of the things are valid numbers. + case $current in +- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; ++ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; + *) +- $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 ++ $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2 + $echo "$modename: \`$vinfo' is not valid version information" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + esac + + case $revision in +- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; ++ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; + *) +- $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 ++ $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2 + $echo "$modename: \`$vinfo' is not valid version information" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + esac + + case $age in +- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; ++ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; + *) +- $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 ++ $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2 + $echo "$modename: \`$vinfo' is not valid version information" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + esac + + if test "$age" -gt "$current"; then + $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2 + $echo "$modename: \`$vinfo' is not valid version information" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + # Calculate the version variables. +@@ -2975,7 +3266,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" + ;; + + freebsd-aout) +@@ -3047,7 +3338,7 @@ + *) + $echo "$modename: unknown library version type \`$version_type'" 1>&2 + $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + esac + +@@ -3098,9 +3389,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 ++ if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 ++ then ++ continue ++ fi ++ fi + removelist="$removelist $p" + ;; + *) ;; +@@ -3122,9 +3419,9 @@ + + # Eliminate all temporary directories. + 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 + + if test -n "$xrpath"; then +@@ -3137,7 +3434,7 @@ + *) finalize_rpath="$finalize_rpath $libdir" ;; + esac + done +- if true || test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then ++ if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then + dependency_libs="$temp_xrpath $dependency_libs" + fi + fi +@@ -3170,14 +3467,19 @@ + ;; + *-*-rhapsody* | *-*-darwin1.[012]) + # Rhapsody C library is in the System framework +- deplibs="$deplibs System.ltframework" ++ deplibs="$deplibs -framework System" + ;; + *-*-netbsd*) + # Don't link with libc until the a.out ld.so is fixed. + ;; +- *-*-openbsd* | *-*-freebsd*) ++ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + # Do not include libc due to us having libc/libc_r. +- test "X$arg" = "X-lc" && continue ++ ;; ++ *-*-sco3.2v5* | *-*-sco5v6*) ++ # Causes problems with __ctype ++ ;; ++ *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) ++ # Compiler inserts libc in the correct place for threads to work + ;; + *) + # Add libc to deplibs on all other systems if necessary. +@@ -3221,11 +3523,11 @@ + 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 + 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 "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then +@@ -3262,11 +3564,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 +- name="`expr $i : '-l\(.*\)'`" ++ name=`expr $i : '-l\(.*\)'` + # If $name is empty we are operating on a -L argument. + 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 + ldd_output=`ldd conftest` +@@ -3314,7 +3616,7 @@ + set dummy $deplibs_check_method + file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` + for a_deplib in $deplibs; do +- name="`expr $a_deplib : '-l\(.*\)'`" ++ name=`expr $a_deplib : '-l\(.*\)'` + # 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 +@@ -3383,7 +3685,7 @@ + set dummy $deplibs_check_method + match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` + for a_deplib in $deplibs; do +- name="`expr $a_deplib : '-l\(.*\)'`" ++ name=`expr $a_deplib : '-l\(.*\)'` + # 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 +@@ -3463,7 +3765,7 @@ + case $host in + *-*-rhapsody* | *-*-darwin1.[012]) + # On Rhapsody replace the C library is the System framework +- newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'` ++ newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'` + ;; + esac + +@@ -3509,17 +3811,39 @@ + fi + fi + fi +- # Time to change all our "foo.ltframework" stuff back to "-framework foo" +- case $host in +- *-*-darwin*) +- newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` +- dependency_libs=`$echo "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` +- ;; +- esac + # Done checking deplibs! + deplibs=$newdeplibs + fi + ++ ++ # move library search paths that coincide with paths to not yet ++ # installed libraries to the beginning of the library search list ++ new_libs= ++ for path in $notinst_path; do ++ case " $new_libs " in ++ *" -L$path/$objdir "*) ;; ++ *) ++ case " $deplibs " in ++ *" -L$path/$objdir "*) ++ new_libs="$new_libs -L$path/$objdir" ;; ++ esac ++ ;; ++ esac ++ done ++ for deplib in $deplibs; do ++ case $deplib in ++ -L*) ++ case " $new_libs " in ++ *" $deplib "*) ;; ++ *) new_libs="$new_libs $deplib" ;; ++ esac ++ ;; ++ *) new_libs="$new_libs $deplib" ;; ++ esac ++ done ++ deplibs="$new_libs" ++ ++ + # All the library-specific variables (install_libdir is set above). + library_names= + old_library= +@@ -3532,7 +3856,7 @@ + hardcode_libdirs= + dep_rpath= + rpath="$finalize_rpath" +- test "$mode" != relink && test "$fast_install" = no && rpath="$compile_rpath$rpath" ++ test "$mode" != relink && rpath="$compile_rpath$rpath" + for libdir in $rpath; do + if test -n "$hardcode_libdir_flag_spec"; then + if test -n "$hardcode_libdir_separator"; then +@@ -3587,7 +3911,7 @@ + fi + + # Get the real and link names of the library. +- eval shared_ext=\"$shrext\" ++ eval shared_ext=\"$shrext_cmds\" + eval library_names=\"$library_names_spec\" + set dummy $library_names + realname="$2" +@@ -3603,6 +3927,7 @@ + fi + + lib="$output_objdir/$realname" ++ linknames= + for link + do + linknames="$linknames $link" +@@ -3617,10 +3942,11 @@ + $show "generating symbol list for \`$libname.la'" + export_symbols="$output_objdir/$libname.exp" + $run $rm $export_symbols +- eval cmds=\"$export_symbols_cmds\" ++ cmds=$export_symbols_cmds + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" ++ eval cmd=\"$cmd\" + if len=`expr "X$cmd" : ".*"` && + test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then + $show "$cmd" +@@ -3630,6 +3956,9 @@ + # The command line is too long to execute in one step. + $show "using reloadable object file for export list..." + skipped_export=: ++ # Break out early, otherwise skipped_export may be ++ # set to false by a later but shorter cmd. ++ break + fi + done + IFS="$save_ifs" +@@ -3650,12 +3979,12 @@ + for test_deplib in $deplibs; do + case " $convenience " in + *" $test_deplib "*) ;; +- *) ++ *) + tmp_deplibs="$tmp_deplibs $test_deplib" + ;; + esac + done +- deplibs="$tmp_deplibs" ++ deplibs="$tmp_deplibs" + + if test -n "$convenience"; then + if test -n "$whole_archive_flag_spec"; then +@@ -3663,67 +3992,13 @@ + eval libobjs=\"\$libobjs $whole_archive_flag_spec\" + else + gentop="$output_objdir/${outputname}x" +- $show "${rm}r $gentop" +- $run ${rm}r "$gentop" +- $show "$mkdir $gentop" +- $run $mkdir "$gentop" +- status=$? +- if test "$status" -ne 0 && test ! -d "$gentop"; then +- exit $status +- fi + generated="$generated $gentop" + +- for xlib in $convenience; do +- # Extract the objects. +- case $xlib in +- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; +- *) xabs=`pwd`"/$xlib" ;; +- esac +- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` +- xdir="$gentop/$xlib" +- +- $show "${rm}r $xdir" +- $run ${rm}r "$xdir" +- $show "$mkdir $xdir" +- $run $mkdir "$xdir" +- status=$? +- if test "$status" -ne 0 && test ! -d "$xdir"; then +- exit $status +- fi +- # We will extract separately just the conflicting names and we will no +- # longer touch any unique names. It is faster to leave these extract +- # automatically by $AR in one run. +- $show "(cd $xdir && $AR x $xabs)" +- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? +- if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then +- : +- else +- $echo "$modename: warning: object name conflicts; renaming object files" 1>&2 +- $echo "$modename: warning: to ensure that they will not overwrite" 1>&2 +- $AR t "$xabs" | sort | uniq -cd | while read -r count name +- do +- i=1 +- while test "$i" -le "$count" +- do +- # Put our $i before any first dot (extension) +- # Never overwrite any file +- name_to="$name" +- while test "X$name_to" = "X$name" || test -f "$xdir/$name_to" +- do +- name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"` +- done +- $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')" +- $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $? +- i=`expr $i + 1` +- done +- done +- fi +- +- libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` +- done ++ func_extract_archives $gentop $convenience ++ libobjs="$libobjs $func_extract_archives_result" + fi + fi +- ++ + if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then + eval flag=\"$thread_safe_flag_spec\" + linker_flags="$linker_flags $flag" +@@ -3734,31 +4009,27 @@ + $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $? + fi + +- # Add all flags from the command line. We here create a library, +- # but those flags were only added to compile_command and +- # finalize_command, which are only used when creating executables. +- # So do it by hand here. +- compiler_flags="$compiler_flags $add_flags" +- # Only add it to commands which use CC, instead of LD, i.e. +- # only to $compiler_flags +- #linker_flags="$linker_flags $add_flags" +- + # Do each of the archive commands. + if test "$module" = yes && test -n "$module_cmds" ; then + if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then +- eval cmds=\"$module_expsym_cmds\" ++ eval test_cmds=\"$module_expsym_cmds\" ++ cmds=$module_expsym_cmds + else +- eval cmds=\"$module_cmds\" ++ eval test_cmds=\"$module_cmds\" ++ cmds=$module_cmds + fi + else + if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then +- eval cmds=\"$archive_expsym_cmds\" ++ eval test_cmds=\"$archive_expsym_cmds\" ++ cmds=$archive_expsym_cmds + else +- eval cmds=\"$archive_cmds\" ++ eval test_cmds=\"$archive_cmds\" ++ cmds=$archive_cmds + fi + fi + +- if test "X$skipped_export" != "X:" && len=`expr "X$cmds" : ".*"` && ++ if test "X$skipped_export" != "X:" && ++ len=`expr "X$test_cmds" : ".*" 2>/dev/null` && + test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then + : + else +@@ -3777,6 +4048,7 @@ + save_libobjs=$libobjs + fi + save_output=$output ++ output_la=`$echo "X$output" | $Xsed -e "$basename"` + + # Clear the reloadable object creation command queue and + # initialize k to one. +@@ -3786,13 +4058,13 @@ + delfiles= + last_robj= + k=1 +- output=$output_objdir/$save_output-${k}.$objext ++ output=$output_objdir/$output_la-${k}.$objext + # Loop over the list of objects to be linked. + for obj in $save_libobjs + do + eval test_cmds=\"$reload_cmds $objlist $last_robj\" + if test "X$objlist" = X || +- { len=`expr "X$test_cmds" : ".*"` && ++ { len=`expr "X$test_cmds" : ".*" 2>/dev/null` && + test "$len" -le "$max_cmd_len"; }; then + objlist="$objlist $obj" + else +@@ -3806,9 +4078,9 @@ + # the last one created. + eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\" + fi +- last_robj=$output_objdir/$save_output-${k}.$objext ++ last_robj=$output_objdir/$output_la-${k}.$objext + k=`expr $k + 1` +- output=$output_objdir/$save_output-${k}.$objext ++ output=$output_objdir/$output_la-${k}.$objext + objlist=$obj + len=1 + fi +@@ -3828,13 +4100,13 @@ + eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\" + fi + +- # Set up a command to remove the reloadale object files ++ # Set up a command to remove the reloadable object files + # after they are used. + i=0 + while test "$i" -lt "$k" + do + i=`expr $i + 1` +- delfiles="$delfiles $output_objdir/$save_output-${i}.$objext" ++ delfiles="$delfiles $output_objdir/$output_la-${i}.$objext" + done + + $echo "creating a temporary reloadable object file: $output" +@@ -3859,28 +4131,54 @@ + # value of $libobjs for piecewise linking. + + # Do each of the archive commands. ++ if test "$module" = yes && test -n "$module_cmds" ; then ++ if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then ++ cmds=$module_expsym_cmds ++ else ++ cmds=$module_cmds ++ fi ++ else + if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then +- eval cmds=\"$archive_expsym_cmds\" ++ cmds=$archive_expsym_cmds + else +- eval cmds=\"$archive_cmds\" ++ cmds=$archive_cmds ++ fi + fi + + # Append the command to remove the reloadable object files + # to the just-reset $cmds. +- eval cmds=\"\$cmds~$rm $delfiles\" ++ eval cmds=\"\$cmds~\$rm $delfiles\" + fi + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" ++ eval cmd=\"$cmd\" + $show "$cmd" +- $run eval "$cmd" || exit $? ++ $run eval "$cmd" || { ++ lt_exit=$? ++ ++ # Restore the uninstalled library and exit ++ if test "$mode" = relink; then ++ $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)' ++ fi ++ ++ exit $lt_exit ++ } + done + IFS="$save_ifs" + + # Restore the uninstalled library and exit + if test "$mode" = relink; then + $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $? +- exit 0 ++ ++ if test -n "$convenience"; then ++ if test -z "$whole_archive_flag_spec"; then ++ $show "${rm}r $gentop" ++ $run ${rm}r "$gentop" ++ fi ++ fi ++ ++ exit $EXIT_SUCCESS + fi + + # Create links to the real library. +@@ -3928,7 +4226,7 @@ + *.lo) + if test -n "$objs$old_deplibs"; then + $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + libobj="$output" + obj=`$echo "X$output" | $Xsed -e "$lo2o"` +@@ -3957,64 +4255,10 @@ + eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\" + else + gentop="$output_objdir/${obj}x" +- $show "${rm}r $gentop" +- $run ${rm}r "$gentop" +- $show "$mkdir $gentop" +- $run $mkdir "$gentop" +- status=$? +- if test "$status" -ne 0 && test ! -d "$gentop"; then +- exit $status +- fi + generated="$generated $gentop" + +- for xlib in $convenience; do +- # Extract the objects. +- case $xlib in +- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; +- *) xabs=`pwd`"/$xlib" ;; +- esac +- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` +- xdir="$gentop/$xlib" +- +- $show "${rm}r $xdir" +- $run ${rm}r "$xdir" +- $show "$mkdir $xdir" +- $run $mkdir "$xdir" +- status=$? +- if test "$status" -ne 0 && test ! -d "$xdir"; then +- exit $status +- fi +- # We will extract separately just the conflicting names and we will no +- # longer touch any unique names. It is faster to leave these extract +- # automatically by $AR in one run. +- $show "(cd $xdir && $AR x $xabs)" +- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? +- if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then +- : +- else +- $echo "$modename: warning: object name conflicts; renaming object files" 1>&2 +- $echo "$modename: warning: to ensure that they will not overwrite" 1>&2 +- $AR t "$xabs" | sort | uniq -cd | while read -r count name +- do +- i=1 +- while test "$i" -le "$count" +- do +- # Put our $i before any first dot (extension) +- # Never overwrite any file +- name_to="$name" +- while test "X$name_to" = "X$name" || test -f "$xdir/$name_to" +- do +- name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"` +- done +- $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')" +- $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $? +- i=`expr $i + 1` +- done +- done +- fi +- +- reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` +- done ++ func_extract_archives $gentop $convenience ++ reload_conv_objs="$reload_objs $func_extract_archives_result" + fi + fi + +@@ -4022,10 +4266,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" +- eval cmds=\"$reload_cmds\" ++ cmds=$reload_cmds + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" ++ eval cmd=\"$cmd\" + $show "$cmd" + $run eval "$cmd" || exit $? + done +@@ -4038,7 +4283,7 @@ + $run ${rm}r $gentop + fi + +- exit 0 ++ exit $EXIT_SUCCESS + fi + + if test "$build_libtool_libs" != yes; then +@@ -4051,17 +4296,18 @@ + # accidentally link it into a program. + # $show "echo timestamp > $libobj" + # $run eval "echo timestamp > $libobj" || exit $? +- exit 0 ++ exit $EXIT_SUCCESS + fi + + if test -n "$pic_flag" || test "$pic_mode" != default; then + # Only do commands if we really have different PIC objects. + reload_objs="$libobjs $reload_conv_objs" + output="$libobj" +- eval cmds=\"$reload_cmds\" ++ cmds=$reload_cmds + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" ++ eval cmd=\"$cmd\" + $show "$cmd" + $run eval "$cmd" || exit $? + done +@@ -4073,7 +4319,7 @@ + $run ${rm}r $gentop + fi + +- exit 0 ++ exit $EXIT_SUCCESS + ;; + + prog) +@@ -4098,24 +4344,50 @@ + case $host in + *-*-rhapsody* | *-*-darwin1.[012]) + # On Rhapsody replace the C library is the System framework +- compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` +- finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` ++ compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'` ++ finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'` + ;; + esac + + case $host in +- *-*-darwin*) ++ *darwin*) + # Don't allow lazy linking, it breaks C++ global constructors + if test "$tagname" = CXX ; then + compile_command="$compile_command ${wl}-bind_at_load" + finalize_command="$finalize_command ${wl}-bind_at_load" + fi +- # Time to change all our "foo.ltframework" stuff back to "-framework foo" +- compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` +- finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + ;; + esac + ++ ++ # move library search paths that coincide with paths to not yet ++ # installed libraries to the beginning of the library search list ++ new_libs= ++ for path in $notinst_path; do ++ case " $new_libs " in ++ *" -L$path/$objdir "*) ;; ++ *) ++ case " $compile_deplibs " in ++ *" -L$path/$objdir "*) ++ new_libs="$new_libs -L$path/$objdir" ;; ++ esac ++ ;; ++ esac ++ done ++ for deplib in $compile_deplibs; do ++ case $deplib in ++ -L*) ++ case " $new_libs " in ++ *" $deplib "*) ;; ++ *) new_libs="$new_libs $deplib" ;; ++ esac ++ ;; ++ *) new_libs="$new_libs $deplib" ;; ++ esac ++ done ++ compile_deplibs="$new_libs" ++ ++ + compile_command="$compile_command $compile_deplibs" + finalize_command="$finalize_command $finalize_deplibs" + +@@ -4160,10 +4432,15 @@ + fi + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) ++ testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'` + case :$dllsearchpath: in + *":$libdir:"*) ;; + *) dllsearchpath="$dllsearchpath:$libdir";; + esac ++ case :$dllsearchpath: in ++ *":$testbindir:"*) ;; ++ *) dllsearchpath="$dllsearchpath:$testbindir";; ++ esac + ;; + esac + done +@@ -4277,13 +4554,25 @@ + + # Prepare the list of exported symbols + if test -z "$export_symbols"; then +- export_symbols="$output_objdir/$output.exp" ++ export_symbols="$output_objdir/$outputname.exp" + $run $rm $export_symbols +- $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' ++ $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' ++ case $host in ++ *cygwin* | *mingw* ) ++ $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' ++ $run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' ++ ;; ++ esac + else +- $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"' +- $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T' ++ $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' ++ $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' + $run eval 'mv "$nlist"T "$nlist"' ++ case $host in ++ *cygwin* | *mingw* ) ++ $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' ++ $run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' ++ ;; ++ esac + fi + fi + +@@ -4334,7 +4623,26 @@ + #endif + + /* The mapping between symbol names and symbols. */ ++" ++ ++ case $host in ++ *cygwin* | *mingw* ) ++ $echo >> "$output_objdir/$dlsyms" "\ ++/* DATA imports from DLLs on WIN32 can't be const, because ++ runtime relocations are performed -- see ld's documentation ++ on pseudo-relocs */ ++struct { ++" ++ ;; ++ * ) ++ $echo >> "$output_objdir/$dlsyms" "\ + const struct { ++" ++ ;; ++ esac ++ ++ ++ $echo >> "$output_objdir/$dlsyms" "\ + const char *name; + lt_ptr address; + } +@@ -4381,20 +4689,33 @@ + esac + + # Now compile the dynamic symbol file. +- $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" +- $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? ++ $show "(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" ++ $run eval '(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? + + # Clean up the generated files. + $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T" + $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T" + + # Transform the symbol file into the correct name. +- 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}%"` ++ 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}%"` ++ 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}%"` ++ 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}%"` ++ ;; ++ esac + ;; + *) + $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + esac + else +@@ -4407,17 +4728,6 @@ + finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` + fi + +- # AIX runtime linking requires linking programs with -Wl,-brtl and libs with -Wl,-G +- # Also add -bnolibpath to the beginning of the link line, to clear the hardcoded runpath. +- # Otherwise, things like the -L path to libgcc.a are accidentally hardcoded by ld. +- # This does not apply on AIX for ia64, which uses a SysV linker. +- case "$host" in +- ia64-*-aix5*) ;; +- *-*-aix4* | *-*-aix5*) +- compile_command=`$echo "X$compile_command $wl-brtl" | $Xsed -e "s/\$CC/\$CC $wl-bnolibpath/1"` +- finalize_command=`$echo "X$finalize_command $wl-brtl" | $Xsed -e "s/\$CC/\$CC $wl-bnolibpath/1"` ;; +- esac +- + 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'` +@@ -4426,7 +4736,7 @@ + # We have no uninstalled library dependencies, so finalize right now. + $show "$link_command" + $run eval "$link_command" +- status=$? ++ exit_status=$? + + # Delete the generated files. + if test -n "$dlsyms"; then +@@ -4434,7 +4744,7 @@ + $run $rm "$output_objdir/${outputname}S.${objext}" + fi + +- exit $status ++ exit $exit_status + fi + + if test -n "$shlibpath_var"; then +@@ -4493,7 +4803,7 @@ + # Link the executable and exit + $show "$link_command" + $run eval "$link_command" || exit $? +- exit 0 ++ exit $EXIT_SUCCESS + fi + + if test "$hardcode_action" = relink; then +@@ -4548,10 +4858,10 @@ + fi + + # Quote $echo for shipping. +- if test "X$echo" = "X$SHELL $0 --fallback-echo"; then +- case $0 in +- [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";; +- *) qecho="$SHELL `pwd`/$0 --fallback-echo";; ++ if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then ++ case $progpath in ++ [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";; ++ *) qecho="$SHELL `pwd`/$progpath --fallback-echo";; + esac + qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"` + else +@@ -4573,11 +4883,13 @@ + *) exeext= ;; + esac + case $host in +- *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" ++ cwrapper="$output_path/$output_name.exe" ++ $rm $cwrappersource $cwrapper ++ trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 + + cat > $cwrappersource < + #include + #include ++#include ++#include ++#include + + #if defined(PATH_MAX) + # define LT_PATHMAX PATH_MAX +@@ -4612,15 +4927,19 @@ + #endif + + #ifndef DIR_SEPARATOR +-#define DIR_SEPARATOR '/' ++# define DIR_SEPARATOR '/' ++# define PATH_SEPARATOR ':' + #endif + + #if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ + defined (__OS2__) +-#define HAVE_DOS_BASED_FILE_SYSTEM +-#ifndef DIR_SEPARATOR_2 +-#define DIR_SEPARATOR_2 '\\' +-#endif ++# define HAVE_DOS_BASED_FILE_SYSTEM ++# ifndef DIR_SEPARATOR_2 ++# define DIR_SEPARATOR_2 '\\' ++# endif ++# ifndef PATH_SEPARATOR_2 ++# define PATH_SEPARATOR_2 ';' ++# endif + #endif + + #ifndef DIR_SEPARATOR_2 +@@ -4630,17 +4949,32 @@ + (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) + #endif /* DIR_SEPARATOR_2 */ + ++#ifndef PATH_SEPARATOR_2 ++# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) ++#else /* PATH_SEPARATOR_2 */ ++# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) ++#endif /* PATH_SEPARATOR_2 */ ++ + #define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) + #define XFREE(stale) do { \ + if (stale) { free ((void *) stale); stale = 0; } \ + } while (0) + ++/* -DDEBUG is fairly common in CFLAGS. */ ++#undef DEBUG ++#if defined DEBUGWRAPPER ++# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__) ++#else ++# define DEBUG(format, ...) ++#endif ++ + const char *program_name = NULL; + + void * xmalloc (size_t num); + char * xstrdup (const char *string); +-char * basename (const char *name); +-char * fnqualify(const char *path); ++const char * base_name (const char *name); ++char * find_executable(const char *wrapper); ++int check_executable(const char *path); + char * strendzap(char *str, const char *pat); + void lt_fatal (const char *message, ...); + +@@ -4649,30 +4983,52 @@ + { + char **newargz; + int i; +- +- program_name = (char *) xstrdup ((char *) basename (argv[0])); ++ ++ program_name = (char *) xstrdup (base_name (argv[0])); ++ DEBUG("(main) argv[0] : %s\n",argv[0]); ++ DEBUG("(main) program_name : %s\n",program_name); + newargz = XMALLOC(char *, argc+2); + EOF + +- cat >> $cwrappersource <> $cwrappersource <> $cwrappersource <<"EOF" +- newargz[1] = fnqualify(argv[0]); ++ cat >> $cwrappersource <<"EOF" ++ newargz[1] = find_executable(argv[0]); ++ if (newargz[1] == NULL) ++ lt_fatal("Couldn't find %s", argv[0]); ++ DEBUG("(main) found exe at : %s\n",newargz[1]); + /* we know the script has the same name, without the .exe */ + /* so make sure newargz[1] doesn't end in .exe */ +- strendzap(newargz[1],".exe"); ++ strendzap(newargz[1],".exe"); + for (i = 1; i < argc; i++) + newargz[i+1] = xstrdup(argv[i]); + newargz[argc+1] = NULL; ++ ++ for (i=0; i> $cwrappersource <> $cwrappersource <> $cwrappersource <> $cwrappersource <<"EOF" ++ cat >> $cwrappersource <<"EOF" ++ return 127; + } + + void * +@@ -4685,59 +5041,159 @@ + return p; + } + +-char * ++char * + xstrdup (const char *string) + { + return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL + ; + } + +-char * +-basename (const char *name) ++const char * ++base_name (const char *name) + { + const char *base; + + #if defined (HAVE_DOS_BASED_FILE_SYSTEM) + /* Skip over the disk name in MSDOS pathnames. */ +- if (isalpha (name[0]) && name[1] == ':') ++ if (isalpha ((unsigned char)name[0]) && name[1] == ':') + name += 2; + #endif + + for (base = name; *name; name++) + if (IS_DIR_SEPARATOR (*name)) + base = name + 1; +- return (char *) base; ++ return base; + } + +-char * +-fnqualify(const char *path) ++int ++check_executable(const char * path) ++{ ++ struct stat st; ++ ++ DEBUG("(check_executable) : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!"); ++ if ((!path) || (!*path)) ++ return 0; ++ ++ if ((stat (path, &st) >= 0) && ++ ( ++ /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */ ++#if defined (S_IXOTH) ++ ((st.st_mode & S_IXOTH) == S_IXOTH) || ++#endif ++#if defined (S_IXGRP) ++ ((st.st_mode & S_IXGRP) == S_IXGRP) || ++#endif ++ ((st.st_mode & S_IXUSR) == S_IXUSR)) ++ ) ++ return 1; ++ else ++ return 0; ++} ++ ++/* Searches for the full path of the wrapper. Returns ++ newly allocated full path name if found, NULL otherwise */ ++char * ++find_executable (const char* wrapper) + { +- size_t size; +- char *p; ++ int has_slash = 0; ++ const char* p; ++ const char* p_next; ++ /* static buffer for getcwd */ + char tmp[LT_PATHMAX + 1]; ++ int tmp_len; ++ char* concat_name; ++ ++ DEBUG("(find_executable) : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"); + +- assert(path != NULL); ++ if ((wrapper == NULL) || (*wrapper == '\0')) ++ return NULL; + +- /* Is it qualified already? */ ++ /* Absolute path? */ ++#if defined (HAVE_DOS_BASED_FILE_SYSTEM) ++ if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':') ++ { ++ concat_name = xstrdup (wrapper); ++ if (check_executable(concat_name)) ++ return concat_name; ++ XFREE(concat_name); ++ } ++ else ++ { ++#endif ++ if (IS_DIR_SEPARATOR (wrapper[0])) ++ { ++ concat_name = xstrdup (wrapper); ++ if (check_executable(concat_name)) ++ return concat_name; ++ XFREE(concat_name); ++ } + #if defined (HAVE_DOS_BASED_FILE_SYSTEM) +- if (isalpha (path[0]) && path[1] == ':') +- return xstrdup (path); ++ } + #endif +- if (IS_DIR_SEPARATOR (path[0])) +- return xstrdup (path); + +- /* prepend the current directory */ +- /* doesn't handle '~' */ ++ for (p = wrapper; *p; p++) ++ if (*p == '/') ++ { ++ has_slash = 1; ++ break; ++ } ++ if (!has_slash) ++ { ++ /* no slashes; search PATH */ ++ const char* path = getenv ("PATH"); ++ if (path != NULL) ++ { ++ for (p = path; *p; p = p_next) ++ { ++ const char* q; ++ size_t p_len; ++ for (q = p; *q; q++) ++ if (IS_PATH_SEPARATOR(*q)) ++ break; ++ p_len = q - p; ++ p_next = (*q == '\0' ? q : q + 1); ++ if (p_len == 0) ++ { ++ /* empty path: current directory */ ++ if (getcwd (tmp, LT_PATHMAX) == NULL) ++ lt_fatal ("getcwd failed"); ++ tmp_len = strlen(tmp); ++ concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1); ++ memcpy (concat_name, tmp, tmp_len); ++ concat_name[tmp_len] = '/'; ++ strcpy (concat_name + tmp_len + 1, wrapper); ++ } ++ else ++ { ++ concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1); ++ memcpy (concat_name, p, p_len); ++ concat_name[p_len] = '/'; ++ strcpy (concat_name + p_len + 1, wrapper); ++ } ++ if (check_executable(concat_name)) ++ return concat_name; ++ XFREE(concat_name); ++ } ++ } ++ /* not found in PATH; assume curdir */ ++ } ++ /* Relative path | not found in path: prepend cwd */ + if (getcwd (tmp, LT_PATHMAX) == NULL) + lt_fatal ("getcwd failed"); +- size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */ +- p = XMALLOC(char, size); +- sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path); +- return p; ++ tmp_len = strlen(tmp); ++ concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1); ++ memcpy (concat_name, tmp, tmp_len); ++ concat_name[tmp_len] = '/'; ++ strcpy (concat_name + tmp_len + 1, wrapper); ++ ++ if (check_executable(concat_name)) ++ return concat_name; ++ XFREE(concat_name); ++ return NULL; + } + + char * +-strendzap(char *str, const char *pat) ++strendzap(char *str, const char *pat) + { + size_t len, patlen; + +@@ -4757,7 +5213,7 @@ + } + + static void +-lt_error_core (int exit_status, const char * mode, ++lt_error_core (int exit_status, const char * mode, + const char * message, va_list ap) + { + fprintf (stderr, "%s: %s: ", program_name, mode); +@@ -4777,16 +5233,16 @@ + va_end (ap); + } + EOF +- # we should really use a build-platform specific compiler +- # here, but OTOH, the wrappers (shell script and this C one) +- # are only useful if you want to execute the "real" binary. +- # Since the "real" binary is built for $host, then this +- # wrapper might as well be built for $host, too. +- $run $LTCC -s -o $cwrapper $cwrappersource +- ;; +- esac +- $rm $output +- trap "$rm $output; exit 1" 1 2 15 ++ # we should really use a build-platform specific compiler ++ # here, but OTOH, the wrappers (shell script and this C one) ++ # are only useful if you want to execute the "real" binary. ++ # Since the "real" binary is built for $host, then this ++ # wrapper might as well be built for $host, too. ++ $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource ++ ;; ++ esac ++ $rm $output ++ trap "$rm $output; exit $EXIT_FAILURE" 1 2 15 + + $echo > $output "\ + #! $SHELL +@@ -4807,7 +5263,7 @@ + + # 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 ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + relink_command=\"$relink_command\" + +@@ -4886,7 +5342,7 @@ + else + $echo \"\$relink_command_output\" >&2 + $rm \"\$progdir/\$file\" +- exit 1 ++ exit $EXIT_FAILURE + fi + fi + +@@ -4936,34 +5392,32 @@ + # Backslashes separate directories on plain windows + *-*-mingw | *-*-os2*) + $echo >> $output "\ +- exec \$progdir\\\\\$program \${1+\"\$@\"} ++ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} + " + ;; + + *) +- # Need to set LD_LIBRARY_PATH, to the value already +- # computed within libtool. + $echo >> $output "\ +- LD_LIBRARY_PATH=\"$rpath\" exec \$progdir/\$program \${1+\"\$@\"} ++ exec \"\$progdir/\$program\" \${1+\"\$@\"} + " + ;; + esac + $echo >> $output "\ + \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\" +- exit 1 ++ exit $EXIT_FAILURE + fi + else + # The program doesn't exist. +- \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2 ++ \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 + \$echo \"This script is just a wrapper for \$program.\" 1>&2 + $echo \"See the $PACKAGE documentation for more information.\" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + fi\ + " + chmod +x $output + fi +- exit 0 ++ exit $EXIT_SUCCESS + ;; + esac + +@@ -4986,78 +5440,78 @@ + + if test -n "$addlibs"; then + gentop="$output_objdir/${outputname}x" +- $show "${rm}r $gentop" +- $run ${rm}r "$gentop" +- $show "$mkdir $gentop" +- $run $mkdir "$gentop" +- status=$? +- if test "$status" -ne 0 && test ! -d "$gentop"; then +- exit $status +- fi + generated="$generated $gentop" + +- # Add in members from convenience archives. +- for xlib in $addlibs; do +- # Extract the objects. +- case $xlib in +- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; +- *) xabs=`pwd`"/$xlib" ;; +- esac +- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` +- xdir="$gentop/$xlib" +- +- $show "${rm}r $xdir" +- $run ${rm}r "$xdir" +- $show "$mkdir $xdir" +- $run $mkdir "$xdir" +- status=$? +- if test "$status" -ne 0 && test ! -d "$xdir"; then +- exit $status +- fi +- # We will extract separately just the conflicting names and we will no +- # longer touch any unique names. It is faster to leave these extract +- # automatically by $AR in one run. +- $show "(cd $xdir && $AR x $xabs)" +- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? +- if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then +- : +- else +- $echo "$modename: warning: object name conflicts; renaming object files" 1>&2 +- $echo "$modename: warning: to ensure that they will not overwrite" 1>&2 +- $AR t "$xabs" | sort | uniq -cd | while read -r count name +- do +- i=1 +- while test "$i" -le "$count" +- do +- # Put our $i before any first dot (extension) +- # Never overwrite any file +- name_to="$name" +- while test "X$name_to" = "X$name" || test -f "$xdir/$name_to" +- do +- name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"` +- done +- $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')" +- $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $? +- i=`expr $i + 1` +- done +- done +- fi +- +- oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP` +- done ++ func_extract_archives $gentop $addlibs ++ oldobjs="$oldobjs $func_extract_archives_result" + fi + +- compiler_flags="$compiler_flags $add_flags" +- + # Do each command in the archive commands. + if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then +- eval cmds=\"$old_archive_from_new_cmds\" ++ cmds=$old_archive_from_new_cmds + else ++ # POSIX demands no paths to be encoded in archives. We have ++ # to avoid creating archives with duplicate basenames if we ++ # might have to extract them afterwards, e.g., when creating a ++ # static archive out of a convenience library, or when linking ++ # the entirety of a libtool archive into another (currently ++ # not supported by libtool). ++ if (for obj in $oldobjs ++ do ++ $echo "X$obj" | $Xsed -e 's%^.*/%%' ++ done | sort | sort -uc >/dev/null 2>&1); then ++ : ++ else ++ $echo "copying selected object files to avoid basename conflicts..." ++ ++ if test -z "$gentop"; then ++ gentop="$output_objdir/${outputname}x" ++ generated="$generated $gentop" ++ ++ $show "${rm}r $gentop" ++ $run ${rm}r "$gentop" ++ $show "$mkdir $gentop" ++ $run $mkdir "$gentop" ++ exit_status=$? ++ if test "$exit_status" -ne 0 && test ! -d "$gentop"; then ++ exit $exit_status ++ fi ++ fi ++ ++ save_oldobjs=$oldobjs ++ oldobjs= ++ counter=1 ++ for obj in $save_oldobjs ++ do ++ objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` ++ case " $oldobjs " in ++ " ") oldobjs=$obj ;; ++ *[\ /]"$objbase "*) ++ while :; do ++ # Make sure we don't pick an alternate name that also ++ # overlaps. ++ newobj=lt$counter-$objbase ++ counter=`expr $counter + 1` ++ case " $oldobjs " in ++ *[\ /]"$newobj "*) ;; ++ *) if test ! -f "$gentop/$newobj"; then break; fi ;; ++ esac ++ done ++ $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" ++ $run ln "$obj" "$gentop/$newobj" || ++ $run cp "$obj" "$gentop/$newobj" ++ oldobjs="$oldobjs $gentop/$newobj" ++ ;; ++ *) oldobjs="$oldobjs $obj" ;; ++ esac ++ done ++ fi ++ + eval cmds=\"$old_archive_cmds\" + + if len=`expr "X$cmds" : ".*"` && + test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then +- : ++ cmds=$old_archive_cmds + else + # the command line is too long to link in one step, link in parts + $echo "using piecewise archive linking..." +@@ -5066,31 +5520,18 @@ + objlist= + concat_cmds= + save_oldobjs=$oldobjs +- # GNU ar 2.10+ was changed to match POSIX; thus no paths are +- # encoded into archives. This makes 'ar r' malfunction in +- # this piecewise linking case whenever conflicting object +- # names appear in distinct ar calls; check, warn and compensate. +- if (for obj in $save_oldobjs +- do +- $echo "X$obj" | $Xsed -e 's%^.*/%%' +- done | sort | sort -uc >/dev/null 2>&1); then +- : +- else +- $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2 +- $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2 +- AR_FLAGS=cq +- fi ++ + # Is there a better way of finding the last object in the list? + for obj in $save_oldobjs + do + last_oldobj=$obj +- done ++ done + for obj in $save_oldobjs + do + oldobjs="$objlist $obj" + objlist="$objlist $obj" + eval test_cmds=\"$old_archive_cmds\" +- if len=`expr "X$test_cmds" : ".*"` && ++ if len=`expr "X$test_cmds" : ".*" 2>/dev/null` && + test "$len" -le "$max_cmd_len"; then + : + else +@@ -5098,7 +5539,7 @@ + oldobjs=$objlist + if test "$obj" = "$last_oldobj" ; then + RANLIB=$save_RANLIB +- fi ++ fi + test -z "$concat_cmds" || concat_cmds=$concat_cmds~ + eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" + objlist= +@@ -5109,12 +5550,13 @@ + if test "X$oldobjs" = "X" ; then + eval cmds=\"\$concat_cmds\" + else +- eval cmds=\"\$concat_cmds~$old_archive_cmds\" ++ eval cmds=\"\$concat_cmds~\$old_archive_cmds\" + fi + fi + fi + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do ++ eval cmd=\"$cmd\" + IFS="$save_ifs" + $show "$cmd" + $run eval "$cmd" || exit $? +@@ -5146,11 +5588,13 @@ + fi + done + # Quote the link command for shipping. +- relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)" ++ 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"` + if test "$hardcode_automatic" = yes ; then +- relink_command= +- fi ++ relink_command= ++ fi ++ ++ + # Only create the output if not a dry run. + if test -z "$run"; then + for installed in no yes; do +@@ -5168,7 +5612,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 +- exit 1 ++ exit $EXIT_FAILURE + fi + newdependency_libs="$newdependency_libs $libdir/$name" + ;; +@@ -5182,7 +5626,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 +- exit 1 ++ exit $EXIT_FAILURE + fi + newdlfiles="$newdlfiles $libdir/$name" + done +@@ -5193,11 +5637,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 +- exit 1 ++ exit $EXIT_FAILURE + fi + newdlprefiles="$newdlprefiles $libdir/$name" + done + dlprefiles="$newdlprefiles" ++ else ++ newdlfiles= ++ for lib in $dlfiles; do ++ case $lib in ++ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; ++ *) abs=`pwd`"/$lib" ;; ++ esac ++ newdlfiles="$newdlfiles $abs" ++ done ++ dlfiles="$newdlfiles" ++ newdlprefiles= ++ for lib in $dlprefiles; do ++ case $lib in ++ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; ++ *) abs=`pwd`"/$lib" ;; ++ esac ++ newdlprefiles="$newdlprefiles $abs" ++ done ++ dlprefiles="$newdlprefiles" + fi + $rm $output + # place dlname in correct position for cygwin +@@ -5241,7 +5704,7 @@ + + # Directory that this library needs to be installed in: + libdir='$install_libdir'" +- if test "$installed" = no && test "$need_relink" = yes && test "$fast_install" = no; then ++ if test "$installed" = no && test "$need_relink" = yes; then + $echo >> $output "\ + relink_command=\"$relink_command\"" + fi +@@ -5254,7 +5717,7 @@ + $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $? + ;; + esac +- exit 0 ++ exit $EXIT_SUCCESS + ;; + + # libtool install mode +@@ -5265,11 +5728,11 @@ + # install_prog (especially on Windows NT). + if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || + # Allow the use of GNU shtool's install command. +- $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then ++ $echo "X$nonopt" | grep shtool > /dev/null; then + # Aesthetically quote it. + arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"` + case $arg in +- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + arg="\"$arg\"" + ;; + esac +@@ -5278,14 +5741,14 @@ + shift + else + install_prog= +- arg="$nonopt" ++ arg=$nonopt + fi + + # The real first argument should be the name of the installation program. + # Aesthetically quote it. + arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` + case $arg in +- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + arg="\"$arg\"" + ;; + esac +@@ -5303,28 +5766,31 @@ + do + if test -n "$dest"; then + files="$files $dest" +- dest="$arg" ++ dest=$arg + continue + fi + + case $arg in + -d) isdir=yes ;; +- -f) prev="-f" ;; +- -g) prev="-g" ;; +- -m) prev="-m" ;; +- -o) prev="-o" ;; ++ -f) ++ case " $install_prog " in ++ *[\\\ /]cp\ *) ;; ++ *) prev=$arg ;; ++ esac ++ ;; ++ -g | -m | -o) prev=$arg ;; + -s) + stripme=" -s" + continue + ;; +- -*) ;; +- ++ -*) ++ ;; + *) + # If the previous option needed an argument, then skip it. + if test -n "$prev"; then + prev= + else +- dest="$arg" ++ dest=$arg + continue + fi + ;; +@@ -5333,7 +5799,7 @@ + # Aesthetically quote the argument. + arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` + case $arg in +- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + arg="\"$arg\"" + ;; + esac +@@ -5343,13 +5809,13 @@ + if test -z "$install_prog"; then + $echo "$modename: you must specify an install program" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + if test -n "$prev"; then + $echo "$modename: the \`$prev' option requires an argument" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + if test -z "$files"; then +@@ -5359,7 +5825,7 @@ + $echo "$modename: you must specify a destination" 1>&2 + fi + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + # Strip any trailing slash from the destination. +@@ -5380,7 +5846,7 @@ + if test "$#" -gt 2; then + $echo "$modename: \`$dest' is not a directory" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + fi + case $destdir in +@@ -5392,7 +5858,7 @@ + *) + $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + esac + done +@@ -5421,7 +5887,7 @@ + else + $echo "$modename: \`$file' is not a valid libtool archive" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + library_names= +@@ -5463,7 +5929,7 @@ + # 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 +- exit 1 ++ exit $EXIT_FAILURE + fi + + if test -n "$inst_prefix_dir"; then +@@ -5478,7 +5944,7 @@ + if $run eval "$relink_command"; then : + else + $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + fi + +@@ -5502,23 +5968,36 @@ + + if test "$#" -gt 0; then + # Delete the old symlinks, and create new ones. ++ # Try `ln -sf' first, because the `ln' binary might depend on ++ # the symlink we replace! Solaris /bin/ln does not understand -f, ++ # so we also need to try rm && ln -s. + for linkname + do + if test "$linkname" != "$realname"; then +- $show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)" +- $run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)" ++ $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })" ++ $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })" + fi + done + fi + + # Do each command in the postinstall commands. + lib="$destdir/$realname" +- eval cmds=\"$postinstall_cmds\" ++ cmds=$postinstall_cmds + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" ++ eval cmd=\"$cmd\" + $show "$cmd" +- $run eval "$cmd" || exit $? ++ $run eval "$cmd" || { ++ lt_exit=$? ++ ++ # Restore the uninstalled library and exit ++ if test "$mode" = relink; then ++ $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)' ++ fi ++ ++ exit $lt_exit ++ } + done + IFS="$save_ifs" + fi +@@ -5556,7 +6035,7 @@ + *) + $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + esac + +@@ -5574,7 +6053,7 @@ + $show "$install_prog $staticobj $staticdest" + $run eval "$install_prog \$staticobj \$staticdest" || exit $? + fi +- exit 0 ++ exit $EXIT_SUCCESS + ;; + + *) +@@ -5612,23 +6091,21 @@ + notinst_deplibs= + relink_command= + +- # To insure that "foo" is sourced, and not "foo.exe", +- # finese the cygwin/MSYS system by explicitly sourcing "foo." +- # which disallows the automatic-append-.exe behavior. +- case $build in +- *cygwin* | *mingw*) wrapperdot=${wrapper}. ;; +- *) wrapperdot=${wrapper} ;; +- esac ++ # Note that it is not necessary on cygwin/mingw to append a dot to ++ # foo even if both foo and FILE.exe exist: automatic-append-.exe ++ # behavior happens only for exec(3), not for open(2)! Also, sourcing ++ # `FILE.' does not work on cygwin managed mounts. ++ # + # If there is no directory component, then add one. +- case $file in +- */* | *\\*) . ${wrapperdot} ;; +- *) . ./${wrapperdot} ;; ++ case $wrapper in ++ */* | *\\*) . ${wrapper} ;; ++ *) . ./${wrapper} ;; + esac + + # Check the variables that should have been set. + if test -z "$notinst_deplibs"; then + $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + finalize=yes +@@ -5650,30 +6127,21 @@ + done + + relink_command= +- # To insure that "foo" is sourced, and not "foo.exe", +- # finese the cygwin/MSYS system by explicitly sourcing "foo." +- # which disallows the automatic-append-.exe behavior. +- case $build in +- *cygwin* | *mingw*) wrapperdot=${wrapper}. ;; +- *) wrapperdot=${wrapper} ;; +- esac ++ # Note that it is not necessary on cygwin/mingw to append a dot to ++ # foo even if both foo and FILE.exe exist: automatic-append-.exe ++ # behavior happens only for exec(3), not for open(2)! Also, sourcing ++ # `FILE.' does not work on cygwin managed mounts. ++ # + # If there is no directory component, then add one. +- case $file in +- */* | *\\*) . ${wrapperdot} ;; +- *) . ./${wrapperdot} ;; ++ case $wrapper in ++ */* | *\\*) . ${wrapper} ;; ++ *) . ./${wrapper} ;; + esac + + outputname= + if test "$fast_install" = no && test -n "$relink_command"; then + if test "$finalize" = yes && test -z "$run"; then +- tmpdir="/tmp" +- test -n "$TMPDIR" && tmpdir="$TMPDIR" +- tmpdir="$tmpdir/libtool-$$" +- if $mkdir "$tmpdir" && chmod 700 "$tmpdir"; then : +- else +- $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2 +- continue +- fi ++ tmpdir=`func_mktempdir` + file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'` + outputname="$tmpdir/$file" + # Replace the output file specification. +@@ -5697,7 +6165,7 @@ + fi + + # remove .exe since cygwin /usr/bin/install will append another +- # one anyways ++ # one anyway + case $install_prog,$host in + */usr/bin/install*,*cygwin*) + case $file:$destfile in +@@ -5729,16 +6197,17 @@ + $show "$install_prog $file $oldlib" + $run eval "$install_prog \$file \$oldlib" || exit $? + +- if test -n "$stripme" && test -n "$striplib"; then ++ if test -n "$stripme" && test -n "$old_striplib"; then + $show "$old_striplib $oldlib" + $run eval "$old_striplib $oldlib" || exit $? + fi + + # Do each command in the postinstall commands. +- eval cmds=\"$old_postinstall_cmds\" ++ cmds=$old_postinstall_cmds + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" ++ eval cmd=\"$cmd\" + $show "$cmd" + $run eval "$cmd" || exit $? + done +@@ -5752,9 +6221,9 @@ + if test -n "$current_libdirs"; then + # Maybe just do a dry run. + test -n "$run" && current_libdirs=" -n$current_libdirs" +- exec_cmd='$SHELL $0 --finish$current_libdirs' ++ exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' + else +- exit 0 ++ exit $EXIT_SUCCESS + fi + ;; + +@@ -5773,10 +6242,11 @@ + for libdir in $libdirs; do + if test -n "$finish_cmds"; then + # Do each command in the finish commands. +- eval cmds=\"$finish_cmds\" ++ cmds=$finish_cmds + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" ++ eval cmd=\"$cmd\" + $show "$cmd" + $run eval "$cmd" || admincmds="$admincmds + $cmd" +@@ -5793,9 +6263,9 @@ + fi + + # Exit here if they wanted silent mode. +- exit 0 ++ test "$show" = : && exit $EXIT_SUCCESS + +- $echo "----------------------------------------------------------------------" ++ $echo "X----------------------------------------------------------------------" | $Xsed + $echo "Libraries have been installed in:" + for libdir in $libdirs; do + $echo " $libdir" +@@ -5828,8 +6298,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." +- $echo "----------------------------------------------------------------------" +- exit 0 ++ $echo "X----------------------------------------------------------------------" | $Xsed ++ exit $EXIT_SUCCESS + ;; + + # libtool execute mode +@@ -5841,7 +6311,7 @@ + if test -z "$cmd"; then + $echo "$modename: you must specify a COMMAND" 1>&2 + $echo "$help" +- exit 1 ++ exit $EXIT_FAILURE + fi + + # Handle -dlopen flags immediately. +@@ -5849,7 +6319,7 @@ + if test ! -f "$file"; then + $echo "$modename: \`$file' is not a file" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + dir= +@@ -5860,7 +6330,7 @@ + else + $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + # Read the libtool library. +@@ -5887,7 +6357,7 @@ + dir="$dir/$objdir" + else + $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + ;; + +@@ -5967,7 +6437,7 @@ + $echo "export $shlibpath_var" + fi + $echo "$cmd$args" +- exit 0 ++ exit $EXIT_SUCCESS + fi + ;; + +@@ -5995,7 +6465,7 @@ + if test -z "$rm"; then + $echo "$modename: you must specify an RM program" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + rmdirs= +@@ -6045,15 +6515,24 @@ + rmfiles="$rmfiles $objdir/$n" + done + test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" +- test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" + +- if test "$mode" = uninstall; then ++ case "$mode" in ++ clean) ++ case " $library_names " in ++ # " " in the beginning catches empty $dlname ++ *" $dlname "*) ;; ++ *) rmfiles="$rmfiles $objdir/$dlname" ;; ++ esac ++ test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" ++ ;; ++ uninstall) + if test -n "$library_names"; then + # Do each command in the postuninstall commands. +- eval cmds=\"$postuninstall_cmds\" ++ cmds=$postuninstall_cmds + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" ++ eval cmd=\"$cmd\" + $show "$cmd" + $run eval "$cmd" + if test "$?" -ne 0 && test "$rmforce" != yes; then +@@ -6065,10 +6544,11 @@ + + if test -n "$old_library"; then + # Do each command in the old_postuninstall commands. +- eval cmds=\"$old_postuninstall_cmds\" ++ cmds=$old_postuninstall_cmds + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" ++ eval cmd=\"$cmd\" + $show "$cmd" + $run eval "$cmd" + if test "$?" -ne 0 && test "$rmforce" != yes; then +@@ -6078,7 +6558,8 @@ + IFS="$save_ifs" + fi + # FIXME: should reinstall the best remaining shared library. +- fi ++ ;; ++ esac + fi + ;; + +@@ -6107,7 +6588,7 @@ + if test "$mode" = clean ; then + noexename=$name + case $file in +- *.exe) ++ *.exe) + file=`$echo $file|${SED} 's,.exe$,,'` + noexename=`$echo $name|${SED} 's,.exe$,,'` + # $file with .exe has already been added to rmfiles, +@@ -6152,20 +6633,20 @@ + "") + $echo "$modename: you must specify a MODE" 1>&2 + $echo "$generic_help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + esac + + if test -z "$exec_cmd"; then + $echo "$modename: invalid operation mode \`$mode'" 1>&2 + $echo "$generic_help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + fi # test -z "$show_help" + + if test -n "$exec_cmd"; then + eval exec $exec_cmd +- exit 1 ++ exit $EXIT_FAILURE + fi + + # We need to display help for each of the modes. +@@ -6201,7 +6682,7 @@ + a more detailed description of MODE. + + Report bugs to ." +- exit 0 ++ exit $EXIT_SUCCESS + ;; + + clean) +@@ -6313,6 +6794,8 @@ + -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 ++ -precious-files-regex REGEX ++ don't remove output files matching REGEX + -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 +@@ -6354,14 +6837,14 @@ + *) + $echo "$modename: invalid operation mode \`$mode'" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + esac + + $echo + $echo "Try \`$modename --help' for more information about other modes." + +-exit 0 ++exit $? + + # The TAGs below are defined such that we never get into a situation + # in which we disable both kinds of libraries. Given conflicting +@@ -6375,12 +6858,11 @@ + # configuration. But we'll never go from static-only to shared-only. + + # ### BEGIN LIBTOOL TAG CONFIG: disable-shared +-build_libtool_libs=no +-build_old_libs=yes ++disable_libs=shared + # ### END LIBTOOL TAG CONFIG: disable-shared + + # ### BEGIN LIBTOOL TAG CONFIG: disable-static +-build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac` ++disable_libs=static + # ### END LIBTOOL TAG CONFIG: disable-static + + # Local Variables: --- kdeutils-3.5.8.orig/debian/patches/common/05_pedantic-errors.diff +++ kdeutils-3.5.8/debian/patches/common/05_pedantic-errors.diff @@ -0,0 +1,12 @@ +--- a/admin/acinclude.m4.in ++++ b/admin/acinclude.m4.in +@@ -2144,9 +2144,6 @@ + save_CXXFLAGS="$CXXFLAGS" + kde_safe_LIBS="$LIBS" + LIBS="$LIBS $X_EXTRA_LIBS" +-if test "$GXX" = "yes"; then +-CXXFLAGS="$CXXFLAGS -pedantic-errors" +-fi + AC_TRY_COMPILE([ + $2 + ], --- kdeutils-3.5.8.orig/debian/patches/common/04_am_maintainer_mode.diff +++ kdeutils-3.5.8/debian/patches/common/04_am_maintainer_mode.diff @@ -0,0 +1,11 @@ +--- a/admin/configure.in.min ++++ b/admin/configure.in.min +@@ -38,6 +38,8 @@ + dnl Automake doc recommends to do this only here. (Janos) + AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs + ++AM_MAINTAINER_MODE ++ + KDE_SET_PREFIX + + dnl generate the config header --- kdeutils-3.5.8.orig/debian/patches/common/06_disable_no_undefined.diff +++ kdeutils-3.5.8/debian/patches/common/06_disable_no_undefined.diff @@ -0,0 +1,18 @@ +--- a/admin/acinclude.m4.in ++++ b/admin/acinclude.m4.in +@@ -1689,15 +1689,6 @@ + KDE_USE_CLOSURE_TRUE="#" + KDE_USE_CLOSURE_FALSE="" + KDE_NO_UNDEFINED="" +- case $host in +- *-*-linux-gnu) +- KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined], +- [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined], +- [KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"], +- [KDE_NO_UNDEFINED=""])], +- [KDE_NO_UNDEFINED=""]) +- ;; +- esac + fi + AC_SUBST(KDE_USE_CLOSURE_TRUE) + AC_SUBST(KDE_USE_CLOSURE_FALSE) --- kdeutils-3.5.8.orig/debian/patches/common/README +++ kdeutils-3.5.8/debian/patches/common/README @@ -0,0 +1,14 @@ +Common patches across KDE Debian packages +========================================= + + These directory should contain patches to the admin/ subdir of KDE + modules that are meant to be applied to all packaged modules. As the + admin/ subdir is shared across modules (and so, it's identical for all + modules at a certain version), I think it makes sense to have these + patches in a central location, and update them here. + + The script update.sh takes care of automatically updating the patches + that update autotools and libtool. You need to pass the location of an + admin/ directory as the first argument. + + -- Adeodato Simó, 2005-02-26 --- kdeutils-3.5.8.orig/debian/patches/common/update.sh +++ kdeutils-3.5.8/debian/patches/common/update.sh @@ -0,0 +1,47 @@ +#!/bin/sh + +ADMIN="$1" + +test -d "$ADMIN" || { + echo >&2 "Error, admin dir '$ADMIN' does not exist." + exit 1 +} + +rm -rf a b +mkdir a b + +cp -a "$ADMIN" a/admin + +############################################################ +PATCH=03_libtool_update.diff +rm -rf b/admin; cp -a a/admin b + +cp -f /usr/share/libtool/libtool.m4 b/admin/libtool.m4.in +cp -f /usr/share/libtool/ltmain.sh b/admin/ltmain.sh + +diff -Nrua a b >$PATCH +############################################################ + + +############################################################ +PATCH=02_autotools_update.diff +AUTOMAKE_DIR=/usr/share/automake-1.9 +rm -rf b/admin; cp -a a/admin b + +( cd b/admin + for file in *; do + case "$file" in + config.guess|config.sub) + continue + ;; + esac + if test -r "$AUTOMAKE_DIR/$file"; then + cp -f "$AUTOMAKE_DIR/$file" "$file" + fi + done +) + +diff -Nrua a b >$PATCH +############################################################ + +rm -rf a b --- kdeutils-3.5.8.orig/debian/patches/common/kubuntu_01_kdepot.diff +++ kdeutils-3.5.8/debian/patches/common/kubuntu_01_kdepot.diff @@ -0,0 +1,26 @@ +--- kde/admin/cvs.sh 2005-11-26 02:42:02.000000000 +0000 ++++ kde/admin/cvs.sh 2005-11-26 02:42:26.000000000 +0000 +@@ -537,6 +537,8 @@ + if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi + export EXTRACTRC PREPARETIPS + ++kdepotpath=/usr/include/kde/kde.pot ++ + for subdir in $dirs; do + test -z "$VERBOSE" || echo "Making messages in $subdir" + (cd $subdir +@@ -554,10 +556,10 @@ + fi + perl -e '$mes=0; while () { 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:-`kde-config --expandvars --install include`}/kde.pot +- if ! test -f $kdepotpath; then +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- fi ++# 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 --- kdeutils-3.5.8.orig/debian/patches/12_superkaramba_xmms.diff +++ kdeutils-3.5.8/debian/patches/12_superkaramba_xmms.diff @@ -0,0 +1,219 @@ +--- kde.orig/superkaramba/src/xmmssensor.cpp ++++ kde.patched/superkaramba/src/xmmssensor.cpp +@@ -10,11 +10,122 @@ + #include "xmmssensor.h" + + #ifdef HAVE_XMMS +-#include ++#include ++ ++class XMMSSensor::XMMS ++{ ++public: ++ XMMS() : libxmms( 0 ) ++ { ++ libxmms = new QLibrary( "xmms.so.1" ); ++ if ( !libxmms->load() ) ++ { ++ delete libxmms; ++ libxmms = 0; ++ } ++ ++ if ( libxmms != 0 ) ++ { ++ // resolve functions ++ *(void**) (&xmms_remote_is_running) = ++ libxmms->resolve( "xmms_remote_is_running" ); ++ ++ *(void**) (&xmms_remote_is_playing) = ++ libxmms->resolve( "xmms_remote_is_playing" ); ++ ++ *(void**) (&xmms_remote_get_playlist_title) = ++ libxmms->resolve( "xmms_remote_get_playlist_title" ); ++ ++ *(void**) (&xmms_remote_get_playlist_time) = ++ libxmms->resolve( "xmms_remote_get_playlist_time" ); ++ ++ *(void**) (&xmms_remote_get_playlist_pos) = ++ libxmms->resolve( "xmms_remote_get_playlist_pos" ); ++ ++ *(void**) (&xmms_remote_get_output_time) = ++ libxmms->resolve( "xmms_remote_get_output_time" ); ++ } ++ } ++ ++ bool isInitialized() const ++ { ++ return libxmms != 0 && ++ xmms_remote_is_running != 0 && ++ xmms_remote_is_playing != 0 && ++ xmms_remote_get_playlist_title != 0 && ++ xmms_remote_get_playlist_time != 0 && ++ xmms_remote_get_playlist_pos != 0 && ++ xmms_remote_get_output_time != 0; ++ } ++ ++ bool isRunning(int session) ++ { ++ if ( !isInitialized() ) return false; ++ ++ return (*xmms_remote_is_running)(session); ++ } ++ ++ bool isPlaying(int session) ++ { ++ if ( !isInitialized() ) return false; ++ ++ return (*xmms_remote_is_playing)(session); ++ } ++ ++ char* getPlaylistTitle(int session, int pos) ++ { ++ if ( !isInitialized() ) return ""; ++ ++ return (*xmms_remote_get_playlist_title)(session, pos); ++ } ++ ++ int getPlaylistTime(int session, int pos) ++ { ++ if ( !isInitialized() ) return 0; ++ ++ return (*xmms_remote_get_playlist_time)(session, pos); ++ } ++ ++ int getPlaylistPos(int session) ++ { ++ if ( !isInitialized() ) return 0; ++ ++ return (*xmms_remote_get_playlist_pos)(session); ++ } ++ ++ int getOutputTime(int session) ++ { ++ if ( !isInitialized() ) return 0; ++ ++ return (*xmms_remote_get_output_time)(session); ++ } ++ ++private: ++ QLibrary* libxmms; ++ ++ bool (*xmms_remote_is_running)(int); ++ bool (*xmms_remote_is_playing)(int); ++ ++ char* (*xmms_remote_get_playlist_title)(int, int); ++ int (*xmms_remote_get_playlist_time)(int, int); ++ int (*xmms_remote_get_playlist_pos)(int); ++ int (*xmms_remote_get_output_time)(int); ++}; ++ ++#else // No XMMS ++ ++class XMMSSensor::XMMS ++{ ++public: ++ XMMS() {} ++ ++ bool isInitialized() const { return false; } ++}; + #endif // HAVE_XMMS + ++ + XMMSSensor::XMMSSensor( int interval, const QString &encoding ) +- : Sensor( interval ) ++ : Sensor( interval ), xmms( 0 ) + { + if( !encoding.isEmpty() ) + { +@@ -25,9 +136,13 @@ + else + codec = QTextCodec::codecForLocale(); + ++ xmms = new XMMS(); ++ + } + XMMSSensor::~XMMSSensor() +-{} ++{ ++ delete xmms; ++} + + void XMMSSensor::update() + { +@@ -43,21 +158,21 @@ + int songLength = 0; + int currentTime = 0; + bool isPlaying = false; +- bool isRunning = xmms_remote_is_running(0); ++ bool isRunning = xmms->isRunning(0); + + if( isRunning ) + { +- isPlaying = xmms_remote_is_playing(0); +- pos = xmms_remote_get_playlist_pos(0); ++ isPlaying = xmms->isPlaying(0); ++ pos = xmms->getPlaylistPos(0); + qDebug("unicode start"); +- title = codec->toUnicode( QCString( xmms_remote_get_playlist_title( 0, pos ) ) ); ++ title = codec->toUnicode( QCString( xmms->getPlaylistTitle( 0, pos ) ) ); + qDebug("unicode end"); + if( title.isEmpty() ) + title = "XMMS"; + + qDebug("Title: %s", title.ascii()); +- songLength = xmms_remote_get_playlist_time( 0, pos ); +- currentTime = xmms_remote_get_output_time( 0 ); ++ songLength = xmms->getPlaylistTime( 0, pos ); ++ currentTime = xmms->getOutputTime( 0 ); + } + #endif // HAVE_XMMS + +@@ -144,6 +259,9 @@ + + } + ++bool XMMSSensor::hasXMMS() const ++{ ++ return xmms->isInitialized(); ++} + +- + #include "xmmssensor.moc" +--- kde.orig/superkaramba/src/xmmssensor.h ++++ kde.patched/superkaramba/src/xmmssensor.h +@@ -28,10 +28,13 @@ + ~XMMSSensor(); + void update(); + void setMaxValue( SensorParams *); ++ bool hasXMMS() const; + + private: + QTextCodec *codec; + ++ class XMMS; ++ XMMS *xmms; + }; + + +--- kde.orig/superkaramba/src/Makefile.am ++++ kde.patched/superkaramba/src/Makefile.am +@@ -1,5 +1,5 @@ + # set the include path for X, qt and KDE +-INCLUDES = $(all_includes) $(XMMS_INCLUDES) $(PYTHONINC) ++INCLUDES = $(all_includes) $(PYTHONINC) + + # these are the headers for your project + noinst_HEADERS = karamba.h karambaapp.h karamba_python.h lineparser.h \ +@@ -40,9 +40,9 @@ + + # kde_cfg_DATA = superkaramba.kcfg + +-superkaramba_LDFLAGS = -Wl,-export-dynamic $(KDE_RPATH) $(all_libraries) $(PYTHONLIB) $(XMMS_LDFLAGS) +-#superkaramba_LDADD = -lkio $(LIB_KDEUI) $(XMMS_LDADD) $(LIBPYTHON) $(LIBKVM) $(MY_LIBKNEWSTUFF) +-superkaramba_LDADD = -lkio $(LIB_KDEUI) $(XMMS_LIBS) $(LIBPYTHON) $(LIBKVM) $(MY_LIBKNEWSTUFF) ++superkaramba_LDFLAGS = -Wl,-export-dynamic $(KDE_RPATH) $(all_libraries) $(PYTHONLIB) ++#superkaramba_LDADD = -lkio $(LIB_KDEUI) $(LIBPYTHON) $(LIBKVM) $(MY_LIBKNEWSTUFF) ++superkaramba_LDADD = -lkio $(LIB_KDEUI) $(LIBPYTHON) $(LIBKVM) $(MY_LIBKNEWSTUFF) + + # this is where the desktop file will go + shelldesktopdir = $(kde_appsdir)/Utilities --- kdeutils-3.5.8.orig/debian/patches/kubuntu_18_kmilo_rear_speakers_volume.diff +++ kdeutils-3.5.8/debian/patches/kubuntu_18_kmilo_rear_speakers_volume.diff @@ -0,0 +1,117 @@ +diff -Naur kdeutils-3.5.8/kmilo/generic/generic_monitor.cpp kdeutils-3.5.8-patched/kmilo/generic/generic_monitor.cpp +--- kdeutils-3.5.8/kmilo/generic/generic_monitor.cpp 2007-05-14 09:40:46.000000000 +0200 ++++ kdeutils-3.5.8-patched/kmilo/generic/generic_monitor.cpp 2007-12-10 20:48:06.000000000 +0100 +@@ -40,15 +40,17 @@ + using namespace KMilo; + + GenericMonitor::GenericMonitor(QObject *parent, const char *name, const QStringList& args) +-: Monitor(parent, name, args) ++: Monitor(parent, name, args), m_rear(3) + { + _poll = false; + m_displayType = Monitor::None; + + m_mute = false; + m_progress = 0; +- m_minVolume = 0; +- m_maxVolume = 100; ++ m_frontminVolume = 0; ++ m_frontmaxVolume = 100; ++ m_rearminVolume = 0; ++ m_rearmaxVolume = 100; + m_volume = 50; + } + +@@ -123,9 +125,13 @@ + return false; + } else { + reply = kmixClient->call("absoluteVolumeMax", 0); +- m_maxVolume = reply; ++ m_frontmaxVolume = reply; + reply = kmixClient->call("absoluteVolumeMin", 0); +- m_minVolume = reply; ++ m_frontminVolume = reply; ++ reply = kmixClient->call("absoluteVolumeMax", m_rear); ++ m_rearmaxVolume = reply; ++ reply = kmixClient->call("absoluteVolumeMin", m_rear); ++ m_rearminVolume = reply; + return true; + } + } +@@ -135,9 +141,9 @@ + if (!retrieveVolume()) + return; + +- m_volume += (int)((m_maxVolume - m_minVolume) * step /100) +1; +- if (m_volume > m_maxVolume) +- m_volume = m_maxVolume; ++ m_volume += (int)((m_frontmaxVolume - m_frontminVolume) * step /100) +1; ++ if (m_volume > m_frontmaxVolume || m_volume > m_rearmaxVolume) ++ m_volume = QMIN(m_frontmaxVolume, m_rearmaxVolume); + + displayVolume(); + } +@@ -147,9 +153,9 @@ + if (!retrieveVolume()) + return; + +- m_volume -= (int)((m_maxVolume - m_minVolume) * step /100) +1; +- if (m_volume < m_minVolume) +- m_volume = m_minVolume; ++ m_volume -= (int)((m_frontmaxVolume - m_frontminVolume) * step /100) +1; ++ if (m_volume < m_frontminVolume || m_volume < m_rearminVolume) ++ m_volume = QMAX(m_frontminVolume, m_rearminVolume); + + displayVolume(); + } +@@ -161,17 +167,19 @@ + + void GenericMonitor::displayVolume() + { +- _interface->displayProgress(i18n("Volume"), (int)(m_volume * 100 / (m_maxVolume - m_minVolume))); ++ _interface->displayProgress(i18n("Volume"), (int)(m_volume * 100 / (m_frontmaxVolume - m_frontminVolume))); + + // If we got this far, the DCOP communication with kmix works, + // so we don't have to test the result. + kmixClient->send("setAbsoluteVolume", 0, m_volume); ++ kmixClient->send("setAbsoluteVolume", m_rear, m_volume); + + // if mute then unmute + if (m_mute) + { + m_mute = false; +- kmixClient->send("setMasterMute", m_mute); ++ kmixClient->send("setMute", 0, m_mute); ++ kmixClient->send("setMute", m_rear, m_mute); + } + } + +@@ -236,7 +244,8 @@ + muteText = i18n("Mute off"); + } + +- kmixClient->send("setMasterMute", m_mute); ++ kmixClient->send("setMute", 0, m_mute); ++ kmixClient->send("setMute", m_rear, m_mute); + + _interface->displayText(muteText); + } +diff -Naur kdeutils-3.5.8/kmilo/generic/generic_monitor.h kdeutils-3.5.8-patched/kmilo/generic/generic_monitor.h +--- kdeutils-3.5.8/kmilo/generic/generic_monitor.h 2007-05-14 09:40:46.000000000 +0200 ++++ kdeutils-3.5.8-patched/kmilo/generic/generic_monitor.h 2007-12-10 20:48:06.000000000 +0100 +@@ -75,10 +75,12 @@ + DCOPRef *kmixClient, *kmixWindow; + + int m_progress; ++ const int m_rear; + long m_volume, m_oldVolume; + bool m_mute; + +- long m_maxVolume, m_minVolume; ++ long m_frontmaxVolume, m_frontminVolume; ++ long m_rearmaxVolume, m_rearminVolume; + + Monitor::DisplayType m_displayType; + }; + + --- kdeutils-3.5.8.orig/debian/patches/13_klaptopdaemon_dpkg_statoverride.diff +++ kdeutils-3.5.8/debian/patches/13_klaptopdaemon_dpkg_statoverride.diff @@ -0,0 +1,31 @@ +--- kde.orig/klaptopdaemon/acpi.cpp ++++ kde.patched/klaptopdaemon/acpi.cpp +@@ -186,7 +186,7 @@ + proc << kdesu; + proc << "-u"; + proc << "root"; +- proc << "chown root "+helper+"; chmod +s "+helper; ++ proc << "dpkg-statoverride --update --add root root 6755 "+helper; + proc.start(KProcess::Block); // run it sync so has_acpi below sees the results + } + } else { +--- kde.orig/klaptopdaemon/apm.cpp ++++ kde.patched/klaptopdaemon/apm.cpp +@@ -166,7 +166,7 @@ + proc << kdesu; + proc << "-u"; + proc << "root"; +- proc << QString("chown root ")+apm_name+"; chmod +s "+apm_name; ++ proc << QString("dpkg-statoverride --update --add root root 6755 ")+apm_name; + proc.start(KProcess::Block); // run it sync so has_apm below sees the results + } + } else { +@@ -208,7 +208,7 @@ + proc << kdesu; + proc << "-u"; + proc << "root"; +- proc << "chown root "+helper+"; chmod +s "+helper; ++ proc << "dpkg-statoverride --update --add root root 6755 "+helper; + proc.start(KProcess::Block); // run it sync so has_acpi below sees the results + } + } else { --- kdeutils-3.5.8.orig/debian/patches/17_use_free_unrar_if_available.diff +++ kdeutils-3.5.8/debian/patches/17_use_free_unrar_if_available.diff @@ -0,0 +1,35 @@ +Index: kdeutils/ark/rar.cpp +=================================================================== +--- kdeutils/ark/rar.cpp ++++ kdeutils/ark/rar.cpp +@@ -55,6 +55,8 @@ + { + // Check if rar is available + bool have_rar = !KGlobal::dirs()->findExe( "rar" ).isNull(); ++ bool have_unrar = !KGlobal::dirs()->findExe( "unrar" ).isNull(); ++ bool have_unrar_free = !KGlobal::dirs()->findExe( "unrar-free" ).isNull(); + + if ( have_rar ) + { +@@ -63,13 +65,20 @@ + verifyCompressUtilityIsAvailable( m_archiver_program ); + verifyUncompressUtilityIsAvailable( m_unarchiver_program ); + } +- else ++ else if (have_unrar) + { + // If rar is not available, try to use unrar to open the archive read-only + m_unarchiver_program = "unrar"; + verifyUncompressUtilityIsAvailable( m_unarchiver_program ); + setReadOnly( true ); + } ++ else ++ { ++ // If rar is not available, try to use unrar to open the archive read-only ++ m_unarchiver_program = "unrar-free"; ++ verifyUncompressUtilityIsAvailable( m_unarchiver_program ); ++ setReadOnly( true ); ++ } + + + --- kdeutils-3.5.8.orig/debian/patches/14_kmilo_actions.diff +++ kdeutils-3.5.8/debian/patches/14_kmilo_actions.diff @@ -0,0 +1,149 @@ +diff -Nur kdeutils-3.5.5/kmilo/generic/generic_monitor.cpp kdeutils-3.5.5.new/kmilo/generic/generic_monitor.cpp +--- kdeutils-3.5.5/kmilo/generic/generic_monitor.cpp 2006-10-01 19:28:15.000000000 +0200 ++++ kdeutils-3.5.5.new/kmilo/generic/generic_monitor.cpp 2006-11-02 17:35:45.000000000 +0100 +@@ -25,6 +25,7 @@ + + #include + #include ++#include + + #include + #include +@@ -33,6 +34,7 @@ + #include "kmilointerface.h" + #include + #include ++#include + + + // FIXME: use DCOPRef where possible instead of hand-rolled DCOP calls. +@@ -58,7 +60,21 @@ + + bool GenericMonitor::init() + { ++ config = new KConfig("kmilodrc"); ++ config->setGroup("kubuntu"); ++ + static const ShortcutInfo shortcuts[] = { ++ { "Search", KShortcut("XF86Search"), SLOT(launchSearch()) }, ++ { "Home Folder", KShortcut("XF86MyComputer"), SLOT(launchHomeFolder()) }, ++ { "Mail", KShortcut("XF86Mail"), SLOT(launchMail()) }, ++ { "Audio Media", KShortcut("XF86AudioMedia"), SLOT(launchMusic()) }, ++ { "Music", KShortcut("XF86Music"), SLOT(launchMusic()) }, ++ { "Browser", KShortcut("XF86WWW"), SLOT(launchBrowser()) }, ++ { "Calculator", KShortcut("XF86Calculator"), SLOT(launchCalculator()) }, ++ { "Terminal", KShortcut("XF86Terminal"), SLOT(launchTerminal()) }, ++ { "Eject", KShortcut("XF86Eject"), SLOT(eject()) }, ++ { "Help", KShortcut("XF86Launch0"), SLOT(launchHelp()) }, ++ { "Light Bulb", KShortcut("XF86LightBulb"), SLOT(lightBulb()) }, + { "FastVolumeUp", Qt::Key_VolumeUp, SLOT(fastVolumeUp()) }, + { "FastVolumeDown", Qt::Key_VolumeDown, SLOT(fastVolumeDown()) }, + { "SlowVolumeUp", Qt::CTRL+Qt::Key_VolumeUp, SLOT(slowVolumeUp()) }, +@@ -249,6 +265,68 @@ + return m_displayType; + } + ++void GenericMonitor::launch(QString configKey, QString defaultApplication) ++{ ++ QString application = config->readEntry(configKey, defaultApplication); ++ KProcess proc; ++ proc << application; ++ proc.start(KProcess::DontCare); ++} ++ ++void GenericMonitor::launchMail() ++{ ++ kdDebug() << "launchMail" << endl; ++ kapp->invokeMailer("", "", "", "", "", "", "", ""); ++} ++ ++void GenericMonitor::launchBrowser() ++{ ++ kapp->invokeBrowser(""); ++} ++ ++void GenericMonitor::launchSearch() ++{ ++ launch("search", "kfind"); ++} ++ ++void GenericMonitor::launchHomeFolder() ++{ ++ QString home = QDir::home().path(); ++ KProcess proc; ++ proc << "kfmclient" << "exec" << home; ++ proc.start(KProcess::DontCare); ++} ++ ++void GenericMonitor::launchMusic() ++{ ++ launch("search", "amarok"); ++} ++ ++void GenericMonitor::launchCalculator() ++{ ++ launch("search", "speedcrunch"); ++} ++ ++void GenericMonitor::launchTerminal() ++{ ++ launch("search", "konsole"); ++} ++ ++void GenericMonitor::launchHelp() ++{ ++ launch("search", "khelpcenter"); ++} ++ ++void GenericMonitor::eject() ++{ ++ launch("search", "eject"); ++} ++ ++void GenericMonitor::lightBulb() ++{ ++ kdDebug() << "lightBulb()" << endl; ++ _interface->displayText("Screen Light"); ++} + + K_EXPORT_COMPONENT_FACTORY(kmilo_generic, KGenericFactory("kmilo_generic")) + +diff -Nur kdeutils-3.5.5/kmilo/generic/generic_monitor.h kdeutils-3.5.5.new/kmilo/generic/generic_monitor.h +--- kdeutils-3.5.5/kmilo/generic/generic_monitor.h 2006-01-19 17:49:13.000000000 +0100 ++++ kdeutils-3.5.5.new/kmilo/generic/generic_monitor.h 2006-11-02 17:37:42.000000000 +0100 +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + #include "kmilod.h" + #include "monitor.h" +@@ -62,6 +63,16 @@ + void fastVolumeUp(); + void fastVolumeDown(); + void mute(); ++ void launchMail(); ++ void launchBrowser(); ++ void launchSearch(); ++ void launchHomeFolder(); ++ void launchMusic(); ++ void launchCalculator(); ++ void launchTerminal(); ++ void launchHelp(); ++ void eject(); ++ void lightBulb(); + + private: + void volumeUp(int step); +@@ -69,8 +80,10 @@ + bool retrieveMute(); + bool retrieveVolume(); + void displayVolume(); ++ void launch(QString configKey, QString defaultApplication); + + KGlobalAccel *ga; ++ KConfig* config; + + DCOPRef *kmixClient, *kmixWindow; + --- kdeutils-3.5.8.orig/debian/patches/15_klaptopdaemon_filenames_check.diff +++ kdeutils-3.5.8/debian/patches/15_klaptopdaemon_filenames_check.diff @@ -0,0 +1,187 @@ +--- a/klaptopdaemon/laptop_daemon.cpp 2006-01-19 11:49:18.000000000 -0500 ++++ b/klaptopdaemon/laptop_daemon.cpp 2006-11-10 16:13:00.000000000 -0500 +@@ -952,7 +952,7 @@ + // the lid button turns stuff on when it's down and back off again when it's raised + // (kind of like the fridge door light) + // +- if (lid_state != laptop_portable::get_button(laptop_portable::LidButton)) { ++ if (s.enable_lid_button && lid_state != laptop_portable::get_button(laptop_portable::LidButton)) { + lid_state = !lid_state; + if (lid_state) { + if (s.button_lid_bright_enabled) { +@@ -1015,7 +1015,7 @@ + // + // the power button on the other hand is an off/on switch for non-suspend type ops + // +- if (power_state != laptop_portable::get_button(laptop_portable::PowerButton)) { ++ if (s.enable_power_button && power_state != laptop_portable::get_button(laptop_portable::PowerButton)) { + power_state = !power_state; + if (power_state) { + if (power_button_off) { +--- a/klaptopdaemon/portable.cpp 2006-05-22 14:08:33.000000000 -0400 ++++ b/klaptopdaemon/portable.cpp 2006-11-10 16:11:11.000000000 -0500 +@@ -177,7 +177,7 @@ + int bcnt = 0; + memset(ap, 0, sizeof(apm_info)); + QFile f("/proc/pmu/info"); +- if (!f.open(IO_ReadOnly)) ++ if (!f.exists() || !f.open(IO_ReadOnly)) + return 1; + + while (!f.atEnd()) { +@@ -200,7 +200,7 @@ + int maxcharge = 0; + for (int i = 0; i < bcnt; i++) { + QFile bf(QString("/proc/pmu/battery_%1").arg(i)); +- if (!bf.open(IO_ReadOnly)) ++ if (!bf.exists() || !bf.open(IO_ReadOnly)) + continue; + + while(!bf.atEnd()) { +@@ -331,7 +331,7 @@ + bool present = false; + if ((test_count==0 || acpi_last_known != last_seed) && !bat.info_file.isNull()) { + f = new QFile(bat.info_file); +- if (f && f->open(IO_ReadOnly)) { ++ if (f && f->exists() && f->open(IO_ReadOnly)) { + while(f->readLine(buff,1024) > 0) { + if (buff.contains("design capacity low:", false)) { + QRegExp rx("(\\d*)\\D*$"); +@@ -361,7 +361,7 @@ + } + if (!bat.state_file.isNull()) { + f = new QFile(bat.state_file); +- if (f && f->open(IO_ReadOnly)) { ++ if (f && f->exists() && f->open(IO_ReadOnly)) { + while(f->readLine(buff,1024) > 0) { + if (buff.contains("present rate:", false)) { + QRegExp rx("(\\d*)\\D*$"); +@@ -692,7 +692,7 @@ + QFile p("/sys/power/state"); + QFile f("/proc/acpi/sleep"); + +- if (p.open(IO_ReadOnly)) { ++ if (p.exists() && p.open(IO_ReadOnly)) { + QString l; + p.readLine(l,500); + QStringList ll = QStringList::split(' ',l,false); +@@ -708,7 +708,7 @@ + } + p.close(); + } +- else if (f.open(IO_ReadOnly)) { ++ else if (f.exists() && f.open(IO_ReadOnly)) { + QString l; + f.readLine(l, 500); + QStringList ll = QStringList::split(' ',l,false); +@@ -1254,7 +1254,7 @@ + if (!lav_inited) { + lav_inited =1; + lav_file.setName("/proc/loadavg"); +- lav_openok = lav_file.open( IO_ReadOnly ); ++ lav_openok = lav_file.exists() && lav_file.open( IO_ReadOnly ); + if (lav_openok) + lav_file.close(); + } +@@ -1303,7 +1303,7 @@ + QFile cf("/proc/cpufreq"); + bool haveProfile = false; + +- if (cf.open(IO_ReadOnly)) { ++ if (cf.exists() && cf.open(IO_ReadOnly)) { + while (!cf.atEnd()) { + QString l; + cf.readLine(l, 500); +@@ -1318,7 +1318,7 @@ + } + if (haveProfile) { + QFile ci("/proc/cpuinfo"); +- if (ci.open(IO_ReadOnly)) { ++ if (ci.exists() && ci.open(IO_ReadOnly)) { + while (!ci.atEnd()) { + QString l; + ci.readLine(l, 500); +@@ -1536,7 +1536,7 @@ + !(::access(name.latin1(), R_OK)==0 && ::acpi_helper_ok(0))) + continue; + QFile f(name); +- if (f.open(IO_ReadOnly)) { ++ if (f.exists() && f.open(IO_ReadOnly)) { + while (!f.atEnd() && i < MAP_SIZE) { + QString l; + f.readLine(l, 500); +@@ -1574,7 +1574,7 @@ + if (get_enable) { + name = QString("/proc/acpi/processor/")+dp->d_name+"/limit"; + f.setName(name); +- if (f.open(IO_ReadOnly)) { ++ if (f.exists() && f.open(IO_ReadOnly)) { + while (!f.atEnd() && i < MAP_SIZE) { + QString l; + f.readLine(l, 500); +@@ -1617,7 +1617,7 @@ + + // read current scaling policy + QFile f("/sys/devices/system/cpu/" + cpu + "/cpufreq/scaling_governor"); +- if(!f.open(IO_ReadOnly) || f.atEnd()) ++ if(!f.exists() || !f.open(IO_ReadOnly) || f.atEnd()) + return CPUFREQ_NONE; + f.readLine(buffer, 256); + cur = buffer.stripWhiteSpace(); +@@ -1626,7 +1626,7 @@ + // read available scaling policies + states.clear(); + f.setName("/sys/devices/system/cpu/" + cpu + "/cpufreq/scaling_available_governors"); +- if(!f.open(IO_ReadOnly)) ++ if(!f.exists() || !f.open(IO_ReadOnly)) + return CPUFREQ_NONE; + int count = 0; + if(!f.atEnd()) { +@@ -1652,7 +1652,7 @@ + states.clear(); + + QFile f("/proc/cpufreq"); +- if (f.open(IO_ReadOnly)) { ++ if (f.exists() && f.open(IO_ReadOnly)) { + while (!f.atEnd()) { + QString l; + f.readLine(l, 1024); +@@ -1688,7 +1688,7 @@ + + // current frequency + QFile f("/proc/sys/cpu/" + cpu + "/speed"); +- if(!f.open(IO_ReadOnly) || f.atEnd()) ++ if(!f.exists() || !f.open(IO_ReadOnly) || f.atEnd()) + return CPUFREQ_NONE; + f.readLine(buffer, 16); + f.close(); +@@ -1698,7 +1698,7 @@ + const char* files[] = { "max", "min" }; + for(int i = 0; i <= 1; ++i) { + f.setName("/proc/sys/cpu/" + cpu + "/speed-" + files[i]); +- if(!f.open(IO_ReadOnly) || f.atEnd()) ++ if(!f.exists() || !f.open(IO_ReadOnly) || f.atEnd()) + return CPUFREQ_NONE; + f.readLine(buffer, 16); + f.close(); +@@ -1903,7 +1903,7 @@ + if (::access(name.latin1(), R_OK)!=0) + continue; + QFile f(name); +- if (f.open(IO_ReadOnly)) { ++ if (f.exists() && f.open(IO_ReadOnly)) { + while (!f.atEnd()) { + QString l; + f.readLine(l, 500); +@@ -1968,9 +1968,9 @@ + default: + break; + } +- if (!name.isEmpty()) { ++ if (!name.isEmpty()) { + QFile f(name); +- if (f.open(IO_ReadOnly)) { ++ if (f.exists() && f.open(IO_ReadOnly)) { + while (!f.atEnd()) { + QString l; + f.readLine(l, 500); --- kdeutils-3.5.8.orig/debian/patches/10_klaptopdaemon_checksum.diff +++ kdeutils-3.5.8/debian/patches/10_klaptopdaemon_checksum.diff @@ -0,0 +1,34 @@ +--- kde.orig/klaptopdaemon/apm.cpp ++++ kde.new/klaptopdaemon/apm.cpp +@@ -187,14 +187,6 @@ + unsigned long len, crc; + QString helper = KStandardDirs::findExe("klaptop_acpi_helper"); + checkcrc(helper.latin1(), len, crc); +- if (len != file_len || crc != file_crc) { +- QString str(i18n("The %1 application does not seem to have " +- "the same size or checksum as when it was compiled we do NOT recommend " +- "you proceed with making it setuid-root without further investigation").arg(helper)); +- int rc = KMessageBox::warningContinueCancel(0, str, i18n("KLaptopDaemon"), i18n("Run Nevertheless")); +- if (rc != KMessageBox::Continue) +- return; +- } + + QString kdesu = KStandardDirs::findExe("kdesu"); + if (!kdesu.isEmpty()) { +--- kde.orig/klaptopdaemon/acpi.cpp ++++ kde.new/klaptopdaemon/acpi.cpp +@@ -165,14 +165,6 @@ + unsigned long len, crc; + QString helper = KStandardDirs::findExe("klaptop_acpi_helper"); + checkcrc(QFile::encodeName(helper), len, crc); +- if (len != file_len || crc != file_crc) { +- QString str(i18n("The %1 application does not seem to have " +- "the same size or checksum as when it was compiled we do NOT recommend " +- "you proceed with making it setuid-root without further investigation").arg(helper)); +- int rc = KMessageBox::warningContinueCancel(0, str, i18n("KLaptopDaemon"), i18n("Run Nevertheless")); +- if (rc != KMessageBox::Continue) +- return; +- } + + QString kdesu = KStandardDirs::findExe("kdesu"); + if (!kdesu.isEmpty()) { --- kdeutils-3.5.8.orig/debian/patches/11_floppy_nodes.diff +++ kdeutils-3.5.8/debian/patches/11_floppy_nodes.diff @@ -0,0 +1,27 @@ +--- kde.orig/kfloppy/format.cpp ++++ kde.patched/kfloppy/format.cpp +@@ -165,15 +165,15 @@ + // + #ifdef ANY_LINUX + +-const char *fd0H1440[] = { "/dev/fd0u1440", "/dev/floppy/0u1440", "/dev/fd0h1440", "/dev/fd0H1440", 0L } ; +-const char *fd0D720[] = { "/dev/fd0u720", "/dev/floppy/0u720", "/dev/fd0D720", "/dev/fd0h720", 0L }; +-const char *fd0h1200[] = { "/dev/fd0h1200", "/dev/floppy/0h1200", 0L }; +-const char *fd0h360[] = { "/dev/fd0u360", "/dev/floppy/0u360", "/dev/fd0h360", "/dev/fd0d360", 0L }; +- +-const char *fd1H1440[] = { "/dev/fd1u1440", "/dev/floppy/1u1440","/dev/fd1h1440", "/dev/fd1H1440", 0L } ; +-const char *fd1D720[] = { "/dev/fd1u720", "/dev/floppy/1u720", "/dev/fd1D720", "/dev/fd1h720", 0L }; +-const char *fd1h1200[] = { "/dev/fd1h1200", "/dev/floppy/1h1200", 0L }; +-const char *fd1h360[] = { "/dev/fd1u360", "/dev/floppy/1u360","/dev/fd1h360", "/dev/fd1d360", 0L }; ++const char *fd0H1440[] = { "/dev/fd0u1440", "/dev/fd0h1440", "/dev/fd0", 0L } ; ++const char *fd0D720[] = { "/dev/fd0u720", "/dev/fd0h720", "/dev/fd0", 0L }; ++const char *fd0h1200[] = { "/dev/fd0h1200", "/dev/fd0", 0L }; ++const char *fd0h360[] = { "/dev/fd0u360", "/dev/fd0h360", "/dev/fd0d360", "/dev/fd0", 0L }; ++ ++const char *fd1H1440[] = { "/dev/fd1u1440", "/dev/fd1h1440", "/dev/fd1", 0L } ; ++const char *fd1D720[] = { "/dev/fd1u720", "/dev/fd1h720", "/dev/fd1", 0L }; ++const char *fd1h1200[] = { "/dev/fd1h1200", "/dev/fd1", 0L }; ++const char *fd1h360[] = { "/dev/fd1u360", "/dev/fd1h360", "/dev/fd1d360", "/dev/fd1", 0L }; + + const char *fd0auto[] = { "/dev/fd0", 0L }; + const char *fd1auto[] = { "/dev/fd1", 0L }; --- kdeutils-3.5.8.orig/debian/patches/kubuntu_01_kmenu_tidy.diff +++ kdeutils-3.5.8/debian/patches/kubuntu_01_kmenu_tidy.diff @@ -0,0 +1,8 @@ +--- kdeutils/kcharselect/KCharSelect.desktop 2005-03-17 00:37:01.991143032 +0000 ++++ kdeutils/kcharselect/KCharSelect.desktop 2005-03-17 00:37:11.258734144 +0000 +@@ -88,4 +88,4 @@ + Name[zh_TW]=KDE å­—å…ƒé¸æ“‡ + X-KDE-StartupNotify=true + X-DCOP-ServiceType=Multi +-Categories=Qt;KDE;Utility;X-KDE-More; ++Categories=Qt;KDE;Utility; --- kdeutils-3.5.8.orig/debian/patches/kubuntu_02_kregexpeditor_kmenu_entry_tidy.diff +++ kdeutils-3.5.8/debian/patches/kubuntu_02_kregexpeditor_kmenu_entry_tidy.diff @@ -0,0 +1,9 @@ +--- kdeutils/kregexpeditor/kregexpeditor.desktop 2005-03-17 02:21:23.051317208 +0000 ++++ kdeutils/kregexpeditor/kregexpeditor.desktop 2005-03-17 02:21:33.604712848 +0000 +@@ -60,5 +60,5 @@ + Terminal=false + Type=Application + X-KDE-StartupNotify=true +-Categories=Qt;KDE;Utility;X-KDE-More; ++Categories=Qt;KDE;Utility; + Icon=kregexpeditor --- kdeutils-3.5.8.orig/debian/patches/kubuntu_04_use_pmi.diff +++ kdeutils-3.5.8/debian/patches/kubuntu_04_use_pmi.diff @@ -0,0 +1,61 @@ +--- kdeutils/klaptopdaemon/acpi_helper.cpp 2005-09-29 15:14:27.000000000 +0100 ++++ kdeutils/klaptopdaemon/acpi_helper.cpp 2005-09-29 16:58:32.000000000 +0100 +@@ -100,7 +100,7 @@ + Returns only if the program does not exist; if the program exists + and is unsafe, exit; if the program exists and is safe, run it + and never return. */ +-void run_program(const char *path) ++void run_program(const char *path, const int action) + { + struct stat sb; + int err; +@@ -118,7 +118,13 @@ + exit(1); + } + ::setuid(::geteuid()); // otherwise bash will throw it away +- ::execl(path, NULL); // this is not KDE environment code ++ if (action == 1) { ++ system("/usr/sbin/pmi action hibernate"); ++ } else if (action == 2) { ++ system("/usr/sbin/pmi action sleep"); ++ } else { ++ ::execl(path, NULL); // this is not KDE environment code ++ } + exit(0); + } + +@@ -139,11 +145,13 @@ + for (i = 1; i < argc; i++) + if (strcmp(argv[i], "--suspend") == 0 || strcmp(argv[i], "-suspend") == 0) { + /* Returns only if suspend does not exist. */ +- run_program("/usr/sbin/suspend"); ++ run_program("/usr/sbin/pmi", 2); ++ /* + if (useSysPower) + write_to_power("mem"); + else + write_to_proc_sleep(3); ++ */ + exit(0); + } else + if (strcmp(argv[i], "--standby") == 0 || strcmp(argv[i], "-standby") == 0) { +@@ -158,15 +166,17 @@ + exit(0); + } else + if (strcmp(argv[i], "--hibernate") == 0 || strcmp(argv[i], "-hibernate") == 0) { +- run_program("/usr/sbin/hibernate"); ++ run_program("/usr/sbin/pmi", 1); ++ /* + if (useSysPower) + write_to_power("disk"); + else + write_to_proc_sleep(4); ++ */ + exit(0); + } else + if (strcmp(argv[i], "--software-suspend") == 0 || strcmp(argv[i], "-software-suspend") == 0) { +- run_program("/usr/sbin/hibernate"); ++ run_program("/usr/sbin/hibernate", 0); + exit(0); + } else + if (strcmp(argv[i], "--throttling") == 0 || strcmp(argv[i], "-throttling") == 0) { --- kdeutils-3.5.8.orig/debian/patches/kubuntu_06_lock_on_hibernate.diff +++ kdeutils-3.5.8/debian/patches/kubuntu_06_lock_on_hibernate.diff @@ -0,0 +1,17 @@ +--- kdeutils/klaptopdaemon/daemondock.cpp 2005-10-03 18:01:20.000000000 +0100 ++++ kdeutils/klaptopdaemon/daemondock.cpp 2005-10-03 18:01:54.000000000 +0100 +@@ -102,10 +102,10 @@ + if (can_standby || can_suspend || can_hibernate) { + rightPopup->insertSeparator(); + if (can_standby) rightPopup->insertItem(i18n("Standby..."), this, SLOT(invokeStandby())); +- if (can_suspend) rightPopup->insertItem(i18n("&Lock && Suspend..."), this, SLOT(invokeLockSuspend())); +- if (can_suspend) rightPopup->insertItem(i18n("&Suspend..."), this, SLOT(invokeSuspend())); +- if (can_hibernate) rightPopup->insertItem(i18n("&Lock && Hibernate..."), this, SLOT(invokeLockHibernation())); +- if (can_hibernate) rightPopup->insertItem(i18n("&Hibernate..."), this, SLOT(invokeHibernation())); ++ // if (can_suspend) rightPopup->insertItem(i18n("&Lock && Suspend..."), this, SLOT(invokeLockSuspend())); ++ if (can_suspend) rightPopup->insertItem(i18n("&Suspend..."), this, SLOT(invokeLockSuspend())); ++ // if (can_hibernate) rightPopup->insertItem(i18n("&Lock && Hibernate..."), this, SLOT(invokeLockHibernation())); ++ if (can_hibernate) rightPopup->insertItem(i18n("&Hibernate..."), this, SLOT(invokeLockHibernation())); + } + + rightPopup->insertSeparator(); --- kdeutils-3.5.8.orig/debian/patches/kubuntu_08_kwallermanager_menu_tidy.diff +++ kdeutils-3.5.8/debian/patches/kubuntu_08_kwallermanager_menu_tidy.diff @@ -0,0 +1,7 @@ +--- kdeutils/kwallet/kwalletmanager.desktop 2005-09-10 09:21:30.000000000 +0100 ++++ kdeutils/kwallet/kwalletmanager.desktop 2006-01-18 15:19:52.000000000 +0000 +@@ -53,3 +53,4 @@ + X-KDE-StartupNotify=false + Categories=Qt;KDE;Settings; + DocPath=kwallet/index.html ++NoDisplay=true --- kdeutils-3.5.8.orig/debian/patches/kubuntu_09_hide_ark_part.diff +++ kdeutils-3.5.8/debian/patches/kubuntu_09_hide_ark_part.diff @@ -0,0 +1,7 @@ +--- kdeutils-3.5.1/ark/ark_part.desktop~ 2006-01-19 16:49:29.000000000 +0000 ++++ kdeutils-3.5.1/ark/ark_part.desktop 2006-02-15 15:49:45.000000000 +0000 +@@ -127,3 +127,4 @@ + SwallowTitle= + ServiceTypes=Browser/View + X-KDE-Library=libarkpart ++Hidden=true --- kdeutils-3.5.8.orig/debian/patches/kubuntu_14_kmilo_powermanager.diff +++ kdeutils-3.5.8/debian/patches/kubuntu_14_kmilo_powermanager.diff @@ -0,0 +1,50 @@ +diff -Nur kdeutils-3.5.6/kmilo/generic/generic_monitor.cpp kdeutils-3.5.6.new/kmilo/generic/generic_monitor.cpp +--- kdeutils-3.5.6/kmilo/generic/generic_monitor.cpp 2007-02-04 20:44:07.000000000 +0100 ++++ kdeutils-3.5.6.new/kmilo/generic/generic_monitor.cpp 2007-02-04 20:53:18.000000000 +0100 +@@ -75,6 +75,9 @@ + { "Eject", KShortcut("XF86Eject"), SLOT(eject()) }, + { "Help", KShortcut("XF86Launch0"), SLOT(launchHelp()) }, + { "Light Bulb", KShortcut("XF86LightBulb"), SLOT(lightBulb()) }, ++ { "Battery", KShortcut("XF86LaunchB"), SLOT(pmBattery()) }, ++ { "Suspend", KShortcut("XF86Standby"), SLOT(pmSuspend()) }, ++ { "Hibernate", KShortcut("XF86Sleep"), SLOT(pmHibernate()) }, + { "FastVolumeUp", Qt::Key_VolumeUp, SLOT(fastVolumeUp()) }, + { "FastVolumeDown", Qt::Key_VolumeDown, SLOT(fastVolumeDown()) }, + { "SlowVolumeUp", Qt::CTRL+Qt::Key_VolumeUp, SLOT(slowVolumeUp()) }, +@@ -328,6 +331,23 @@ + _interface->displayText("Screen Light"); + } + ++void GenericMonitor::pmBattery() ++{ ++ DCOPRef("power-manager*", "power-manager").send("showTip"); ++} ++ ++void GenericMonitor::pmSuspend() ++{ ++ DCOPRef("power-manager*", "power-manager").send("suspend"); ++} ++ ++void GenericMonitor::pmHibernate() ++{ ++ DCOPRef("power-manager*", "power-manager").send("hibernate"); ++} ++ ++ ++ + K_EXPORT_COMPONENT_FACTORY(kmilo_generic, KGenericFactory("kmilo_generic")) + + #include "generic_monitor.moc" +diff -Nur kdeutils-3.5.6/kmilo/generic/generic_monitor.h kdeutils-3.5.6.new/kmilo/generic/generic_monitor.h +--- kdeutils-3.5.6/kmilo/generic/generic_monitor.h 2007-02-04 20:44:07.000000000 +0100 ++++ kdeutils-3.5.6.new/kmilo/generic/generic_monitor.h 2007-02-04 20:54:06.000000000 +0100 +@@ -73,6 +73,9 @@ + void launchHelp(); + void eject(); + void lightBulb(); ++ void pmBattery(); ++ void pmSuspend(); ++ void pmHibernate(); + + private: + void volumeUp(int step); --- kdeutils-3.5.8.orig/debian/patches/kubuntu_15_kmilo_compact_look.diff +++ kdeutils-3.5.8/debian/patches/kubuntu_15_kmilo_compact_look.diff @@ -0,0 +1,243 @@ +diff -Nur kdeutils-3.5.7/kmilo/kmilod/defaultskin.cpp kdeutils-3.5.7.new/kmilo/kmilod/defaultskin.cpp +--- kdeutils-3.5.7/kmilo/kmilod/defaultskin.cpp 2006-01-19 11:49:10.000000000 -0500 ++++ kdeutils-3.5.7.new/kmilo/kmilod/defaultskin.cpp 2007-05-26 10:58:46.000000000 -0400 +@@ -33,6 +33,7 @@ + #include + #include + #include ++#include + + #include "defaultskin.h" + +@@ -49,6 +50,9 @@ + KWin::setType(_widget->winId(), NET::Override); + + _widget->hide(); ++ ++ KConfig config("kmilodrc"); ++ reconfigure( &config ); + } + + +@@ -57,6 +61,34 @@ + _widget = 0; + } + ++void DefaultSkin::reconfigure( KConfig *config ) { ++ ++ config->setGroup("DefaultSkin"); ++ ++ QFont *defaultFont = new QFont("Sans", 10, QFont::Bold ); ++ QSize *defaultSize = new QSize( 80, 30 ); ++ QColor *defaultpaletteForegroundColor = new QColor( 200, 200, 200 ); ++ QColor *defaultpaletteBackgroundColor = new QColor( 100, 100, 100 ); ++ QFont *defaultProgressFont = new QFont("Sans", 8, QFont::Bold ); ++ ++ _widget->resize( config->readSizeEntry("Size", defaultSize ) ); ++ _widget->setFont( config->readFontEntry("Font", defaultFont ) ); ++ _widget->setPaletteForegroundColor( config->readColorEntry("paletteForegroundColor", defaultpaletteForegroundColor ) ); ++ _widget->setPaletteBackgroundColor( config->readColorEntry("paletteBackgroundColor", defaultpaletteBackgroundColor ) ); ++ _widget->_progress->setFont( config->readFontEntry("ProgressFont", defaultProgressFont ) ); ++ ++ if ( ! config->hasGroup("DefaultSkin") ) ++ { ++ ++ config->writeEntry("Size", *defaultSize ); ++ config->writeEntry("Font", *defaultFont ); ++ config->writeEntry("paletteForegroundColor", *defaultpaletteForegroundColor ); ++ config->writeEntry("paletteBackgroundColor", *defaultpaletteBackgroundColor ); ++ config->writeEntry("ProgressFont", *defaultProgressFont ); ++ ++ } ++ ++} + + void DefaultSkin::clear() { + _timer.stop(); +diff -Nur kdeutils-3.5.7/kmilo/kmilod/defaultskin.h kdeutils-3.5.7.new/kmilo/kmilod/defaultskin.h +--- kdeutils-3.5.7/kmilo/kmilod/defaultskin.h 2006-01-19 11:49:10.000000000 -0500 ++++ kdeutils-3.5.7.new/kmilo/kmilod/defaultskin.h 2007-05-26 10:58:46.000000000 -0400 +@@ -37,6 +37,7 @@ + virtual ~DefaultSkin(); + + virtual void clear(); ++ virtual void reconfigure( KConfig *config ); + + virtual void displayText(const QString& text, const QPixmap& customPixmap=QPixmap()); + virtual void displayProgress(const QString& text, +diff -Nur kdeutils-3.5.7/kmilo/kmilod/defaultwidget.ui kdeutils-3.5.7.new/kmilo/kmilod/defaultwidget.ui +--- kdeutils-3.5.7/kmilo/kmilod/defaultwidget.ui 2005-09-10 04:21:33.000000000 -0400 ++++ kdeutils-3.5.7.new/kmilo/kmilod/defaultwidget.ui 2007-05-26 10:59:16.000000000 -0400 +@@ -7,21 +7,6 @@ + + DefaultWidget + +- +- +- 0 +- 0 +- 566 +- 180 +- +- +- +- +- 214 +- 213 +- 212 +- +- + + + unnamed +@@ -30,19 +15,6 @@ + + _widgetStack + +- +- +- 214 +- 213 +- 212 +- +- +- +- StyledPanel +- +- +- Sunken +- + + + page +@@ -58,26 +30,6 @@ + + _textOnly + +- +- +- 26 +- 69 +- 198 +- +- +- +- +- 214 +- 213 +- 212 +- +- +- +- +- 28 +- 1 +- +- + + + +@@ -98,41 +50,18 @@ + + unnamed + +- +- +- spacer1 +- +- +- Horizontal +- +- +- Expanding +- +- +- +- 81 +- 31 +- +- +- +- ++ + +- spacer1_2 +- +- +- Horizontal ++ _progressText + +- +- Expanding ++ ++ + +- +- +- 81 +- 31 +- ++ ++ AlignCenter + +- +- ++ ++ + + _progress + +@@ -144,52 +73,14 @@ + 0 + + +- +- +- 214 +- 213 +- 212 +- +- + + false + + +- +- +- _progressText +- +- +- +- 26 +- 69 +- 198 +- +- +- +- +- 214 +- 213 +- 212 +- +- +- +- +- 28 +- 1 +- +- +- +- +- +- +- AlignCenter +- +- + + + + + +- ++ + --- kdeutils-3.5.8.orig/debian/patches/kubuntu_16_ark_utf8.diff +++ kdeutils-3.5.8/debian/patches/kubuntu_16_ark_utf8.diff @@ -0,0 +1,14 @@ +diff -Nur kdeutils-3.5.6/ark/arch.cpp kdeutils-3.5.6.new/ark/arch.cpp +--- kdeutils-3.5.6/ark/arch.cpp 2006-10-01 19:28:15.000000000 +0200 ++++ kdeutils-3.5.6.new/ark/arch.cpp 2007-06-12 22:02:44.000000000 +0200 +@@ -262,7 +262,9 @@ + break; // We are done all the complete lines + + data[ lfChar ] = '\0'; +- m_buffer.append( data + startChar ); ++ ++ m_buffer.append( QString::fromUtf8(data + startChar).latin1() ); ++ + data[ lfChar ] = '\n'; + startChar = lfChar + 1; + --- kdeutils-3.5.8.orig/debian/patches/kubuntu_17_zoo_extraction_fix.diff +++ kdeutils-3.5.8/debian/patches/kubuntu_17_zoo_extraction_fix.diff @@ -0,0 +1,14 @@ +diff -Nur kdeutils-3.5.8/ark/zoo.cpp kdeutils-3.5.8.new/ark/zoo.cpp +--- kdeutils-3.5.8/ark/zoo.cpp 2006-05-22 20:08:38.000000000 +0200 ++++ kdeutils-3.5.8.new/ark/zoo.cpp 2007-10-23 16:26:29.000000000 +0200 +@@ -54,8 +54,9 @@ + ZooArch::ZooArch( ArkWidget *gui, const QString & fileName ) + : Arch( gui, fileName ) + { +- m_archiver_program = "zoo"; ++ m_archiver_program = m_unarchiver_program = "zoo"; + verifyCompressUtilityIsAvailable( m_archiver_program ); ++ verifyUncompressUtilityIsAvailable( m_unarchiver_program ); + + m_headerString = "----"; + } --- kdeutils-3.5.8.orig/debian/icons/kwikdisk-16.xpm +++ kdeutils-3.5.8/debian/icons/kwikdisk-16.xpm @@ -0,0 +1,196 @@ +/* XPM */ +static char *kwikdisk-16[] = { +/* columns rows colors chars-per-pixel */ +"16 16 174 2", +" c black", +". c #010000", +"X c #000103", +"o c #000601", +"O c #040000", +"+ c #040100", +"@ c #060100", +"# c #00040A", +"$ c #00060F", +"% c #010801", +"& c #000D02", +"* c #0B0000", +"= c #0E0400", +"- c #001101", +"; c #001300", +": c #001602", +"> c #021A04", +", c #011F04", +"< c #130200", +"1 c #1A0602", +"2 c #030F23", +"3 c #031524", +"4 c #051325", +"5 c #05172F", +"6 c #023E06", +"7 c #09320D", +"8 c #0D243A", +"9 c #220601", +"0 c #260F02", +"q c #301405", +"w c #052542", +"e c #03490B", +"r c #0B5414", +"t c #095D15", +"y c #0A6615", +"u c #0F7A19", +"i c #0D6B52", +"p c #107244", +"a c #621D09", +"s c #6D1D08", +"d c #692109", +"f c #6E290E", +"g c #7D2D0B", +"h c #73341C", +"j c #0B6790", +"k c #11618A", +"l c #276A8F", +"z c #286A93", +"x c #606E8E", +"c c #04850E", +"v c #028210", +"b c #068019", +"n c #009E15", +"m c #089310", +"M c #159429", +"N c #1A9120", +"B c #03A018", +"V c #06A01B", +"C c #00B210", +"Z c #02B513", +"A c #06B517", +"S c #08B419", +"D c #0BB51B", +"F c #0AB619", +"G c #0FB71E", +"H c #0CBA1B", +"J c #0DA421", +"K c #229B2A", +"L c #299C2D", +"P c #21A427", +"I c #22AD6A", +"U c #01C60E", +"Y c #03CB0F", +"T c #07D21A", +"R c #11CE18", +"E c #19C225", +"W c #25C831", +"Q c #28CF33", +"! c #29D033", +"~ c #34D23F", +"^ c #3DCE4B", +"/ c #39DE41", +"( c #41D94A", +") c #43D84A", +"_ c #4CE453", +"` c #6CF26F", +"' c #0B9DB7", +"] c #1494E7", +"[ c #06A6F3", +"{ c #0CACF6", +"} c #01B1FF", +"| c #07B4F9", +" . c #05B4FF", +".. c #05BBFA", +"X. c #0FB8FF", +"o. c #0FBAFF", +"O. c #228DCA", +"+. c #2AA6C2", +"@. c #00C4FF", +"#. c #04C5FF", +"$. c #08C5FF", +"%. c #0DC6FF", +"&. c #01D3FF", +"*. c #05D0FF", +"=. c #09DDFF", +"-. c #17C6F6", +";. c #13C6FF", +":. c #1CC4FF", +">. c #29D0FF", +",. c #3BCDF5", +"<. c #34D1FF", +"1. c #34D8FF", +"2. c #35DCFF", +"3. c #4C82A7", +"4. c #4986AF", +"5. c #768CA5", +"6. c #4295C3", +"7. c #5CCE9C", +"8. c #74DD8F", +"9. c #40D4FF", +"0. c #41D6FF", +"q. c #45D5FF", +"w. c #46D6FF", +"e. c #67C7EA", +"r. c #841E06", +"t. c #9C3F11", +"y. c #874A23", +"u. c #9D6037", +"i. c #A55E2F", +"p. c #CF3F12", +"a. c #D33E0F", +"s. c #D17B37", +"d. c #FD4B10", +"f. c #F15614", +"g. c #F95C1B", +"h. c #FF5B19", +"j. c #F6661C", +"k. c #FF611D", +"l. c #FF621F", +"z. c #FF6918", +"x. c #FF691C", +"c. c #E46C22", +"v. c #E6792B", +"b. c #FF6D26", +"n. c #FF7B28", +"m. c #FF782D", +"M. c #FF7C28", +"N. c #FF7A32", +"B. c #FF7C32", +"V. c #FF7F36", +"C. c #E98A37", +"Z. c #FF822C", +"A. c #FF8135", +"S. c #FF8237", +"D. c #FF8E34", +"F. c #FF893A", +"G. c #FF8745", +"H. c #FF8949", +"J. c #F38E50", +"K. c #FF9E47", +"L. c #FF9D5F", +"P. c #E4A16D", +"I. c #EFA578", +"U. c #FFA363", +"Y. c #FEB574", +"T. c #8C969C", +"R. c #86EDFF", +"E. c #8BEFFF", +"W. c #FFB682", +"Q. c #FFB984", +"!. c #FFBD87", +"~. c #FFC696", +"^. c #FFD4AB", +"/. c None", +/* pixels */ +"/./././././././.# $ /./././././.", +"/./././././. 8 3.4.4 /././././.", +"/././././.3 z e.E.R.6.5 /./././.", +"/././././.k 1.0.q.q.0.O.2 /././.", +"/././.@ * j =.%. .o.<.,.w /././.", +"/./.q u.i.l &.*.:.>.2.-.i ; /./.", +"0 y.P.^.~.T...@.;.$.#.| 7.L : /.", +"s.Y.!.Q.W.I.5.{ o.} [ +.8.` K , ", +"C.K.F.S.N.V.J.x ] ' I ^ ) ( / N ", +"v.D.Z.z.m.L.U.h p T R F H Q _ P ", +"c.M.n.S.G.H.N.f u Y U E W ~ Q m ", +"t.j.x.b.l.l.g.a t A C G F F Z c ", +"= g f.h.d.a.s < & y V J n B v 6 ", +"/.@ d p.r.9 /./.% r M u e ; ", +"/./. 1 @ /././././.o 7 > /./.", +"/./././././././././././././././." +}; --- kdeutils-3.5.8.orig/debian/icons/kcalc-16.xpm +++ kdeutils-3.5.8/debian/icons/kcalc-16.xpm @@ -0,0 +1,196 @@ +/* XPM */ +static char *kcalc-16[] = { +/* columns rows colors chars-per-pixel */ +"16 16 174 2", +" c #000000", +". c #000001", +"X c #010101", +"o c #010102", +"O c #010103", +"+ c #020205", +"@ c #030205", +"# c #020207", +"$ c #030306", +"% c #040408", +"& c #040409", +"* c #070711", +"= c #090912", +"- c #0B0B11", +"; c #0B0B15", +": c #0C0C18", +"> c #0E0E18", +", c #18171D", +"< c #18181F", +"1 c #121224", +"2 c #141325", +"3 c #151429", +"4 c #15152B", +"5 c #20203F", +"6 c #36363E", +"7 c #202040", +"8 c #202041", +"9 c #212142", +"0 c #212242", +"q c #222241", +"w c #2F2F59", +"e c #38384C", +"r c #363651", +"t c #32315D", +"y c #393956", +"u c #353664", +"i c #3B3B6A", +"p c #3B3B6D", +"a c #3E3E71", +"s c #45467B", +"d c #4D4D76", +"f c #545368", +"g c #555470", +"h c #6E6E6C", +"j c #6F6F6E", +"k c #6F6F6F", +"l c #686779", +"z c #7D7D7D", +"x c #7F7F7F", +"c c #4E4E91", +"v c #50518E", +"b c #545597", +"n c #585994", +"m c #5A5B9A", +"M c #6F6E89", +"N c #676F9D", +"B c #6061A1", +"V c #6B6BA3", +"C c #6E6FAE", +"Z c #7777A2", +"A c #7072AF", +"S c #7275B3", +"D c #7174B8", +"F c #7B7DBD", +"G c #38B53D", +"H c #3DA747", +"J c #0AC40A", +"K c #1DC91C", +"L c #1CCA1C", +"P c #29C92A", +"I c #2FC332", +"U c #46CC49", +"Y c #4CCB4B", +"T c #42D642", +"R c #75C475", +"E c #74C47A", +"W c #71DA70", +"Q c #75DC75", +"! c #7F83C4", +"~ c #7BC681", +"^ c #DB4148", +"/ c #D46875", +"( c #D87986", +") c #808080", +"_ c #878788", +"` c #8A8A8B", +"' c #898BAB", +"] c #8585BD", +"[ c #8E8FBD", +"{ c #8898B7", +"} c #989CB2", +"| c #89B29B", +" . c #85A5A3", +".. c #99A7BA", +"X. c #A5B7BD", +"o. c #B4B4BD", +"O. c #B7BDB2", +"+. c #878BCA", +"@. c #8D8DC2", +"#. c #989DD6", +"$. c #989DD7", +"%. c #9FA2D5", +"&. c #A4A5D2", +"*. c #A3A7DB", +"=. c #AFAFD5", +"-. c #AEB0C9", +";. c #A9AEE0", +":. c #A9AEE1", +">. c #ABB0E1", +",. c #B0B3E0", +"<. c #B3B8E6", +"1. c #88CF8A", +"2. c #89D393", +"3. c #9CC2A9", +"4. c #9FD9A0", +"5. c #A1C9A8", +"6. c #B4DFBD", +"7. c #B3C8C4", +"8. c #BFC1D5", +"9. c #BCCDD1", +"0. c #BFD8D4", +"q. c #BBC0EA", +"w. c #BCC1EB", +"e. c #BEC2E9", +"r. c #BEC3E9", +"t. c #BCC2ED", +"y. c #BEC5EF", +"u. c #F28589", +"i. c #C8B2CF", +"p. c #C4BFDD", +"a. c #C6D0D7", +"s. c #D8C2D2", +"d. c #C2C7EE", +"f. c #C3C8EF", +"g. c #C5C9EC", +"h. c #C6CAED", +"j. c #C7CCEE", +"k. c #C8CDEE", +"l. c #C9CDEE", +"z. c #CBCFEF", +"x. c #C2C8F0", +"c. c #C5CAF0", +"v. c #C6CBF0", +"b. c #C7CCF0", +"n. c #C7CDF0", +"m. c #CDD0EC", +"M. c #CCD2F5", +"N. c #CED3F5", +"B. c #CED4F4", +"V. c #CED5F6", +"C. c #D2C9E3", +"Z. c #DAD5E9", +"A. c #DAD9E4", +"S. c #D0D5F3", +"D. c #D2D5F0", +"F. c #D1D6F4", +"G. c #D3D8F3", +"H. c #DADEF6", +"J. c #DCDFF4", +"K. c #DCDFF5", +"L. c #D9DDF8", +"P. c #D9DFF9", +"I. c #D3E2E1", +"U. c #DCE1F9", +"Y. c #DDE1F9", +"T. c #DFE3F9", +"R. c #E1E1EF", +"E. c #E1E3F7", +"W. c #E3E7FA", +"Q. c #E6EAFD", +"!. c #E8E9FA", +"~. c #E8EAFC", +"^. c gray100", +"/. c None", +/* pixels */ +"/./././././.2 g [ @.r /././././.", +"/././. , f ' ..| .g @ /./././.", +"/._ 6 l } X.3.1.Y H N 2 /./././.", +"/.Z.a.7.5.4.W K J G { t /././.", +"/.R.a.R Q T L I E O.p.n ; /././.", +"/.o.-.E P Y 2.0.s.u.( ] 9 /././.", +"/._ M 9.6.I.E.Q.i.^ / ,.s & /./.", +"/./.e =.!.!.b.b.e.C.Z.f.S 3 /./.", +"/./.- Z z.D.r.F.J.F.P.t.#.u /.", +"/././.y &.Y.J.D.L.e.f.l.e.m * /.", +"/././.> V z.Y.d.d.f.B.H.f.! 8 /.", +"/./././.i &.F.f.M.Y.b.y.*.D 9 j ", +"/./././.4 C V.W.b.f.>.+.v 9 $ j ", +"/./././.$ p :.B.<.#.B t : k ", +"/././././.9 F :.S p 1 /./.", +"/././././.; c b 9 & /./././." +}; --- kdeutils-3.5.8.orig/debian/icons/kedit-16.xpm +++ kdeutils-3.5.8/debian/icons/kedit-16.xpm @@ -0,0 +1,186 @@ +/* XPM */ +static char *kedit-16[] = { +/* columns rows colors chars-per-pixel */ +"16 16 164 2", +" c black", +". c #020000", +"X c #050300", +"o c #050600", +"O c #060600", +"+ c #1B0000", +"@ c #1C0000", +"# c #1C0101", +"$ c #1D0000", +"% c #191603", +"& c #1D160E", +"* c #1F190E", +"= c #3D0000", +"- c #31300B", +"; c #460406", +": c #4E000D", +"> c #560207", +", c #57070C", +"< c #580107", +"1 c #503C20", +"2 c #660104", +"3 c #54470B", +"4 c #585614", +"5 c #5C5C17", +"6 c #7F4816", +"7 c #990002", +"8 c #9A0306", +"9 c #9A0407", +"0 c #9C0408", +"q c #9D090C", +"w c #9E0F17", +"e c #9A1319", +"r c #9F273A", +"t c #A60609", +"y c #AD0F16", +"u c #A5171A", +"i c #A61619", +"p c #A2293C", +"a c #A4293B", +"s c #814712", +"d c #804816", +"f c #964212", +"g c #9F4E1A", +"h c #934220", +"j c #975626", +"k c #985726", +"l c #A04F1B", +"z c #A1531C", +"x c #BA4639", +"c c #BA4739", +"v c #B07B2D", +"b c #B07C2D", +"n c #8F7748", +"m c #BB4144", +"M c #BF4158", +"N c #BB525D", +"B c #C9323D", +"V c #D73E49", +"C c #CB4D5B", +"Z c #CA5054", +"A c #D94754", +"S c #D05A46", +"D c #D75E5B", +"F c #C15665", +"G c #CB5B7A", +"H c #D95F66", +"J c #DD5967", +"K c #CF624F", +"L c #CE6250", +"P c #DC635E", +"I c #D27D4F", +"U c #D47E4F", +"Y c #C6636B", +"T c #CA6265", +"R c #CF6A6A", +"E c #D46361", +"W c #D8666B", +"Q c #D0777F", +"! c #E25F6D", +"~ c #E4606E", +"^ c #E4626F", +"/ c #E1686C", +"( c #E76B6C", +") c #E9606B", +"_ c #EC666F", +"` c #EE666F", +"' c #E26272", +"] c #E36474", +"[ c #E46370", +"{ c #E66775", +"} c #E96671", +"| c #EA6670", +" . c #EC6473", +".. c #ED6D76", +"X. c #E96E7A", +"o. c #EF6A78", +"O. c #E87F6B", +"+. c #E97E6A", +"@. c #E47777", +"#. c #F06B73", +"$. c #A56787", +"%. c #BF6E81", +"&. c #B47E94", +"*. c #C37699", +"=. c #CF7F94", +"-. c #CC7F9A", +";. c #F07880", +":. c #9D9310", +">. c #B79E7E", +",. c #FC941C", +"<. c #FC9923", +"1. c #FF9A24", +"2. c #FF9A25", +"3. c #FFB407", +"4. c #FFB507", +"5. c #E4BE34", +"6. c #D48351", +"7. c #D89A58", +"8. c #D79C79", +"9. c #C7A150", +"0. c #FDAE46", +"q. c #F0B853", +"w. c #FFC118", +"e. c #FFD702", +"r. c #FFD40A", +"t. c #FFD40B", +"y. c #FFD70A", +"u. c #F2D511", +"i. c #FFEE1C", +"p. c #FFEF1D", +"a. c #FFF11B", +"s. c #FFFB1E", +"d. c #FFFC1E", +"f. c #FFF024", +"g. c #FDF753", +"h. c #AFBFE2", +"j. c #B0C0E0", +"k. c #BDECFF", +"l. c #DB8585", +"z. c #C482A2", +"x. c #EB8585", +"c. c #F0858D", +"v. c #F4969E", +"b. c #F19DA4", +"n. c #EFACAF", +"m. c #F4A8AE", +"M. c #FAA7AA", +"N. c #F9A8AC", +"B. c #F4B2B6", +"V. c #F7B0B4", +"C. c #F7B7BC", +"Z. c #C8BFE3", +"A. c #DDD2D6", +"S. c #C6EDFF", +"D. c #E3D5DD", +"F. c #E6D4DC", +"G. c #F9C0C3", +"H. c #FDC8C9", +"J. c #FACED0", +"K. c #FAD8DB", +"L. c #EAFDFF", +"P. c #FDE2E3", +"I. c gray100", +"U. c None", +/* pixels */ +"U.U.U.U.U.U.U.U.U.U.U.U.f.9.& U.", +"U.U.q 8 U.t 2 U.U.U.U.i.i.5.n * ", +"U.U.u m 0 *.=.> U.U.s.i.r.4.0.1 ", +"U.7 T P.Y D.I.-.: :.s.e.4.1.s X ", +"U.u n.K.J.l.D.L.8.u.r.4.1.6 U.", +"8 Z C.G.H.B.Q A.g.e.4.1.6 U.U.", +"y x.N.M.m.V.b.R q.w.,.f U.U.U.", +"h 6.P o.;.c.v.@.S 7.>.$.< U.U.U.", +"5 l K +.! _ ..W H N j.S.*., U.", +"O - b x ( .._ | X.! F j.k.G = U.", +"U.U.3 k U D .| ^ ] A &.Z.a @ U.", +"U.U.U.4 l K O.~ ^ ' C z.p + U.U.", +"U.U.U.O - v x / { J M r @ U.U.U.", +"U.U.U.U.U.3 j I E V w @ U.U.U.U.", +"U.U.U.U.U.U.4 z B e + U.U.U.U.U.", +"U.U.U.U.U.U.O % ; @ U.U.U.U.U.U." +}; --- kdeutils-3.5.8.orig/debian/icons/kcalc.xpm +++ kdeutils-3.5.8/debian/icons/kcalc.xpm @@ -0,0 +1,230 @@ +/* XPM */ +static char *kcalc[] = { +/* columns rows colors chars-per-pixel */ +"32 32 192 2", +" c black", +". c #17172C", +"X c #18182E", +"o c #20203C", +"O c #212140", +"+ c #262648", +"@ c #2F2F5A", +"# c #303059", +"$ c #363668", +"% c #3D3D74", +"& c #0F7F10", +"* c #44447C", +"= c #454584", +"- c #484889", +"; c #4D4D93", +": c #525286", +"> c #52529B", +", c #5454A1", +"< c #5B5BA4", +"1 c #5C5DA8", +"2 c #656594", +"3 c #747497", +"4 c #6060A2", +"5 c #6364AC", +"6 c #6B6BA3", +"7 c #6C6CAA", +"8 c #6C6DB2", +"9 c #7272A0", +"0 c #7070AE", +"q c #7273B3", +"w c #7274B9", +"e c #7979B3", +"r c #7D7EB9", +"t c #088A08", +"y c #169416", +"u c #00B500", +"i c #00BE00", +"p c #2D8C31", +"a c #219221", +"s c #269C29", +"d c #2E9E31", +"f c #309430", +"g c #21AC21", +"h c #26BC26", +"j c #3FBF3F", +"k c #00C600", +"l c #07CA07", +"z c #0CCD0C", +"x c #16C316", +"c c #16CB16", +"v c #1FC61F", +"b c #1ACB1A", +"n c #12D012", +"m c #2AC02A", +"M c #22D422", +"N c #2BD42B", +"B c #33C033", +"V c #44AA45", +"C c #5DA65F", +"Z c #58AE58", +"A c #54B358", +"S c #5EA660", +"D c #6DAF6D", +"F c #6FAF70", +"G c #67B96C", +"H c #70A979", +"J c #77B17C", +"K c #7CB87C", +"L c #45D545", +"P c #4BD64B", +"I c #67D367", +"U c #6FDE6F", +"Y c #7BCA7E", +"T c #75DE75", +"R c #79E179", +"E c #B31F21", +"W c #AF3A40", +"Q c #D31818", +"! c #F40707", +"~ c #FD0C0C", +"^ c #FF2828", +"/ c #D26062", +"( c #FE6262", +") c #B47180", +"_ c #BA7180", +"` c #8384BB", +"' c #8989BF", +"] c #9292BC", +"[ c #9C9CBD", +"{ c #8CB898", +"} c #90BE9F", +"| c #BF838F", +" . c #B68099", +".. c #A4A4BE", +"X. c #8285C4", +"o. c #8689C5", +"O. c #8D8DC1", +"+. c #898DCB", +"@. c #9393C4", +"#. c #9B9CCB", +"$. c #9A9DD2", +"%. c #9DA1D4", +"&. c #9DA2DA", +"*. c #A3A3CC", +"=. c #AAAACF", +"-. c #A2A4D4", +";. c #A2A6D9", +":. c #A4A9DB", +">. c #ABACD3", +",. c #AAAEDC", +"<. c #AEB1DC", +"1. c #B3B3D5", +"2. c #B2B4DB", +"3. c #BABAD5", +"4. c #BBBBDA", +"5. c #A3AAE2", +"6. c #A8AEE1", +"7. c #AEB3E0", +"8. c #AFB6E8", +"9. c #B6BAE2", +"0. c #B3BAE9", +"q. c #B8BBE1", +"w. c #B9BFEB", +"e. c #B6BFF3", +"r. c #92C29F", +"t. c #90CC96", +"y. c #8DE38D", +"u. c #9EE99E", +"i. c #AAC1BF", +"p. c #A6D3AA", +"a. c #B2D9B2", +"s. c #A7E0A7", +"d. c #A2EAA2", +"f. c #BFE1BF", +"g. c #AAC2C4", +"h. c #BCC4D5", +"j. c #B5D6C4", +"k. c #BEDCCC", +"l. c #BEC1E4", +"z. c #BEC5F2", +"x. c #D6A1AB", +"c. c #D1B0BF", +"v. c #FF9393", +"b. c #EABEBE", +"n. c #C1CFCF", +"m. c #C2C2DE", +"M. c #C7CEDB", +"N. c #D0C5DF", +"B. c #D5C9DF", +"V. c #C3C5E3", +"C. c #C1C5EB", +"Z. c #C6CAEB", +"A. c #CDCDE4", +"S. c #C9CDEC", +"D. c #C4CBF2", +"F. c #C4CCF9", +"G. c #C9CEF0", +"H. c #CED1ED", +"J. c #CCD1F2", +"K. c #CBD4FE", +"L. c #CFD8FF", +"P. c #D0D0E5", +"I. c #D3D4EC", +"U. c #DBDCED", +"Y. c #D1D6F3", +"T. c #D0D7FC", +"R. c #D4D9F5", +"E. c #D3DAFE", +"W. c #DADEF4", +"Q. c #D8DFFF", +"!. c #CAE8CA", +"~. c #C3F1C3", +"^. c #CAF3CA", +"/. c #D2E3DF", +"(. c #D3F5D3", +"). c #D7E2EF", +"_. c #DEE5E6", +"`. c #DCE9E9", +"'. c #DEE0F4", +"]. c #DBE1FE", +"[. c #FFCDCD", +"{. c #E7EEEF", +"}. c #E1E3F4", +"|. c #E1E6FE", +" X c #E5E9FD", +".X c #EBEBF4", +"XX c #E9EDFE", +"oX c #EEF1FF", +"OX c #F1F1F7", +"+X c #F1F4FE", +"@X c #FEFEFF", +"#X c None", +/* pixels */ +"#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X@.' ' ` 2 #X#X#X#X#X#X#X#X#X#X", +"#X#X#X#X#X#X#X#X#X#X#X#X#X#X#.@.@.' #.r 6 #X#X#X#X#X#X#X#X#X", +"#X#X#X#X#X#X#X#X#X#X#X#X*.#.#.@.>.i./.' 0 #X#X#X#X#X#X#X#X#X", +"#X#X#X#X#X#X#X#X#X#X=.=.*.#.4.{ S Z & V.8 : #X#X#X#X#X#X#X#X", +"#X#X#X#X#X#X#X#X1.1.=.=.h.H S a.(.y.y r.q < #X#X#X#X#X#X#X#X", +"#X#X#X#X#Xm.4.4.1.4.M.J D f.(.T x i u p #.< @ #X#X#X#X#X#X#X#X", +"#X#X#XA.M.m.4.m.n.S D !.^.u.v i i k z t g.< ; #X#X#X#X#X#X#X", +"#X#X#XA.V.P._.F K !.^.d.R x i k z M h p ).` , O #X#X#X#X#X#X#X", +"#X#X#XV.A.@Xf s.~.u.T P c k z M m d } X Xq., = #X#X#X#X#X#X", +"#X#X#X3.4.OXa I U L b l z N h s r. Xc.| B.].5 > #X#X#X#X#X#X", +"#X#X#X..4.A.p.g c z n N B A j. XXXc.b.[./ B.$., % #X#X#X#X#X", +"#X#X#X =.>.{.V c N j G k.XXW.V.J.x.v.( ! ) R., ; #X#X#X#X#X", +"#X#X#X#X[ =.I.p.Y t.`.oXXX X.X@X'. .^ ~ ~ _ ].o., o #X#X#X#X#X", +"#X#X#X#X #.=.+X+X+X'.W.I.W.+X XL.-.W Q E N.].0., - #X#X#X#X", +"#X#X#X#X ] @.I.+X X.X@X}.4.T.T.].-.].].J.l.J.Q.8 > #X#X#X#X", +"#X#X#X#X#X3 @.>.oX}.oX|.K.-.V.2.%.G.].Y.oX@XV.F.:., * #X#X#X", +"#X#X#X#X#X ` ' }.}.J.Q.].%.].].R.J.E.W.oX].F.%.F.1 ; #X#X#X", +"#X#X#X#X#X#X3 ` <.XXS.2.*.J. XY..X@XV.Z.].T.Q.%.T.+., @ #X#X#X", +"#X#X#X#X#X#X e r ].XX X].V.J.'.+X XF.;.9.V.#.D.L.z., ; #X#X", +"#X#X#X#X#X#X#X7 q 4. X].}.@X}.<.].L.R.%.E.T.J.}.U.8.w , #X#X", +"#X#X#X#X#X#X#X 7 e ].'.oXXXL.:.9.Z.#.D.T.T.U.+X X$.&., = #X", +"#X#X#X#X#X#X#X 4 1 V.].J.E.].7.].z.D.I.H.z.H.].T.w.e.5 > #X", +"#X#X#X#X#X#X#X#X* 1 X.].Z.2.<.<.E.Q.).@XoX;.D.D.].$.e.8 , #X", +"#X#X#X#X#X#X#X#X > , J.].].R.S.z.E.}.|.L.6.K.8.$.X.1 , - #X", +"#X#X#X#X#X#X#X#X#X- , $.].].'.@XXX,.z.T.].$.K.5.5 , > @ #X", +"#X#X#X#X#X#X#X#X#X > 1 Q.Q.}.XXT.%.K.<.:.$.w , , % #X", +"#X#X#X#X#X#X#X#X#X#X; , :.Q.J.E.].-.K.F.+., , - X #X#X", +"#X#X#X#X#X#X#X#X#X#X > 8 T.z.2.>.6.&.1 , ; + #X#X#X#X", +"#X#X#X#X#X#X#X#X#X#X > , 8.T.L.8.w , , $ #X#X#X#X#X#X", +"#X#X#X#X#X#X#X#X#X#X#X% , o.F.X., , - #X#X#X#X#X#X#X#X", +"#X#X#X#X#X#X#X#X#X#X#X > , 1 , ; . #X#X#X#X#X#X#X#X#X", +"#X#X#X#X#X#X#X#X#X#X#X#X; , > $ #X#X#X#X#X#X#X#X#X#X#X" +}; --- kdeutils-3.5.8.orig/debian/icons/ark.xpm +++ kdeutils-3.5.8/debian/icons/ark.xpm @@ -0,0 +1,279 @@ +/* XPM */ +static char *ark[] = { +/* columns rows colors chars-per-pixel */ +"32 32 241 2", +" c black", +". c #20130A", +"X c #301C10", +"o c #382210", +"O c #007700", +"+ c #007B00", +"@ c #107C06", +"# c #492B18", +"$ c #533516", +"% c #543319", +"& c #5D371C", +"* c #613920", +"= c #683D22", +"- c #64401A", +"; c #6B4021", +": c #704224", +"> c #754822", +", c #784725", +"< c #7C4C24", +"1 c #7D4C29", +"2 c #018300", +"3 c #0E8803", +"4 c #009400", +"5 c #009E00", +"6 c #0D9C03", +"7 c #109308", +"8 c #109A09", +"9 c #00A500", +"0 c #00A800", +"q c #0EA003", +"w c #00B300", +"e c #00BC00", +"r c #10A20A", +"t c #238208", +"y c #308512", +"u c #308A12", +"i c #308C1D", +"p c #309A1C", +"a c #30A220", +"s c #30AA23", +"d c #3CB020", +"f c #00C500", +"g c #00C900", +"h c #00D300", +"j c #00DE00", +"k c #1EDB1E", +"l c #00E200", +"z c #00E900", +"x c #00F400", +"c c #06FE06", +"v c #08FE08", +"b c #23D100", +"n c #3ADF3A", +"m c #29ED29", +"M c #37FF37", +"N c #39FF39", +"B c #5E9614", +"V c #5FA012", +"C c #6F9F16", +"Z c #7F9C19", +"A c #68A414", +"S c #74B641", +"D c #40D720", +"F c #4EDA30", +"G c #5DDD40", +"H c #56E256", +"J c #53EF53", +"K c #60C852", +"L c #6FFF6F", +"P c #74E672", +"I c #71FF71", +"U c #7DF17D", +"Y c #814F27", +"T c #855226", +"R c #87552D", +"E c #8B5626", +"W c #8D5A23", +"Q c #8E5C2F", +"! c #915D26", +"~ c #935F31", +"^ c #956121", +"/ c #986325", +"( c #9A6329", +") c #9E6836", +"_ c #996B3D", +"` c #A06728", +"' c #A56B27", +"] c #A46B2A", +"[ c #A86F2E", +"{ c #A26D33", +"} c #AE7424", +"| c #AB712B", +" . c #B27724", +".. c #B67C23", +"X. c #B5792D", +"o. c #BA7C2B", +"O. c #B07631", +"+. c #B57B32", +"@. c #B1783F", +"#. c #B97F35", +"$. c #AE7D43", +"%. c #AB7D4A", +"&. c #90981D", +"*. c #BF8225", +"=. c #BE802E", +"-. c #BD8334", +";. c #B99B2D", +":. c #9FAF41", +">. c #9FB249", +",. c #9FB552", +"<. c #9FB95A", +"1. c #B7814B", +"2. c #BA8541", +"3. c #BC864B", +"4. c #BD8944", +"5. c #BB9242", +"6. c #B6956B", +"7. c #BFB743", +"8. c #B0C262", +"9. c #C68626", +"0. c #C4832B", +"q. c #CA872A", +"w. c #CE8B2A", +"e. c #C28430", +"r. c #C3883B", +"t. c #CC8E33", +"y. c #D28D2A", +"u. c #D5922A", +"i. c #DD962B", +"p. c #D99631", +"a. c #DD9C35", +"s. c #D89A39", +"d. c #E09D34", +"f. c #E7A12C", +"g. c #ECA62C", +"h. c #E4A032", +"j. c #E4A23A", +"k. c #E6A83D", +"l. c #E9A633", +"z. c #EAAA3B", +"x. c #FCB62E", +"c. c #FFB82E", +"v. c #F3B33F", +"b. c #F8B738", +"n. c #FFBB34", +"m. c #FEBC3A", +"M. c #C08941", +"N. c #CD954B", +"B. c #CC9A4C", +"V. c #D19D4E", +"C. c #DD9F41", +"Z. c #C49C61", +"A. c #CFB954", +"S. c #D5A648", +"D. c #D9A14A", +"F. c #D4A15E", +"G. c #DCA352", +"H. c #DEA954", +"J. c #DBA95B", +"K. c #DDAB61", +"L. c #E2A649", +"P. c #E4A844", +"I. c #E4AA4C", +"U. c #E0A65C", +"Y. c #E8AE52", +"T. c #E7B158", +"R. c #EAB455", +"E. c #EAB45A", +"W. c #EDB854", +"Q. c #EFBF59", +"!. c #F7BC4A", +"~. c #F5B953", +"^. c #F5BB58", +"/. c #E5B666", +"(. c #ECB760", +"). c #ECBB64", +"_. c #E9BC70", +"`. c #F0B76F", +"'. c #F7BF60", +"]. c #F0BF6A", +"[. c #C7C469", +"{. c #CFC76A", +"}. c #CFD07A", +"|. c #EFC15C", +" X c #FFC144", +".X c #FFC44B", +"XX c #FFC651", +"oX c #FBC658", +"OX c #FFC855", +"+X c #FFCA5B", +"@X c #E6C776", +"#X c #F3C060", +"$X c #F1C269", +"%X c #FDC564", +"&X c #F9C368", +"*X c #FECC63", +"=X c #FFCA6A", +"-X c #F2C573", +";X c #F4CE7B", +":X c #FECD71", +">X c #FFD067", +",X c #FED16B", +".+ 4 5 4 y |.*X=X:X].[ r.! $ BXBXBX", +"BXBXBX9.h.gXcX/.z.*X,X BX", +"BXBXBXBXBXu.i.-XsXT.s.2XpXpXsXtX^.%X=XH.O.Z.kXvXvX7X_ < o BX", +"BXBXBXBXBXi.f.u.).eXE.t.;XtXW.i.i.C.#.3.9XgXjX8X%.T % BXBX", +"BXBXBXBXBXi.g.c.i.D.&XR.0.u.i.u.o.+._.eXeX;X2.( ( BXBXBXBX", +"BXBXBXBXBXu.l.n.m.a.t.0.9.o.*.| V.=X=X&X3.( u.c.] BXBXBXBXBXBX", +"BXBXBXBXBXu.z. X.XXXOXoXW.S.B.-.-.` | ] t.b.n.c.` BXBXBXBXBXBX", +"BXBXBXBXBXw.k.OXOX*X*X,X,XX+XOXXX.X.X Xm.m.( BXBXBXBXBXBX", +"BXBXBXBXBXq.P.*X*X,XX*X+X+XOX.X.X.Xm.( BXBXBXBXBXBX", +"BXBXBXBXBX0.q.#XX*X+X+XOX.X.X) BXBXBXBXBXBX", +"BXBXBXBXBXBX} =.$XrXpXaXaXsXpX2X2X < T = . BXBXBXBXBXBXBXBXBXBXBXBXBX" +}; --- kdeutils-3.5.8.orig/debian/icons/kdf.xpm +++ kdeutils-3.5.8/debian/icons/kdf.xpm @@ -0,0 +1,199 @@ +/* XPM */ +static char *kdf[] = { +/* columns rows colors chars-per-pixel */ +"32 32 161 2", +" c black", +". c #001E01", +"X c #1D0200", +"o c #003302", +"O c #200300", +"+ c #005500", +"@ c #006302", +"# c #00640F", +"$ c #006C15", +"% c #007705", +"& c #007B0B", +"* c #007E10", +"= c #006B7A", +"- c #00777F", +"; c #520900", +": c #5E0500", +"> c #640800", +", c #7C1300", +"< c #0033B8", +"1 c #0030C6", +"2 c #00449F", +"3 c #0043BD", +"4 c #004BB9", +"5 c #00669D", +"6 c #204BB6", +"7 c #3058BD", +"8 c #004CCB", +"9 c #0041D1", +"0 c #0050CD", +"q c #0052D0", +"w c #1057D3", +"e c #005DE5", +"r c #0060DF", +"t c #006DDF", +"y c #106EDB", +"u c #0064E0", +"i c #006CE2", +"p c #006CEB", +"a c #0071EE", +"s c #0079E4", +"d c #007CEB", +"f c #0076F1", +"g c #00850F", +"h c #008C00", +"j c #008E15", +"k c #009701", +"l c #00940F", +"z c #009907", +"x c #009217", +"c c #00911A", +"v c #009B15", +"b c #00A204", +"n c #00AE0D", +"m c #00A414", +"M c #00AC13", +"N c #00AC1F", +"B c #00B707", +"V c #00B409", +"C c #00BA02", +"Z c #00BD0E", +"A c #00B411", +"S c #00B218", +"D c #00BA10", +"F c #00BB19", +"G c #00A920", +"H c #2E931D", +"J c #00994F", +"K c #00C20D", +"L c #00CB0B", +"P c #00C711", +"I c #00D405", +"U c #00D20A", +"Y c #00DC04", +"T c #00DA08", +"R c #00C033", +"E c #00D325", +"W c #00E406", +"Q c #00EB04", +"! c #00E118", +"~ c #00F302", +"^ c #00FA01", +"/ c #409F21", +"( c #40A525", +") c #40AC29", +"_ c #40A736", +"` c #0082EF", +"' c #0083F1", +"] c #008CF3", +"[ c #0091F4", +"{ c #009BF3", +"} c #009DFF", +"| c #00A4FF", +" . c #00ABFE", +".. c #00B3FE", +"X. c #00BAFE", +"o. c #26ACFF", +"O. c #00C2FE", +"+. c #00CAFE", +"@. c #00D3FE", +"#. c #00DBFE", +"$. c #00E1FF", +"%. c #831900", +"&. c #9A1B01", +"*. c #962200", +"=. c #A01A02", +"-. c #AE1D01", +";. c #A92A00", +":. c #BB2C03", +">. c #B93503", +",. c #9F6D6A", +"<. c #BF664A", +"1. c #CC3900", +"2. c #CF3B08", +"3. c #DC3308", +"4. c #EE3606", +"5. c #FF3F09", +"6. c #D64103", +"7. c #CF5C35", +"8. c #E14A0D", +"9. c #EE5B13", +"0. c #FF440C", +"q. c #FF4807", +"w. c #FF4B0D", +"e. c #FF4C10", +"r. c #FE5600", +"t. c #FF510D", +"y. c #FE5E06", +"u. c #FF5C0B", +"i. c #FF5412", +"p. c #FF5C14", +"a. c #FF5A18", +"s. c #FE630B", +"d. c #F16315", +"f. c #F5651A", +"g. c #F56918", +"h. c #FF6511", +"j. c #FF641B", +"k. c #FF6914", +"l. c #FD6B1D", +"z. c #FE731C", +"x. c #FE791E", +"c. c #FF6620", +"v. c #FF6C22", +"b. c #FF7323", +"n. c #FF7729", +"m. c #FF7B24", +"M. c #FF7C2A", +"N. c #CF6F45", +"B. c #EF863F", +"V. c #FF8227", +"C. c #FF832C", +"Z. c #FF8A2C", +"A. c #FF8532", +"S. c #FF8C33", +"D. c #FF9334", +"F. c #FF9338", +"G. c #FF9836", +"H. c #FF9B3A", +"J. c #FFA040", +"K. c gray100", +"L. c None", +/* pixels */ +"L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.p p { p e L.L.L.L.L.L.L.L.L.L.L.L.", +"L.L.L.L.L.L.L.L.L.L.L.L.L.a p { @.$.+.r 3 L.L.L.L.L.L.L.L.L.L.L.", +"L.L.L.L.L.L.L.L.L.L.L.L.a ] O.$.$.$.$.#.t 3 L.L.L.L.L.L.L.L.L.L.", +"L.L.L.L.L.L.L.L.L.L.f ' O.#.#.#.#.#.#.#.@.r 9 L.L.L.L.L.L.L.L.L.", +"L.L.L.L.L.L.L.L.L.' .@.@.@.@.@.@.@.@.@.@.+.s < L.L.L.L.L.L.L.L.", +"L.L.L.L.L.L.L.L.L.] #.+.+.+.+.+.+.+.+.+.+.+.+.i 1 L.L.L.L.L.L.L.", +"L.L.L.L.L.L.L.L.L.] $.#.O.X.O.O.O.X.O.X.O.O.O.X.8 L.L.L.L.L.L.", +"L.L.L.L.L.L.L.L.L.] $.$.@.X...X.X.X.X.X.X. .....q L.L.L.L.L.L.", +"L.L.L.L.L.L.L.L.r.` $.$.#.#... . ... . . . .....q L.L.L.L.L.L.", +"L.L.L.L.L.L.r.s.Z.` @.#.#.@.+...| | | | . ...X.0 L.L.L.L.L.L.", +"L.L.L.L.r.y.x.H.H.d @.@.@.@.@.@.o.} } | . .X.X.0 L.L.L.L.L.L.", +"L.L.L.r.x.G.H.F.D.d +.+.+.+.+.+. .} | .....X.O.8 L.L.L.L.L.L.", +"L.L.L.x.G.D.D.Z.Z.p O.O.O.+.O.O.| | . ...X.X.O.8 L.L.L.L.L.L.", +"L.L.L.m.J.Z.V.V.m.,.d X.X.X.O.X.| | ...X.X.O.O.8 L.L.L.L.L.L.", +"L.L.L.x.H.F.V.z.x.z.<.y ....X... . . ...X.X.X.i = $ L.L.L.L.L.L.", +"L.L.L.z.F.D.D.m.k.k.s.7.w ... . . ..... .t - ! ^ F c L.L.L.L.L.", +"L.L.L.l.S.S.S.C.z.u.u.p.N.7 [ . . ...d 5 E ^ ^ ^ ^ P c L.L.L.L.", +"L.L.L.g.A.C.V.m.M.b.n.F.F.B.6 ] .d 5 R ^ ^ ^ ^ ^ ^ ^ P j L.L.L.", +"L.L.L.d.M.M.n.m.b.b.S.A.A.M._ 2 4 J W W W W W W W W W W K g L.L.", +"L.L.L.9.b.b.b.b.l.l.M.n.n.n.) m D U U U U U U U U U U U U n L.", +"L.L.L.6.f.l.l.j.l.j.b.v.v.c.) m M Z K D K K D K D K K K U V L.", +"L.L.L.1.>.9.j.j.p.p.c.c.a.a.( M A Z K A M M M M M V K L T B L.", +"L.L.L.L. ;.8.p.p.i.a.i.e.e./ A D K L U m v v m S Z L U W B L.", +"L.L.L.L.L.L.*.2.t.w.e.0.0.3.H A Z L U U T M v M Z K U W W B L.", +"L.L.L.L.L.L.L.%.:.q.0.4.=.: G Z L L T T W K m A Z L T W ~ C L.", +"L.L.L.L.L.L.L.L., &.-.> X G K L U T W Q L M Z K U W Q ~ C L.", +"L.L.L.L.L.L.L.L.L.; O N S L U W W ~ U A K U T Q ~ ^ C L.", +"L.L.L.L.L.L.L.L.L.L. L.L.L.j M T W ~ ~ T Z L U W Q ^ Y h L.", +"L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.# v T ~ ^ W K U T Q Y k + L.", +"L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.* l W ^ Y L T Y b @ L.L.", +"L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.& & I W L z @ . L.L.L.L.", +"L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L. & z % o L.L.L.L.L." +}; --- kdeutils-3.5.8.orig/debian/icons/kregexpeditor-16.xpm +++ kdeutils-3.5.8/debian/icons/kregexpeditor-16.xpm @@ -0,0 +1,203 @@ +/* XPM */ +static char *kregexpeditor-16[] = { +/* columns rows colors chars-per-pixel */ +"16 16 181 2", +" c #040756", +". c #080857", +"X c #0D1059", +"o c #0E105D", +"O c #6F375D", +"+ c #682565", +"@ c #774465", +"# c #2D3984", +"$ c #283B8A", +"% c #293C8A", +"& c #2C3C8A", +"* c #2E3D8A", +"= c #36308F", +"- c #333C85", +"; c #313F8A", +": c #1C2DDF", +"> c #1D2DDF", +", c #1E2EDF", +"< c #1437DF", +"1 c #1636DC", +"2 c #123CD9", +"3 c #1538DA", +"4 c #1638DA", +"5 c #1638DF", +"6 c #0922FF", +"7 c #0A22FF", +"8 c #0F25FF", +"9 c #1327FF", +"0 c #1729FF", +"q c #172AFF", +"w c #182AFF", +"e c #1B2CFF", +"r c #2030DF", +"t c #2130DF", +"y c #2230DF", +"u c #1153BF", +"i c #34418A", +"p c #37448B", +"a c #3B478C", +"s c #3F4C8E", +"d c #304793", +"f c #314893", +"g c #334893", +"h c #354A93", +"j c #364993", +"k c #374993", +"l c #384A93", +"z c #384B93", +"x c #3A4B93", +"c c #3B4B93", +"v c #3C4B93", +"b c #3C4E93", +"n c #3F4F93", +"m c #3E539B", +"M c #0943D5", +"N c #244CC0", +"B c #2842DF", +"V c #374DCE", +"C c #314AD1", +"Z c #2F6CDF", +"A c #3A71DF", +"S c #424B8E", +"D c #404D93", +"F c #435093", +"G c #465394", +"H c #40549B", +"J c #42559B", +"K c #44579B", +"L c #4C5795", +"P c #49599B", +"I c #4D5C9B", +"U c #505094", +"Y c #4F74BE", +"T c #5075BE", +"R c #5076BE", +"E c #5579BE", +"W c #5B7CBE", +"Q c #646FA8", +"! c #4477DF", +"~ c #4577DF", +"^ c #507DDF", +"/ c #7C8557", +"( c #268E95", +") c #31858C", +"_ c #389AD5", +"` c #2DBCC4", +"' c #30BEC4", +"] c #36BDC0", +"[ c #07CEC9", +"{ c #09CFC9", +"} c #04C9D1", +"| c #05C9D1", +" . c #06C9D1", +".. c #06CAD1", +"X. c #0AD0C9", +"o. c #16E8D1", +"O. c #19EAD1", +"+. c #1DEBD1", +"@. c #5388D9", +"#. c #479AFF", +"$. c #499BFF", +"%. c #4D9DFF", +"&. c #5685E1", +"*. c #50A1E5", +"=. c #59A4FF", +"-. c #5AA4FF", +";. c #5BA5FF", +":. c #5CA5FF", +">. c #628DE2", +",. c #65A8DA", +"<. c #64A2F1", +"1. c #60A8FF", +"2. c #61A8FF", +"3. c #66ABFF", +"4. c #68ACFF", +"5. c #69ADFF", +"6. c #6AADFF", +"7. c #6BAEFF", +"8. c #6CAEFF", +"9. c #6DAFFF", +"0. c #6EAFFF", +"q. c #7DB5EC", +"w. c #71B1FF", +"e. c #72B1FF", +"r. c #72B2FF", +"t. c #73B2FF", +"y. c #74B2FF", +"u. c #78B4FF", +"i. c #78B5FF", +"p. c #79B5FF", +"a. c #7DB8FF", +"s. c #7EB8FF", +"d. c #7FB8FF", +"f. c #7FB9FF", +"g. c #822A3F", +"h. c #81383F", +"j. c #92342F", +"k. c #A92D34", +"l. c #812643", +"z. c #822643", +"x. c #904931", +"c. c #955F30", +"v. c #9FAB3A", +"b. c #959D4D", +"n. c #969E4D", +"m. c #9AA543", +"M. c #9CA542", +"N. c #9DA642", +"B. c #84A772", +"V. c #99BA6C", +"C. c #9DBC6C", +"Z. c #90B17E", +"A. c #ADC542", +"S. c #AEC64D", +"D. c #BFC840", +"F. c #BFC940", +"G. c #C2CE38", +"H. c #C3CE38", +"J. c #CFE740", +"K. c #D2E840", +"L. c #80B9FF", +"P. c #81B9FF", +"I. c #81BAFF", +"U. c #82BAFF", +"Y. c #83BAFF", +"T. c #88BDFF", +"R. c #89BEFF", +"E. c #8BBFFF", +"W. c #8CBFFF", +"Q. c #8CC0FF", +"!. c #8DC0FF", +"~. c #90C2FF", +"^. c #91C2FF", +"/. c #97C6FF", +"(. c #98C6FF", +"). c #99C7FF", +"_. c #9AC7FF", +"`. c #9BC8FF", +"'. c #A5CDFF", +"]. c #A6CEFF", +"[. c #B1D4FF", +/* pixels */ +"o S F D c c k k k k c c c D a . ", +"L [.'._.!.E.P.f.f.f.P.E.!.`.].- ", +"I './.E.P.u.w.8.5.5.w.u.P.Q.`.i ", +"P _.q.] ' ` *.;.;.B.V.C.Z.f.Q.i ", +"K !.,.+.O.o._ $.#.A.J.K.S.w.P.* ", +"K V N X.{ [ u 5 < v.G.G.m.B C * ", +"K t 4 | | | M 7 7 m.D.D.n.0 , % ", +"m , 4 | ( h.g.z.z.j.c.D.n.0 , % ", +"m t 5 | ) k.k.k.k.k.x.N./ 0 : $ ", +"m t e 2 = k.k.k.k.k.+ 8 9 0 , $ ", +"m >.^ ~ U k.k.k.k.k.O Z A ~ &.% ", +"K E.u.5.Q k.k.k.k.k.@ %.;.5.u.% ", +"K !.P.w.<.W E Y Y Y @.;.3.y.P.* ", +"P _.E.f.t.3.1.;.;.:.1.7.y.P.!.i ", +"G '._.Q.I.i.w.9.9.9.w.u.P.!._.# ", +". s n b z k f f f f f k k b p " +}; --- kdeutils-3.5.8.orig/debian/icons/kwikdisk.xpm +++ kdeutils-3.5.8/debian/icons/kwikdisk.xpm @@ -0,0 +1,295 @@ +/* XPM */ +static char *kwikdisk[] = { +/* columns rows colors chars-per-pixel */ +"32 32 257 2", +" c #000000", +". c #000209", +"X c #000A00", +"o c #0A0100", +"O c #000412", +"+ c #000D1F", +"@ c #001402", +"# c #001A03", +"$ c #130200", +"% c #190206", +"& c #00132C", +"* c #021A39", +"= c #002504", +"- c #002908", +"; c #04340B", +": c #043C09", +"> c #023203", +", c #083611", +"< c #220900", +"1 c #280601", +"2 c #3C1200", +"3 c #3B0802", +"4 c #052659", +"5 c #05335F", +"6 c #06316E", +"7 c #0E3060", +"8 c #083172", +"9 c #232E70", +"0 c #054709", +"q c #0C4910", +"w c #06540A", +"e c #055A0A", +"r c #0D5413", +"t c #0B6413", +"y c #10771D", +"u c #06620D", +"i c #1A7822", +"p c #0A4475", +"a c #571204", +"s c #4A1201", +"d c #4B2D37", +"f c #601C08", +"g c #622202", +"h c #762806", +"j c #093783", +"k c #19528F", +"l c #087FB1", +"z c #197DB3", +"x c #2A64A6", +"c c #716E99", +"v c #787094", +"b c #627DAE", +"n c #038C19", +"m c #078A18", +"M c #009816", +"N c #029A18", +"B c #04921D", +"V c #05880F", +"C c #118C21", +"Z c #189C2C", +"A c #1F9730", +"S c #00A214", +"D c #00AC13", +"F c #09A41A", +"G c #00B60F", +"H c #00B610", +"J c #03B912", +"K c #0CBA1C", +"L c #0CB31E", +"P c #10BC1D", +"I c #15A927", +"U c #19B623", +"Y c #17B826", +"T c #209C37", +"R c #20BC2F", +"E c #2CBC38", +"W c #1C9B70", +"Q c #1BA364", +"! c #3EAA7C", +"~ c #00C10D", +"^ c #00CB0B", +"/ c #05C613", +"( c #01D50A", +") c #00D707", +"_ c #19CB23", +"` c #1ECA28", +"' c #1DD325", +"] c #06E20A", +"[ c #21C32D", +"{ c #21C92D", +"} c #25CB31", +"| c #2ACC35", +" . c #2DCE38", +".. c #22D329", +"X. c #2DD735", +"o. c #30CF3B", +"O. c #30D33A", +"+. c #36DF3D", +"@. c #31E037", +"#. c #3BDF42", +"$. c #42D94A", +"%. c #47DA50", +"&. c #58D962", +"*. c #45E54A", +"=. c #4BE152", +"-. c #58F65A", +";. c #58E45E", +":. c #5BE361", +">. c #74EC78", +",. c #73EF77", +"<. c #65EC6A", +"1. c #189B84", +"2. c #2A87B4", +"3. c #0F82DF", +"4. c #0989E9", +"5. c #1991EF", +"6. c #1997F3", +"7. c #01A5FD", +"8. c #01ACFD", +"9. c #0EA8F8", +"0. c #00B5FE", +"q. c #00BBFE", +"w. c #08B2FB", +"e. c #17A4EB", +"r. c #18ADEC", +"t. c #14AFFF", +"y. c #19B1ED", +"u. c #14B3FF", +"i. c #14BCFF", +"p. c #1ABBFF", +"a. c #3286CC", +"s. c #2792E5", +"d. c #38ADF1", +"f. c #26A7F0", +"g. c #01C4FE", +"h. c #00CDFF", +"j. c #09C8FF", +"k. c #00D4FF", +"l. c #00DCFF", +"z. c #0BD2FF", +"x. c #13C2FF", +"c. c #1CCBFF", +"v. c #15C8FF", +"b. c #14DAFF", +"n. c #1CD0FE", +"m. c #1CDFFF", +"M. c #01E3FF", +"N. c #24C9FF", +"B. c #2DCBFF", +"V. c #22C6FF", +"C. c #24D5FF", +"Z. c #29D6FF", +"A. c #33CDFF", +"S. c #36D7FE", +"D. c #5B88B8", +"F. c #59BD88", +"G. c #5DAFA5", +"H. c #57A8BB", +"J. c #449AD9", +"K. c #5EA3C3", +"L. c #48A9E8", +"P. c #60ABE3", +"I. c #41DAFF", +"U. c #42D4FF", +"Y. c #5EDFFF", +"T. c #54DDFF", +"R. c #47E1FF", +"E. c #5DE0FF", +"W. c #64CFFC", +"Q. c #60E9FF", +"!. c #7BEAFF", +"~. c #8B340A", +"^. c #942A0A", +"/. c #A6370E", +"(. c #BE3410", +"). c #AC2809", +"_. c #9E420C", +"`. c #BD4416", +"'. c #BB5417", +"]. c #EF3A09", +"[. c #C44A1B", +"{. c #C35619", +"}. c #DB4512", +"|. c #C65D23", +" X c #CA621F", +".X c #D4661E", +"XX c #CC6822", +"oX c #DA7231", +"OX c #C36833", +"+X c #E7400E", +"@X c #E95618", +"#X c #FE460D", +"$X c #FF4C11", +"%X c #FF5D0B", +"&X c #FF530E", +"*X c #FE5013", +"=X c #FF5A14", +"-X c #FE5A19", +";X c #FF620E", +":X c #FF6413", +">X c #FF641C", +",X c #FF6C1C", +".>.>.,.*.U 0 ", +"XXlXlXsXsXdXgXgXgXaXpX9X7X0Xv 5.t.t.7.4.z ! &.:.:.:.:.:.;.@.U 0 ", +".XuXfXuX5X1X,X,X:X:X;X4XhXnXOX9 s.5.l Q Y ` | .o.O. .} ..X.+.t ", +" XyXyXyXyX1X%X%X%X,XpXxXFXxX|.% 7 W / ( ..P G G G G J _ @.<.$.e ", +"{.iXrXrXrXrX,X:X8XhXvXvXxXpX|.$ , ..) ( ( ..L S D Y X.=.<.:.' e ", +"{.wX6XwX6X6XrXaXgXhXgXhXpX6X[.$ , } ^ ^ ^ ^ ` E [ O.$.$.%.O./ w ", +"{.5X4X5X5X4XwXpX9X9X9X8X3X4X`.$ , [ ~ ~ ~ ~ / o.{ { | | } / J w ", +"/.3X,X,X,X2X7X3X2X2X2X2X2X2X(.$ , R H H H H J [ K K P P J G G w ", +"$ /.X-X3X2X-X-X-X-X-X-X/.$ # C L D D D D Y D D D D D D D 0 ", +"YX$ ~.@X:X=X>X-X$X$X*X$X}.^.1 YX# y I S S S R S S S S S S V > ", +"YXYX$ h @X*X-X*X#X#X+X^.3 YX # y I N N I M M N N V e = ", +"YXYXYX a }.-X$X].).s o YXYXYXYXYXX t A B T n B n u = YX", +"YXYXYXYX a [.(.a $ YXYXYXYXYXYXYXYX. r A A m t > YXYX", +"YXYXYXYXYX 3 % YXYXYXYXYXYXYXYXYXYXYX q i : X YXYXYXYX", +"YXYXYXYXYXYX YXYXYXYXYXYXYXYXYXYXYXYXYXYX X YXYXYXYXYXYX", +"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX", +"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX" +}; --- kdeutils-3.5.8.orig/debian/icons/kgpg.xpm +++ kdeutils-3.5.8/debian/icons/kgpg.xpm @@ -0,0 +1,268 @@ +/* XPM */ +static char *kgpg[] = { +/* columns rows colors chars-per-pixel */ +"32 32 230 2", +" c black", +". c #3C3C6A", +"X c #703E1B", +"o c #6F3E21", +"O c #723E22", +"+ c #744224", +"@ c #73452B", +"# c #77482A", +"$ c #794727", +"% c #7D4A24", +"& c #7C4B29", +"* c #754A34", +"= c #7C4E32", +"- c #7D5035", +"; c #7A513C", +": c #524F70", +"> c #54547B", +", c #5D5D7C", +"< c #636383", +"1 c #6E6E8B", +"2 c #706F89", +"3 c #717188", +"4 c #79788C", +"5 c #767698", +"6 c #7D7C92", +"7 c #7C7C9A", +"8 c #884E1F", +"9 c #96551E", +"0 c #9E5E1E", +"q c #824B22", +"w c #82542F", +"e c #8A5324", +"r c #8E5925", +"t c #865732", +"y c #875B3F", +"u c #8F5932", +"i c #905821", +"p c #905F2D", +"a c #915F38", +"s c #916439", +"d c #996231", +"f c #99673A", +"g c #9E6D3B", +"h c #A85E1A", +"j c #A9611A", +"k c #AD6A1C", +"l c #B5691C", +"z c #B86514", +"x c #BB6E18", +"c c #A36426", +"v c #A56920", +"b c #AF7D37", +"n c #B57820", +"m c #B97926", +"M c #B87D2E", +"N c #855D40", +"B c #885E43", +"V c #8E664C", +"C c #8E684F", +"Z c #846B5A", +"A c #8D6559", +"S c #8F6953", +"D c #916D56", +"F c #926C59", +"G c #96715C", +"H c #A17741", +"J c #AC7B44", +"K c #A67D5A", +"L c #C66F11", +"P c #CD7010", +"I c #EB7E07", +"U c #887B90", +"Y c #BE8839", +"T c #BD8F4D", +"R c #B28B59", +"E c #A4836A", +"W c #A78670", +"Q c #A78B7D", +"! c #A98F7A", +"~ c #A8917C", +"^ c #BC996E", +"/ c #CC821A", +"( c #D58114", +") c #D38419", +"_ c #D68D19", +"` c #DE8512", +"' c #C58023", +"] c #C3832A", +"[ c #CB8B2C", +"{ c #C5913C", +"} c #D18F2D", +"| c #DCA23E", +" . c #E2810D", +".. c #EC890C", +"X. c #E38E14", +"o. c #F38607", +"O. c #F78806", +"+. c #F88403", +"@. c #FF8B04", +"#. c #FE9107", +"$. c #FE960A", +"%. c #FE9C0C", +"&. c #F59D13", +"*. c #EFA319", +"=. c #FFA00F", +"-. c #F5A919", +";. c #FEA411", +":. c #FEAB15", +">. c #FFB017", +",. c #FFB319", +"<. c #FFBA1C", +"1. c #EDB038", +"2. c #F2AD22", +"3. c #FDB623", +"4. c #FFBD21", +"5. c #FABA2D", +"6. c #F3BD37", +"7. c #C08F53", +"8. c #C09145", +"9. c #C09848", +"0. c #C99745", +"q. c #CC9848", +"w. c #C29E69", +"e. c #C39D77", +"r. c #CCA249", +"t. c #D1A452", +"y. c #D5A55B", +"u. c #D9A757", +"i. c #DAAD5E", +"p. c #D5B253", +"a. c #DEB556", +"s. c #DBB058", +"d. c #CFAB7B", +"f. c #D1A764", +"g. c #DDAF61", +"h. c #D4AD77", +"j. c #E0B351", +"k. c #E2B364", +"l. c #E3BE60", +"z. c #E5BA7B", +"x. c #EBC33F", +"c. c #FFC221", +"v. c #FFC926", +"b. c #FFCE28", +"n. c #FBCF36", +"m. c #FFD42B", +"M. c #FFDA2E", +"N. c #FEDD30", +"B. c #FDDE39", +"V. c #FFE333", +"C. c #FFE936", +"Z. c #FFED39", +"A. c #FFF13D", +"S. c #E4C14A", +"D. c #F0D64C", +"F. c #E4C062", +"G. c #E9CC65", +"H. c #EED364", +"J. c #F2DC6A", +"K. c #FFF343", +"L. c #FEF54C", +"P. c #FDF456", +"I. c #FDF55C", +"U. c #F6E66E", +"Y. c #F7E869", +"T. c #FAEE65", +"R. c #F9ED6D", +"E. c #FCF262", +"W. c #84849C", +"Q. c #92898C", +"!. c #918B98", +"~. c #8585A1", +"^. c #8B8BA2", +"/. c #8787B4", +"(. c #9292A4", +"). c #9393AA", +"_. c #9A9AAC", +"`. c #9393B0", +"'. c #9C9CB2", +"]. c #9A9AB8", +"[. c #A79688", +"{. c #B5A09B", +"}. c #BBAB9F", +"|. c #A2A2AC", +" X c #ABA3A2", +".X c #AAAAAA", +"XX c #A2A2B4", +"oX c #A4A4B9", +"OX c #A9A9B5", +"+X c #AAAABA", +"@X c #B9AEAB", +"#X c #B1B1BD", +"$X c #BEBCBE", +"%X c #ACACC1", +"&X c #B3B3C4", +"*X c #B8B8C5", +"=X c #BBBBCA", +"-X c #C3A98E", +";X c #C1AC92", +":X c #CAB197", +">X c #D6B181", +",X c #D3B68C", +" < 6 #XfXhXhXhXhXhXhXaX&XoX=XkXkXkXkXkX", +"kXkXkXkXkXkXkXkXkXkXkX. > 1 #XgXhXfXpXuXaXdXhXhXaX&X&XeXkXkXkXkX", +"kXkXkXkXkXkXkXkXkX/ ) : , XXfXfXrX+X).).'.&XwXfXhXtXoX&XkXkXkXkX", +"kXkXkXkXkXkXkXn ] [ } Z 4 yXdXyX_.~.~._.).oX+XwXgXgX+X%XjXkXkXkX", +"kXkXkXkXkXkXkXY { a.j.T }.iXyX_.1 ~.kXkXkX].(.OXaXhX=XoXfXkXkXkX", +"kXkXkXkXkXkXe Y p.Y.R.H.i.,X X1 < ^.kXjXkX_.).).rXhX=X'.0XkXkXkX", +"kXkXkXkXkX% p T D.Z.A.I.J.s.R ! :XkXkXjXkX.X^.(.qXgX*X_.$XkXkXkX", +"kXkXkXkXkXw b j.B.V.C.Z.L.R.l.y.3X6X9XkXkX).W.(.wXgX+X).wXkXkXkX", +"kXkXkXkX+ s r.n.m.N.V.C.Z.K.I.H.k.z.5X8XkX3 6 |.pXuX(.W.kXkXkXkX", +"kXkXkX$ t T 6.v.b.m.M.N.V.Z.A.P.U.l.k.3X-X4 (.0XpX+X(.XXkXkXkXkX", +"kXkXkXw J 1.<.c.v.v.m.M.M.V.C.A.L.T.G.g.^ Q.#XuX#X!.^._.kXkXkXkX", +"kXo # g | 3.<.<.c.c.v.b.m.M.V.C.Z.K.I.J.t.w.4X$XW.W.~.kXkXkXkXkX", +"kX+ & 0.5.<.<.<.<.<.c.v.v.m.M.M.V.C.A.L.R.l.f.~ !._.kXkXkXkXkXkX", +"kX+ # Y 2.,.,.,.,.,.<.c.c.v.m.M.N.V.V.Z.K.E.G.t.>X7XkXkXkXkXkXkX", +"kXX + e n *.:.:.:.:.:.,.<.c.v.b.m.M.V.V.Z.A.P.H.u. c #1E1100", +", c #002500", +"< c #002F00", +"1 c #221205", +"2 c #2F1E04", +"3 c #331D07", +"4 c #3A2311", +"5 c #3A2512", +"6 c #3E2910", +"7 c #024900", +"8 c #40290E", +"9 c #482E0E", +"0 c #412610", +"q c #533711", +"w c #593B13", +"e c #5D3D1F", +"r c #583D22", +"t c #774E19", +"y c #654523", +"u c #6E4825", +"i c #7B572A", +"p c #008700", +"a c #009F00", +"s c #149D02", +"d c #00A000", +"f c #00A100", +"g c #02AE00", +"h c #00B000", +"j c #00B700", +"k c #04B400", +"l c #0ABE00", +"z c #10AB03", +"x c #269B06", +"c c #2F9B09", +"v c #38B70E", +"b c #00C400", +"n c #00C500", +"m c #00C600", +"M c #00CA00", +"N c #00CF00", +"B c #0EC800", +"V c #00D900", +"C c #00DC00", +"Z c #00DD00", +"A c #0CDE0C", +"S c #11CA00", +"D c #06E004", +"F c #00EF00", +"G c #00F100", +"H c #18E615", +"J c #1AFF1E", +"K c #1CFF1E", +"L c #1EFF1E", +"P c #34DE22", +"I c #4F9C20", +"U c #509B29", +"Y c #4CB20C", +"T c #56A01A", +"R c #769817", +"E c #7D9419", +"W c #74AA3A", +"Q c #43C522", +"! c #55C137", +"~ c #56CE56", +"^ c #60D650", +"/ c #77C94F", +"( c #69EB6B", +") c #75E365", +"_ c #895D34", +"` c #886A2A", +"' c #9D6C3C", +"] c #A37024", +"[ c #A6753B", +"{ c #BA7D25", +"} c #BC7F26", +"| c #8D9A1C", +" . c #85B016", +".. c #81A331", +"X. c #84A232", +"o. c #A9941F", +"O. c #BE811E", +"+. c #AE844C", +"@. c #A38157", +"#. c #BA8947", +"$. c #B58851", +"%. c #ACB454", +"&. c #C98725", +"*. c #CD8829", +"=. c #CF8B2B", +"-. c #C28635", +";. c #CB8F36", +":. c #D18F2A", +">. c #D79227", +",. c #D7952C", +"<. c #DF922C", +"1. c #D49836", +"2. c #D99834", +"3. c #E6912D", +"4. c #E49937", +"5. c #EB9E38", +"6. c #F48D30", +"7. c #ECA328", +"8. c #E3A23C", +"9. c #F3AF3B", +"0. c #F7B03F", +"q. c #FBBC3E", +"w. c #FDBD3D", +"e. c #C79349", +"r. c #C99245", +"t. c #CC9740", +"y. c #CD9B48", +"u. c #D59841", +"i. c #D09848", +"p. c #D19E59", +"a. c #CEA051", +"s. c #DEA442", +"d. c #DAA24C", +"f. c #D2A156", +"g. c #D6A150", +"h. c #D5A860", +"j. c #D4AB6C", +"k. c #E5AF54", +"l. c #E6AF55", +"z. c #E8A654", +"x. c #EFB344", +"c. c #EBB558", +"v. c #EAB45D", +"b. c #EDB65C", +"n. c #F6BA4E", +"m. c #F5BC4B", +"M. c #F0BA57", +"N. c #E1B46B", +"B. c #EEB661", +"V. c #F1BC64", +"C. c #FFC746", +"Z. c #F6C053", +"A. c #F5C054", +"S. c #F6C25E", +"D. c #FFCC5F", +"F. c #FECE5E", +"G. c #FFD55E", +"H. c #EFC572", +"J. c #FBCE6A", +"K. c #FCCC6E", +"L. c #F6C975", +"P. c #FFCD75", +"I. c #FFD266", +"U. c #FFD06F", +"Y. c #FFD36D", +"T. c #FFD469", +"R. c #F4D171", +"E. c #FFD672", +"W. c #FCD378", +"Q. c #FED87D", +"!. c #FFDA7D", +"~. c #9AFF9C", +"^. c #A1EE92", +"/. c #A6F098", +"(. c #A8F39A", +"). c #A0FFA2", +"_. c #A3FFA5", +"`. c #E7C789", +"'. c #EDDE8D", +"]. c #E5D09F", +"[. c #F9D184", +"{. c #FADD9C", +"}. c #EBDCB2", +"|. c #FFE183", +" X c #FFE187", +".X c #FFE28F", +"XX c #FFE291", +"oX c #FFE094", +"OX c #FFE396", +"+X c #FFE397", +"@X c #FFE29E", +"#X c #FFEDA8", +"$X c #FFECB2", +"%X c #FFF1B3", +"&X c None", +/* pixels */ +"&X&X&X&XB ) /.^./.^ , &X&X&X&X&X", +"&X&X&X&Xj ( ).~._.~ & &X&X&X&X&X", +"&X&X&X&X| H L L L P ` * &X&X&X&X", +"&X&Xx z v D F F F A Q s 7 &X&X&X", +"&X5.H.! N Z V V V Z M / +.- &X&X", +"&X] P.L.T j b b b h W @X+X#.; &X", +":.t.8.0.Z.I d h d ..z.B.V.i @ . ", +"2 a.{.M.D.R.U p X.E.K.r.[ r 4 . ", +"&X> y.[.c.W.'.%.M.b.h.].}.@.0 . ", +"&X&XO.9.v.d.l.4.u.N.`.j.y o . . ", +"&X&X,.w.x.s.;.-.i.g.1.7.8 . &X&X", +"&X&X2.D.T.E.!.J.A.n.C.w.6 . &X&X", +"&X&Xt l. XoX+X!.Y.I.G.n.5 . &X&X", +"&X&X&X9 f.#X%X.X|.K.e.r % . &X&X", +"&X&X&X&X3 $.$XoXp.u = . . . &X&X", +"&X&X&X&X&X1 ' _ - . . . &X&X&X&X" +}; --- kdeutils-3.5.8.orig/debian/icons/kfloppy-16.xpm +++ kdeutils-3.5.8/debian/icons/kfloppy-16.xpm @@ -0,0 +1,206 @@ +/* XPM */ +static char *kfloppy-16[] = { +/* columns rows colors chars-per-pixel */ +"16 16 184 2", +" c black", +". c #000001", +"X c #000002", +"o c #010102", +"O c #000006", +"+ c #00000C", +"@ c #00000D", +"# c #00000E", +"$ c #00000F", +"% c #09090A", +"& c #000010", +"* c #000011", +"= c #000012", +"- c #00001F", +"; c #09091B", +": c #100906", +"> c #110A07", +", c #1D1206", +"< c #000021", +"1 c #030527", +"2 c #050526", +"3 c #0B0723", +"4 c #0D0D22", +"5 c #0E0D2A", +"6 c #0E0E2A", +"7 c #10102E", +"8 c #29190C", +"9 c #3F2824", +"0 c #040541", +"q c #090B41", +"w c #0D0F45", +"e c #11144B", +"r c #171A50", +"t c #1F2257", +"y c #1E2556", +"u c #23235B", +"i c #26285D", +"p c #353543", +"a c #252562", +"s c #282A60", +"d c #292C61", +"f c #343466", +"g c #363A6D", +"h c #374369", +"j c #5A3414", +"k c #6F4216", +"l c #4A4A54", +"z c #4F4F5F", +"x c #424270", +"c c #404C71", +"v c #4F4F7A", +"b c #4C577C", +"n c #515163", +"m c #5C5368", +"M c #62626A", +"N c #646470", +"B c #6A6A79", +"V c #484D83", +"C c #5E5D81", +"Z c #5D5D84", +"A c #5B5E89", +"S c #556287", +"D c #576286", +"F c #576D97", +"G c #6F6982", +"H c #6E6E90", +"J c #637092", +"K c #687597", +"L c #707085", +"P c #747489", +"I c #74809F", +"U c #7A86A4", +"Y c #7989AB", +"T c #91581C", +"R c #8D6121", +"E c #A07541", +"W c #C3781A", +"Q c #BD954F", +"! c #CD902D", +"~ c #D79F2D", +"^ c #DE9729", +"/ c #DA9D2F", +"( c #DEA52D", +") c #F59705", +"_ c #FF9909", +"` c #F79E16", +"' c #FFA513", +"] c #FFA612", +"[ c #FFA715", +"{ c #F8A21B", +"} c #FDA911", +"| c #FCAA12", +" . c #FFA810", +".. c #FFAF1B", +"X. c #E4AA2E", +"o. c #FAB522", +"O. c #FCBB20", +"+. c #DDAB44", +"@. c #FEC01E", +"#. c #FFC226", +"$. c #FFC626", +"%. c #F9C92C", +"&. c #FFD42E", +"*. c #848494", +"=. c #81809D", +"-. c #96878E", +";. c #818EAB", +":. c #8989A5", +">. c #8C8FB3", +",. c #8792AE", +"<. c #8D9AB5", +"1. c #9495AE", +"2. c #9D9DAE", +"3. c #9595B2", +"4. c #919DB7", +"5. c #989AB4", +"6. c #9F9FB6", +"7. c #9FA7BF", +"8. c #A89A99", +"9. c #A5A5B6", +"0. c #A6A6B5", +"q. c #A1A2BC", +"w. c #ACACBC", +"e. c #BCADA7", +"r. c #9A9EC3", +"t. c #9BA8C1", +"y. c #9EABC7", +"u. c #A6AFC5", +"i. c #A9A9C3", +"p. c #A3B0C7", +"a. c #A4B0C7", +"s. c #A7B0C7", +"d. c #ABB5CA", +"f. c #AEB8CD", +"g. c #AFB3D3", +"h. c #B7B7C4", +"j. c #B6B6C6", +"k. c #B3B7C9", +"l. c #B4B5C9", +"z. c #BBBBCA", +"x. c #BAC5D8", +"c. c #C1AF9E", +"v. c #CDBDAD", +"b. c #DDCEB5", +"n. c #C1C2D2", +"m. c #C1C4D2", +"M. c #C7C7D3", +"N. c #C1C5D8", +"B. c #C9C9D7", +"V. c #CACAD6", +"C. c #CACAD9", +"Z. c #CBCBD8", +"A. c #CAD0DD", +"S. c #CCD3DF", +"D. c #D1D1DC", +"F. c #D7D7DF", +"G. c #CED4E1", +"H. c #CFD6E2", +"J. c #D2D6EA", +"K. c #DAD9E0", +"L. c #DBDDE6", +"P. c #DDDDE3", +"I. c #DFDFE8", +"U. c #E0DFE5", +"Y. c #E1E1E8", +"T. c #E3E3E8", +"R. c #E7E7ED", +"E. c #E9E9ED", +"W. c #ECECEF", +"Q. c #EDEDF0", +"!. c #F1F1F5", +"~. c #F0F2F6", +"^. c #F3F3F6", +"/. c #F4F4F7", +"(. c #F6F5F7", +"). c #F4F5F8", +"_. c #F5F5F8", +"`. c #F9F9FA", +"'. c #FBFBFE", +"]. c #FDFDFE", +"[. c #FDFEFE", +"{. c #FEFDFE", +"}. c gray100", +"|. c None", +/* pixels */ +"|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.", +"|.|.j.w.7.1.:.=.H C v x f u 2 |.", +"|.9.M.P.V.L.S.Y V.).).^.^.s.s O ", +"|.% M T.}.U.f.F H.}.}.}.}.p.g + ", +"B |.*.'.(.m.S.^.}.}.}.^.,.d + ", +"Z.M n D.`.W.k.x.f.a.t.4.U J i + ", +"z.I.Z.Q.E.F.q.s.y.<.;.K K S t + ", +"n Z.R.I.F.N.c.+.b.J.Z.n.l.D r = ", +" p G P 5.v.^ ) X.e.g.i.q.b e = ", +"|.|. O m / | [ | ( 8.r.3.c w + ", +"|.|.|.; N Q O.$.#.@.~ -.>.h q = ", +"|.|.|.a V A E %.&...| ! G y 0 = ", +"|.|.|.7 6 1 3 R o.' _ ` 9 < < O ", +"|.|.|.|.|. > T { ' W , ", +"|.|.|.|.|.|.|.|.> j k 8 |.|.|.", +"|.|.|.|.|.|.|.|.|. |.|.|." +}; --- kdeutils-3.5.8.orig/debian/icons/kgpg-16.xpm +++ kdeutils-3.5.8/debian/icons/kgpg-16.xpm @@ -0,0 +1,224 @@ +/* XPM */ +static char *kgpg-16[] = { +/* columns rows colors chars-per-pixel */ +"16 16 202 2", +" c black", +". c #734121", +"X c #734024", +"o c #754224", +"O c #7A4723", +"+ c #7F4C26", +"@ c #784828", +"# c #7E513C", +"$ c #535377", +"% c #55557F", +"& c #7B5646", +"* c #656585", +"= c #767693", +"- c #797994", +"; c #8F511F", +": c #9C5B1F", +"> c #824D25", +", c #824E28", +"< c #83502B", +"1 c #81512E", +"2 c #89562D", +"3 c #8A582C", +"4 c #815335", +"5 c #865631", +"6 c #8C5B30", +"7 c #905923", +"8 c #9C6425", +"9 c #936331", +"0 c #96653F", +"q c #9C6B37", +"w c #AC5F18", +"e c #A6621C", +"r c #B0651E", +"t c #B06C1D", +"y c #BF7A1D", +"u c #A56D34", +"i c #A87B3D", +"p c #B56D24", +"a c #BF7F29", +"s c #B0793D", +"d c #876043", +"f c #8F6A55", +"g c #90674C", +"h c #997156", +"j c #C36E13", +"k c #D27C12", +"l c #B78238", +"z c #BA8537", +"x c #B18245", +"c c #A48D7A", +"v c #A88D7F", +"b c #B98F67", +"n c #B6947B", +"m c #D28D1C", +"M c #D88A1C", +"N c #CC8C2C", +"B c #C38A31", +"V c #C99539", +"C c #D99E30", +"Z c #DDB53E", +"A c #EE8408", +"S c #E28B12", +"D c #E88A10", +"F c #EC9915", +"G c #F58707", +"H c #F68F0A", +"J c #FF9409", +"K c #FF9509", +"L c #FB9B0D", +"P c #FD9E0F", +"I c #FF9D0D", +"U c #FF9D0E", +"Y c #FF9E0E", +"T c #F7A917", +"R c #FEA512", +"E c #FFA612", +"W c #FFA914", +"Q c #FFAE17", +"! c #F8B41E", +"~ c #FFB018", +"^ c #FFB61B", +"/ c #FFB71B", +"( c #FFB81C", +") c #FFBA1D", +"_ c #FFBF1F", +"` c #EDAD2C", +"' c #F5BF2D", +"] c #FAB420", +"[ c #FEBC20", +"{ c #C29943", +"} c #C69550", +"| c #DAB252", +" . c #DAB45A", +".. c #C1A370", +"X. c #C1A678", +"o. c #CFB071", +"O. c #D1AB7A", +"+. c #DAB061", +"@. c #DCB46D", +"#. c #E6BE78", +"$. c #FFC322", +"%. c #FFC422", +"&. c #FFCA25", +"*. c #FFCD27", +"=. c #FFD029", +"-. c #FFD52C", +";. c #FFD82D", +":. c #FFDA2E", +">. c #FFDB2E", +",. c #FCDB34", +"<. c #FFDF31", +"1. c #FFE233", +"2. c #FFE434", +"3. c #FFE534", +"4. c #FFE836", +"5. c #FFE938", +"6. c #FFEB3D", +"7. c #EDCF51", +"8. c #EFD85C", +"9. c #F0D749", +"0. c #E4C067", +"q. c #E7CC64", +"w. c #EBCB67", +"e. c #EACF63", +"r. c #ECD662", +"t. c #FDE940", +"y. c #FEED42", +"u. c #FAE94F", +"i. c #FCEC48", +"p. c #FDEE48", +"a. c #F6E358", +"s. c #FBEC53", +"d. c #85859E", +"f. c #89899C", +"g. c #9B9394", +"h. c #8B87A1", +"j. c #8989A0", +"k. c #8B8BA5", +"l. c #8C8CA2", +"z. c #8C8CA4", +"x. c #8F8FA8", +"c. c #9391A1", +"v. c #9191A7", +"b. c #9292A7", +"n. c #9595AA", +"m. c #9D9BAA", +"M. c #9F9EAF", +"N. c #9C9CB2", +"B. c #9F9FB1", +"V. c #9E9EB6", +"C. c #BBA284", +"Z. c #A0A0B1", +"A. c #A0A0B3", +"S. c #A7A7B5", +"D. c #A5A5B9", +"F. c #A5A5BB", +"G. c #A9A9B4", +"H. c #A9A9BB", +"J. c #AAAABD", +"K. c #ABABBE", +"L. c #ADADBC", +"P. c #ADADBD", +"I. c #AEAEBF", +"U. c #BBB2AB", +"Y. c #B0B0BF", +"T. c #B7B7BD", +"R. c #ACACC0", +"E. c #ADADC0", +"W. c #B1B1C3", +"Q. c #B3B3C5", +"!. c #B8B8C2", +"~. c #B9B9C4", +"^. c #B8B8CA", +"/. c #BCBCC8", +"(. c #BEBECC", +"). c #C3AC8E", +"_. c #CCAF8C", +"`. c #DCB888", +"'. c #C3B5AD", +"]. c #E4BE88", +"[. c #C5C2C2", +"{. c #C1C1CB", +"}. c #C1C1CE", +"|. c #C8C8CE", +" X c #C3C3D1", +".X c #C5C5D1", +"XX c #CACAD1", +"oX c #C9C9D5", +"OX c #CDCDD4", +"+X c #CFCFD4", +"@X c #CDCDD8", +"#X c #D0D0DA", +"$X c #D7D7DC", +"%X c #D9D9DD", +"&X c #D8D8DF", +"*X c #DADAE0", +"=X c #DDDDE2", +"-X c #E9D8CE", +";X c #E3E3E7", +":X c #E3E3E8", +">X c #F7EFE5", +",X c None", +/* pixels */ +",X,X,X,X,X,X,X= k.N.D.E.E.V.,X,X", +",X,X,X,X,X,X* z.P..X#X@X XQ.D.,X", +",X,X,X,X,X$ - P.*X=X*X;X:XoXQ.J.", +",X,X,Xa N x c.OXXXP.I.{.$X*X(.J.", +",X,X,Xz | .).[.M.d.v.Z.~.%X}.J.", +",X@ 9 { 9.s.q...c _.>Xl.S.OX/.N.", +",X5 i Z ,.4.p.8.0.#.].f.G.|.I.b.", +"1 q V ' =.>.3.y.a.w.@.g.T.!.Z.n.", +"3 s ` [ $.&.>.1.6.u.e.X.U.m.h.v.", +"3 B ] ( ) _ &.-.1.5.i.r.o.C.'.,X", +", 8 m T Q Q ( $.=.>.3.t.7.+.`.,X", +"o O 7 y F E E W Q / ) ! C } O.,X", +",Xo & 3 t S L Y Y Y Y M i b -X,X", +",X,Xh.# , e k H K K D u h n ,X,X", +",X,X,X,Xd > : j A G p g v ,X,X,X", +",X,X,X,X,X4 , ; w r 0 f ,X,X,X,X" +}; --- kdeutils-3.5.8.orig/debian/icons/ktimer-16.xpm +++ kdeutils-3.5.8/debian/icons/ktimer-16.xpm @@ -0,0 +1,208 @@ +/* XPM */ +static char *ktimer-16[] = { +/* columns rows colors chars-per-pixel */ +"16 16 186 2", +" c black", +". c #000003", +"X c #00000A", +"o c #000208", +"O c #000309", +"+ c #00000D", +"@ c #000515", +"# c #020811", +"$ c #040E1D", +"% c #000823", +"& c #020E22", +"* c #010D2A", +"= c #020F33", +"- c #081120", +"; c #0B1524", +": c #051335", +"> c #051534", +", c #06193E", +"< c #121B2C", +"1 c #1D2A3E", +"2 c #000B48", +"3 c #041942", +"4 c #071F63", +"5 c #0F275A", +"6 c #122B53", +"7 c #102D5E", +"8 c #092163", +"9 c #0E3070", +"0 c #123577", +"q c #18397E", +"w c #202D41", +"e c #213959", +"r c #355072", +"t c #174590", +"y c #1C4B9A", +"u c #1958BF", +"i c #214590", +"p c #2E588C", +"a c #285095", +"s c #2E58A5", +"d c #335AA4", +"f c #3364A2", +"g c #3E6EA8", +"h c #3365B3", +"j c #316CBD", +"k c #336AC1", +"l c #347CE1", +"z c #4975BA", +"x c #6A76AE", +"c c #4379CC", +"v c #5573C2", +"b c #528BC8", +"n c #5889C1", +"m c #518DD5", +"M c #488CE4", +"N c #4F93EC", +"B c #579AEF", +"V c #5F9AE7", +"C c #639ACD", +"Z c #729BCB", +"A c #629AE7", +"S c #6CA6EF", +"D c #68AAF7", +"F c #70A2E5", +"G c #71A6E2", +"H c #7AA9E5", +"J c #7EADE2", +"K c #7EB1EC", +"L c #FE9277", +"P c #8C8CC1", +"I c #8E99CC", +"U c #809AD6", +"Y c #9E9DC9", +"T c #929DD1", +"R c #91A2D4", +"E c #97A3D4", +"W c #9DA9D6", +"Q c #85B5E9", +"! c #87B7E9", +"~ c #8AB8E9", +"^ c #89B8ED", +"/ c #8AB9EF", +"( c #8ABEF0", +") c #8EBCF2", +"_ c #90B7E5", +"` c #91B7E4", +"' c #92BBEA", +"] c #A5B2DC", +"[ c #AEB8DB", +"{ c #B4ADC5", +"} c #B5BCDE", +"| c #88C1FD", +" . c #88C3FE", +".. c #9DC2ED", +"X. c #9DC3EC", +"o. c #96C3F7", +"O. c #B0C1DF", +"+. c #ADCCED", +"@. c #A5C9F2", +"#. c #A6C9F3", +"$. c #A3C9F8", +"%. c #A2CBFB", +"&. c #ADCEF2", +"*. c #AECEF0", +"=. c #B9CCE7", +"-. c #BBD1ED", +";. c #BCD4EF", +":. c #B2D2F2", +">. c #B1D2F5", +",. c #B5D2F2", +"<. c #B7D6F5", +"1. c #B9D8F5", +"2. c #BFD9F5", +"3. c #ECBFB7", +"4. c #FECBBB", +"5. c #FECEBE", +"6. c #FED1BF", +"7. c #DCC9D1", +"8. c #DECCD1", +"9. c #CCD8ED", +"0. c #C1D8F0", +"q. c #C5D9F2", +"w. c #C5DEF7", +"e. c #C9DFF7", +"r. c #CCDEF2", +"t. c #D9DEEF", +"y. c #D1DEF2", +"u. c #D1DFF5", +"i. c #CEE1F7", +"p. c #C9E4FD", +"a. c #D1E1F3", +"s. c #D1E2F7", +"d. c #D5E2F3", +"f. c #D4E2F7", +"g. c #D6E5F7", +"h. c #D2EAFE", +"j. c #D2EDFE", +"k. c #D5EAFE", +"l. c #D6EAFE", +"z. c #D4EFFE", +"x. c #D5EFFE", +"c. c #D6ECFE", +"v. c #DCE7F7", +"b. c #DFE7F5", +"n. c #DBE9F7", +"m. c #DCE9F7", +"M. c #DBE9FA", +"N. c #D9EDFE", +"B. c #DFE9F8", +"V. c #DEEAF8", +"C. c #DCECFB", +"Z. c #DCEFFE", +"A. c #DFEFFE", +"S. c #D9F0FE", +"D. c #DCF2FE", +"F. c #DCF3FE", +"G. c #DFF2FE", +"H. c #DEF8FE", +"J. c #ECCECE", +"K. c #E2EAF2", +"L. c #E7ECF5", +"P. c #E1EAFA", +"I. c #E1F0FE", +"U. c #E1F2FE", +"Y. c #E4F0FB", +"T. c #E4F2FE", +"R. c #E4F3FE", +"E. c #ECF0F7", +"W. c #EAF0F8", +"Q. c #E9F3FE", +"!. c #EDF3FA", +"~. c #FEEAE2", +"^. c #FDEAE4", +"/. c #FEEFE9", +"(. c #FEEFEA", +"). c #F3F7FD", +"_. c #F2F8FD", +"`. c #F3FAFE", +"'. c #F5FAFE", +"]. c #F8FBFD", +"[. c #F8FBFE", +"{. c #FAFEFE", +"}. c #FDFDFE", +"|. c #FDFEFE", +" X c #FEFEFE", +".X c None", +/* pixels */ +".X.X.X.X2 8 i d d q = .X.X.X.X", +".X.X 4 z ` &.*.:.#.H a @ .X.X.X", +".X 5 F X.0.n.r.V.g.+.o.c % .X.X", +".X: A @.e.e.U.D.A.D.0.R ) k + .X", +" h ^ 2.l.c.j.c.l.S.I ] 1.S 9 ", +"> V ,.w.N.c.7.8.H.E W F.1./ u + ", +"0 K s.U.D.H.J.L [ T D.h.p.>.l * ", +"y ! a.Q.Y.9.} x v P.Y.Y.A.;.N 3 ", +"t _ ).].t.P Y U { {.`.'.`.b.B , ", +"7 G L.{.{.{.{.{.J.^. X X'.d.M $ ", +"$ m =.L.{.{.{.{./.4. X XK.X.j ", +" p Q L.{.{.{.{. X4.~.].y.D 6 ", +".X# b ` b.).{.{.{.(.3.s.| f .X", +".X.X- n ! -.v.f.V.M.} .g O .X.X", +".X.X.XO r Z ' $.%.( C e .X.X.X", +".X.X.X.X O < w 1 ; .X.X.X.X" +}; --- kdeutils-3.5.8.orig/debian/icons/superkaramba.xpm +++ kdeutils-3.5.8/debian/icons/superkaramba.xpm @@ -0,0 +1,517 @@ +/* XPM */ +static char * superkaramba_xpm[] = { +"32 32 482 2", +" c None", +". c #00C4FF", +"+ c #03C8FF", +"@ c #1DD0FF", +"# c #2ED5FF", +"$ c #32D6FF", +"% c #29D4FF", +"& c #0ECFFF", +"* c #00ACFF", +"= c #00B1FF", +"- c #1BBCFF", +"; c #5ED1FF", +"> c #8EDFFF", +", c #97E2FF", +"' c #98E3FF", +") c #98E4FF", +"! c #97E4FF", +"~ c #79DEFF", +"{ c #40D0FF", +"] c #06C1FF", +"^ c #009AFF", +"/ c #019CFF", +"( c #4CBBFF", +"_ c #8FD5FF", +": c #91D6FF", +"< c #91D7FF", +"[ c #92D7FF", +"} c #92D8FF", +"| c #92D9FF", +"1 c #93DAFF", +"2 c #94DBFF", +"3 c #94DCFF", +"4 c #82D7FF", +"5 c #24BAFF", +"6 c #00AEFF", +"7 c #0081FF", +"8 c #0085FF", +"9 c #0086FF", +"0 c #4EADFF", +"a c #8BC9FF", +"b c #8BCAFF", +"c c #8BCBFF", +"d c #8CCCFF", +"e c #8DCDFF", +"f c #8DCEFF", +"g c #8DCFFF", +"h c #8ED0FF", +"i c #8FD1FF", +"j c #8FD2FF", +"k c #8CD1FF", +"l c #2AACFF", +"m c #009CFF", +"n c #009BFF", +"o c #006DFF", +"p c #0070FF", +"q c #0071FF", +"r c #1C82FF", +"s c #84BCFF", +"t c #85BDFF", +"u c #86BEFF", +"v c #86BFFF", +"w c #86C0FF", +"x c #87C0FF", +"y c #87C1FF", +"z c #88C2FF", +"A c #88C3FF", +"B c #89C4FF", +"C c #89C5FF", +"D c #89C6FF", +"E c #8AC7FF", +"F c #8BC8FF", +"G c #83C5FF", +"H c #1190FF", +"I c #048BFF", +"J c #048AFF", +"K c #0057FF", +"L c #005AFF", +"M c #005BFF", +"N c #005DFF", +"O c #478BFF", +"P c #80AFFF", +"Q c #80B0FF", +"R c #80B1FF", +"S c #81B2FF", +"T c #81B3FF", +"U c #82B4FF", +"V c #82B5FF", +"W c #82B6FF", +"X c #83B7FF", +"Y c #84B8FF", +"Z c #86BAFF", +"` c #8ABCFF", +" . c #8CBEFF", +".. c #8FC0FF", +"+. c #90C1FF", +"@. c #52A1FF", +"#. c #1781FF", +"$. c #1481FF", +"%. c #0C7CFF", +"&. c #0045FF", +"*. c #0046FF", +"=. c #0047FF", +"-. c #0049FF", +";. c #5183FF", +">. c #7AA2FF", +",. c #7BA3FF", +"'. c #7BA4FF", +"). c #7CA5FF", +"!. c #7CA6FF", +"~. c #7CA7FF", +"{. c #7DA8FF", +"]. c #7EA9FF", +"^. c #81ABFF", +"/. c #85AFFF", +"(. c #8AB2FF", +"_. c #8EB6FF", +":. c #91B8FF", +"<. c #93BAFF", +"[. c #94BCFF", +"}. c #75A9FF", +"|. c #2A7BFF", +"1. c #277AFF", +"2. c #2077FF", +"3. c #002EFF", +"4. c #0030FF", +"5. c #0032FF", +"6. c #0033FF", +"7. c #0035FF", +"8. c #3F67FF", +"9. c #7593FF", +"0. c #7594FF", +"a. c #7695FF", +"b. c #7696FF", +"c. c #7797FF", +"d. c #7798FF", +"e. c #7899FF", +"f. c #7C9DFF", +"g. c #82A2FF", +"h. c #88A7FF", +"i. c #8DACFF", +"j. c #92B0FF", +"k. c #95B3FF", +"l. c #98B5FF", +"m. c #9AB7FF", +"n. c #7DA3FF", +"o. c #3C76FF", +"p. c #3875FF", +"q. c #3372FF", +"r. c #1660FF", +"s. c #001BFF", +"t. c #001CFF", +"u. c #001EFF", +"v. c #001FFF", +"w. c #0020FF", +"x. c #1433FF", +"y. c #6F83FF", +"z. c #7085FF", +"A. c #7186FF", +"B. c #7187FF", +"C. c #7188FF", +"D. c #7289FF", +"E. c #768DFF", +"F. c #7D94FF", +"G. c #849AFF", +"H. c #8AA0FF", +"I. c #90A5FF", +"J. c #95AAFF", +"K. c #98ADFE", +"L. c #99AEFC", +"M. c #9AAFFB", +"N. c #6A8AFB", +"O. c #446DFC", +"P. c #446EFD", +"Q. c #416DFE", +"R. c #2F60FF", +"S. c #0006FF", +"T. c #0007FF", +"U. c #0008FF", +"V. c #000AFF", +"W. c #000BFF", +"X. c #000CFF", +"Y. c #000EFF", +"Z. c #3A45FF", +"`. c #6B75FF", +" + c #6E78FF", +".+ c #707BFF", +"++ c #737EFF", +"@+ c #7681FF", +"#+ c #7D89FF", +"$+ c #8490FF", +"%+ c #8A96FF", +"&+ c #8F9BFF", +"*+ c #93A0FE", +"=+ c #95A1FC", +"-+ c #95A2FA", +";+ c #95A3F8", +">+ c #8B9AF7", +",+ c #4861F7", +"'+ c #445FF8", +")+ c #4460F9", +"!+ c #4461FB", +"~+ c #4360FD", +"{+ c #042DFF", +"]+ c #000DFF", +"^+ c #0009FF", +"/+ c #0208FF", +"(+ c #0B0FFF", +"_+ c #494CFF", +":+ c #7678FF", +"<+ c #7A7DFF", +"[+ c #7D80FF", +"}+ c #8385FF", +"|+ c #8B8DFF", +"1+ c #9194FF", +"2+ c #9799FF", +"3+ c #9B9EFF", +"4+ c #9C9FFC", +"5+ c #989CFA", +"6+ c #9599F7", +"7+ c #8A8FF5", +"8+ c #515AF3", +"9+ c #4550F3", +"0+ c #4450F4", +"a+ c #4451F6", +"b+ c #4452F8", +"c+ c #4453FA", +"d+ c #0D22FE", +"e+ c #0021FF", +"f+ c #001DFF", +"g+ c #0721FF", +"h+ c #142BFF", +"i+ c #2034FF", +"j+ c #2B3DFF", +"k+ c #4A59FF", +"l+ c #7782FF", +"m+ c #8A92FF", +"n+ c #9097FF", +"o+ c #979EFF", +"p+ c #9DA3FF", +"q+ c #A2A7FF", +"r+ c #A5A9FE", +"s+ c #A3A7FB", +"t+ c #9EA1F8", +"u+ c #8286F5", +"v+ c #5A5EF2", +"w+ c #787AED", +"x+ c #8E8FEC", +"y+ c #6466EE", +"z+ c #4447F3", +"A+ c #4447F6", +"B+ c #4447F9", +"C+ c #1317FE", +"D+ c #002FEC", +"E+ c #0033FD", +"F+ c #0132FF", +"G+ c #0A38FF", +"H+ c #1A43FF", +"I+ c #284EFF", +"J+ c #3658FF", +"K+ c #4261FF", +"L+ c #4D69FF", +"M+ c #556FFF", +"N+ c #667DFF", +"O+ c #7F92FF", +"P+ c #91A0FF", +"Q+ c #9AA8FF", +"R+ c #9EABFF", +"S+ c #9CA8FE", +"T+ c #8E9CFB", +"U+ c #7887F8", +"V+ c #6B7BF5", +"W+ c #6A79F1", +"X+ c #A2ABEC", +"Y+ c #BEC4ED", +"Z+ c #828DEC", +"`+ c #4655F2", +" @ c #4452F5", +".@ c #4451F8", +"+@ c #1322FE", +"@@ c #003BD3", +"#@ c #0045F5", +"$@ c #094CFF", +"%@ c #1A57FF", +"&@ c #2B62FF", +"*@ c #3B6DFF", +"=@ c #4A77FF", +"-@ c #5780FF", +";@ c #6488FF", +">@ c #6E8FFF", +",@ c #7F9BFF", +"'@ c #88A1FF", +")@ c #8EA5FF", +"!@ c #91A7FF", +"~@ c #92A8FF", +"{@ c #8EA3FC", +"]@ c #859CF9", +"^@ c #7B93F6", +"/@ c #708AF3", +"(@ c #728BF0", +"_@ c #738BEF", +":@ c #5571F1", +"<@ c #4462F4", +"[@ c #4461F6", +"}@ c #3C59FA", +"|@ c #0225FB", +"1@ c #0048CD", +"2@ c #0051E8", +"3@ c #045DFF", +"4@ c #1567FF", +"5@ c #2872FF", +"6@ c #3A7CFF", +"7@ c #4B87FF", +"8@ c #5B91FF", +"9@ c #6B9AFF", +"0@ c #79A3FF", +"a@ c #85ABFF", +"b@ c #8FB1FF", +"c@ c #97B6FF", +"d@ c #9FBAFF", +"e@ c #A3BDFF", +"f@ c #A4BDFF", +"g@ c #A2BCFF", +"h@ c #9EB8FE", +"i@ c #94B0FB", +"j@ c #89A8F8", +"k@ c #7D9EF6", +"l@ c #7194F5", +"m@ c #648AF5", +"n@ c #567FF5", +"o@ c #4974F7", +"p@ c #446FF9", +"q@ c #1348FB", +"r@ c #002EDF", +"s@ c #0042A7", +"t@ c #0056D6", +"u@ c #0970F7", +"v@ c #1F7FFF", +"w@ c #3289FF", +"x@ c #4693FF", +"y@ c #589DFF", +"z@ c #6AA7FF", +"A@ c #7CB0FF", +"B@ c #8CB9FF", +"C@ c #9BC2FF", +"D@ c #A7C8FF", +"E@ c #AFCDFF", +"F@ c #B5D0FF", +"G@ c #B8D1FF", +"H@ c #B6D0FF", +"I@ c #B0CCFF", +"J@ c #AAC7FF", +"K@ c #A1C1FE", +"L@ c #95B9FC", +"M@ c #88B0FA", +"N@ c #7BA6F9", +"O@ c #6D9CF9", +"P@ c #5F92F9", +"Q@ c #5187FA", +"R@ c #2167FD", +"S@ c #0049F0", +"T@ c #003CCF", +"U@ c #005ABD", +"V@ c #0774E1", +"W@ c #2592FC", +"X@ c #3A9DFF", +"Y@ c #4EA6FF", +"Z@ c #62AFFF", +"`@ c #75B8FF", +" # c #88C1FF", +".# c #9BCAFF", +"+# c #ACD3FF", +"@# c #BCDBFF", +"## c #C8E1FF", +"$# c #CEE4FF", +"%# c #CEE3FF", +"&# c #C7DFFF", +"*# c #BDD9FF", +"=# c #B2D3FF", +"-# c #A7CCFF", +";# c #9CC5FF", +"># c #8FBDFE", +",# c #82B5FD", +"'# c #73ACFD", +")# c #63A1FD", +"!# c #3484FE", +"~# c #0563F8", +"{# c #004FD9", +"]# c #00389F", +"^# c #006DC0", +"/# c #128EE6", +"(# c #3CABFC", +"_# c #52B6FF", +":# c #67BDFF", +"<# c #7BC5FF", +"[# c #90CEFF", +"}# c #A4D6FF", +"|# c #B8DEFF", +"1# c #CBE7FF", +"2# c #DDEFFF", +"3# c #E8F4FF", +"4# c #E4F2FF", +"5# c #D6EAFF", +"6# c #C6E3FF", +"7# c #B7DBFF", +"8# c #A9D4FF", +"9# c #9ACCFF", +"0# c #8CC5FF", +"a# c #7EBCFF", +"b# c #68B1FF", +"c# c #3D9AFF", +"d# c #1D86FA", +"e# c #0366DF", +"f# c #0048AE", +"g# c #0073B1", +"h# c #0F9AE2", +"i# c #45BAF9", +"j# c #67C9FF", +"k# c #7CD0FF", +"l# c #90D7FF", +"m# c #A5DEFF", +"n# c #B9E5FF", +"o# c #CEECFF", +"p# c #E2F3FF", +"q# c #F3FAFF", +"r# c #EDF7FF", +"s# c #DAF0FF", +"t# c #C7E8FF", +"u# c #B5E0FF", +"v# c #A5D9FF", +"w# c #94D1FF", +"x# c #81C9FF", +"y# c #4BB0FF", +"z# c #2F9EF7", +"A# c #097CDE", +"B# c #0053A5", +"C# c #00577C", +"D# c #0295CF", +"E# c #26B5ED", +"F# c #63D0FB", +"G# c #8ADEFF", +"H# c #9EE3FF", +"I# c #B1E8FF", +"J# c #C3EDFF", +"K# c #D2F1FF", +"L# c #DBF4FF", +"M# c #D9F3FF", +"N# c #CEEFFF", +"O# c #BEE9FF", +"P# c #ACE3FF", +"Q# c #99DCFF", +"R# c #85D5FF", +"S# c #70CDFF", +"T# c #55C0FB", +"U# c #24A4EC", +"V# c #0383CE", +"W# c #006888", +"X# c #009BCB", +"Y# c #1CBBE9", +"Z# c #4FD1F5", +"`# c #82E1FB", +" $ c #ACECFE", +".$ c #BAEFFF", +"+$ c #C0F0FF", +"@$ c #B8EEFF", +"#$ c #ADEAFF", +"$$ c #9DE6FE", +"%$ c #7DDBFB", +"&$ c #4FC9F5", +"*$ c #23B2E9", +"=$ c #0393CF", +"-$ c #006592", +";$ c #007399", +">$ c #0091C1", +",$ c #05A4D8", +"'$ c #1DB3E5", +")$ c #2FBBE9", +"!$ c #35BFEB", +"~$ c #30BDEA", +"{$ c #20B8E6", +"]$ c #0BACDB", +"^$ c #0099C6", +"/$ c #007EA3", +" ", +" ", +" ", +" ", +" . + @ # $ % & ", +" * = - ; > , , ' ) ! ~ { ] ", +" ^ / ( _ : < [ } | 1 1 2 3 4 5 6 ", +" 7 8 9 0 a b c d d e f g h h i j k l m n ", +" o p q r s t u v w x y z A B C D E F G H I J ", +" K L M N O P Q R S T U V W X Y Z ` ...+.@.#.$.%. ", +" &.*.=.-.;.>.,.'.).!.~.{.].^./.(._.:.<.[.}.|.1.2. ", +" 3.4.5.6.7.8.9.0.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r. ", +" s.t.u.v.w.x.y.z.A.B.C.D.E.F.G.H.I.J.K.L.M.N.O.P.Q.R. ", +" S.T.U.V.W.X.Y.Z.`. +.+++@+#+$+%+&+*+=+-+;+>+,+'+)+!+~+{+ ", +" ]+X.W.^+U.T./+(+_+:+<+[+}+|+1+2+3+4+5+6+7+8+9+0+a+b+c+d+ ", +" e+w.v.f+t.g+h+i+j+k+l+m+n+o+p+q+r+s+t+u+v+w+x+y+z+A+B+C+ ", +" D+E+6.F+G+H+I+J+K+L+M+N+O+P+Q+R+S+T+U+V+W+X+Y+Z+`+ @.@+@ ", +" @@#@=.$@%@&@*@=@-@;@>@a.,@'@)@!@~@{@]@^@/@(@_@:@<@[@}@|@ ", +" 1@2@3@4@5@6@7@8@9@0@a@b@c@d@e@f@g@h@i@j@k@l@m@n@o@p@q@r@ ", +" s@t@u@v@w@x@y@z@A@B@C@D@E@F@G@H@I@J@K@L@M@N@O@P@Q@R@S@T@ ", +" U@V@W@X@Y@Z@`@ #.#+#@###$#%#&#*#=#-#;#>#,#'#)#!#~#{#]# ", +" ^#/#(#_#:#<#[#}#|#1#2#3#4#5#6#7#8#9#0#a#b#c#d#e#f# ", +" g#h#i#j#k#l#m#n#o#p#q#r#s#t#u#v#w#x#:#y#z#A#B# ", +" C#D#E#F#G#H#I#J#K#L#M#N#O#P#Q#R#S#T#U#V# ", +" W#X#Y#Z#`# $.$+$+$@$#$$$%$&$*$=$-$ ", +" ;$>$,$'$)$!$~${$]$^$/$ ", +" ", +" ", +" ", +" ", +" ", +" "}; --- kdeutils-3.5.8.orig/debian/icons/superkaramba-16.xpm +++ kdeutils-3.5.8/debian/icons/superkaramba-16.xpm @@ -0,0 +1,147 @@ +/* XPM */ +static char * superkaramba_16_xpm[] = { +"16 16 128 2", +" c None", +". c #0CB8FF", +"+ c #48D1FF", +"@ c #62DBFF", +"# c #67DDFF", +"$ c #58DAFF", +"% c #21C9FF", +"& c #0087FF", +"* c #149AFF", +"= c #7CC9FF", +"- c #8ED1FF", +"; c #8FD2FF", +"> c #90D4FF", +", c #91D5FF", +"' c #8DD5FF", +") c #37BAFF", +"! c #009EFF", +"~ c #005FFF", +"{ c #0066FF", +"] c #5A9EFF", +"^ c #83B7FF", +"/ c #84B9FF", +"( c #84BBFF", +"_ c #85BCFF", +": c #87BFFF", +"< c #8AC2FF", +"[ c #8BC3FF", +"} c #208FFF", +"| c #0D82FF", +"1 c #003BFF", +"2 c #003EFF", +"3 c #6088FF", +"4 c #789CFF", +"5 c #799EFF", +"6 c #7AA0FF", +"7 c #7FA5FF", +"8 c #89ADFF", +"9 c #91B4FF", +"0 c #96B9FF", +"a c #568FFF", +"b c #2C76FF", +"c c #000FFF", +"d c #0013FF", +"e c #0016FF", +"f c #2F42FF", +"g c #6E7EFF", +"h c #7182FF", +"i c #7788FF", +"j c #8495FF", +"k c #8FA0FF", +"l c #96A6FD", +"m c #95A7FA", +"n c #4E6EF9", +"o c #4367FC", +"p c #234EFE", +"q c #0017FF", +"r c #0014FF", +"s c #0213FF", +"t c #101EFF", +"u c #4D57FF", +"v c #7E84FF", +"w c #8D92FF", +"x c #9A9EFF", +"y c #A0A3FD", +"z c #9397F7", +"A c #6B70F2", +"B c #5E65F0", +"C c #444CF6", +"D c #2A35FC", +"E c #0039EC", +"F c #023EFF", +"G c #1A4DFF", +"H c #3962FF", +"I c #5275FF", +"J c #6884FF", +"K c #869BFF", +"L c #96A8FF", +"M c #93A4FD", +"N c #798CF7", +"O c #7B8EF0", +"P c #8293EE", +"Q c #455AF4", +"R c #253CFB", +"S c #004ED1", +"T c #106DFD", +"U c #3682FF", +"V c #5A97FF", +"W c #7BAAFF", +"X c #95B9FF", +"Y c #A7C3FF", +"Z c #ADC7FF", +"` c #A6C2FF", +" . c #95B5FB", +".. c #7CA2F8", +"+. c #618EF7", +"@. c #4074FA", +"#. c #053FE6", +"$. c #1081E2", +"%. c #46A9FE", +"&. c #6EBAFF", +"*. c #96CCFF", +"=. c #BBDDFF", +"-. c #D7EAFF", +";. c #D4E7FF", +">. c #BBDAFF", +",. c #A2CCFF", +"'. c #87BDFE", +"). c #5FA6FE", +"!. c #1675F4", +"~. c #0043B3", +"{. c #1998D5", +"]. c #5BC8FA", +"^. c #97DDFF", +"/. c #BFE9FF", +"(. c #E0F5FF", +"_. c #DCF2FF", +":. c #B9E5FF", +"<. c #96D7FF", +"[. c #6BC5FE", +"}. c #299EED", +"|. c #045DA9", +"1. c #24A3C8", +"2. c #53C4E7", +"3. c #72D4F3", +"4. c #77D6F5", +"5. c #5FCEF0", +"6. c #3CB5DD", +"7. c #0F86B4", +" ", +" ", +" . + @ # $ % ", +" & * = - ; > , ' ) ! ", +" ~ { ] ^ / ( _ : < [ } | ", +" 1 2 3 4 5 6 7 8 9 0 a b ", +" c d e f g h i j k l m n o p ", +" q r s t u v w x y z A B C D ", +" E F G H I J K L M N O P Q R ", +" S T U V W X Y Z ` ...+.@.#. ", +" $.%.&.*.=.-.;.>.,.'.).!.~. ", +" {.].^./.(._.:.<.[.}.|. ", +" 1.2.3.4.5.6.7. ", +" ", +" ", +" "}; --- kdeutils-3.5.8.orig/debian/icons/kfloppy.xpm +++ kdeutils-3.5.8/debian/icons/kfloppy.xpm @@ -0,0 +1,280 @@ +/* XPM */ +static char *kfloppy[] = { +/* columns rows colors chars-per-pixel */ +"32 32 242 2", +" c black", +". c #000015", +"X c #02021E", +"o c #180F07", +"O c #010122", +"+ c #080836", +"@ c #0C0C3B", +"# c #181821", +"$ c #10133C", +"% c #1F143E", +"& c #35210F", +"* c #362110", +"= c #010142", +"- c #0D0D4B", +"; c #141740", +": c #16164E", +"> c #191B45", +", c #1C1F49", +"< c #141451", +"1 c #1C1C55", +"2 c #1C2A54", +"3 c #21244E", +"4 c #24245C", +"5 c #252953", +"6 c #2B2D5B", +"7 c #25335C", +"8 c #30345E", +"9 c #2B2B61", +"0 c #2C3B64", +"q c #323265", +"w c #353963", +"e c #3A3B6A", +"r c #3E3E70", +"t c #2D487C", +"y c #364065", +"u c #34426B", +"i c #3D486E", +"p c #3D4B74", +"a c #402713", +"s c #432A12", +"d c #553617", +"f c #553518", +"g c #643E1A", +"h c #633F32", +"j c #774922", +"k c #7F4E25", +"l c #44445D", +"z c #42436E", +"x c #494964", +"c c #4E4E6B", +"v c #434373", +"b c #424C73", +"n c #484A74", +"m c #4B4B78", +"M c #475277", +"N c #425179", +"B c #4C557B", +"V c #53536D", +"C c #515174", +"Z c #52527B", +"A c #58587F", +"S c #755F5B", +"D c #63636F", +"F c #626273", +"G c #62627D", +"H c #6F6F7F", +"J c #796E78", +"K c #3C5585", +"L c #4F5E84", +"P c #545B80", +"I c #5B5B83", +"U c #566286", +"Y c #556388", +"T c #5D6186", +"R c #5C698D", +"E c #576C96", +"W c #636389", +"Q c #65698C", +"! c #6A6783", +"~ c #6A6A8C", +"^ c #616E91", +"/ c #657396", +"( c #6A7799", +") c #6C7A9B", +"_ c #77778C", +"` c #7B7B8D", +"' c #737393", +"] c #727698", +"[ c #737F9E", +"{ c #7F7F94", +"} c #797A9B", +"| c #6B7EA2", +" . c #717FA0", +".. c #7F7FA0", +"X. c #7587A9", +"o. c #7788AA", +"O. c #7A84A4", +"+. c #7C89A7", +"@. c #7D8CAC", +"#. c #835223", +"$. c #895526", +"%. c #8F5A26", +"&. c #955C25", +"*. c #945F2A", +"=. c #9D5E21", +"-. c #9A632A", +";. c #A4621F", +":. c #BB751E", +">. c #AB7230", +",. c #B57B32", +"<. c #997B63", +"1. c #A67642", +"2. c #A97742", +"3. c #B27F44", +"4. c #CC7B17", +"5. c #D47E16", +"6. c #B68345", +"7. c #BB8744", +"8. c #BF8B48", +"9. c #D68518", +"0. c #DB911C", +"q. c #C18224", +"w. c #CA8C26", +"e. c #CE9327", +"r. c #CD942B", +"t. c #D59727", +"y. c #DA9720", +"u. c #DA9B25", +"i. c #DB9C28", +"p. c #DFA325", +"a. c #DFA828", +"s. c #E6880D", +"d. c #E1991D", +"f. c #E99411", +"g. c #ED9C15", +"h. c #FF8A04", +"j. c #FE950B", +"k. c #FF9B0E", +"l. c #FF9E10", +"z. c #F0A518", +"x. c #F2AD1B", +"c. c #FEA212", +"v. c #FEAC19", +"b. c #F5B31D", +"n. c #FFB11B", +"m. c #E1A827", +"M. c #E1AB2A", +"N. c #E5B32B", +"B. c #E7B92D", +"V. c #E9BF30", +"C. c #FFB720", +"Z. c #FEBA21", +"A. c #C38E48", +"S. c #CC954B", +"D. c #CE984B", +"F. c #D59D4D", +"G. c #DDA450", +"H. c #E1A853", +"J. c #EBC532", +"K. c #EDCB35", +"L. c #FEC126", +"P. c #FFC628", +"I. c #FFCE2D", +"U. c #FFD531", +"Y. c #FFDF37", +"T. c #FFE038", +"R. c #86848F", +"E. c #868692", +"W. c #84849F", +"Q. c #8C8690", +"!. c #8585A3", +"~. c #8686A8", +"^. c #8188A7", +"/. c #848EAB", +"(. c #8B8BA4", +"). c #8D8DAC", +"_. c #8590AC", +"`. c #8292B1", +"'. c #8A95B0", +"]. c #8A99B6", +"[. c #8D9CB8", +"{. c #918DA7", +"}. c #9393A9", +"|. c #9B97A4", +" X c #9A9AAE", +".X c #9393B2", +"XX c #909BB5", +"oX c #909FBA", +"OX c #9A9AB4", +"+X c #9B9BBA", +"@X c #94A2BB", +"#X c #99A5BE", +"$X c #9EA8BF", +"%X c #A39FB5", +"&X c #A2A2B5", +"*X c #A5A5BC", +"=X c #A9A5B7", +"-X c #ABABBC", +";X c #99A6C0", +":X c #9DAAC2", +">X c #A5A5C1", +",X c #A1ADC3", +"X>X+X+X%XU u 6 = X ", +"VX # l x V l Z @XgXS.t.f.j.j.g.J.A.0X8X8X1XX>XL u 5 = O ", +"VXVX n ! 7.t.g.c.c.c.c.z.B.A.%X+X+X.X.XOXB 0 3 = O ", +"VXVXVXVX e <.r.x.n.n.n.n.n.v.x.M.3.=X*X#XOXOXM 9 , = O ", +"VXVXVXVXVXVXVXVXe Q.,.M.Z.Z.Z.Z.Z.Z.Z.C.a.3.{.).!.).b 7 > = O ", +"VXVXVXVXVXVXVXVXq +.Q.>.a.P.P.P.P.P.P.Z.Z.r.2.}.).).i 2 $ = O ", +"VXVXVXVXVXVXVXVX9 O.[ H >.p.I.U.U.I.Z.C.C.Z.w.2.(.!.y 2 $ = O ", +"VXVXVXVXVXVXVXVX4 I m e J -.u.U.T.C.n.l.j.j.b.:.S C > @ + = O ", +"VXVXVXVXVXVXVXVX4 < - - = % -.y.Y.v.v.j.l.j.c.d.j = = = = = X ", +"VXVXVXVXVXVXVXVX s &.0.c.n.k.h.j.l.0.k ", +"VXVXVXVXVXVXVXVX d %.9.c.P.n.c.l.:.g ", +"VXVXVXVXVXVXVXVXVXVXVXVXVXVX f $.5.j.j.j.4.#.o VXVXVXVXVX", +"VXVXVXVXVXVXVXVXVXVXVXVXVXVXVX f k =.;.&.j * VXVXVXVXVX", +"VXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVX * s * VXVXVXVXVXVX", +"VXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVX VXVXVXVXVXVX", +"VXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVX VXVXVXVXVXVXVXVX" +}; --- kdeutils-3.5.8.orig/debian/icons/kcharselect.xpm +++ kdeutils-3.5.8/debian/icons/kcharselect.xpm @@ -0,0 +1,178 @@ +/* XPM */ +static char *kcharselect[] = { +/* columns rows colors chars-per-pixel */ +"32 32 140 2", +" c black", +". c #010101", +"X c #020202", +"o c #030303", +"O c #040404", +"+ c #050505", +"@ c #060606", +"# c #070707", +"$ c #0E0E0E", +"% c #0F0F0F", +"& c #111111", +"* c #131313", +"= c #141414", +"- c #454545", +"; c #474747", +": c #494949", +"> c #4B4B4B", +", c #4C4C4C", +"< c #4D4D4D", +"1 c #4F4F4F", +"2 c #505050", +"3 c #515151", +"4 c #525252", +"5 c #545454", +"6 c #5A5A5A", +"7 c #5D5D5D", +"8 c #5E5E5E", +"9 c #5F5F5F", +"0 c #616161", +"q c #626262", +"w c #636363", +"e c #646464", +"r c #666666", +"t c #676767", +"y c #6D6D6D", +"u c #6E6E6E", +"i c #6F6F6F", +"p c #707070", +"a c #717171", +"s c #727272", +"d c #737373", +"f c #747474", +"g c #8A8A8A", +"h c #8B8B8B", +"j c #8C8C8C", +"k c #8D8D8D", +"l c #8E8E8E", +"z c #8F8F8F", +"x c #909090", +"c c #919191", +"v c #929292", +"b c #939393", +"n c #949494", +"m c #959595", +"M c #969696", +"N c #979797", +"B c #989898", +"V c #999999", +"C c #9A9A9A", +"Z c #9B9B9B", +"A c #9C9C9C", +"S c #9D9D9D", +"D c #9E9E9E", +"F c #9F9F9F", +"G c #A0A0A0", +"H c #A1A1A1", +"J c #A2A2A2", +"K c #A3A3A3", +"L c #A5A5A5", +"P c #AEAEAE", +"I c #B0B0B0", +"U c #B1B1B1", +"Y c #B2B2B2", +"T c #B4B4B4", +"R c #B5B5B5", +"E c #B7B7B7", +"W c #B8B8B8", +"Q c #B9B9B9", +"! c #BABABA", +"~ c #BBBBBB", +"^ c #BCBCBC", +"/ c #BDBDBD", +"( c #BEBEBE", +") c #BFBFBF", +"_ c #C0C0C0", +"` c #C1C1C1", +"' c #C2C2C2", +"] c #C3C3C3", +"[ c #C4C4C4", +"{ c #C5C5C5", +"} c #C6C6C6", +"| c #C7C7C7", +" . c #C8C8C8", +".. c #C9C9C9", +"X. c #CACACA", +"o. c #CBCBCB", +"O. c #CCCCCC", +"+. c #CDCDCD", +"@. c #CECECE", +"#. c #D0D0D0", +"$. c #D2D2D2", +"%. c #D5D5D5", +"&. c #D6D6D6", +"*. c #D7D7D7", +"=. c #D8D8D8", +"-. c #D9D9D9", +";. c #DADADA", +":. c #DBDBDB", +">. c #DCDCDC", +",. c #DDDDDD", +"<. c #DEDEDE", +"1. c #DFDFDF", +"2. c #E0E0E0", +"3. c #E1E1E1", +"4. c #E2E2E2", +"5. c #E3E3E3", +"6. c #E4E4E4", +"7. c #E5E5E5", +"8. c #E6E6E6", +"9. c #E7E7E7", +"0. c #E8E8E8", +"q. c #E9E9E9", +"w. c #EAEAEA", +"e. c #EBEBEB", +"r. c #ECECEC", +"t. c #EDEDED", +"y. c #EEEEEE", +"u. c #EFEFEF", +"i. c #F0F0F0", +"p. c #F1F1F1", +"a. c #F2F2F2", +"s. c #F3F3F3", +"d. c #F4F4F4", +"f. c #F5F5F5", +"g. c #F6F6F6", +"h. c #F7F7F7", +"j. c #F9F9F9", +"k. c #FAFAFA", +"l. c #FBFBFB", +"z. c None", +/* pixels */ +"z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.", +"z.z.z.z.z.z.z.z.z.z.z.z.z.z.O * = # z.z.z.z.z.z.z.z.z.z.z.z.z.z.", +"z.z.z.z.z.z.z.z.z.z.z.z.z.O a O...a O z.z.z.z.z.z.z.z.z.z.z.z.z.", +"z.z.z.z.z.z.z.z.z.z.z.z.O a <.4.4.4.a O z.z.z.z.z.z.z.z.z.z.z.z.", +"z.z.z.z.z.z.z.z.z.z.z.O a 4.7.7.7.7.4.a O z.z.z.z.z.z.z.z.z.z.z.", +"z.z.z.z.z.z.z.z.z.z.O a 4.7.9.<.<.9.7.7.a O z.z.z.z.z.z.z.z.z.z.", +"z.z.z.z.z.z.z.z.z.O f 4.9.t.%.V G <.9.9.7.f O z.z.z.z.z.z.z.z.z.", +"z.z.z.z.z.z.z.z.O a 4.9.9.:.G <.4._ 9.t.9.7.a O z.z.z.z.z.z.z.z.", +"z.z.z.z.z.z.z.O a 4.9.t.:.G <.u.k.t.t.t.t.t.7.f O z.z.z.z.z.z.z.", +"z.z.z.z.z.z.O a 4.9.9.:.L <.t.7.7.4.4.4.<.9.9.7.a O z.z.z.z.z.z.", +"z.z.z.z.z.O a <.9.9.:.G <.s.:.G G G G G F ~ 9.9.7.a z.z.z.z.z.", +"z.z.z.z.O y <.7.9.%.G <.u.t.s.k.s.s.u.t.t.Y 4.9.7.4.a O z.z.z.z.", +"z.z.z. r :.4.7.%.G :.s.4.G u.7.4.4.<.<.<.4.9.9.7.7.<.y O z.z.z.", +"z.z.O 1 L O.4.7.^ ^ u.s.s.Y 9.^ t.l.k.s.u.u.t.9.7.4.:...r O z.z.", +"z. 4 F F G O.7.7...t.s.s.Y t.^ 9.k.s.u.u.u.t.9.7.:...O...t z.", +"z.% b G F V G @.9.9.u.t.u.Y 9.~ 9.k.s.s.u.t.9.7.:.......O.^ = z.", +"z.% l F V V b F @.9.9.t.u.P 7.~ 9.s.s.u.t.t.9.<.[ _ [ ....~ * z.", +"z. 1 V V V b v F @.9.t.t.:.u.4.t.u.u.u.t.9.:._ _ _ [ ..[ t z.", +"z.z.O 1 b b b v l b O.9.9.t.t.u.t.u.t.9.9.:.^ ~ ^ _ [ _ r O z.z.", +"z.z.z. 1 b v l l l V @.9.9.t.9.t.9.t.9.<._ Y ~ ^ ^ ^ 0 z.z.z.", +"z.z.z.z.O : l l l g l b O.9.7.9.7.9.7.:._ ~ ~ Y ~ ~ 0 O z.z.z.z.", +"z.z.z.z.z.O ; g l l v v F O.7.7.7.7.<.[ ^ ~ ~ ~ Y 0 z.z.z.z.z.", +"z.z.z.z.z.z. ; l v v b b G O.4.4.:..._ _ ^ ^ Y 6 O z.z.z.z.z.z.", +"z.z.z.z.z.z.z. : v b b V V G @.:...[ [ _ _ ^ 0 z.z.z.z.z.z.z.", +"z.z.z.z.z.z.z.z.O : b V V V F [ %.....[ [ _ 0 O z.z.z.z.z.z.z.z.", +"z.z.z.z.z.z.z.z.z.O 1 V F F G [ %.O.....[ 0 O z.z.z.z.z.z.z.z.z.", +"z.z.z.z.z.z.z.z.z.z. 1 V F G _ @.O.O...0 O z.z.z.z.z.z.z.z.z.z.", +"z.z.z.z.z.z.z.z.z.z.z.O 4 F G _ @.O...t O z.z.z.z.z.z.z.z.z.z.z.", +"z.z.z.z.z.z.z.z.z.z.z.z.O 4 L ^ @...r O z.z.z.z.z.z.z.z.z.z.z.z.", +"z.z.z.z.z.z.z.z.z.z.z.z.z. 4 Y ^ t O z.z.z.z.z.z.z.z.z.z.z.z.z.", +"z.z.z.z.z.z.z.z.z.z.z.z.z.z.O * = O z.z.z.z.z.z.z.z.z.z.z.z.z.z.", +"z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z." +}; --- kdeutils-3.5.8.orig/debian/icons/kjots.xpm +++ kdeutils-3.5.8/debian/icons/kjots.xpm @@ -0,0 +1,177 @@ +/* XPM */ +static char *kjots[] = { +/* columns rows colors chars-per-pixel */ +"32 32 139 2", +" c #010102", +". c #09090C", +"X c #0E0E1F", +"o c #111115", +"O c #11111D", +"+ c #121223", +"@ c #171728", +"# c #1C1C22", +"$ c #212127", +"% c #23232C", +"& c #2A2A35", +"* c #2B2B47", +"= c #2E2E4B", +"- c #34344C", +"; c #38384E", +": c #323250", +"> c #3C3C52", +", c #424253", +"< c #40405D", +"1 c #4C4C56", +"2 c #4C4C59", +"3 c #525163", +"4 c #575769", +"5 c #5D5D66", +"6 c #595968", +"7 c #5C5C72", +"8 c #6B6B7C", +"9 c #71717D", +"0 c #6F7286", +"q c #717281", +"w c #757590", +"e c #7B7B97", +"r c #7E7F9C", +"t c #7979A9", +"y c #FFB40A", +"u c #E8BB25", +"i c #FFB640", +"p c #FABB41", +"a c #FFC000", +"s c #FFCF00", +"d c #F6C211", +"f c #FCD404", +"g c #FFD50D", +"h c #FFD900", +"j c #F9D911", +"k c #FFE500", +"l c #FFEA00", +"z c #FFF40A", +"x c #FAE325", +"c c #F7ED3E", +"v c #DAD670", +"b c #F9C144", +"n c #E2D86F", +"m c #F7CE68", +"M c #FDC46B", +"N c #FECC7B", +"B c #FFD961", +"V c #F3DA79", +"C c #8585A1", +"Z c #8585AF", +"A c #8D8DAD", +"S c #8787B0", +"D c #8A8AB1", +"F c #9494AB", +"G c #9999AF", +"H c #9393BE", +"J c #979AB9", +"K c #9A9AB2", +"L c #9A9ABE", +"P c #A0A0AE", +"I c #A3A3B7", +"U c #A3A3BB", +"Y c #A9AABB", +"T c #9D9DC0", +"R c #A4A4C3", +"E c #A7A7C8", +"W c #A6A9C2", +"Q c #AAAAC4", +"! c #ABABCA", +"~ c #AFB0C0", +"^ c #AFB2CA", +"/ c #B3B3C3", +"( c #B2B2CD", +") c #BABACA", +"_ c #B5B5D1", +"` c #BABAD3", +"' c #BCC0D5", +"] c #CEC4B8", +"[ c #DBCDAC", +"{ c #DCCDB8", +"} c #E0C783", +"| c #E4D48A", +" . c #EDD488", +".. c #EADF97", +"X. c #F5DE8E", +"o. c #E4D3A3", +"O. c #E8D2A6", +"+. c #E5D3B3", +"@. c #E6D2B8", +"#. c #ECDBB5", +"$. c #F3DAB0", +"%. c #EAE482", +"&. c #EBE68C", +"*. c #E6E29E", +"=. c #F7E086", +"-. c #F8E29D", +";. c #E8E7A7", +":. c #FFE4AC", +">. c #C2C1CE", +",. c #CCC2C2", +"<. c #C2C2D3", +"1. c #C2C2D9", +"2. c #CCCCD4", +"3. c #CBCADB", +"4. c #CDD0DD", +"5. c #D4CDD1", +"6. c #DEDFCF", +"7. c #D6D0D0", +"8. c #D1D1DB", +"9. c #CACAE2", +"0. c #CDD1E5", +"q. c #D3D3E4", +"w. c #D7D9E5", +"e. c #DADAE4", +"r. c #DCDCE9", +"t. c #ECDDC4", +"y. c #E5E1DF", +"u. c #EDE2D8", +"i. c #FFECD2", +"p. c #E2E2EC", +"a. c #EAE6E3", +"s. c #E9E9EE", +"d. c #E6E6F0", +"f. c #EAEAF2", +"g. c #EFEFF8", +"h. c #F2F2F5", +"j. c #F5F5F9", +"k. c #FEFEFE", +"l. c None", +/* pixels */ +"l.l.l.l.l.l.l., H D D A S A S S S A S S S A # l.l.l.l.l.l.l.l.l.", +"l.l.l.l.l.l.l.> 1.f.g.g.f.f.f.f.s.p.p.r.r.Q C O l.l.l.l.l.l.l.l.", +"l.l.l.l.l.l.l.; 0.k.k.k.k.k.k.k.k.k.k.j.g./ 0.r o l.l.l.l.l.l.l.", +"l.l.l.l.l.l.l.; 9.k.k.k.k.k.k.k.k.k.k.j.f.! h.w.e o l.l.l.l.l.l.", +"l.l.l.l.l.l.l.; 9.k.h.s.f.f.f.f.p.r.f.j.f.( j.k.9.w . l.l.l.l.l.", +"l.l.l.l.l.l.l.; 9.k.0._ _ _ _ _ _ ( 3.j.g.! j.k.j.1.7 l.l.l.l.", +"l.l.l.l.l.l.l.; 9.k.h.f.g.s.f.f.d.p.f.j.s.Q k.k.k.j.` 3 l.l.l.l.", +"l.l.l.l.l.l.l.; 9.k.w.<.1.<.1.' ` ` q.k.f.Q h.h.j.j.d.( 3 l.l.", +"l.l.l.l.l.l.l.; 9.k.f.p.p.p.p.p.r.r.d.j.h.Q R E W R R Q L $ l.l.", +"l.l.l.l.l.l.l.- 9.k.r.3.3.3.3.9.1.1.r.j.h.s.p.r.e.w.w.p.R @ l.l.", +"l.l.l.l.l.l.l.: 9.k.k.j.k.j.k.j.j.j.h.g.f.f.d.p.r.r.r.f.E @ l.l.", +"l.l.l.l.l.l.l.- 9.h.3.<.` ` <._ ) _ ( ( _ ( _ ! ! E ! p.E @ l.l.", +"l.l.l.l.l.l.l.- 9.g.h.j.e.g.f.8.h.j.e.>.p.r.q.0.0.q.q.d.E @ l.l.", +"l.l.l.l.l.. l.- 3.h.k.k.2.<.) g.k.k.w.( _ _ ( ! ! ! ! p.E @ l.l.", +"l.l.l.l.$ Y 9 > ` s.k.k.w.e.a.k.k.p.8.r.q.q.q.q.q.q.0.f.R @ l.l.", +"l.l.l.l.6 k.k.Y ^ w.k.k.) >.k.k.h.( _ _ _ _ ( ( ( ! ( s.E @ l.l.", +"l.l.l.l.o >.f.0.#.@.k.k.2.h.k.j.2.p.p.p.d.p.r.r.r.r.r.g.E + l.l.", +"l.l.l.l.l.3 0.$.N u.j.k.k.k.k.) U ` ` ` _ _ _ _ _ _ _ d.E + l.l.", +"l.l.l.l.l.q u.M i.a.k.k.a.k.k.8.K r.r.r.w.w.r.q.q.q.q.g.E + l.l.", +"l.l.# 2 8 ` N u :.t.k.k.] y.k.k.8.I Q ! _ _ _ ( ( ! _ g.E + l.l.", +"l.l.5 k.j.4.p y B #.k.k.o.} h.k.k.8.5.<.p.r.r.r.r.w.w.g.E + l.l.", +"l.l.1 p.f.3.b a j ..k.j.| d [ k.k.j./ W _ ! _ ! ! ! ! g.! + l.l.", +"l.l.. % , ` m f l V k.k.n h u a.k.k.e.8.p.r.r.r.r.r.r.h.E + l.l.", +"l.l.l.l.l.0 t.f z ;.h.d.v l d ,.j.j.e./ ` ` ` _ _ _ _ g.! + l.l.", +"l.l.l.l.l.6 9. .x &.6.;.c j O.W G e.p.p.p.p.p.p.p.r.r.j.! + l.l.", +"l.l.l.l.& 2.e.1.+.X.-.X.V { ( <./ U ` ` ` _ _ _ _ ( _ j.! + l.l.", +"l.l.l.l.q k.p.r J >.5.5./ W F 2.r.Y f.g.g.f.f.f.f.f.f.j.! + l.l.", +"l.l.l.l.& P 2 : _ Y / Y / p.Q K Y W ` ` ` ` _ 3.g.g.g.j.R X l.l.", +"l.l.l.l.l. * 9.8.e.2.w.k.g.p.r.f.s.p.p.p.p.d.h.g.h.j.T + l.l.", +"l.l.l.l.l.l.l.= 3.g.) / j.k.k.k.k.k.k.k.k.k.k.k.k.k.j.k.E + l.l.", +"l.l.l.l.l.l.l.= H E L L R R E R R R R T T T T T T T T T t + l.l.", +"l.l.l.l.l.l.l.. @ O O @ O + X X X X O X X X X X X X X X X l.l." +}; --- kdeutils-3.5.8.orig/debian/icons/kdf-16.xpm +++ kdeutils-3.5.8/debian/icons/kdf-16.xpm @@ -0,0 +1,206 @@ +/* XPM */ +static char *kdf-16[] = { +/* columns rows colors chars-per-pixel */ +"16 16 184 2", +" c black", +". c #000001", +"X c #010000", +"o c #000200", +"O c #000201", +"+ c #020000", +"@ c #000006", +"# c #000600", +"$ c #000801", +"% c #000B03", +"& c #000F00", +"* c #0E0000", +"= c #000111", +"- c #00021A", +"; c #001100", +": c #001300", +"> c #001804", +", c #21310A", +"< c #001748", +"1 c #001C48", +"2 c #001E48", +"3 c #001C4C", +"4 c #004904", +"5 c #006701", +"6 c #006009", +"7 c #006E05", +"8 c #007E10", +"9 c #541201", +"0 c #712003", +"q c #776B7D", +"w c #00539D", +"e c #00549F", +"r c #005EB5", +"t c #0067E4", +"y c #0075ED", +"u c #0079EF", +"i c #007BEF", +"p c #007DF0", +"a c #007EF0", +"s c #007FF0", +"d c #007EF5", +"f c #5E6C98", +"g c #75758F", +"h c #00881E", +"j c #009A0B", +"k c #009F15", +"l c #00AF00", +"z c #00AB0C", +"x c #00A914", +"c c #05B30D", +"v c #00B806", +"b c #00BD05", +"n c #00B809", +"m c #00BA0F", +"M c #00BC0F", +"N c #00B012", +"B c #00B212", +"V c #00B411", +"C c #00B710", +"Z c #01B415", +"A c #00AA3B", +"S c #04825D", +"D c #00C106", +"F c #00C10E", +"G c #00C70D", +"H c #00CA02", +"J c #00C905", +"K c #00CB0C", +"L c #00CD0B", +"P c #00CF0D", +"I c #00C514", +"U c #00D00B", +"Y c #00D40A", +"T c #00DF00", +"R c #00DE07", +"E c #00D908", +"W c #00D80B", +"Q c #00DC0B", +"! c #00DF08", +"~ c #00DE0A", +"^ c #00D324", +"/ c #00E501", +"( c #00E606", +") c #00E308", +"_ c #00E905", +"` c #00EC06", +"' c #00E809", +"] c #00F106", +"[ c #00F503", +"{ c #00FD00", +"} c #00FF02", +"| c #00FF03", +" . c #00A292", +".. c #00B087", +"X. c #1881DB", +"o. c #0088EC", +"O. c #0081FE", +"+. c #0087FE", +"@. c #0088F1", +"#. c #008EFE", +"$. c #009EEB", +"%. c #0098F1", +"&. c #009DF8", +"*. c #059FFF", +"=. c #0DACEA", +"-. c #00A4FF", +";. c #00A6FF", +":. c #00A7FF", +">. c #00A8FF", +",. c #01A8FF", +"<. c #00AAFF", +"1. c #00ADFF", +"2. c #00AEFF", +"3. c #00AFFF", +"4. c #00B0FF", +"5. c #02B2FF", +"6. c #00B7F8", +"7. c #00B5FF", +"8. c #00B6FD", +"9. c #00B7FF", +"0. c #00B9FF", +"q. c #00BAFF", +"w. c #00BCFF", +"e. c #00BDFF", +"r. c #00BEFF", +"t. c #22A5D7", +"y. c #22A2E2", +"u. c #00C2FF", +"i. c #00C3FF", +"p. c #00C5FF", +"a. c #05C3FF", +"s. c #00CEFE", +"d. c #00CEFF", +"f. c #00D0FF", +"g. c #00D1FF", +"h. c #00D2FF", +"j. c #00D4FF", +"k. c #00D5FF", +"l. c #00DEFF", +"z. c #00DFFF", +"x. c #00E4FF", +"c. c #00E9FF", +"v. c #4D83B1", +"b. c #921301", +"n. c #AC3A09", +"m. c #B75A13", +"M. c #856B71", +"N. c #CC2F04", +"B. c #C77820", +"V. c #E85C13", +"C. c #F34F0D", +"Z. c #FF4910", +"A. c #F85200", +"S. c #FF5200", +"D. c #FD5400", +"F. c #FA5E08", +"G. c #FF5711", +"H. c #F96006", +"J. c #F46319", +"K. c #FB651A", +"L. c #FF6719", +"P. c #FF651C", +"I. c #FF6B12", +"U. c #FB701D", +"Y. c #FC731F", +"T. c #FF771C", +"R. c #FF6420", +"E. c #FF7222", +"W. c #FB7A25", +"Q. c #FF7A29", +"!. c #FF7B28", +"~. c #FF7D28", +"^. c #C68827", +"/. c #FF8021", +"(. c #FF8227", +"). c #FE892D", +"_. c #FE8B2C", +"`. c #FF8330", +"'. c #FF8A32", +"]. c #FF9136", +"[. c #FF9534", +"{. c #FA913A", +"}. c gray100", +"|. c None", +/* pixels */ +"|.|.|.|.|.|.t o.7.e @ |.|.|.|.|.", +"|.|.|.|.u @.6.l.c.k.w = |.|.|.|.", +"|.|.|.+.&.s.h.h.s.k.s.r - |.|.|.", +"|.|.|.M.=.l.r.q.r.r.u.1.3 |.|.", +"|.|.D.H.t.x.h.5.:.:.5.:.2 |.|.", +"|.F./.{.y.k.h.a.*.:.7.5.2 |.|.", +"|.).[.(.v.r.p.q.:.1.u.:.< |.|.", +"|.).].T.J.f :.7.5.1.$...h ; |.|.", +"|.W.'.!.I.Y.g #.%. .^ { { z > |.", +"|.Y.!.E.!.`.^.S A T / R ) ' j ", +"|.n.K.L.P.R.B.c b m B V C P n $ ", +"|. 0 C.G.Z.m.Z K P x k C ~ b # ", +"|.|. 9 N.b., I Y ( L B P ] J # ", +"|.|.|. * % 8 ~ [ W F ) { l ", +"|.|.|.|.|.|.|. 6 ( ` W J 5 ; ", +"|.|.|.|.|.|.|.|. 4 v 7 : " +}; --- kdeutils-3.5.8.orig/debian/icons/ktimer.xpm +++ kdeutils-3.5.8/debian/icons/ktimer.xpm @@ -0,0 +1,285 @@ +/* XPM */ +static char *ktimer[] = { +/* columns rows colors chars-per-pixel */ +"32 32 247 2", +" c #000000", +". c #00000B", +"X c #000113", +"o c #00041A", +"O c #01081A", +"+ c #000321", +"@ c #000A25", +"# c #000E2A", +"$ c #051026", +"% c #02112F", +"& c #02143A", +"* c #001F3F", +"= c #0B1B3B", +"- c #021A47", +"; c #081C40", +": c #021F59", +"> c #001E66", +", c #0F2958", +"< c #162A4F", +"1 c #112651", +"2 c #102853", +"3 c #182F5B", +"4 c #1C345E", +"5 c #002366", +"6 c #01266A", +"7 c #072D6E", +"8 c #0C2E6A", +"9 c #042A77", +"0 c #002A7A", +"q c #092775", +"w c #05307B", +"e c #09347C", +"r c #1D3765", +"t c #1F3966", +"y c #1E3C6F", +"u c #153775", +"i c #264273", +"p c #284370", +"a c #002E84", +"s c #03358A", +"d c #0A3C8D", +"f c #0A3D90", +"g c #0C4090", +"h c #094299", +"j c #12418A", +"k c #1B448A", +"l c #1F488E", +"z c #1D4E99", +"x c #124CA3", +"c c #1454B1", +"v c #175AB8", +"b c #1F5FB8", +"n c #2F5B9B", +"m c #3B5582", +"M c #3B5E92", +"N c #295DA9", +"B c #3D659C", +"V c #336CB9", +"C c #386DB5", +"Z c #3C73BC", +"A c #2A6DC5", +"S c #3075CE", +"D c #3975C2", +"F c #3D79D7", +"G c #2176E1", +"H c #4E6D9C", +"J c #4270B1", +"K c #5173A5", +"L c #6462AC", +"P c #7372B6", +"I c #7375B9", +"U c #797BBC", +"Y c #457DC9", +"T c #3A88E2", +"R c #5681B8", +"E c #5E84B6", +"W c #5B84B9", +"Q c #6581AC", +"! c #648BBC", +"~ c #6C8FBD", +"^ c #4782D0", +"/ c #408DDE", +"( c #5C95DC", +") c #5E99D5", +"_ c #5A98DB", +"` c #4694E6", +"' c #4595E8", +"] c #4A9AE9", +"[ c #509EEA", +"{ c #5E9AE2", +"} c #5C9DE9", +"| c #42A8FF", +" . c #56A3EC", +".. c #5CA7ED", +"X. c #6191CA", +"o. c #6398CF", +"O. c #6D9ACE", +"+. c #6395D7", +"@. c #6399D2", +"#. c #7C8FC4", +"$. c #7C99C4", +"%. c #7F9FCB", +"&. c #7690D0", +"*. c #729FD9", +"=. c #6DA4DE", +"-. c #73A1D3", +";. c #70A4DC", +":. c #71ABDE", +">. c #7BA0D1", +",. c #7AABDD", +"<. c #67A9E5", +"1. c #64ACEF", +"2. c #6BA3E3", +"3. c #6CACEB", +"4. c #69AEF1", +"5. c #73ABE4", +"6. c #72AFEA", +"7. c #7BADE4", +"8. c #79ACE9", +"9. c #74B3EC", +"0. c #7DB0E7", +"q. c #75B3F0", +"w. c #7BBEF6", +"e. c #FF7E5D", +"r. c #FF8970", +"t. c #8287C2", +"y. c #868AC4", +"u. c #8C88C0", +"i. c #8E91C8", +"p. c #919DCF", +"a. c #82A0CA", +"s. c #83ABDA", +"d. c #8EABD1", +"f. c #8FAFDB", +"g. c #8BB5DF", +"h. c #92AFD6", +"j. c #9CA2D2", +"k. c #93B4DC", +"l. c #9DB7DC", +"z. c #81AEE0", +"x. c #85B3E4", +"c. c #83B4E9", +"v. c #8CB6E3", +"b. c #8FB8E5", +"n. c #8CBAE9", +"m. c #81B7F2", +"M. c #83BAF1", +"N. c #8ABBF3", +"B. c #94BAE5", +"V. c #93BCEB", +"C. c #9CBCE5", +"Z. c #A2A8D5", +"A. c #A8AAD4", +"S. c #ADB6DD", +"D. c #A8BEDF", +"F. c #A4BEE6", +"G. c #82C1F4", +"H. c #8DC3F3", +"J. c #8ECCFA", +"K. c #9CC0E5", +"L. c #9BC0EB", +"P. c #9FCAEF", +"I. c #93C2F5", +"U. c #91CBF5", +"Y. c #98C4F2", +"T. c #9CCDF3", +"R. c #95D0F9", +"E. c #9BD3F8", +"W. c #A3C4E6", +"Q. c #A3C4EB", +"!. c #A9C1E0", +"~. c #AFCAED", +"^. c #AACBF2", +"/. c #ACD0F5", +"(. c #ABD8F3", +"). c #ABDDFD", +"_. c #B3CEEB", +"`. c #BBC1E3", +"'. c #BFCFE6", +"]. c #B3CFF4", +"[. c #B9D2ED", +"{. c #B4D1F1", +"}. c #B7DEF4", +"|. c #BCD6F2", +" X c #BEDAF5", +".X c #BCD8F8", +"XX c #B4E6FF", +"oX c #BAECFF", +"OX c #D5A9AA", +"+X c #F6AC9C", +"@X c #FFAB90", +"#X c #EEB6AB", +"$X c #F3B5A3", +"%X c #FFBCA5", +"&X c #F3BCB5", +"*X c #FFC1AE", +"=X c #FFC4B2", +"-X c #D5C4C7", +";X c #C3C3E0", +":X c #C1CBE9", +">X c #CBCEE7", +",X c #C9CFE8", +"XP L P u.y.F #.mXAXAXAXAXAXAXAXAXsXcXL. .Z O ", +"u 9.) cXsXSXSXSXSX8X;XzXAXSXSXCX*XlXSXSXSXAXSXSXSXSXzXZXL...C ", +"= 6.) yXzXSXSXSXSXSXSXSXSXSXSXSXVX%XSXSXSXSXSXSXSXSXzXmX8.1.n ", +"O X.<.!.CXmXSXSXSXSXSXSXSXSXSXSXSX*XlXSXSXSXSXSXSXAXzXzX2.4.y ", +" B G.O.AXzXcXAXSXSXSXSXSXSXSXSXSXVX%XSXSXSXSXSXcXpXAX~.3.{ = ", +"DX2 H.) :XpX8XSXSXSXSXSXSXSXSXSXSXSX*XlXSXSXSXSXcX3XpX7.w.J . DX", +"DXX W U.X.mXcXAXSXSXSXSXSXSXSXSXSXSXVX%XSXSXSXSXzXSXQ.9.9.4 DX", +"DXDX1 T.:.h.SXzXSXSXSXSXSXSXSXSXSXSXSX*XlXSXSXzXmXyX5.J.J . DXDX", +"DXDX M XX@.D.AXzXAXmXSXSXSXSXSXSXSXSXVX$XmXcXmXzX7.R.=.= DXDX", +"DXDXDXo E oXo.l.AXvXpXSXSXSXSXAXSXSXSXAX$X-XAXuX7.E.m.t DXDXDX", +"DXDXDXDX# ! 0X,.%. c #8A3C03", +", c #8A3C04", +"< c #8B3C04", +"1 c #8C3D03", +"2 c #8C3C04", +"3 c #893D09", +"4 c #854F3B", +"5 c #895136", +"6 c #945125", +"7 c #BA5603", +"8 c #BB5703", +"9 c #B85404", +"0 c #BD5903", +"q c #BE5A03", +"w c #BE5904", +"e c #BF5C03", +"r c #B05B1E", +"t c #925640", +"y c #9D5F45", +"u c #92634E", +"i c #827A64", +"p c #A87867", +"a c #C05B04", +"s c #C35E03", +"d c #C05C04", +"f c #C25C04", +"g c #C56004", +"h c #E76C02", +"j c #E96F02", +"k c #EA7004", +"l c #EC7202", +"z c #ED7C1B", +"x c #EE7F1D", +"c c #F67C02", +"v c #F77C02", +"b c #FA7B04", +"n c #FA7E02", +"m c #F87D04", +"M c #C27F5F", +"N c #FC8002", +"B c #FE8204", +"V c #F0821C", +"C c #FD8B1B", +"Z c #FE8E1C", +"A c #FD901F", +"S c #EA8125", +"D c #F68D28", +"F c #F88E26", +"G c #FE9123", +"H c #FD9228", +"J c #FC9429", +"K c #FD952A", +"L c #CD885F", +"P c #D3925D", +"I c #CB8A6A", +"U c #E5A065", +"Y c #EDA363", +"T c #EEA366", +"R c #E9AB79", +"E c #F0A566", +"W c #F1A868", +"Q c #F1A86A", +"! c #F3AA6A", +"~ c #F5AD6D", +"^ c #F3AD71", +"/ c #F4AE70", +"( c #F7B070", +") c #FCB573", +"_ c #FDB573", +"` c #C0C000", +"' c #808080", +"] c #838383", +"[ c #8383AE", +"{ c #8A8ABC", +"} c #A9A9A9", +"| c #AEAEAE", +" . c #A9A9E1", +".. c #C29A88", +"X. c #D7A88D", +"o. c #DEBAA6", +"O. c #E0B49C", +"+. c #EEB897", +"@. c #EAB99E", +"#. c #E4B6A6", +"$. c #E3B8A3", +"%. c #FCC58B", +"&. c #F8C6A3", +"*. c #FEDEAC", +"=. c #F8D0BA", +"-. c #C0C0C0", +";. c #C6C6C6", +":. c #D6D6D4", +">. c #C0C0FF", +",. c #FFFFC0", +"<. c #E1E1E1", +"1. c gray100", +"2. c None", +/* pixels */ +"2.2.2.2.2.2.2.2.2.2.2. 2.2.2.2.2.2.2.2.2.2.2.2.2.2.2.2.2.2.", +"2.2.2.2.2.2.2.2.2.2. 2.2.2.2.2.2.2.2.2.2.2.2.2.2.2.2.", +"2.2.2.2.2.2.2.2. 2.2.2.2.2.2.2.2.2.2.2.2.2.2.", +"2.2.2.2.2.2.2.2. { >.>. >.>.{ 2.2.2.2.2.2.2.2.2.2.2.2.2.2.", +"2. 1.1.1.1.1.1.1.1. 2.2.2.2.2.2.2.", +" ,.,.,.,.,.,.,. { >.>.>.>.>.>.{ ` ,.,.,.,.,.,. 2.2.2.2.2.2.", +" ,.1.1.1.1.1.1.1. -.:.1.1.1.1.1.-. 2.2.2.2.2.2.", +" ,.1.1.1.1.1.1.1.1.-.-.-.-.-.-.:.:.1.1.1.1.1.1.-. 2.2.2.2.2.2.", +" ,.1.1.1.1.1.1.1.1.1. 1.1.1.1.1.1.1.1.1.1.1.1.-. 2. 2.2.", +" ,.1.1.1.1.1.1.1.1. 1. 1.1.1.1.1.1.1.1.1.1.1.-. P ^ o. 2.", +" ,.1.>.>.>.>.>.>. ' -.1. >.>.>.>.>.>.>.>.>.1.-.+ / *.z Q X. ", +" ,.1.1.1.1.1.1.1.; ' -.1. 1.1.1.1.1.1.1.1.1.@ ( *.D k 9 6 ", +" ,.1.1.1.1.1. 1.-.; -.-.1. 1.1.1.1.1.1.1.* U *.H b w , 2.", +" ,.1.1.1.1. 1. 1. 1.-.-.-.1. 1.1.1.1.1.* Q *.Z b f 2 2.2.", +" ,.1.>.>. ' -.1. 1.-.' ' -.1. >.>.>.* ) *.G m a , 2.2.2.", +" ,.1.1.1.; ' -.-.-.' ; ' ; 1.1.* Q *.K B f , 2.2.2.2.", +" ,.1.1.1.-.; ' -.-. ; -.; ; -.1.* E *.Z N g 2 2.2.2.2.2.", +" ,.1.1.1.1.' ; ' -.1. 1.' ' ' 1.* _ *.C c w , % 2.2.2.2.2.2.", +" ,.1.>.>.>.>.-.; ' -.1. >.>.>.* ~ *.K v e > $ 2.2.2.2.2.2.", +" ,.1.1.1.1.1.1.-.; ' ; 1.1.* Y *.F n s > # ] 2.2.2.2.2.2.", +" ,.1.1.1.1.1.1.1.-.; ; -.1.* T %.V l 0 1 O | ] 2.2.2.2.2.2.", +" ,.1.1.1.1.1.1.1.1.' ' ' 1.* R *.x j 8 > O | | } 2.2.2.2.2.2.", +" ,.1.>.>.>.>.>.>.>.>.>.>.* $.&.S h 7 3 O [ [ <.} 2.2.2.2.2.2.", +" ,.1.1.1.1.1.1.1.1.1.1.1...=.+.L r > O | | <.<.-. 2.2.2.2.2.2.", +" ,.1.1.1.1.1.1.1.1.1.1.* #.@.M y 4 O | | <.<.1.-. 2.2.2.2.2.2.", +" ,.1.1.1.1.1.1.1.1.1.1.p O.I t = & | | <.<.1.1.-. 2.2.2.2.2.2.", +" ,.1.>.>.>.>.>.>.>.>.>.i u 5 O [ [ . . .>.>.1.-. 2.2.2.2.2.2.", +" ,.1.1.1.1.1.1.1.1.1.- . o | | <.<.<.1.1.1.1.1.-. 2.2.2.2.2.2.", +" ,.1.1.1.1.1.1.1.1.1.X X ;.<.<.<.1.1.1.1.1.1.1.-. 2.2.2.2.2.2.", +" ,.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.-. 2.2.2.2.2.2.", +" -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-. 2.2.2.2.2.2.", +"2. 2.2.2.2.2.2.2." +}; --- kdeutils-3.5.8.orig/debian/icons/kcharselect-16.xpm +++ kdeutils-3.5.8/debian/icons/kcharselect-16.xpm @@ -0,0 +1,279 @@ +/* XPM */ +static char *kcharselect-16[] = { +/* columns rows colors chars-per-pixel */ +"16 16 257 2", +" c black", +". c #010101", +"X c #020202", +"o c gray1", +"O c #040404", +"+ c gray2", +"@ c #060606", +"# c #070707", +"$ c gray3", +"% c #090909", +"& c gray4", +"* c #0B0B0B", +"= c #0C0C0C", +"- c gray5", +"; c #0E0E0E", +": c gray6", +"> c #101010", +", c #111111", +"< c gray7", +"1 c #131313", +"2 c gray8", +"3 c #151515", +"4 c #161616", +"5 c gray9", +"6 c #181818", +"7 c #191919", +"8 c gray10", +"9 c #1B1B1B", +"0 c gray11", +"q c #1D1D1D", +"w c #1E1E1E", +"e c gray12", +"r c #202020", +"t c gray13", +"y c #222222", +"u c #232323", +"i c gray14", +"p c #252525", +"a c gray15", +"s c #272727", +"d c #282828", +"f c gray16", +"g c #2A2A2A", +"h c gray17", +"j c #2C2C2C", +"k c #2D2D2D", +"l c gray18", +"z c #2F2F2F", +"x c gray19", +"c c #313131", +"v c #323232", +"b c gray20", +"n c #343434", +"m c #353535", +"M c gray21", +"N c #373737", +"B c gray22", +"V c #393939", +"C c #3A3A3A", +"Z c gray23", +"A c #3C3C3C", +"S c gray24", +"D c #3E3E3E", +"F c #3F3F3F", +"G c gray25", +"H c #414141", +"J c gray26", +"K c #434343", +"L c #444444", +"P c gray27", +"I c #464646", +"U c gray28", +"Y c #484848", +"T c #494949", +"R c gray29", +"E c #4B4B4B", +"W c #4C4C4C", +"Q c gray30", +"! c #4E4E4E", +"~ c gray31", +"^ c #505050", +"/ c #515151", +"( c gray32", +") c #535353", +"_ c gray33", +"` c #555555", +"' c #565656", +"] c gray34", +"[ c #585858", +"{ c gray35", +"} c #5A5A5A", +"| c #5B5B5B", +" . c gray36", +".. c #5D5D5D", +"X. c gray37", +"o. c #5F5F5F", +"O. c #606060", +"+. c gray38", +"@. c #626262", +"#. c gray39", +"$. c #646464", +"%. c #656565", +"&. c gray40", +"*. c #676767", +"=. c #686868", +"-. c DimGray", +";. c #6A6A6A", +":. c gray42", +">. c #6C6C6C", +",. c #6D6D6D", +"<. c gray43", +"1. c #6F6F6F", +"2. c gray44", +"3. c #717171", +"4. c #727272", +"5. c gray45", +"6. c #747474", +"7. c gray46", +"8. c #767676", +"9. c #777777", +"0. c gray47", +"q. c #797979", +"w. c gray48", +"e. c #7B7B7B", +"r. c #7C7C7C", +"t. c gray49", +"y. c #7E7E7E", +"u. c gray50", +"i. c #808080", +"p. c #818181", +"a. c gray51", +"s. c #838383", +"d. c #848484", +"f. c gray52", +"g. c #868686", +"h. c gray53", +"j. c #888888", +"k. c #898989", +"l. c gray54", +"z. c #8B8B8B", +"x. c gray55", +"c. c #8D8D8D", +"v. c #8E8E8E", +"b. c gray56", +"n. c #909090", +"m. c gray57", +"M. c #929292", +"N. c #939393", +"B. c gray58", +"V. c #959595", +"C. c gray59", +"Z. c #979797", +"A. c #989898", +"S. c gray60", +"D. c #9A9A9A", +"F. c #9B9B9B", +"G. c gray61", +"H. c #9D9D9D", +"J. c gray62", +"K. c #9F9F9F", +"L. c #A0A0A0", +"P. c gray63", +"I. c #A2A2A2", +"U. c gray64", +"Y. c #A4A4A4", +"T. c #A5A5A5", +"R. c gray65", +"E. c #A7A7A7", +"W. c gray66", +"Q. c #A9A9A9", +"!. c #AAAAAA", +"~. c gray67", +"^. c #ACACAC", +"/. c gray68", +"(. c #AEAEAE", +"). c #AFAFAF", +"_. c gray69", +"`. c #B1B1B1", +"'. c #B2B2B2", +"]. c gray70", +"[. c #B4B4B4", +"{. c gray71", +"}. c #B6B6B6", +"|. c #B7B7B7", +" X c gray72", +".X c #B9B9B9", +"XX c gray73", +"oX c #BBBBBB", +"OX c #BCBCBC", +"+X c gray74", +"@X c gray", +"#X c gray75", +"$X c #C0C0C0", +"%X c #C1C1C1", +"&X c gray76", +"*X c #C3C3C3", +"=X c gray77", +"-X c #C5C5C5", +";X c #C6C6C6", +":X c gray78", +">X c #C8C8C8", +",X c gray79", +" c #443319", +", c #4A3519", +"< c #620E08", +"1 c #524C09", +"2 c #7E4C14", +"3 c #6F552B", +"4 c #615739", +"5 c #70582D", +"6 c #7A4E76", +"7 c #8F040A", +"8 c #8E090C", +"9 c #900809", +"0 c #9B0003", +"q c #9B0508", +"w c #9D090C", +"e c #A60507", +"r c #A40508", +"t c #A30A0C", +"y c #AC0B0E", +"u c #A81013", +"i c #B40709", +"p c #B90F1A", +"a c #B41117", +"s c #AD1223", +"d c #AC1D23", +"f c #BC1F25", +"g c #BD1F2E", +"h c #BB1F31", +"j c #AB2028", +"k c #A32433", +"l c #B32229", +"z c #B6292B", +"x c #BD2220", +"c c #BB202C", +"v c #BB2922", +"b c #BA2B2B", +"n c #B22225", +"m c #B22F3C", +"M c #BC2C31", +"N c #B3313A", +"B c #BC3638", +"V c #BD393A", +"C c #A83043", +"Z c #B63B49", +"A c #BD3F42", +"S c #B83B48", +"D c #844C14", +"F c #9C4410", +"G c #9F4B12", +"H c #845B28", +"J c #A94814", +"K c #B24D27", +"L c #B14D28", +"P c #B57239", +"I c #9D5D7D", +"U c #B7474B", +"Y c #BA434A", +"T c #B94D68", +"R c #BB4972", +"E c #B55471", +"W c #A77C4E", +"Q c #B9646A", +"! c #C20D16", +"~ c #CB0C12", +"^ c #C51217", +"/ c #C3121A", +"( c #CD1116", +") c #CD141B", +"_ c #C42D34", +"` c #C72E38", +"' c #D8263A", +"] c #C24A5C", +"[ c #D84C5C", +"{ c #D2525B", +"} c #DE525D", +"| c #CB5260", +" . c #D65D62", +".. c #DA5668", +"X. c #DE5C64", +"o. c #DB5D6A", +"O. c #D85665", +"+. c #DC5F70", +"@. c #C57345", +"#. c #D1666D", +"$. c #D46C62", +"%. c #D96E62", +"&. c #D56562", +"*. c #DD6072", +"=. c #DF6779", +"-. c #DC6C7A", +";. c #D77376", +":. c #DE7B7E", +">. c #E05E6D", +",. c #E15F72", +"<. c #E1606D", +"1. c #EC646E", +"2. c #E36370", +"3. c #E56A73", +"4. c #EA6671", +"5. c #EC6972", +"6. c #E46B7A", +"7. c #E47562", +"8. c #EE7263", +"9. c #E2777B", +"0. c #EB737D", +"q. c #F26A6E", +"w. c #F36A70", +"e. c #F67175", +"r. c #F07F75", +"t. c #F2767C", +"y. c #9A7284", +"u. c #B9578B", +"i. c #BB588A", +"p. c #BC6194", +"a. c #B773A7", +"s. c #B571A8", +"d. c #B875AA", +"f. c #BC7BAB", +"g. c #C96789", +"h. c #C07FA9", +"j. c #E37785", +"k. c #E47B85", +"l. c #EF7C85", +"z. c #EA7481", +"x. c #96851C", +"c. c #BEA820", +"v. c #98804D", +"b. c #988054", +"n. c #958B7D", +"m. c #BC9552", +"M. c #B6A577", +"N. c #DBB915", +"B. c #C1A23C", +"V. c #C8BB36", +"C. c #FB9F12", +"Z. c #F58D21", +"A. c #FC8E25", +"S. c #F98D2A", +"D. c #FB9126", +"F. c #FE9528", +"G. c #FF9F34", +"H. c #FAA218", +"J. c #FFBC00", +"K. c #E0AE2E", +"L. c #F9B13F", +"P. c #D68354", +"I. c #D6885B", +"U. c #CD8775", +"Y. c #CAA940", +"T. c #DAA74A", +"R. c #D0AE69", +"E. c #FFAB45", +"W. c #EDB967", +"Q. c #F3B46C", +"!. c #F4BB6C", +"~. c #F9B96E", +"^. c #FFC001", +"/. c #FFCD0B", +"(. c #FFD209", +"). c #FFC526", +"_. c #FFD12F", +"`. c #FFEE13", +"'. c #FFED1C", +"]. c #FFF413", +"[. c #FFF21B", +"{. c #FFEB23", +"}. c #FFE63F", +"|. c #ECCE45", +" X c #F7D84F", +".X c #EFC578", +"XX c #FFD771", +"oX c #FFD87B", +"OX c #EEEA70", +"+X c #94A7BB", +"@X c #AA8BA6", +"#X c #B28EA4", +"$X c #B8B3DA", +"%X c #ADBDE3", +"&X c #ACD2FF", +"*X c #B6C2F9", +"=X c #B1DAFF", +"-X c #BADBFF", +";X c #BCE2FE", +":X c #CB979F", +">X c #D49B9E", +",X c #C282A9", +" YXYXYXYX", +"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX'.'.XX.X5 YXYXYX", +"YXYXYXYXYXYXYXYXYXYXYXt 8 YXYXYXYXYXYXYXYXYXYX'.'.`.}.W v.5 YXYX", +"YXYXYXYXYXw w YXYXYXw r i - YXYXYXYXYXYXYXYX'.'.'.'./.K.4 R.> YX", +"YXYXYXYXYXw u q YXw r T g./ - YXYXYXYXYXYX'.'.'.'./.J.J.L.gXm. ", +"YXYXYXYXq d pXA 0 t E bXJXh.! - YXYXYXYX'.'.'.'./.J.J.H.A.G.H ", +"YXYXYXYX0 ;.UXDXb C nXUXUXHXh.~ - YX'.'.'.'./.J.J.H.S.F.D ", +"YXYXYXq n AXPXLXNXY >XUXUXUXKX#X! * 1 [.[.'./.J.J.H.S.F.D YX", +"YXYXYX0 :.LXAXAXLXNXV >XUXIXmXmXf.v N.[.'./.J.J.H.S.F.D YXYX", +"YXYXq z dXfXfXAXDXFXdXV >XMXKXUXnX|.].'./.J.J.H.S.F.D YXYXYX", +"YXw q 9.pXpXBXCXCXCXDXiXN :XUXKXOX].'./.J.J.H.S.F.D YXYXYXYX", +"YXq M 5XqXaXdXdXdXdXdXfXeXB :XcX X`./.J.J.H.S.F.D YXYXYXYXYX", +"w t X.6XuXsXsXsXsXsXyXsXdX6Xm U.oX_.J.J.H.S.F.2 YXYXYXYXYXYX", +"w c 0.4X0X8X0XtXuX9XeXtXeXqX4Xz P.hX).C.A.D.J + YXYXYXYXYXYXYX", +"7 v Q..X7.q.w.t.k.3X8X8X9X6XrXr.v I.hXE.Z.W 6 p - YXYXYXYXYXYXYX", +"o B.P @.K { w.<.1.w.0.k.3X7Xk.$.8.v @.M.n.+XzXs.! - YXYXYXYXYXYX", +"& V.< s S >.,.4.q.5.<.q.e.l.#.U &. .d y.-X-XzXvXs.! - YXYXYXYXYX", +". x.c.F V Q.W.8.1.,.w.w.4.,.5.3.-.j.3.M #X;X-XzXcXs.! - YXYXYX", +"YX. # @ B.P @.L ] q.w.5.,.q.w.2.6.0.z.>.l #XzX&X-XxXs.! = YXYX", +"YXYXYX% V.< s Z <.w.4.2.q.q.4.o.4.3.2.=...z @X=X&XvX*X' 9 YXYX", +"YXYXYX. x.c.F S ~.W.%.1.w.2.2.q.4.,.*.<.3.[ d %XxXkXi.( = YXYX", +"YXYXYXYX. # @ c.P @.K { 4.2.q.4.2.+.2.,.+...d jXzXu.~ - YXYX", +"YXYXYXYXYXYX% V.< s S o.,.q.q.>.o.4.2.+.*.` Q lXu.~ - YXYXYX", +"YXYXYXYXYXYX. x.c.F V Q.Q.7.>.>.4.2.+.*...z $Xp.~ - YXYXYXYX", +"YXYXYXYXYXYXYX. # @ B.P @.L ] q.4.+.+.3._ I p.~ - YXYXYXYXYX", +"YXYXYXYXYXYXYXYXYX% V.< s Z >.>.+.+.2.} k R ) - YXYXYXYXYXYX", +"YXYXYXYXYXYXYXYXYX. x.c.F S Q.Q.%.o.5._ g ) - YXYXYXYXYXYXYX", +"YXYXYXYXYXYXYXYXYXYX # @ c.W @.L | } a ^ ; YXYXYXYXYXYXYXYX", +"YXYXYXYXYXYXYXYXYXYXYXYX$ V.< s Z +.h y ; YXYXYXYXYXYXYXYXYX", +"YXYXYXYXYXYXYXYXYXYXYXYX. x.c.G h ' y ; YXYXYXYXYXYXYXYXYXYX", +"YXYXYXYXYXYXYXYXYXYXYXYXYX. $ O : t ; YXYXYXYXYXYXYXYXYXYXYX", +"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX X YXYXYXYXYXYXYXYXYXYXYXYX" +}; --- kdeutils-3.5.8.orig/debian/icons/kregexpeditor.xpm +++ kdeutils-3.5.8/debian/icons/kregexpeditor.xpm @@ -0,0 +1,188 @@ +/* XPM */ +static char *kregexpeditor[] = { +/* columns rows colors chars-per-pixel */ +"32 32 150 2", +" c black", +". c #00003D", +"X c #000043", +"o c #00004B", +"O c #00005C", +"+ c #000062", +"@ c #0A0C7B", +"# c #5F3561", +"$ c #673757", +"% c #662465", +"& c #622570", +"* c #683265", +"= c #5E5A61", +"- c #665258", +"; c #764C70", +": c #794F72", +"> c #0E1180", +", c #171A80", +"< c #1C2085", +"1 c #0720FF", +"2 c #0A22FF", +"3 c #1226FF", +"4 c #1629FF", +"5 c #1B2BFF", +"6 c #2436DF", +"7 c #2B3FDF", +"8 c #117DB9", +"9 c #2769BF", +"0 c #0B57D0", +"q c #0D58D0", +"w c #1243D7", +"e c #1149D5", +"r c #1C49DF", +"t c #0667CB", +"y c #0868CB", +"u c #234EDF", +"i c #2C40DF", +"p c #2A51DF", +"a c #3356DF", +"s c #3B5ADF", +"d c #472391", +"f c #482391", +"g c #503581", +"h c #4757A3", +"j c #4D5DA6", +"k c #566394", +"l c #5F639D", +"z c #4565B5", +"x c #4966B5", +"c c #4D69B5", +"v c #4B6EBC", +"b c #4E70BC", +"n c #5A6BAE", +"m c #536CB5", +"M c #5B6EB1", +"N c #5372BC", +"B c #5C70B5", +"V c #5976BC", +"C c #5D78BC", +"Z c #635D91", +"A c #62659D", +"S c #68689D", +"D c #627BBC", +"F c #687BB8", +"G c #415EDF", +"H c #577CC3", +"J c #5A7DC3", +"K c #587CDB", +"L c #547AE3", +"P c #597FE4", +"I c #2D888E", +"U c #3E95FF", +"Y c #26A8CB", +"T c #2BABCB", +"R c #30ADCD", +"E c #3CADCE", +"W c #3FB0CE", +"Q c #05C8D1", +"! c #0BD3C9", +"~ c #14E6D1", +"^ c #16E8D1", +"/ c #1AEAD1", +"( c #6D82BC", +") c #679EB8", +"_ c #7388BF", +"` c #7FAB96", +"' c #4096FF", +"] c #4599FF", +"[ c #4A9BFF", +"{ c #5598EF", +"} c #509FFF", +"| c #4FAACA", +" . c #44B2CE", +".. c #54A9D5", +"X. c #5CABD6", +"o. c #53A0FF", +"O. c #55A8F1", +"+. c #5AA4FF", +"@. c #6482C3", +"#. c #6A86C3", +"$. c #6D88C3", +"%. c #668FD1", +"&. c #6790D1", +"*. c #6192DD", +"=. c #6B92D1", +"-. c #7289C3", +";. c #7296D1", +":. c #7799D1", +">. c #7D9CD1", +",. c #7FB0CE", +"<. c #63A9FF", +"1. c #6BADFF", +"2. c #6FB0FF", +"3. c #73B2FF", +"4. c #7AB5FF", +"5. c #7EB8FF", +"6. c #A92D34", +"7. c #845A3F", +"8. c #904931", +"9. c #9A5231", +"0. c #9E7334", +"q. c #ADA139", +"w. c #A1B03A", +"e. c #8A9457", +"r. c #8E9E56", +"t. c #828D62", +"y. c #9CA542", +"u. c #A2BF62", +"i. c #ACC543", +"p. c #BEC840", +"a. c #A5C063", +"s. c #C4D238", +"d. c #C0C940", +"f. c #CEE640", +"g. c #D0E740", +"h. c #D3E940", +"j. c #83AD96", +"k. c #89B196", +"l. c #83A0D1", +"z. c #88A2D1", +"x. c #83BAFF", +"c. c #89BEFF", +"v. c #8DC0FF", +"b. c #92C3FF", +"n. c #99C6FF", +"m. c #9EC9FF", +"M. c #A3CCFF", +"N. c #ABD0FF", +"B. c #B1D4FF", +"V. c None", +/* pixels */ +" o O + + + O + + + O + + O + O + O + + O + + O + O + O + + o ", +"o < F -._ $.#.@.D #.J J J J H H H H J H J J J @.@.#.#.#._ n > o ", +"+ _ B.N.M.m.n.n.c.c.c.x.c.x.4.x.x.4.5.5.x.c.c.c.b.n.m.M.N.N.j + ", +"+ z.N.M.m.n.b.c.x.x.x.4.4.4.3.3.3.3.4.4.4.5.5.x.c.c.b.n.m.M.B + ", +"+ l.M.m.n.b.c.x.x.4.4.3.2.2.1.1.1.1.1.3.3.3.4.4.x.x.c.b.n.M.M + ", +"+ >.m.n.b.c.x.5.4.2.1.1.1.<.<.<.<.<.<.<.1.1.3.3.4.x.c.c.b.n.N + ", +"+ >.n.b.c.c.| . . . .E O.+.+.+.o.+.) ` ` j.j.k.k.z.x.x.c.n.m + ", +"+ :.n.c.c.X./ / / ^ ^ ^ R } } } } } i.g.g.h.h.h.h.a.4.x.x.c.N + ", +"+ ;.b.x.x.../ / / ^ ^ ^ T [ [ ] ] ] i.f.f.h.h.h.h.a.3.4.5.v.c + ", +"+ ;.c.x.4.../ / / ^ ^ ~ Y ' ' ' U U i.f.f.f.h.h.h.a.1.4.5.x.c + ", +"+ =.K G G 9 ! ! ! ! ! ! 8 u r r r r w.s.s.s.s.s.s.r.a s s L c + ", +"+ ;.i 5 5 r ! Q Q Q Q Q y 2 2 2 2 1 y.p.p.p.d.d.s.t.5 5 5 6 c + ", +"+ =.i 5 5 e Q Q Q Q Q Q t 1 1 1 1 2 y.p.p.p.p.d.p.t.4 5 5 6 c + ", +"+ =.i 5 5 e Q Q Q Q Q Q t 1 1 1 1 1 y.p.p.p.p.d.p.t.5 4 5 6 z + ", +"+ %.7 5 5 e Q Q Q I - - $ % % % % % 8.9.9.q.p.d.p.t.4 5 5 6 z + ", +"+ %.7 5 5 e Q Q Q = 6.6.6.6.6.6.6.6.6.6.6.0.p.d.p.t.4 5 5 6 z + ", +"+ %.7 5 5 e Q Q Q = 6.6.6.6.6.6.6.6.6.6.6.0.p.p.p.t.4 5 5 6 z + ", +"+ =.7 5 5 w Q Q Q = 6.6.6.6.6.6.6.6.6.6.6.7.e.e.e.k 4 4 5 6 z + ", +"+ =.7 5 5 5 e q 0 # 6.6.6.6.6.6.6.6.6.6.6.d 2 3 3 4 4 5 5 6 z + ", +"+ %.7 5 5 5 4 4 3 & 6.6.6.6.6.6.6.6.6.6.6.d 3 3 3 4 4 5 5 6 z + ", +"+ =.P s a a a p u * 6.6.6.6.6.6.6.6.6.6.6.& u u p p a a s L z + ", +"+ =.x.5.3.1.<.+.o.; 6.6.6.6.6.6.6.6.6.6.6.k ] [ o.+.<.1.4.5.c + ", +"+ =.c.5.4.3.<.<.+.; 6.6.6.6.6.6.6.6.6.6.6.Z [ o.+.<.1.2.4.x.x + ", +"+ :.c.x.4.3.1.<.<.: 6.6.6.6.6.6.6.6.6.6.6.l o.+.+.1.1.4.5.x.c + ", +"+ :.c.c.5.4.3.1.<.*.S S A A A l l l A A A { +.<.1.1.3.4.5.c.m + ", +"+ :.n.c.x.5.4.3.1.<.<.+.+.o.o.o.} o.} o.+.+.<.<.1.3.5.5.c.b.m + ", +"+ >.n.b.c.c.4.4.3.1.<.<.+.+.+.+.+.+.+.<.+.<.1.1.3.4.5.c.c.b.N + ", +"+ >.M.n.n.c.x.5.4.3.3.1.1.<.<.<.<.<.<.<.1.2.3.4.4.5.c.c.n.m.m + ", +"+ l.M.M.n.b.c.x.5.5.4.4.2.1.2.1.1.1.1.3.3.3.4.5.5.c.c.b.n.M.M + ", +"+ ( N.M.m.n.n.c.c.5.5.5.4.4.4.3.3.3.4.3.4.5.5.x.c.c.n.n.m.M.h + ", +"o @ M D D D C V V N N N v v v v v v v v N v N N V C C D D j @ o ", +"V.. O O O O O O O O O O O O O O O O O O O O O O O O O O O O X V." +}; --- kdeutils-3.5.8.orig/debian/icons/kjots-16.xpm +++ kdeutils-3.5.8/debian/icons/kjots-16.xpm @@ -0,0 +1,198 @@ +/* XPM */ +static char *kjots-16[] = { +/* columns rows colors chars-per-pixel */ +"16 16 176 2", +" c black", +". c #000001", +"X c #040405", +"o c #101017", +"O c #121217", +"+ c #18181F", +"@ c #1E1E26", +"# c #20202F", +"$ c #22222E", +"% c #22222F", +"& c #24242B", +"* c #24242F", +"= c #242430", +"- c #252530", +"; c #2A2A34", +": c #2A2A3C", +"> c #31313C", +", c #4F515B", +"< c #5A5B69", +"1 c #5F5E6F", +"2 c #5A5A70", +"3 c #5D5D72", +"4 c #5D5D73", +"5 c #5E5E73", +"6 c #5F5F74", +"7 c #5E5E77", +"8 c #606075", +"9 c #616176", +"0 c #636376", +"q c #636377", +"w c #63637C", +"e c #646479", +"r c #66667A", +"t c #66667B", +"y c #67677A", +"u c #6C6D76", +"i c #68687B", +"p c #7E7E85", +"a c #FABC21", +"s c #F2D829", +"d c #F8D645", +"f c #E5CD7B", +"g c #E8CE71", +"h c #E9D769", +"j c #F6DC6B", +"k c #F9E945", +"l c #808088", +"z c #8D8EA5", +"x c #9E9FAC", +"c c #A0A0B6", +"v c #A2A3B5", +"b c #A7A7C4", +"n c #AFADC2", +"m c #B6B6C7", +"M c #B0B0CA", +"N c #B3B4CB", +"B c #B7B9CD", +"V c #BABACB", +"C c #BABACE", +"Z c #BDBDCE", +"A c #B9B9D1", +"S c #B8B8D2", +"D c #BABAD4", +"F c #BCBCD2", +"G c #BDBDD3", +"H c #BFBED1", +"J c #BEBED5", +"K c #BFBFD7", +"L c #C0B8AE", +"P c #EADB86", +"I c #F7CA85", +"U c #EDD8BB", +"Y c #EDE1A3", +"T c #FAE2BD", +"R c #C0C0D1", +"E c #C1C1D5", +"W c #C2C2D7", +"Q c #C6C5D2", +"! c #C1C1D9", +"~ c #C2C2D9", +"^ c #C4C4DB", +"/ c #C5C5DA", +"( c #C5C5DB", +") c #C6C6D8", +"_ c #C4C4DC", +"` c #C6C6DC", +"' c #C6C6DD", +"] c #C7C7DC", +"[ c #C8C8D9", +"{ c #CACAD9", +"} c #C8C8DD", +"| c #C9C9DD", +" . c #CACADE", +".. c #CBCBDF", +"X. c #CCCCDF", +"o. c #CDCDDF", +"O. c #CFCFDE", +"+. c #D0CDCC", +"@. c #D2D2DB", +"#. c #D0D0DF", +"$. c #CDCDE1", +"%. c #CECEE1", +"&. c #CFCFE2", +"*. c #CECEE4", +"=. c #D1D1E1", +"-. c #D0D0E2", +";. c #D0D0E3", +":. c #D1D1E2", +">. c #D3D3E0", +",. c #D2D2E2", +"<. c #D2D2E3", +"1. c #D3D3E4", +"2. c #D4D4E0", +"3. c #D4D4E5", +"4. c #D5D5E6", +"5. c #D6D6E5", +"6. c #D7D7E6", +"7. c #D4D4EA", +"8. c #D7D7EC", +"9. c #D8D8E4", +"0. c #D8D8E6", +"q. c #D9D9E6", +"w. c #D9D9E7", +"e. c #DADAE7", +"r. c #DBDBE7", +"t. c #DADAEE", +"y. c #DBDBEE", +"u. c #DBDBEF", +"i. c #DCDCE8", +"p. c #DDDDE8", +"a. c #DDDDE9", +"s. c #DCDCEF", +"d. c #DEDEF0", +"f. c #DFDFF0", +"g. c #E0D9C8", +"h. c #E9E1DD", +"j. c #FAF2DA", +"k. c #E2E2EB", +"l. c #E0E0EC", +"z. c #E3E3ED", +"x. c #E4E4EC", +"c. c #E4E4EF", +"v. c #E5E5EF", +"b. c #E7E7EE", +"n. c #E8E4E7", +"m. c #EDEAEB", +"M. c #EBEBF0", +"N. c #EAEAF2", +"B. c #EAEAF3", +"V. c #EBEBF4", +"C. c #ECECF1", +"Z. c #EEEEF6", +"A. c #EDEDF9", +"S. c #EEEEFA", +"D. c #F0F1F4", +"F. c #F0F1F5", +"G. c #F4F4F7", +"H. c #F1F1FA", +"J. c #F1F1FB", +"K. c #F1F2F8", +"L. c #F1F1FC", +"P. c #F2F2FC", +"I. c #F2F7FA", +"U. c #F7F7FC", +"Y. c #F7F7FF", +"T. c #F8F8F8", +"R. c #F8F8FA", +"E. c #F9F9FB", +"W. c #F8FAFB", +"Q. c #F9F9FF", +"!. c #F8FAFE", +"~. c #F9FBFE", +"^. c #FBFBFF", +"/. c #FCFBFB", +"(. c gray100", +"). c None", +/* pixels */ +").).).- M J J F A A b > ).).).).", +").).).- z.(.(.(.(.(.6.C ; ).).).", +").).).% a.c.6.q.<.B.>.(.F @ ).).", +").).).- p.a.>.>.$.B.$.C.U.v + ).", +").).).* p.v.q.r.7.V.z.[ [ *.7 ).", +").).).% 5.v.r.q.>.>.6.<.} a.i ).", +").).X % #.E.#.5.G.[ ! J D 7.y ).", +"). p v Q /.@.E.b.} ' ^ ! 8.y ).", +").)., h.U E.F.C.! >...} } y.y ).", +").& u I T E.m.F.Z E ' ' ! y.y ).", +").x n.a j !.f j.F.C ^ [ ! y.y ).", +").O 1 d k I.s g !.>.} } ' d.y ).", +").).< g.P Y h L B >.$...^ d.y ).", +"). l z n +.H N N $.>.6.N.L.y ).", +").). % ' ^ P.U.H.H.A.A.U.!.w ).", +").).).o 2 4 q q q 6 6 4 7 7 : )." +}; --- kdeutils-3.5.8.orig/debian/cdbs/buildvars.mk +++ kdeutils-3.5.8/debian/cdbs/buildvars.mk @@ -0,0 +1,86 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2002,2003 Colin Walters +# Description: Defines some useful variables, but no rules +# +# 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, 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., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class + +ifndef _cdbs_rules_buildvars +_cdbs_rules_buildvars = 1 + +CDBS_VERSION = something + +# Common useful variables +DEB_SOURCE_PACKAGE := $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':')) +DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ') +DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-) +DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//') +DEB_ISNATIVE := $(shell dpkg-parsechangelog | egrep '^Version:' | perl -ne 'print if not /^Version:\s*.*-/;') + +# Split into arch/indep packages +ifneq ($(DEB_INDEP_PACKAGES),cdbs) +DEB_INDEP_PACKAGES := $(filter-out $(DONT_BUILD), $(strip $(shell $(_cdbs_scripts_path)/list-packages indep))) +DEB_ARCH_PACKAGES := $(filter-out $(DONT_BUILD), $(filter-out $(DEB_INDEP_PACKAGES),$(strip $(shell $(_cdbs_scripts_path)/list-packages same)))) +endif +# Split into normal and udeb packages +ifeq ($(DEB_UDEB_PACKAGES),) +DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES))) +DEB_UDEB_PACKAGES = $(filter-out $(DONT_BUILD),$(filter %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES))) +else +DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES), $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES))) +endif +# Too much bother for now. If someone complains we'll fix it. +#DEB_ARCH_UDEB_PACKAGES = $(filter %-udeb, $(DEB_ARCH_PACKAGES)) +#DEB_INDEP_UDEB_PACKAGES = $(filter %-udeb, $(DEB_INDEP_PACKAGES)) +# A handy list of every package, udeb or not +DEB_ALL_PACKAGES = $(filter-out $(DONT_BUILD),$(DEB_PACKAGES) $(DEB_UDEB_PACKAGES)) +DEB_INDEP_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_INDEP_PACKAGES))) +DEB_ARCH_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_ARCH_PACKAGES))) + +DEB_DBG_PACKAGES = $(filter-out $(DONT_BUILD), $(filter %-dbg, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES))) + +# Some support for srcdir != builddir builds. +# These are relative to the root of the package +DEB_SRCDIR ?= . +DEB_BUILDDIR ?= $(strip $(DEB_SRCDIR)) + +# Miscellaneous bits +DEB_ARCH = $(shell dpkg --print-architecture) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM) +DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU) +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) +DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM) +DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU) +DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) +DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU) +DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS) + +ifeq ($(words $(DEB_ALL_PACKAGES)),1) + DEB_DESTDIR = $(CURDIR)/debian/$(strip $(DEB_ALL_PACKAGES))/ +else + DEB_DESTDIR = $(CURDIR)/debian/tmp/ +endif + +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.23-1.1) + +endif --- kdeutils-3.5.8.orig/debian/cdbs/versions.pl +++ kdeutils-3.5.8/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/-[^-]+$//; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "KDE-Version3=$version3\n"; +print "KDE-Version2=$version2\n"; +print "KDE-Next-Version3=$version3_next\n"; +print "KDE-Next-Version2=$version2_next\n"; --- kdeutils-3.5.8.orig/debian/cdbs/debian-qt-kde.mk +++ kdeutils-3.5.8/debian/cdbs/debian-qt-kde.mk @@ -0,0 +1,109 @@ +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# Note: This _must_ be included before autotools.mk, or it won't work. +common-configure-arch common-configure-indep:: debian/stamp-cvs-make +debian/stamp-cvs-make: + if test -n "$(DEB_KDE_CVS_MAKE)" -a ! -f configure; then \ + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; \ + fi + touch debian/stamp-cvs-make + +include /usr/share/cdbs/1/class/kde.mk$(_cdbs_makefile_suffix) +include debian/cdbs/uploaders.mk + +DEB_PATCHDIRS := debian/patches/common debian/patches + +DEB_KDE_ENABLE_FINAL := yes +DEB_INSTALL_DOCS_ALL := + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V +DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + install -p -D -m644 debian/$(cdbs_curpkg).presubj \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ + fi + +binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: + set -e; \ + for doc in `cd $(DEB_DESTDIR)/usr/share/doc/kde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \ + meinproc $(DEB_DESTDIR)/usr/share/doc/kde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \ + done + +clean:: + if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ + cd $(DEB_SRCDIR); \ + find . -name Makefile.in -print | \ + xargs --no-run-if-empty rm -f; \ + rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ + configure configure.files configure.in stamp-h.in \ + subdirs; \ + fi + rm -f debian/stamp-cvs-make + +endif --- kdeutils-3.5.8.orig/debian/cdbs/team-members +++ kdeutils-3.5.8/debian/cdbs/team-members @@ -0,0 +1,16 @@ +Sune Vuorela +Ana Beatriz Guerrero Lopez +Fathi Boudra +Modestas Vainius +Josh Metzler +Isaac Clerencia +Adeodato Simó +Adeodato Simo +Christopher Martin +Daniel Schepler +Sarah Hobbs +Nacho Barrientos Arias +Ricardo Javier Cardenes Medina +Ricardo Cardenes +Armin Berres +Francesco Pedrini --- kdeutils-3.5.8.orig/debian/cdbs/uploaders.mk +++ kdeutils-3.5.8/debian/cdbs/uploaders.mk @@ -0,0 +1,29 @@ + +MAINTAINER=Debian Qt/KDE Maintainers +UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//') + + +debian/control.tmp: + @if [ ! -e debian/control.in ] ; then \ + echo "this package is not yet prepared for using automatic update of uploaders"; \ + echo "Please do so."; \ + exit 1; \ + fi + @sed 's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in > debian/control.tmp + +check-uploaders: debian/control.tmp + @if ! diff -q debian/control debian/control.tmp ; then \ + echo "WARNING:: Control file differs from manually generated one" ; \ + echo "WARNING:: Please update it manually and check it afterwards" ; \ + echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\ + echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\ + fi + + +clean:: + rm -f debian/control.tmp + +update-uploaders: debian/control.tmp + @mv -f debian/control.tmp debian/control + +makebuilddir:: check-uploaders --- kdeutils-3.5.8.orig/debian/man/kcalc.1 +++ kdeutils-3.5.8/debian/man/kcalc.1 @@ -0,0 +1,185 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH KCALC 1 "June 2006" "K Desktop Environment" "KDE Calculator" +.SH NAME +kcalc +\- KDE Calculator +.SH SYNOPSIS +\fBkcalc\fP [Qt\-options] [KDE\-options] +.SH DESCRIPTION +\fBKCalc\fP is a scientific calculator for KDE. In addition to the usual functionality offered by most scientific calculators, \fBKCalc\fP offers a number of features: +.br +.IP " \-" +\fBKCalc\fP provides trigonometric functions, logic operations, and it is able to do statistical calculations. +.IP " \-" +\fBKCalc\fP allows you to cut and paste numbers from/into its display. +.IP " \-" +\fBKCalc\fP features a results\-stack which lets you conveniently recall previous results. +.IP " \-" +You can configure \fBKCalc\fP's display colors and font. +.IP " \-" +You can configure \fBKCalc\fP's precision and the number of digits after the period. +.IP " \-" +\fBKCalc\fP offers a great number of useful key\-bindings, which make using \fBKCalc\fP without using a pointing device easy. +.PP +Hint: Pressing (and holding) the Ctrl\-key, displays on every button, the corresponding key\-binding. + +.SH OPTIONS +.SS Generic options: +.TP +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-kde +Show KDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v, \-\-version +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options +.SS +.SS Qt options: +.TP +.B \-\-display +Use the X\-server display 'displayname' +.TP +.B \-\-session +Restore the application for the given 'sessionId' +.TP +.B \-\-cmap +Causes the application to install a private color +map on an 8\-bit display +.TP +.B \-\-ncols +Limits the number of colors allocated in the color +cube on an 8\-bit display, if the application is +using the QApplication::ManyColor color +specification +.TP +.B \-\-nograb +tells Qt to never grab the mouse or the keyboard +.TP +.B \-\-dograb +running under a debugger can cause an implicit +\-nograb, use \-dograb to override +.TP +.B \-\-sync +switches to synchronous mode for debugging +.TP +.B \-\-fn, \-\-font +defines the application font +.TP +.B \-\-bg, \-\-background +sets the default background color and an +application palette (light and dark shades are +calculated) +.TP +.B \-\-fg, \-\-foreground +sets the default foreground color +.TP +.B \-\-btn, \-\-button +sets the default button color +.TP +.B \-\-name +sets the application name +.TP +.B \-\-title +sets the application title (caption) +.TP +.B \-\-visual TrueColor +forces the application to use a TrueColor visual on +an 8\-bit display +.TP +.B \-\-inputstyle <inputstyle> +sets XIM (X Input Method) input style. Possible +values are onthespot, overthespot, offthespot and +root +.TP +.B \-\-im <XIM server> +set XIM server +.TP +.B \-\-noxim +disable XIM +.TP +.B \-\-reverse +mirrors the whole layout of widgets +.SS +.SS KDE options: +.TP +.B \-\-caption <caption> +Use 'caption' as name in the titlebar +.TP +.B \-\-icon <icon> +Use 'icon' as the application icon +.TP +.B \-\-miniicon <icon> +Use 'icon' as the icon in the titlebar +.TP +.B \-\-config <filename> +Use alternative configuration file +.TP +.B \-\-dcopserver <server> +Use the DCOP Server specified by 'server' +.TP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps +.TP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager +.TP +.B \-\-style <style> +sets the application GUI style +.TP +.B \-\-geometry <geometry> +sets the client geometry of the main widget \- see man X for the argument format + +.SH FILES +.TP +.I ~/.kde/share/config/kcalcrc +\fBkcalc\fP configuration file + +.SH SEE ALSO +Full user documentation is available through the KDE Help Center. You can also enter the URL +.BR help:/kcalc/ +directly into konqueror or you can run +.BR "khelpcenter help:/kcalc/" +from the command\-line. +.br +.SH AUTHORS +.nf +Klaus Niederkruger <kniederk@math.uni\-koeln.de> +.br +Bernd Johannes Wuebben <wuebben@kde.org> +.br +Evan Teran <eteran@alum.rit.edu> +.br +Espen Sand <espen@kde.org> +.br +Chris Howells <howells@kde.org> +.br +Aaron J. Seigo <aseigo@olympusproject.org> +.br +Charles Samuels <charles@altair.dhs.org> +.br +René Mérou <ochominutosdearco@yahoo.es> +.br + +.br +.fi +Please use http://bugs.kde.org to report bugs; do not mail the authors directly. +.PP +This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. --- kdeutils-3.5.8.orig/debian/man/kedit.1 +++ kdeutils-3.5.8/debian/man/kedit.1 @@ -0,0 +1,165 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH KEDIT 1 "June 2006" "K Desktop Environment" "KDE text editor" +.SH NAME +kedit +\- KDE text editor +.SH SYNOPSIS +\fBkedit\fP [Qt\-options] [KDE\-options] [options] \fIfile\fP +.SH DESCRIPTION +\fBKEdit\fP is a text editor for the KDE Desktop. It is a small editor which can be used with \fBKonqueror\fP for text and configuration file browsing. \fBKEdit\fP also serves well for creating small plain text documents. It is not meant to be a programmers editor, in particular it is not meant to replace any of the more powerful editors such as \fBKate\fP, \fBXEmacs\fP or \fBEmacs\fP. +.sp 1 +\fBKEdit\fP's functionality will intentionally remain rather limited to ensure a reasonably fast start. +.SH OPTIONS +.SS +.SS Arguments: +.TP +.B file +File or URL to open +.SS Options: +.TP +.B \-\-encoding <encoding> +Encoding to use for the following documents +.SS +.SS Generic options: +.TP +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-kde +Show KDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v, \-\-version +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options +.SS +.SS Qt options: +.TP +.B \-\-display <displayname> +Use the X-server display 'displayname' +.TP +.B \-\-session <sessionId> +Restore the application for the given 'sessionId' +.TP +.B \-\-cmap +Causes the application to install a private color +map on an 8\-bit display +.TP +.B \-\-ncols <count> +Limits the number of colors allocated in the color +cube on an 8\-bit display, if the application is +using the QApplication::ManyColor color +specification +.TP +.B \-\-nograb +tells Qt to never grab the mouse or the keyboard +.TP +.B \-\-dograb +running under a debugger can cause an implicit +\-nograb, use \-dograb to override +.TP +.B \-\-sync +switches to synchronous mode for debugging +.TP +.B \-\-fn, \-\-font <fontname> +defines the application font +.TP +.B \-\-bg, \-\-background <color> +sets the default background color and an +application palette (light and dark shades are +calculated) +.TP +.B \-\-fg, \-\-foreground <color> +sets the default foreground color +.TP +.B \-\-btn, \-\-button <color> +sets the default button color +.TP +.B \-\-name <name> +sets the application name +.TP +.B \-\-title <title> +sets the application title (caption) +.TP +.B \-\-visual TrueColor +forces the application to use a TrueColor visual on +an 8\-bit display +.TP +.B \-\-inputstyle <inputstyle> +sets XIM (X Input Method) input style. Possible +values are onthespot, overthespot, offthespot and +root +.TP +.B \-\-im <XIM server> +set XIM server +.TP +.B \-\-noxim +disable XIM +.TP +.B \-\-reverse +mirrors the whole layout of widgets +.SS +.SS KDE options: +.TP +.B \-\-caption <caption> +Use 'caption' as name in the titlebar +.TP +.B \-\-icon <icon> +Use 'icon' as the application icon +.TP +.B \-\-miniicon <icon> +Use 'icon' as the icon in the titlebar +.TP +.B \-\-config <filename> +Use alternative configuration file +.TP +.B \-\-dcopserver <server> +Use the DCOP Server specified by 'server' +.TP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps +.TP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager +.TP +.B \-\-style <style> +sets the application GUI style +.TP +.B \-\-geometry <geometry> +sets the client geometry of the main widget \- see man X for the argument format +.SS + +.SH SEE ALSO +\fBkate\fP(1), \fBkwrite\fP(1) +.sp 1 +Full user documentation is available through the KDE Help Center. You can also enter the URL +.BR help:/kedit/ +directly into konqueror or you can run +.BR "khelpcenter help:/kedit/" +from the command\-line. +.br +.SH AUTHORS +.nf +Bernd Johannes Wuebben <wuebben@kde.org> +.br + +.br +.fi +Please use http://bugs.kde.org to report bugs; do not mail the author directly. +.PP +This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. --- kdeutils-3.5.8.orig/debian/man/superkaramba.1 +++ kdeutils-3.5.8/debian/man/superkaramba.1 @@ -0,0 +1,51 @@ +.TH SUPERKARAMBA 1 "juli 27, 2003" +.SH NAME +superkaramba \- a program based on karamba improving the eyecandy of KDE. +.SH SYNOPSIS +.B superkaramba +[\fIQt-options\fR] [\fIKDE-options\fR] \fIfile\fR +.SH DESCRIPTION +This manual page documents briefly the +.B superkaramba +command. +This manual page was written for the Debian distribution +because the original program does not have a manual page. +Instead, it has documentation in the GNU Info format; see below. +.PP +.B Superkaramba +is a tool based on karamba that allows anyone to easily create and run little +interactive widgets on a KDE desktop. Widgets are defined in a simple text file +and can be augmented with Python code to make them interactive. +.SH OPTIONS +A summary of options are included below. +.TP +.B \-\-help +Show summary of options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-kde +Show KDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v, \-\-version +Show version of program. +.TP +.B \-\-license +Show license information +.TP +.B file +A required argument 'file' +.SH AUTHOR +.B Superkaramba +was written by Adam Geitgey <adam@rootnode.org> and Hans Karlsson +<d98hk@efd.lth.se>. +.PP +This manual page was written by Jean-Michel Kelbert <kelbert@debian.org>, +for the Debian project (but may be used by others). --- kdeutils-3.5.8.orig/debian/man/kdf.1 +++ kdeutils-3.5.8/debian/man/kdf.1 @@ -0,0 +1,154 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH KDF 1 "June 2006" "K Desktop Environment" "KDE free disk space utility" +.SH NAME +kdf +\- KDE free disk space utility +.SH SYNOPSIS +\fBkdf\fP [Qt\-options] [KDE\-options] +.SH DESCRIPTION +\fBKDiskFree\fP displays available file devices (hard drive partitions, floppy and CD drives, etc.) along with information on their capacity, free space, type and mount point. It also allows you to mount and unmount drives and view them in a file manager. +.sp 1 +\fBKDiskFree\fP is similar to \fBkwikdisk\fP and is useful if you want to keep a \fBKDiskFree\fP window available at all times. +.SH OPTIONS +.SS Generic options: +.TP +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-kde +Show KDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v, \-\-version +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options +.SS +.SS Qt options: +.TP +.B \-\-display <displayname> +Use the X-server display 'displayname' +.TP +.B \-\-session <sessionId> +Restore the application for the given 'sessionId' +.TP +.B \-\-cmap +Causes the application to install a private color +map on an 8\-bit display +.TP +.B \-\-ncols <count> +Limits the number of colors allocated in the color +cube on an 8\-bit display, if the application is +using the QApplication::ManyColor color +specification +.TP +.B \-\-nograb +tells Qt to never grab the mouse or the keyboard +.TP +.B \-\-dograb +running under a debugger can cause an implicit +\-nograb, use \-dograb to override +.TP +.B \-\-sync +switches to synchronous mode for debugging +.TP +.B \-\-fn, \-\-font <fontname> +defines the application font +.TP +.B \-\-bg, \-\-background <color> +sets the default background color and an +application palette (light and dark shades are +calculated) +.TP +.B \-\-fg, \-\-foreground <color> +sets the default foreground color +.TP +.B \-\-btn, \-\-button <color> +sets the default button color +.TP +.B \-\-name <name> +sets the application name +.TP +.B \-\-title <title> +sets the application title (caption) +.TP +.B \-\-visual TrueColor +forces the application to use a TrueColor visual on +an 8\-bit display +.TP +.B \-\-inputstyle <inputstyle> +sets XIM (X Input Method) input style. Possible +values are onthespot, overthespot, offthespot and +root +.TP +.B \-\-im <XIM server> +set XIM server +.TP +.B \-\-noxim +disable XIM +.TP +.B \-\-reverse +mirrors the whole layout of widgets +.SS +.SS KDE options: +.TP +.B \-\-caption <caption> +Use 'caption' as name in the titlebar +.TP +.B \-\-icon <icon> +Use 'icon' as the application icon +.TP +.B \-\-miniicon <icon> +Use 'icon' as the icon in the titlebar +.TP +.B \-\-config <filename> +Use alternative configuration file +.TP +.B \-\-dcopserver <server> +Use the DCOP Server specified by 'server' +.TP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps +.TP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager +.TP +.B \-\-style <style> +sets the application GUI style +.TP +.B \-\-geometry <geometry> +sets the client geometry of the main widget - see man X for the argument format + +.SH SEE ALSO +\fBkwikdisk\fP(1) +.sp 1 +Full user documentation is available through the KDE Help Center. You can also enter the URL +.BR help:/kdf/ +directly into konqueror or you can run +.BR "khelpcenter help:/kdf/" +from the command\-line. +.br +.SH AUTHORS +.nf +Michael Kropfberger <michael.kropfberger@gmx.net> +.br + +.br +.fi +Please use http://bugs.kde.org to report bugs; do not mail the author directly. +.PP +This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. --- kdeutils-3.5.8.orig/debian/man/kwikdisk.1 +++ kdeutils-3.5.8/debian/man/kwikdisk.1 @@ -0,0 +1,151 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH KWIKDISK 1 "June 2006" "K Desktop Environment" "KDE Free disk space utility" +.SH NAME +kwikdisk +\- KDE Free disk space utility +.SH SYNOPSIS +\fBkwikdisk\fB [Qt\-options] [KDE\-options] +.SH DESCRIPTION +\fBkwikdisk\fP is a kicker applet to display the available file devices (hard drive partitions, floppy and CD drives, etc.) along with information on their free space, type and mount point. It also allows you to mount and unmount drives. +.sp 1 +\fBkwikdisk\fP is similar to \fBKDiskFree\fP, but takes up less screen space. +.SH OPTIONS +.SS Generic options: +.TP +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-kde +Show KDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v, \-\-version +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options +.SS +.SS Qt options: +.TP +.B \-\-display <displayname> +Use the X-server display 'displayname' +.TP +.B \-\-session <sessionId> +Restore the application for the given 'sessionId' +.TP +.B \-\-cmap +Causes the application to install a private color +map on an 8\-bit display +.TP +.B \-\-ncols <count> +Limits the number of colors allocated in the color +cube on an 8\-bit display, if the application is +using the QApplication::ManyColor color +specification +.TP +.B \-\-nograb +tells Qt to never grab the mouse or the keyboard +.TP +.B \-\-dograb +running under a debugger can cause an implicit +\-nograb, use \-dograb to override +.TP +.B \-\-sync +switches to synchronous mode for debugging +.TP +.B \-\-fn, \-\-font <fontname> +defines the application font +.TP +.B \-\-bg, \-\-background <color> +sets the default background color and an +application palette (light and dark shades are +calculated) +.TP +.B \-\-fg, \-\-foreground <color> +sets the default foreground color +.TP +.B \-\-btn, \-\-button <color> +sets the default button color +.TP +.B \-\-name <name> +sets the application name +.TP +.B \-\-title <title> +sets the application title (caption) +.TP +.B \-\-visual TrueColor +forces the application to use a TrueColor visual on +an 8\-bit display +.TP +.B \-\-inputstyle <inputstyle> +sets XIM (X Input Method) input style. Possible +values are onthespot, overthespot, offthespot and +root +.TP +.B \-\-im <XIM server> +set XIM server +.TP +.B \-\-noxim +disable XIM +.TP +.B \-\-reverse +mirrors the whole layout of widgets +.SS +.SS KDE options: +.TP +.B \-\-caption <caption> +Use 'caption' as name in the titlebar +.TP +.B \-\-icon <icon> +Use 'icon' as the application icon +.TP +.B \-\-miniicon <icon> +Use 'icon' as the icon in the titlebar +.TP +.B \-\-config <filename> +Use alternative configuration file +.TP +.B \-\-dcopserver <server> +Use the DCOP Server specified by 'server' +.TP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps +.TP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager +.TP +.B \-\-style <style> +sets the application GUI style +.TP +.B \-\-geometry <geometry> +sets the client geometry of the main widget \- see man X for the argument format + +.SH SEE ALSO +\fBkdf\fP(1) +.SH AUTHORS +.nf +Michael Kropfberger <michael.kropfberger@gmx.net> +.br +Espen Sand <espen@kde.org> +.br +Stanislav Karchebny <Stanislav.Karchebny@kdemail.net> +.br + +.br +.fi +Please use http://bugs.kde.org to report bugs; do not mail the authors directly. +.PP +This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. --- kdeutils-3.5.8.orig/debian/man/khexedit.1 +++ kdeutils-3.5.8/debian/man/khexedit.1 @@ -0,0 +1,169 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH KHEXEDIT 1 "June 2006" "K Desktop Environment" "KDE hex editor" +.SH NAME +khexedit +\- KDE hex editor +.SH SYNOPSIS +\fBkhexedit\fP [Qt\-options] [KDE\-options] [options] [file(s)] +.SH DESCRIPTION +\fBKHexEdit\fP is an editor for the raw data of binary files. It includes find/replace functions, bookmarks, many configuration options, drag and drop support and other powerful features. +.sp 1 +When a document is opened, the bytes are displayed in hexadecimal format in the data editor window. The data can be edited, cut, copied, pasted, dragged and dropped much as text is in an text editor or word processor. A cursor marks the current position. Pressing the Insert key toggles between overwrite and insert text entry modes. The data can also be displayed as octal, binary or decimal values, by choosing the desired format in the View menu. +.sp 1 +The offset column on the left indicates the position of a particular byte in the file. The text field on the right displays the ASCII encoding of the file. The cursor position and edits in the data editor window are reflected in the text field. The text field can also be edited, and those changes are reflected in the data editor window. +.sp 1 +The search bar allows the user to search for a specific value \-\- hexadecimal, octal, binary, decimal or text. +.sp 1 +The conversion field displays the value of the byte at the cursor position in a variety of bases. It also displays the value of all standard data types starting at the cursor. +.sp 1 +Multiple documents can be open at the same time but only one can be active. Use the Documents menu to select which document will be active. +.SH OPTIONS +.SS +.SS Arguments: +file(s) File(s) to open +.SS Options: +.TP +.B \-\-offset <offset> +Jump to 'offset' +.SS +.SS Generic options: +.TP +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-kde +Show KDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v, \-\-version +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options +.SS +.SS Qt options: +.TP +.B \-\-display <displayname> +Use the X-server display 'displayname' +.TP +.B \-\-session <sessionId> +Restore the application for the given 'sessionId' +.TP +.B \-\-cmap +Causes the application to install a private color +map on an 8\-bit display +.TP +.B \-\-ncols <count> +Limits the number of colors allocated in the color +cube on an 8\-bit display, if the application is +using the QApplication::ManyColor color +specification +.TP +.B \-\-nograb +tells Qt to never grab the mouse or the keyboard +.TP +.B \-\-dograb +running under a debugger can cause an implicit +\-nograb, use \-dograb to override +.TP +.B \-\-sync +switches to synchronous mode for debugging +.TP +.B \-\-fn, \-\-font <fontname> +defines the application font +.TP +.B \-\-bg, \-\-background <color> +sets the default background color and an +application palette (light and dark shades are +calculated) +.TP +.B \-\-fg, \-\-foreground <color> +sets the default foreground color +.TP +.B \-\-btn, \-\-button <color> +sets the default button color +.TP +.B \-\-name <name> +sets the application name +.TP +.B \-\-title <title> +sets the application title (caption) +.TP +.B \-\-visual TrueColor +forces the application to use a TrueColor visual on +an 8\-bit display +.TP +.B \-\-inputstyle <inputstyle> +sets XIM (X Input Method) input style. Possible +values are onthespot, overthespot, offthespot and +root +.TP +.B \-\-im <XIM server> +set XIM server +.TP +.B \-\-noxim +disable XIM +.TP +.B \-\-reverse +mirrors the whole layout of widgets +.SS +.SS KDE options: +.TP +.B \-\-caption <caption> +Use 'caption' as name in the titlebar +.TP +.B \-\-icon <icon> +Use 'icon' as the application icon +.TP +.B \-\-miniicon <icon> +Use 'icon' as the icon in the titlebar +.TP +.B \-\-config <filename> +Use alternative configuration file +.TP +.B \-\-dcopserver <server> +Use the DCOP Server specified by 'server' +.TP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps +.TP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager +.TP +.B \-\-style <style> +sets the application GUI style +.TP +.B \-\-geometry <geometry> +sets the client geometry of the main widget \- see man X for the argument format +.SS + +.SH SEE ALSO +Full user documentation is available through the KDE Help Center. You can also enter the URL +.BR help:/khexedit/ +directly into konqueror or you can run +.BR "khelpcenter help:/khexedit/" +from the command\-line. +.br +.SH AUTHORS +.nf +Espen Sand <espensa@online.no> +.br + +.br +.fi +Please use http://bugs.kde.org to report bugs; do not mail the author directly. +.PP +This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. --- kdeutils-3.5.8.orig/debian/man/kgpg.1 +++ kdeutils-3.5.8/debian/man/kgpg.1 @@ -0,0 +1,187 @@ +.TH KGPG "1" "December 2002" "KDE" "KDE Application" +.SH NAME +kgpg \- a KDE frontend for GNU Privacy Guard (GnuPG) +.SH SYNOPSIS +.B kgpg +[\fIQt-options\fR] [\fIKDE-options\fR] [\fIoptions\fR] \fIfile\fR +.SH DESCRIPTION +This manual page documents briefly the +.B Kgpg +KDE Application. +This manual page was written for the Debian GNU/Linux distribution +because the original program does not have a manual page. +.PP +.B Kgpg +is a simple graphical interface for gpg (http://gnupg.org). +Basically, It allows you to encrypt and decrypt files or messages, and to manage your keys. +.PP +Kgpg can be used in different ways: +.IP "1 -" 4 +Open Kgpg. You will see an editor. Just type or paste your text in the editor. You can then easily encrypt/decrypt the text. +.IP "2 -" 4 +On your Desktop or from a Konqueror window, right click on a file and you will see an encrypt file entry in the menu. just select it to encrypt the file. In the same way, simply left click on an encrypted file to decrypt it. +.IP "3 -" 4 +If you enable Kgpg's Klipper action, as soon as you copy an encrypted text to the clipboard, a popup menu will ask you if you want to decrypt it. +.SH OPTIONS +.TP +.B \-e +encrypt file +.TP +.B \-s +show encrypted file +.TP +.B \-S +sign file +.TP +.B \-V +verify signature +.SS "Arguments:" +.TP 12 +file +file to open +.SS "Generic options:" +.TP 12 +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-kde +Show KDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v\fR, \fB\-\-version +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options +.SS "Qt options" +.TP 12 +.BI \-\-display \ displayname +Use the X-server display \fIdisplayname\fP. +.TP +.BI \-\-session \ sessionId +Restore the application for the given \fIsessionId\fP. +.TP +.B \-\-cmap +Causes the application to install a private color +map on an 8-bit display. +.TP +.BI \-\-ncols \ count +Limits the number of colors allocated in the color +cube on an 8-bit display, if the application is +using the QApplication::ManyColor color +specification. +.TP +.B \-\-nograb +tells Qt to never grab the mouse or the keyboard. +.TP +.B \-\-dograb +running under a debugger can cause an implicit +.B \-nograb, use \fB\-dograb\fR to override. +.TP +.B \-\-sync +switches to synchronous mode for debugging. +.TP +.BI "\-\-fn\fR, \fP\-\-font" \ fontname +defines the application font. +.TP +.BI "-\-bg\fR, \fB\-\-background" \ color +sets the default background color and an +application palette (light and dark shades are +calculated). +.TP +.BI "\-\-fg\fR, \fB\-\-foreground" \ color +sets the default foreground color. +.TP +.BI \-\-btn\fR, \fB\-\-button \ color +sets the default button color. +.TP +.BI \-\-name \ name +sets the application name. +.TP +.BI \-\-title \ title +sets the application title (caption). +.TP +.B \-\-visual TrueColor +forces the application to use a TrueColor visual on +an 8-bit display. +.TP +.BI \-\-inputstyle \ inputstyle +sets XIM (X Input Method) input style. Possible +values are +.BR onthespot ", " overthespot ", " offthespot and root . +.TP +.BI \-\-im " XIM-server" +set XIM server. +.TP +.B \-\-noxim +disable XIM. +.TP +.B \-\-reverse +mirrors the whole layout of widgets. +.SS "KDE options" +.TP 12 +.BI \-\-caption \ caption +Use \fIcaption\fP as name in the titlebar. +.TP +.BI \-\-icon \ icon +Use \fIicon\fP as the application icon. +.TP +.BI \-\-miniicon \ icon +Use \fIicon\fP as the icon in the titlebar. +.TP +.BI \-\-config \ filename +Use alternative configuration file. +.TP +.BI \-\-dcopserver \ server +Use the DCOP Server specified by \fIserver\fP. +.TP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps. +.TP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager. +.TP +.BI \-\-style \ style +sets the application GUI style. +.TP +.BI \-\-geometry \ geometry +sets the client geometry of the main widget. +.SH AUTHOR +kgpg was written by +.nh +.ad l +y0k0 <bj@altern.org>, +.br +.hy +This manual page was prepared by +.nh +.ad l +Karolina Lindqvist <pgd\-karolinali@algonet.se> +.hy +for the Debian GNU/Linux system (but may be used by others). +.SH "SEE ALSO" +The full documentation for +.B Kgpg +is maintained as a docbook manual. If the +.B khelpcenter +program is properly installed at your site, the command +.IP +.B khelpcenter help:/kgpg +.PP +should give you access to the complete manual. +.P +Alternatively the manual can be browsed in +.B konqueror +giving it the URL help:/kgpg + --- kdeutils-3.5.8.orig/debian/man/kfloppy.1 +++ kdeutils-3.5.8/debian/man/kfloppy.1 @@ -0,0 +1,182 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH KFLOPPY 1 "June 2006" "K Desktop Environment" "KDE Floppy Disk Utility" +.SH NAME +kfloppy +\- KDE Floppy Disk Utility +.SH SYNOPSIS +\fBkfloppy\fP [Qt\-options] [KDE\-options] [device] +.SH DESCRIPTION +\fBKfloppy Formatter\fP is a utility that provides a straightforward graphical means to format 3.5" and 5.25" floppy disks. +.sp 1 +Starting \fBKfloppy\fP opens a single window by which the user may choose appropriate settings and control the formatting process. +.sp 1 +\fBCaution\fP +.br +Make sure that your floppy disk is not mounted. \fBKfloppy\fP cannot format a mounted floppy disk. +.sp 1 +\fBKfloppy\fP offers the following settings for floppy size: +.RS 3 +.TP +\- 3.5" 1.44MB +.TP +\- 3.5" 720KB +.TP +\- 5.25" 1.2MB +.TP +\- 5.25" 360KB +.TP +\- Auto-Detect +.RE +.sp 1 +\fBNote\fP +.br +The 800KB disk format used by Mac floppy drives cannot be supported on PC floppy drives since they are not capable of formatting disks in that fashion. +.sp 1 +\fBKfloppy\fP supports the file systems DOS, ext2 and Minix. +.SH OPTIONS +.SS +.SS Arguments: +.TP +.B device +Default device +.SS Generic options: +.TP +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-kde +Show KDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v, \-\-version +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options +.SS +.SS Qt options: +.TP +.B \-\-display <displayname> +Use the X-server display 'displayname' +.TP +.B \-\-session <sessionId> +Restore the application for the given 'sessionId' +.TP +.B \-\-cmap +Causes the application to install a private color +map on an 8\-bit display +.TP +.B \-\-ncols <count> +Limits the number of colors allocated in the color +cube on an 8\-bit display, if the application is +using the QApplication::ManyColor color +specification +.TP +.B \-\-nograb +tells Qt to never grab the mouse or the keyboard +.TP +.B \-\-dograb +running under a debugger can cause an implicit +\-nograb, use \-dograb to override +.TP +.B \-\-sync +switches to synchronous mode for debugging +.TP +.B \-\-fn, \-\-font <fontname> +defines the application font +.TP +.B \-\-bg, \-\-background <color> +sets the default background color and an +application palette (light and dark shades are +calculated) +.TP +.B \-\-fg, \-\-foreground <color> +sets the default foreground color +.TP +.B \-\-btn, \-\-button <color> +sets the default button color +.TP +.B \-\-name <name> +sets the application name +.TP +.B \-\-title <title> +sets the application title (caption) +.TP +.B \-\-visual TrueColor +forces the application to use a TrueColor visual on +an 8\-bit display +.TP +.B \-\-inputstyle <inputstyle> +sets XIM (X Input Method) input style. Possible +values are onthespot, overthespot, offthespot and +root +.TP +.B \-\-im <XIM server> +set XIM server +.TP +.B \-\-noxim +disable XIM +.TP +.B \-\-reverse +mirrors the whole layout of widgets +.SS +.SS KDE options: +.TP +.B \-\-caption <caption> +Use 'caption' as name in the titlebar +.TP +.B \-\-icon <icon> +Use 'icon' as the application icon +.TP +.B \-\-miniicon <icon> +Use 'icon' as the icon in the titlebar +.TP +.B \-\-config <filename> +Use alternative configuration file +.TP +.B \-\-dcopserver <server> +Use the DCOP Server specified by 'server' +.TP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps +.TP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager +.TP +.B \-\-style <style> +sets the application GUI style +.TP +.B \-\-geometry <geometry> +sets the client geometry of the main widget - see man X for the argument format +.SS + +.SH SEE ALSO +Full user documentation is available through the KDE Help Center. You can also enter the URL +.BR help:/kfloppy/ +directly into konqueror or you can run +.BR "khelpcenter help:/kfloppy/" +from the command\-line. +.br +.SH AUTHORS +.nf +Bernd Johannes Wuebben <wuebben@kde.org> +.br + +.br +.fi +Please use http://bugs.kde.org to report bugs; do not mail the author directly. +.PP +This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. --- kdeutils-3.5.8.orig/debian/man/ark.1 +++ kdeutils-3.5.8/debian/man/ark.1 @@ -0,0 +1,82 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. +.TH Ark "1" "May 2006" "Ark" "User Commands" +.SH NAME +Ark \- manual page for Ark +.SH SYNOPSIS +.B ark +[\fIQt-options\fR] [\fIKDE-options\fR] [\fIKDE-tempfile-options\fR] [\fIoptions\fR] [\fIfolder\fR] [\fIfiles\fR] [\fIarchive\fR] +.SH DESCRIPTION +KDE Archiving tool +Ark is a graphical program for managing various archive formats within the +KDE environment. Archives can be viewed, extracted, created and modified +from within Ark. +The program can handle various formats such as tar, gzip, bzip2, zip, rar and +lha (if the appropriate command-line programs are installed). +Ark can work closely with Konqueror in the KDE environment to handle archives, +if you install the Konqueror Integration plugin available in the konq-plugins +package. +.SS "Generic options" +.TP +\fB\-\-help\fR +Show help about options +.TP +\fB\-\-help\-qt\fR +Show Qt specific options +.TP +\fB\-\-help\-kde\fR +Show KDE specific options +.TP +\fB\-\-help\-kde\-tempfile\fR +Show KDE\-tempfile specific options +.TP +\fB\-\-help\-all\fR +Show all options +.TP +\fB\-\-author\fR +Show author information +.TP +\fB\-v\fR, \fB\-\-version\fR +Show version information +.TP +\fB\-\-license\fR +Show license information +.TP +\fB\-\-\fR +End of options +.SH OPTIONS +.TP +\fB\-\-extract\fR +Open extract dialog, quit when finished +.TP +\fB\-\-extract\-to\fR +Extract 'archive' to 'folder'. Quit when finished. +\&'folder' will be created if it does not exist. +.TP +\fB\-\-add\fR +Ask for the name of the archive to add 'files' to. Quit when finished. +.TP +\fB\-\-add\-to\fR +Add 'files' to 'archive'. Quit when finished. +\&'archive' will be created if it does not exist. +.TP +\fB\-\-guess\-name\fR +Used with '\-\-extract\-to'. When specified, 'archive' +will be extracted to a subfolder of 'folder' +whose name will be the name of 'archive' without the filename extension. +.SS "Arguments" +.TP +folder +Folder to extract to +.TP +files +Files to be added +.TP +archive +Open 'archive' +.SH AUTHOR +Ark was written by Matthias Elter <elter@kde.org> and many others. +.br +Ark is released under the GNU General Public License. +.PP +This manual page was written by Sune Vuorela <debian@pusling.com> +for the Debian Project, and is released under the same terms as the program. --- kdeutils-3.5.8.orig/debian/man/kcharselect.1 +++ kdeutils-3.5.8/debian/man/kcharselect.1 @@ -0,0 +1,257 @@ +.lf 1 info/kdeutils.kcharselect.1 +.TH KCHARSELECT 1 "May 2003" KDE "KDE Application" +.SH NAME +kcharselect \- KDE Character Selector +.SH SYNOPSIS +.B kcharselect +[\fIQt-options\fR] [\fIKDE-options\fR] +.SH DESCRIPTION +This manual page documents briefly the +.B KCharSelect +KDE Application. +This manual page was written for the Debian GNU/Linux distribution +because the original program does not have a manual page. +.PP +Using +.B KCharSelect +one can view all the glyphs, organized by character table, available from any +installed font. One can also assemble a string of characters by clicking on +characters in the table. The string can be exported to the clipboard for +later use. +.PP +.B KCharSelect +is helpful for determining which characters in a font have glyphs as well as +for selecting characters that may be difficult to produce. +.P +This program is part of the official KDE utils module. +.SH OPTIONS +.SS "General Options" +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-kde +Show KDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v\fR, \fB\-\-version +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options +.lf 1 info/kdeqtoptions +.SS "KDE options" +.TP 12 +.BI \-\-caption \ caption +Use \fIcaption\fP as name in the titlebar. +.TP +.BI \-\-icon \ icon +Use \fIicon\fP as the application icon. \fIicon\fP is the name of the +icon, which can either be an absolute filename path, or otherwise the +icon is sought for in places according to the normal KDE rules. +.TP +.BI \-\-miniicon \ icon +Use \fIicon\fP as the icon in the titlebar. \fIicon\fP is the filename +of the icon, according to the same rules as for the \-\-icon parameter. +.TP +.BI \-\-config \ filename +Use an alternative configuration file, instead of the default, which +is normally located in +.I /usr/share/config +or in +.RB $ KDEHOME\fI/share/config +.TP +.BI \-\-dcopserver \ server +Set the address of the DCOP server to attach to. +.TP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps. This option has the same +effect as definiting the environment variable KDE_DEBUG. +.TP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager. +.TP +.BI \-\-style \ style +sets the application GUI style. +.TP +.BI \-\-geometry \ geometry +sets the client geometry of the main widget. +The geometry parameter follows the normal X convention for geometry, +which is on the form: +.RS +.IP +[\fIwidth\fBx\fIheight\fR][{\fB+-\fR}\fIxpos\fR{\fB+-\fR}\fIypos\fR] +.P +Where \fIwidth\fR and \fIheight\fR gives the desired minimum width and +height, of the main application window. Both in pixels. A value of 0 +specifies the default size. The optional \fIxpos\fR and \fIypos\fR +specifies the x,y-position that which is desired for the application +window. Specifying negative values for x or y implies that the x or y +position is to be measured from the left or bottom screen edge, +instead of as in the normal case, with positive values, from the left +and top edges. +.RE +.SS "Qt options" +.TP 12 +.BI \-\-display \ displayname +Use the X-server display \fIdisplayname\fP. +.TP +.BI \-\-session \ sessionId +Restore the application for the given \fIsessionId\fP. +.TP +.B \-\-cmap +Causes the application to install a private color +map on an 8-bit display. +.TP +.BI \-\-ncols \ count +Limits the number of colors allocated in the color +cube on an 8-bit display, if the application is +using the QApplication::ManyColor color +specification. +.TP +.B \-\-nograb +Tells Qt to never grab the mouse or the keyboard. +.TP +.B \-\-dograb +Running under a debugger can cause an implicit +.B \-nograb, use \fB\-dograb\fR to override. +.TP +.B \-\-sync +switches to synchronous mode for debugging. +.TP +.BI "\-\-fn\fR, \fP\-\-font" \ fontname +Defines the default application font. The \fIfontname\fP should be in +the X logical font name description format XLFD. For a full description of +the format see +.I /usr/X11R6/lib/X11/doc/xlfd.TXT +Note that the application might override the font specified with +its own font. +.TP +.BI "-\-bg\fR, \fB\-\-background" \ color +Sets the default background color and an +application palette (light and dark shades are +calculated). +.TP +.BI "\-\-fg\fR, \fB\-\-foreground" \ color +Sets the default foreground color. +.TP +.BI \-\-btn\fR, \fB\-\-button \ color +Sets the default button color. +.TP +.BI \-\-name \ name +Sets the application name. +.TP +.BI \-\-title \ title +Sets the application title. This option might, or might not appear +in the title bar caption, depending on the application. To change the caption, use the +.B \-\-caption +option instead. +.TP +.B \-\-visual TrueColor +Forces the application to use a TrueColor visual on +an 8-bit display. +.TP +.BI \-\-inputstyle \ inputstyle +Sets XIM (X Input Method) input style. Possible +values are +.BR onthespot ", " overthespot ", " offthespot and root . +.TP +.BI \-\-im " XIM-server" +Set XIM server. +.TP +.B \-\-noxim +Disable XIM. +.TP +.B \-\-reverse +Mirror reverses the whole layout of widgets. This means that menus +will go in the opposite direction, the scroll bar will be on the +opposite side, etc. For a normal western layout that means that menus +and tool bars will go from the right edge to the left, the vertical +scroll bar will be on the left side and so on. + +.lf 48 info/kdeutils.kcharselect.1 +.SH ENVIRONMENT +.lf 1 info/kdeenviron +.SS "standard KDE environment variables" +.IP KDE_LANG +Language locale setting to use. This option makes it possible to set +another language environment for a program than what is the default. The +correct language pack for this language has to be installed for this option +to work. The default language when there is none set is en_US. When +deciding upon a language, the following resources are looked up, in +order: KDE_LANG, configuration file, LC_CTYPE, LC_MESSAGES, LC_ALL, +LANG. +.IP KDE_UTF8_FILENAMES +Assume that all filenames are in UTF-8 format regardless of the +current language setting. Otherwise the filename format is defined by +the language. +.IP KDE_MULTIHEAD +If this variable has the value +.B true +multihead multiple display mode is enabled. The KDE display will be +shared over more than one screen. +.IP DISPLAY +Specifies the X display to run KDE on. +.IP KDESYCOCA +Specifies and alternative path for the +.I ksycoca +KDE system configuration cache file. +The default path is +/tmp/kde-$USER/ksycoca +.IP DCOPSERVER +Specifies an alternative path for the DCOP server file. The default +file is +$HOME/.DCOPserver_\fIhostname\fP_\fIdisplayname\fP +.IP SESSION_MANAGER +The session manager to use. This option is set automatically by KDE +and is a network path to the session manager socket. +.IP HOME +Path to the home directory for the current user. +.IP KDEHOME +The KDE per-user setting directory. Default if not specified is +.I $HOME/.kde +.lf 50 info/kdeutils.kcharselect.1 +.SH FILES +.TP +.I $HOME/.kde/share/config/kcharselectrc +configuration file. +.SH AUTHOR +KCharSelect was written by +.nh +.ad l +Reginald Stadlbauer <reggie@kde.org>. +.hy +.br +Please use http://bugs.kde.org to report bugs, do not mail the authors directly. +.br +This manual page was prepared by +.nh +.ad l +Karolina Lindqvist <pgd\-karolinali@algonet.se> +.hy +for the Debian GNU/Linux system (but may be used by others). +.SH "SEE ALSO" +The full documentation for +.B KCharSelect +is maintained as a docbook manual. If the +.B khelpcenter +program is properly installed at your site, the command +.IP +.B khelpcenter help:/kcharselect +.PP +should give you access to the complete manual. +.P +Alternatively the manual can be browsed in +.B konqueror +giving it the URL help:/kcharselect + --- kdeutils-3.5.8.orig/debian/changelog +++ kdeutils-3.5.8/debian/changelog @@ -0,0 +1,1498 @@ +kdeutils (4:3.5.8-1ubuntu5) hardy; urgency=low + + * kgpg: Add depend on konsole + + -- Terence Simpson <stdin@stdin.me.uk> Tue, 08 Jan 2008 13:18:21 +0000 + +kdeutils (4:3.5.8-1ubuntu4) hardy; urgency=low + + * Add kubuntu_18_kmilo_rear_speakers_volume.diff from X2B to correctly + adjust volume for surround sound speaker systems + + -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 14 Dec 2007 12:12:48 +0000 + +kdeutils (4:3.5.8-1ubuntu3) hardy; urgency=low + + * Rebuild for libsnmp10 -> libsnmp15 transition. + * s/developers/Developers/ for the Maintainer field. + + -- Steve Kowalik <stevenk@ubuntu.com> Mon, 10 Dec 2007 20:31:22 +1100 + +kdeutils (4:3.5.8-1ubuntu2) hardy; urgency=low + + * Run buildprep before upload + + -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 15 Nov 2007 10:55:31 +0000 + +kdeutils (4:3.5.8-1ubuntu1) hardy; urgency=low + + * Merge with Debian, remaining change + - Add package kmilo-legacy + + -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 14 Nov 2007 17:25:45 +0000 + +kdeutils (4:3.5.8-1) unstable; urgency=low + + * Implement the use of uploaders.mk and update control. + + +++ Changes by Ana Beatriz Guerrero Lopez: + + * New upstream release: + + Remove patch 16_klaptopdaemon_lock_and_hibernate, applied upstream. + * Bye, bye, xmms. Remove xmms support in superkaramba. + * Redo buildprep and bump build-dependencies to 3.5.8 + + -- Ana Beatriz Guerrero Lopez <ana@debian.org> Sun, 14 Oct 2007 12:52:24 +0200 + +kdeutils (4:3.5.7-3) unstable; urgency=low + + * New patch for 16_klaptopdaemon_lock_and_hibernate, take 3. Thanks to Raul + again. (Closes: #416824) + + -- Ana Beatriz Guerrero Lopez <ana@debian.org> Tue, 03 Jul 2007 15:58:20 +0200 + +kdeutils (4:3.5.7-2) unstable; urgency=low + + * Redone patch 16_klaptopdaemon_lock_and_hibernate. Thanks to Raúl Sánchez + Siles again. (Closes: #416824) + + -- Ana Beatriz Guerrero Lopez <ana@debian.org> Mon, 18 Jun 2007 21:38:07 +0200 + +kdeutils (4:3.5.8-0ubuntu2) hardy; urgency=low + + * Added kubuntu_17_zoo_extraction_fix.diff, fixes zoo extraction + support. Patch from SVN + + -- Anthony Mercatante <tonio@ubuntu.com> Thu, 25 Oct 2007 15:41:44 +0200 + +kdeutils (4:3.5.8-0ubuntu1) gutsy; urgency=low + + * New upstream release + + -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 09 Oct 2007 11:41:26 +0100 + +kdeutils (4:3.5.7-1ubuntu4) gutsy; urgency=low + + * debian/control: drop xmms-dev to allow xmms to move to universe, adjust + maintainer field. + + -- Kees Cook <kees@ubuntu.com> Thu, 21 Jun 2007 13:59:49 -0700 + +kdeutils (4:3.5.7-1ubuntu3) gutsy; urgency=low + + * Added kubuntu_16_ark_utf8.diff + Fixed encoding issue opening rar and zip files. + + -- Anthony Mercatante <tonio@kubuntu.com> Thu, 14 Jun 2007 13:17:22 +0200 + +kdeutils (4:3.5.7-1ubuntu2) gutsy; urgency=low + + * Added the compact look kmilo patch kubuntu_15_kmilo_compact_look.diff from + http://blog.guillermoamaral.com/2007/04/14/patch-kde-kmilo-compact-dialog/ + + -- Ryan Kavanagh <ryanakca@kubuntu.com> Sat, 26 May 2007 11:04:06 -0400 + +kdeutils (4:3.5.7-1ubuntu1) gutsy; urgency=low + + * Merge with Debian for new upstream release + + -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 23 May 2007 16:45:43 +0100 + +kdeutils (4:3.5.7-1) unstable; urgency=low + + * New upstream release: + + Adapt patch 15 about klaptop daemon filenames. + * Change build-deps from libsnmp10-dev to libsnmp-dev. + * Add patch to use unrar-free if available. (Closes: #423170) + + -- Sune Vuorela <debian@pusling.com> Tue, 15 May 2007 21:31:36 +0200 + +kdeutils (4:3.5.6-2ubuntu1) gutsy; urgency=low + + * Merge with Debian + * Remaining changes in KUBUNTU-DEBIAN-DIFFERENCES + + -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 30 Apr 2007 20:32:55 +0100 + +kdeutils (4:3.5.6-2) unstable; urgency=low + + * Upload to unstable after Etch release. + + +++ Changes by Ana Beatriz Guerrero Lopez: + + * Update from libsnmp9-dev to libsnmp10-dev. + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Mon, 23 Apr 2007 16:20:48 +0100 + +kdeutils (4:3.5.6-1) experimental; urgency=low + + * New upstream release. + * Update Uploaders. + * Make kdeutils-dbg depend on kdelibs-dbg to get useful backtraces when + debugging. + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 17 Jan 2007 00:16:21 +0100 + +kdeutils (4:3.5.5-2) unstable; urgency=medium + + +++ Changes by Fathi Boudra: + + * Add 14_kmilo_actions patch, stolen from Kubuntu. It adds new actions to the + generic kmilo actions (volume up/down and mute). Thanks to Jonathan + Riddell. (Closes: #396622) + + * Remove tpctl build-depends, which was removed from testing due to #392235 + and #392239. (Closes: #397637) + + +++ Changes by Josh Metzler: + + * Adapt rewritten paragraph for kcharselect.1 manpage. (Closes: #314691) + + * Add klaptopdaemon patch to check for empty filenames before trying to + open them so we don't fill .xsession-errors and keep the disk busy. + (Closes: #397098) + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Tue, 14 Nov 2006 17:32:12 -0500 + +kdeutils (4:3.5.6-0ubuntu2) feisty; urgency=low + + * Added kubuntu_14_kmilo_powermanager.diff: + Implement keyboard shortcuts for laptop keys (Battery, Suspend, + Hibernate). Guidance Power Manager is called trough DCOP interfaces. + + -- Luka Renko <lure@ubuntu.com> Sun, 4 Feb 2007 20:57:29 +0100 + +kdeutils (4:3.5.6-0ubuntu1) feisty; urgency=low + + * New upstream release + * Remove patches applied upstream + - kubuntu_10_show_ksim.diff + - kubuntu_13_ark_part.diff + + -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 17 Jan 2007 11:22:30 +0000 + +kdeutils (4:3.5.5-1ubuntu4) feisty; urgency=low + + * Remove kmilo.install.powerpc, fix build failure, it isn't + needed since we don't use pbbuttons + + -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 15 Jan 2007 20:22:42 +0000 + +kdeutils (4:3.5.5-1ubuntu3) feisty; urgency=low + + * Rebuild for python2.5 as the default python version. + + -- Matthias Klose <doko@ubuntu.com> Mon, 15 Jan 2007 17:57:17 +0000 + +kdeutils (4:3.5.5-1ubuntu2) feisty; urgency=low + + * Removed ark_part.desktop from ark.install + + -- Anthony Mercatante <tonio@ubuntu.com> Mon, 04 Dec 2006 22:53:32 +0200 + +kdeutils (4:3.5.5-1ubuntu1) feisty; urgency=low + + * Merge with Debian + * Compile with --enable-gcc-hidden-visibility + + -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 16 Nov 2006 20:41:48 +0000 + +kdeutils (4:3.5.5-1) unstable; urgency=low + + * New upstream release. + + Fixes kcalc: Alt-H does not select hex. (Closes: #272026) + + Fixes kwalletmanager does not appear in kde system tray. + (Closes: #372258) + + Fixes kgpg: Kgpg editor crashes on decrypting. (Closes: #372767) + + +++ Changes by Christopher Martin: + + * Change ark's Recommends: p7zip to p7zip-full, which has the binaries it + actually looks for. (Closes: #381696) + + * Allow kpowersave, an alternative to klaptopdaemon, to satisfy the Depends + of kdeutils. (Closes: #382545) + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 4 Oct 2006 20:39:27 -0400 + +kdeutils (4:3.5.4-1) unstable; urgency=low + + * New upstream release. + + * KDE_3_5_BRANCH update (up to r567761). + + Fixes kwalletmanager crashes on logout. (Closes: #372564, #377001) + + +++ Changes by Christopher Martin: + + * Add kdf, kwikdisk, kfloppy, and kedit manpages, thanks to Holger Hartmann. + (Closes: #370490, #370527, #370783) + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sat, 29 Jul 2006 21:01:40 -0400 + +kdeutils (4:3.5.5-0ubuntu3) feisty; urgency=low + + * Upgrade kubuntu_13_ark_part.diff for better 7z integration + + -- Anthony Mercatante <tonio@ubuntu.com> Fri, 20 Oct 2006 18:50:05 +0200 + +kdeutils (4:3.5.5-0ubuntu2) edgy; urgency=low + + * Add kubuntu_13_ark_part.diff, fixes ark kpart + + -- Anthony Mercatante <tonio@ubuntu.com> Tue, 11 Oct 2006 13:42:05 +0200 + +kdeutils (4:3.5.5-0ubuntu1) edgy; urgency=low + + * New upstream release + * kubuntu_12_kmilo_actions.diff updated + * Remove kubuntu_13_downgrade_kwallet.diff + + -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 3 Oct 2006 10:56:05 +0000 + +kdeutils (4:3.5.4-0ubuntu5) edgy; urgency=low + + * Rebuild with latest cdbs to add gettext domain to .desktop files for + langpacks-desktopfiles-kde, no source changes + + -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 5 Sep 2006 22:53:11 +0000 + +kdeutils (4:3.5.4-0ubuntu4) edgy; urgency=low + + * Added kubuntu_13_downgrade_kwallet to avoid bug #57696, downgrading + kwalletmanager to 3.5.2, This bug has been reported on KDE 2 month + ago (http://bugs.kde.org/show_bug.cgi?id=129161) and 3.5.4 has been + released without any correction. + Because most apps' authentication system is based on this, the issue + is quite critical. + This is a crappy way to do, but sometimes the working thing isn't the + cleanest. + + -- Anthony Mercatante <tonio@ubuntu.com> Sat, 26 Aug 2006 11:43:28 +0200 + +kdeutils (4:3.5.4-0ubuntu3) edgy; urgency=low + + * Removed ubuntu.xmodmap from kmilo (moved to kdebase package) + + -- Luka Renko <lure@ubuntu.com> Sun, 20 Aug 2006 12:15:28 +0200 + +kdeutils (4:3.5.4-0ubuntu2) edgy; urgency=low + + [ Jonathan Riddell ] + * Create package kmilo-legacy for all the non-generic KMilo plugins + + [ Luka Renko and Jonathan Riddell ] + * Added ubuntu.xmodmap with keycode -> keysym mappings + * kubuntu_12_kmilo_actions.diff: kmilo actions and run xmodmap on startup + + -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 4 Aug 2006 16:59:19 +0000 + +kdeutils (4:3.5.4-0ubuntu1) edgy; urgency=low + + * New upstream release + + -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 25 Jul 2006 10:12:20 +0000 + +kdeutils (4:3.5.3-1ubuntu1) edgy; urgency=low + + * Sync with Debian + + -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 3 Jul 2006 20:57:29 +0000 + +kdeutils (4:3.5.3-1) unstable; urgency=low + + * New upstream release. + + Fixes kregexpeditor crash when editing Pos (or Neg) Look Ahead. + (Closes: #287811) + + Fixes ark's ability to open deb packages. (Closes: #362871) + + * KDE_3_5_BRANCH update (up to r548145). + + +++ Changes by Christopher Martin: + + * Remove arj from ark's Recommends, since support doesn't exist currently. + (Closes: #362677) + + * Add p7zip to the ark Recommends, since Free support for that format does + exist. + + * Add ark manpage, thanks to Sune Vuorela. (Closes: #365806) + + * Add kcalc and khexedit manpages, thanks to Holger Hartmann. + (Closes: #369855, #370170) + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sun, 4 Jun 2006 16:47:31 -0400 + +kdeutils (4:3.5.2-1) unstable; urgency=low + + * New upstream release. + + * KDE_3_5_BRANCH update (up to r524080). + + +++ Changes by Christopher Martin: + + * When klaptopdaemon changes klaptop_acpi_helper's permissions, use + dpkg-statoverride. Thanks to Romain Lenglet for the patch. See + klatopdaemon's README.Debian for details. + (Closes: #355527, #355529) + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 29 Mar 2006 19:16:13 -0500 + +kdeutils (4:3.5.1-2) unstable; urgency=low + + +++ Changes by Christopher Martin: + + * KDE_3_5_BRANCH update (up to r507313). Includes kcalc fixes for hex + precision. (Closes: #347928) + + * Add a patch which dlopens XMMS instead of linking to it in Superkaramba. + Set XMMS as a Suggests, rather than a dependency. Thanks to Kevin Krammer + for the patch. (Closes: #276587, #350589) + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 8 Feb 2006 20:12:20 -0500 + +kdeutils (4:3.5.1-1) unstable; urgency=low + + * New upstream release. + + +++ Changes by Christopher Martin: + + * Upload to unstable. + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Fri, 27 Jan 2006 11:56:34 -0500 + +kdeutils (4:3.5.0-3) unstable; urgency=low + + +++ Changes by Christopher Martin: + + * Upload to unstable. + + * KDE_3_5_BRANCH update (up to r495372). + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sat, 7 Jan 2006 17:19:54 -0500 + +kdeutils (4:3.5.0-2) experimental; urgency=low + + * Upload to experimental. + + * KDE_3_5_BRANCH update (up to r489522). + + +++ Changes by Christopher Martin: + + * No longer build with gcc-3.4 on any architectures, since gcc-4.0 should + be fixed. (Closes: #342990) + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sun, 18 Dec 2005 18:53:11 -0500 + +kdeutils (4:3.5.2-0ubuntu8) dapper; urgency=low + + * debian/cdbs/kde.mk: + - added dh_iconcache. + + -- Daniel Holbach <daniel.holbach@ubuntu.com> Sun, 21 May 2006 16:42:11 +0200 + +kdeutils (4:3.5.2-0ubuntu7) dapper; urgency=low + + * Add kubuntu_11_suspend2.diff fixing suspect2 detection, + closes Malone #41926 + + -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 1 May 2006 17:27:21 +0100 + +kdeutils (4:3.5.2-0ubuntu6) dapper; urgency=low + + * Fix ksim.install for removed .desktop file + + -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 1 May 2006 16:09:05 +0100 + +kdeutils (4:3.5.2-0ubuntu5) dapper; urgency=low + + * Add kubuntu_10_show_ksim.diff + Closes malone #40113 + + -- Jonathan Riddell <jriddell@ubuntu.com> Sat, 29 Apr 2006 15:40:37 +0100 + +kdeutils (4:3.5.2-0ubuntu4) dapper; urgency=low + + * Edit debian/cdbs/kde.mk to mark .po files as UTF-8 + + -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 21 Apr 2006 19:14:31 +0100 + +kdeutils (4:3.5.2-0ubuntu3) dapper; urgency=low + + * Install klaptop_acpi_helper setuid root so it can be used by default + + -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 18 Apr 2006 16:52:49 +0100 + +kdeutils (4:3.5.2-0ubuntu2) dapper; urgency=low + + * Remove xmms build-dep + + -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 30 Mar 2006 19:14:56 +0100 + +kdeutils (4:3.5.2-0ubuntu1) dapper; urgency=low + + * New upstream release + + -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 20 Mar 2006 12:06:31 +0000 + +kdeutils (4:3.5.1-0ubuntu2) dapper; urgency=low + + * Add kubuntu_09_hide_ark_part.diff, hide the mostly unused Ark part + things open in Ark proper by default anyway + + -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 15 Feb 2006 15:50:17 +0000 + +kdeutils (4:3.5.1-0ubuntu1) dapper; urgency=low + + * New upstream release + * Build-dep on libsnmp5-dev | libsnmp9-dev for backports + + -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 23 Jan 2006 14:26:07 +0000 + +kdeutils (4:3.5.0-0ubuntu4) dapper; urgency=low + + * Add kubuntu_08_kwallermanager_menu_tidy.diff to + remove KWallet from menu (can be launched from systray) + + -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 18 Jan 2006 15:20:43 +0000 + +kdeutils (4:3.5.0-0ubuntu3) dapper; urgency=low + + * Rebuild because libXft.la is gone + + -- Stephan Hermann <sh@sourcecode.de> Sat, 14 Jan 2006 15:52:30 +0100 + +kdeutils (4:3.5.0-0ubuntu2) dapper; urgency=low + + * Add kubuntu_07_tidy_messages.diff to rm generated + tips.cpp file + + -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 8 Dec 2005 03:02:34 +0000 + +kdeutils (4:3.5.0-0ubuntu1) dapper; urgency=low + + * New upstream release + * Remove gcc 3.4 on hppa + + -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 6 Dec 2005 12:29:24 +0000 + +kdeutils (4:3.5-rc2-0ubuntu2) dapper; urgency=low + + * Build-dep on libsnmp9-dev not libsnmp5-dev + + -- Jonathan Riddell <jriddell@ubuntu.com> Sat, 26 Nov 2005 17:41:10 +0000 + +kdeutils (4:3.5-rc2-0ubuntu1) dapper; urgency=low + + * New upstream pre-release + * Generate .pot files + + -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 21 Nov 2005 22:51:19 +0000 + +kdeutils (4:3.5-rc1-1ubuntu1) dapper; urgency=low + + * Sync with Debian + + -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 14 Nov 2005 01:18:32 +0000 + +kdeutils (4:3.5.0-1) alioth; urgency=low + + * New upstream release. + + +++ Changes by Christopher Martin: + + * New package: superkaramba. It is no longer an independent source package, + but has been merged in KDE. + + * Also add a kdeutils-doc package, containing the superkaramba and kcalc + API documentation. + + * Improve ark's description by referring to it as a _graphical_ archiving + tool. (Closes: #335839) + + * Bump DH_COMPAT to 5. No changes. + + * Add kdeutils-dbg, to help track down problems. + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 30 Nov 2005 09:34:21 -0500 + +kdeutils (4:3.4.3-2) unstable; urgency=low + + * Upload to unstable, rebuilding against kdelibs4c2a. + + +++ Changes by Christopher Martin: + + * Improve ark's description by referring to it as a _graphical_ archiving + tool. (Closes: #335839) + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 1 Dec 2005 12:03:16 +0100 + +kdeutils (4:3.4.3-1) experimental; urgency=low + + * New upstream release. + + +++ Changes by Christopher Martin: + + * Add a patch which fixes kfloppy formatting with udev, though auto-detection + remains broken. This is an adapted version of the patch submitted by + Edward J. Sharnock. (Closes: #329588, #278909, #264924) + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sun, 16 Oct 2005 09:50:15 -0400 + +kdeutils (4:3.4.2-3) unstable; urgency=low + + +++ Changes by Adeodato Simó: + + * Build-Depend on libsnmp9-dev instead of libsnmp5-dev. (Closes: #328210) + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 14 Sep 2005 11:59:43 +0200 + +kdeutils (4:3.4.2-2) unstable; urgency=low + + +++ Changes by Luk Claes: + + * Build with g++-3.4 on arm, m68k and hppa; kdeutils triggers the same gcc 4.0 + ICE as arts does. + + * Update FSF's address + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sat, 10 Sep 2005 21:31:16 +0000 + +kdeutils (4:3.4.2-1) unstable; urgency=low + + * New upstream release. + + +++ Changes by Pierre Habouzit: + + * Change kdessh depends: ssh becomes (open)ssh-client. (Closes: #315045) + + +++ Changes by Christopher Martin: + + * Add a patch to disable klaptopdaemon's warning concerning + klaptop_acpi_helper's checksum when using the provided dialog to make + it SUID, since this warning always erroneously states that the + checksum has changed since installation. + (Closes: #247864). + + +++ Changes by Luk Claes: + + * Add me to uploaders. + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sun, 3 Jul 2005 21:25:30 +0200 + +kdeutils (4:3.4.3-0ubuntu2) dapper; urgency=low + + * Add missing build-depends + + -- LaMont Jones <lamont@ubuntu.com> Tue, 1 Nov 2005 14:49:18 -0700 + +kdeutils (4:3.4.3-0ubuntu1) breezy; urgency=low + + * New upstream release + * Build with GCC 3.4 on hppa + + -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 7 Oct 2005 19:57:56 +0000 + +kdeutils (4:3.4.2-0ubuntu3) breezy; urgency=low + + * Fix kubuntu_04_use_pmi.diff, call suspend on suspend not hibernate + + -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 5 Oct 2005 01:31:31 +0100 + +kdeutils (4:3.4.2-0ubuntu2) breezy; urgency=low + + * Add kubuntu_03_klaptopdaemon_35.diff make klaptopdaemon use scripts + instead of /proc directly + * Add kubuntu_04_use_pmi.diff make klaptop_acpi_helper use /usr/sbin/pmi + * Add kubuntu_05_disable_nonsense_security_check.diff from SuSE, + stop broken warning that binary doesn't match checksum + * Install klaptop_acpi_helper setuid root so it can be used by default + * Add kubuntu_06_lock_on_hibernate.diff reduce options to only lock on hibernate + + -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 29 Sep 2005 17:11:22 +0100 + +kdeutils (4:3.4.2-0ubuntu1) breezy; urgency=low + + * New upstream release + * Build using unsermake + + -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 26 Jul 2005 16:26:03 +0000 + +kdeutils (4:3.4.1-0ubuntu1) breezy; urgency=low + + * Update version number following KDE 3.4.1 release + * Add all packages back to meta-package + + -- Jonathan Riddell <jr@jriddell.org> Wed, 1 Jun 2005 01:00:54 +0000 + +kdeutils (4:3.4.1-0pre1ubuntu2) breezy; urgency=low + + * Remove powerpc kmilo module from kmilo.install.powerpc until + pbbuttonsd-dev is in main + + -- Jonathan Riddell <jr@jriddell.org> Thu, 26 May 2005 18:18:31 +0000 + +kdeutils (4:3.4.1-0pre1ubuntu1) breezy; urgency=low + + * Sync with Debian, remove build-dep on pbbuttonsd-dev and tpctl + until they are in main + + -- Jonathan Riddell <jr@jriddell.org> Thu, 26 May 2005 13:29:29 +0000 + +kdeutils (4:3.4.1-1) experimental; urgency=low + + * New upstream release. + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Tue, 31 May 2005 15:43:52 -0400 + +kdeutils (4:3.4.0-0pre1) alioth; urgency=low + + * New upstream release. + + * Bugs reported in the Debian BTS fixed by this release: + + - klaptopdaemon won't trigger a suspend at startup. (Closes: #301362) + + * Converted packaging to CDBS. + + +++ Changes by Pierre Habouzit : + + * [ark.mime] add handlers for application/(g)zip (closes: #297263). + + * [debian/control] upgrade packages descriptions. + + * New kdeutils-doc-html package, containing doc-base registered HTML versions + of application handbooks, for users without Konqueror or KHelpCenter. + + +++ Changes by Adeodato Simó: + + * Created XPM icons for packages having a menu file. Install them in + /usr/share/pixmaps and update the menu entries to use them. + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Mon, 4 Apr 2005 16:41:47 +0200 + +kdeutils (4:3.3.2-2) unstable; urgency=low + + +++ Changes by Christopher Martin: + + * Change kgpg's section to kde. (Closes: #292399) + + +++ Changes by Adeodato Simó: + + * Backport patch to make kgpg display the correct fingerprint for a key even + if '--fingerprint' is specified in the configuration file. Formerly, always + the last fingerprint was displayed. (Closes: #251342) + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 03 Mar 2005 17:49:31 +0100 + +kdeutils (4:3.3.2-1) unstable; urgency=low + + +++ Changes by Christopher Martin: + + * KDE_3_3_BRANCH update. + + * Fix debian/copyright to refer to License rather than to Copyright + when discussing KDE's licenses. + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 26 Jan 2005 17:23:10 +0100 + +kdeutils (4:3.3.2-0pre1) experimental; urgency=low + + * New upstream release: + - khexedit sorts numerically the 'Occurrence' and 'Percentage' columns in + the Statistics window. (Closes: #260929) + * KDE_3_3_BRANCH update. + * Remove build-dependency on automake1.9. + * Strengthen Suggests to Recommends on compression utilties found in + main. Also add Recommends on bzip2. + * Add patch fixing kfloppy + udev. (Closes: #273890) + * Add kcharselect manpage from Karolina Lindqvist. (Closes: #192570) + * Updated kmilo and ksim package descriptions. (Closes: #250094, #235347) + + -- Christopher Martin <chrsmrtn@freeshell.org> Thu, 16 Dec 2004 15:26:40 -0500 + +kdeutils (4:3.3.1-1) unstable; urgency=low + + * New upstream release. + * KDE_3_3_BRANCH update. + * Added kdessh Depends on ssh. (Closes: #271875) + * Added Build-Depends libxtst-dev. (Closes: #276835) + + -- Christopher L Cheney <ccheney@debian.org> Mon, 8 Nov 2004 14:30:00 -0600 + +kdeutils (4:3.3.0-1) unstable; urgency=high + + * New upstream release. + + -- Christopher L Cheney <ccheney@debian.org> Sat, 14 Aug 2004 23:00:00 -0500 + +kdeutils (4:3.2.3-1) unstable; urgency=high + + * New upstream release. + * Added kgpg Depends: gnupg. (Closes: #252132) + + -- Christopher L Cheney <ccheney@debian.org> Wed, 4 Aug 2004 01:00:00 -0500 + +kdeutils (4:3.2.2-2) unstable; urgency=high + + * KDE_3_2_BRANCH pbuttonsd fix. (Closes: #245820) + + -- Christopher L Cheney <ccheney@debian.org> Mon, 26 Apr 2004 21:00:00 -0500 + +kdeutils (4:3.2.2-1) unstable; urgency=low + + * New upstream release. + * Added Build-Depends: pbbuttonsd-dev [powerpc]. (Closes: #242291) + * debian/*.menu: remove the obsolete kderemove tag. + + -- Christopher L Cheney <ccheney@debian.org> Fri, 16 Apr 2004 20:00:00 -0500 + +kdeutils (4:3.2.1-1) unstable; urgency=low + + * New upstream release. + * Added ark/kedit mime nametemplate support. (Closes: #235217) + + -- Christopher L Cheney <ccheney@debian.org> Sat, 6 Mar 2004 18:00:00 -0600 + +kdeutils (4:3.2.0-0pre1v1) experimental; urgency=low + + * New upstream release. + + -- Christopher L Cheney <ccheney@debian.org> Fri, 20 Feb 2004 04:00:00 -0600 + +kdeutils (4:3.1.95-1) unstable; urgency=low + + * New upstream release. + * Apple Powerbook buttons are not supported due to pbbuttons missing from sid. + + -- Christopher L Cheney <ccheney@debian.org> Fri, 30 Jan 2004 14:00:00 -0600 + +kdeutils (4:3.1.5-1) unstable; urgency=low + + * New upstream release. + * Added libtool arm patch. + * libkregexpeditor renamed to kregexpeditor. (Closes: #210330) + + -- Christopher L Cheney <ccheney@debian.org> Wed, 14 Jan 2004 03:00:00 -0600 + +kdeutils (4:3.1.4-1) unstable; urgency=low + + * New upstream release. + * Added patch to update autotools files. + * Added patch to remove pedantic-errors from KDE_CHECK_FUNC_EXT since it + causes configure checks to fail due to #line numbers being > 32767. + + -- Christopher L Cheney <ccheney@debian.org> Sat, 18 Oct 2003 04:00:00 -0500 + +kdeutils (4:3.1.3-1) unstable; urgency=low + + * New upstream release. + + -- Christopher L Cheney <ccheney@debian.org> Mon, 4 Aug 2003 00:00:00 -0500 + +kdeutils (4:3.1.2-1) unstable; urgency=low + + * New upstream release. + * Update ark Suggests to arj (Closes: #188409) + + -- Christopher L Cheney <ccheney@debian.org> Sun, 25 May 2003 13:00:00 -0500 + +kdeutils (4:3.1.1-1) unstable; urgency=low + + * New upstream release. + * Add 'chmod +x configure' to rules. (Closes: #181358) + + -- Christopher L Cheney <ccheney@debian.org> Wed, 12 Mar 2003 12:00:00 -0600 + +kdeutils (4:3.1.0-1) unstable; urgency=low + + * New upstream. + * Redo debian dir. + + -- Christopher L Cheney <ccheney@debian.org> Tue, 04 Feb 2003 22:00:00 -0600 + +kdeutils (4:2.2.2-9.2) stable-security; urgency=high + + * Non-maintainer upload by the Security Team + * Added special detection routine for big/little endianess on MIPS since + the line "byteorder : {big|little} endian" from /proc/cpuinfo was + removed as of Linux 2.4.20, resulting in the mipsel buildd being + unable to build this package. + + -- Martin Schulze <joey@infodrom.org> Sat, 18 Jan 2003 20:27:49 +0100 + +kdeutils (4:2.2.2-9.1) stable-security; urgency=high + + * Non-maintainer upload by the Security Team + * Applied upstream patches to fix several potential vulnerabilities. + http://www.kde.org/info/security/advisory-20021220-1.txt + + -- Martin Schulze <joey@infodrom.org> Mon, 6 Jan 2003 21:04:20 +0100 + +kdeutils (4:2.2.2-9) unstable; urgency=low + + * Change Maintainer to Chris. + * Fix PowerPC problems. + + -- Daniel Stone <daniel@sfarc.net> Wed, 27 Feb 2002 22:22:08 +1100 + +kdeutils (4:2.2.2-8) unstable; urgency=low + + * Oh, I so desperately enjoy fixing these grave-severity s390 + char-isn't-always-signed-you-dickhead bugs. + * klaptopdaemon/portable.cpp: + - See above. (closes: #127003) + + -- Daniel Stone <daniel@sfarc.net> Sun, 30 Dec 2001 07:56:15 -0500 + +kdeutils (4:2.2.2-7) unstable; urgency=low + + * Build against a post-Stone Age version of libstdc++. (closes: #125868) + + -- Daniel Stone <daniel@sfarc.net> Thu, 20 Dec 2001 14:10:19 +1100 + +kdeutils (4:2.2.2-6) unstable; urgency=low + + * New maintainer. (closes: #114104) + * debian/{ark,kab,karm,kcalc,kcharselect,kdepasswd,kdf,kedit,kfind,kfloppy, + khexedit,kjots,kljettool,klpq,klprfax,knotes,kpm,kpmdocked,ktimer,kwikdisk} + .sgml, debian/*.manpages, debian/rules, debian/control: + - New manpages. I am _so_ over writing these now. + * Fix typos. (closes: #124417, #124839) + + -- Daniel Stone <daniel@sfarc.net> Fri, 30 Nov 2001 21:59:49 +1100 + +kdeutils (4:2.2.2-5) unstable; urgency=low + + * Fix autobuild + * This is why I should test it on alpha before uploading... + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 30 Nov 2001 01:12:00 -0700 + +kdeutils (4:2.2.2-4) unstable; urgency=low + + * Sync with upstream + * Update documentation for freeze + * cleanup build process even more + * Update build-deps/deps/etc... + + -- Ivan E. Moore II <rkrusty@debian.org> Thu, 29 Nov 2001 04:30:00 -0700 + +kdeutils (4:2.2.2-3) unstable; urgency=low + + * Fix Flags for alpha + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 28 Nov 2001 00:15:00 -0700 + +kdeutils (4:2.2.2-2) unstable; urgency=low + + * Autobuild fix for alpha + * Hey! let's put the headers in the right place! Can't believe I missed + this before..this must have been broken for quite some time. + + -- Ivan E. Moore II <rkrusty@debian.org> Tue, 27 Nov 2001 01:56:00 -0700 + +kdeutils (4:2.2.2-1) unstable; urgency=low + + * New upstream version + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 07 Nov 2001 23:05:00 -0700 + +kdeutils (4:2.2.1-1.4) unstable; urgency=low + + * This *should* fix the autobuild problems for alpha + * Cleanup overrides + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 12 Oct 2001 23:05:00 -0700 + +kdeutils (4:2.2.1-1.3) unstable; urgency=low + + * Don't search for auto* as it hoses things + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 08 Oct 2001 19:36:00 -0700 + +kdeutils (4:2.2.1-1.2) unstable; urgency=low + + * Fix configure (Closes: #114580) + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 05 Oct 2001 14:51:00 -0700 + +kdeutils (4:2.2.1-1.1) unstable; urgency=low + + * Don't use automake since it's hosed + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 03 Oct 2001 14:51:00 -0700 + +kdeutils (4:2.2.1-1) unstable; urgency=low + + * New upstream version 2.2.1 + * Change maintainer + * Lintian fixes + * Fix description (Closes: #109118) + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 07 Sep 2001 14:51:00 -0700 + +kdeutils (4:2.2.0-final-1) unstable; urgency=low + + * New upstream version 2.2 + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 30 Jul 2001 00:01:00 -0700 + +kdeutils (4:2.2.0-0.1beta1-1) unstable; urgency=low + + * Sync with upstream + * More gcc3 fixes + + -- Ivan E. Moore II <rkrusty@debian.org> Thu, 26 Jul 2001 20:22:00 -0700 + +kdeutils (4:2.2.0-0beta1-3) unstable; urgency=low + + * Sync with upstream + * More alpha fixes + + -- Ivan E. Moore II <rkrusty@debian.org> Sat, 07 Jul 2001 03:44:00 -0700 + +kdeutils (4:2.2.0-0beta1-2) unstable; urgency=low + + * Sync with upstream + * Autobuild for alpha now + + -- Ivan E. Moore II <rkrusty@debian.org> Tue, 03 Jul 2001 02:37:00 -0700 + +kdeutils (4:2.2.0-0beta1-1) unstable; urgency=low + + * Sync with upstream + * Fix ktimer description (Closes: #102939) + * Fix mips build + + -- Ivan E. Moore II <rkrusty@debian.org> Sat, 30 Jun 2001 20:30:00 -0700 + +kdeutils (4:2.2-cvs20010622-1) unstable; urgency=low + + * New upstream cvs pull + * 2.2 beta 1 + * Adding in Enhances + * New package: klprfax (Closes: #100507) + * Fixes these problems: + %CPU field problem (Closes: #85272) + bad translation in df causes kdf to crash (Closes: 94011) + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 22 Jun 2001 06:30:00 -0700 + +kdeutils (4:2.1.1-2) unstable; urgency=low + + * Update menu bits to include new kde menu remval tag + * More upstream fixes + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 08 Apr 2001 17:48:00 -0700 + +kdeutils (4:2.1.1-1.0.1) unstable; urgency=low + + * Rebuild with older libc + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 26 Mar 2001 15:13:00 -0700 + +kdeutils (4:2.1.1-1) unstable; urgency=low + + * New upstream version + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 19 Mar 2001 15:13:00 -0700 + +kdeutils (4:2.1.0-2) unstable; urgency=low + + * Fix kfloppy by switching from fdformat to superformat...it now at least + formats. + * Some other upstream updates as well + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 12 Mar 2001 15:13:00 -0700 + +kdeutils (4:2.1.0-1) unstable; urgency=low + + * New upstream CVS pull + + -- Ivan E. Moore II <rkrusty@debian.org> Thu, 08 Mar 2001 02:03:00 -0700 + +kdeutils (4:2.1-final-1) unstable; urgency=low + + * New upstream version + * Upping standards version + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 19 Feb 2001 02:31:00 -0700 + +kdeutils (4:2.1-beta2-0128-1) unstable; urgency=low + + * kdf re-added + * More upstream fixes + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 29 Jan 2001 10:46:00 -0700 + +kdeutils (4:2.1-beta2-1) unstable; urgency=low + + * New upstream beta + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 22 Jan 2001 06:00:00 -0700 + +kdeutils (4:2.1-20010115-1) unstable; urgency=low + + * More upstream fixes + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 15 Jan 2001 01:00:00 -0700 + +kdeutils (4:2.1-20010106-1) unstable; urgency=low + + * More upstream fixes + * Updating/fixing depends and build-depends + + -- Ivan E. Moore II <rkrusty@debian.org> Sat, 06 Jan 2001 23:30:00 -0700 + +kdeutils (4:2.1-20010101-1) unstable; urgency=low + + * More upstream fixes + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 01 Jan 2001 17:11:00 -0700 + +kdeutils (4:2.1-20001218-1) unstable; urgency=low + + * More upstream fixes + * Removing extra mime files (Closes: #79887) + * Adding in new menu hints (Closes: #80030, #80021, #80068)) + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 18 Dec 2000 09:55:00 -0700 + +kdeutils (4:2.1-20001216-1) unstable; urgency=low + + * More upstream fixes + * Adding in missing conflicts for kdeutils + + -- Ivan E. Moore II <rkrusty@debian.org> Sat, 16 Dec 2000 23:55:00 -0700 + +kdeutils (4:2.1-20001213-1) unstable; urgency=low + + * New upstream beta version + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 13 Dec 2000 18:00:00 -0700 + +kdeutils (4:2.0-final-7) unstable; urgency=low + + * Fixing package confliction (Closes: #77670) + + -- Ivan E. Moore II <rkrusty@debian.org> Tue, 21 Nov 2000 17:00:00 -0700 + +kdeutils (4:2.0-final-6) unstable; urgency=low + + * more upstream fixes + * build-depends cleanup + * adding in lintian overrides + + -- Ivan E. Moore II <rkrusty@debian.org> Tue, 21 Nov 2000 07:30:00 -0700 + +kdeutils (4:2.0-final-5) unstable; urgency=low + + * more upstream fixes + + -- Ivan E. Moore II <rkrusty@debian.org> Sat, 18 Nov 2000 06:30:00 -0700 + +kdeutils (4:2.0-final-4) unstable; urgency=low + + * more upstream fixes + * adding in menu hints + + -- Ivan E. Moore II <rkrusty@debian.org> Thu, 09 Nov 2000 22:45:00 -0700 + +kdeutils (4:2.0-final-3) unstable; urgency=low + + * more upstream fixes + * mime entry fixes (again) + * build against new xlibs + + -- Ivan E. Moore II <rkrusty@debian.org> Sat, 04 Nov 2000 23:00:00 -0700 + +kdeutils (4:2.0-final-2) unstable; urgency=low + + * more upstream fixes + * mime entry fixes + + -- Ivan E. Moore II <rkrusty@debian.org> Thu, 02 Nov 2000 18:00:00 -0700 + +kdeutils (4:2.0-final-0) unstable; urgency=low + + * KDE 2.0 + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 23 Oct 2000 00:00:00 -0700 + +kdeutils (4:2.0-20001016-0) unstable; urgency=low + + * more upstream fixes + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 16 Oct 2000 15:00:00 -0700 + +kdeutils (4:2.0-20001011-0) unstable; urgency=low + + * KDE 2.0 RC2 + + -- Ivan E. Moore II <rkrusty@debian.org> Thu, 12 Oct 2000 06:00:00 -0700 + +kdeutils (4:2.0-20001006-0) unstable; urgency=low + + * More upstream fixes + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 06 Oct 2000 15:00:00 -0700 + +kdeutils (4:2.0-20001005-0) unstable; urgency=low + + * More upstream fixes + * Compiling against non-versioned kdelibs again + + -- Ivan E. Moore II <rkrusty@debian.org> Thu, 05 Oct 2000 15:00:00 -0700 + +kdeutils (4:2.0-20001002-0) unstable; urgency=low + + * KDE 2.0 RC1 + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 02 Oct 2000 01:30:00 -0700 + +kdeutils (4:2.0-20000925-2) unstable; urgency=low + + * More upstream fixes + * Clean build against new libc + + -- Ivan E. Moore II <rkrusty@debian.org> Tue, 26 Sep 2000 23:30:00 -0700 + +kdeutils (4:2.0-20000925-0) unstable; urgency=low + + * More upstream fixes + * Build-Depends fixes + * Fixing kdf-kdessh file mixup (Closes: #72413) + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 25 Sep 2000 15:30:00 -0700 + +kdeutils (4:2.0-20000920-2) unstable; urgency=low + + * Removing kdessh and setting proper depends for ark + + -- Ivan E. Moore II <rkrusty@debian.org> Thu, 21 Sep 2000 17:30:00 -0700 + +kdeutils (4:2.0-20000920-0) unstable; urgency=low + + * More upstream fixes + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 20 Sep 2000 23:00:00 -0700 + +kdeutils (4:2.0-20000918-0) unstable; urgency=low + + * More upstream fixes + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 18 Sep 2000 23:00:00 -0700 + +kdeutils (4:2.0-20000912-0) unstable; urgency=low + + * More upstream fixes + * Fixing old confliction/dependency loop + * Breaking up packages + + -- Ivan E. Moore II <rkrusty@debian.org> Tue, 12 Sep 2000 23:00:00 -0700 + +kdeutils (4:2.0-20000909-0) unstable; urgency=low + + * More upstream fixes + + -- Ivan E. Moore II <rkrusty@debian.org> Sat, 09 Sep 2000 22:00:00 -0700 + +kdeutils (4:2.0-20000907-2) unstable; urgency=low + + * Removing -dev package since it's empty...arggg + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 08 Sep 2000 01:00:00 -0700 + +kdeutils (4:2.0-20000907-0) unstable; urgency=low + + * More upstream fixes + * More package work + * Merging package changes with upstream cvs + + -- Ivan E. Moore II <rkrusty@debian.org> Thu, 07 Sep 2000 04:30:00 -0700 + +kdeutils (4:2.0-20000825-0) experimental; urgency=low + + * KDE 2.0 beta 4 + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 25 Aug 2000 22:30:00 -0700 + +kdeutils (4:2.0-20000820-1.0) experimental; urgency=low + + * new beta version + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 20 Aug 2000 09:45:00 -0700 + +kdeutils-cvs (4:2.0-20000521-1.0) experimental; urgency=low + + * new CVS version + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 21 May 2000 18:15:00 -0700 + +kdeutils-cvs (4:2.0-20000512-1.1) experimental; urgency=low + + * new CVS version + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 12 May 2000 22:00:00 -0700 + +kdeutils-cvs (4:2.0-20000308-1.0) experimental; urgency=low + + * new CVS version + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 08 Mar 2000 22:00:00 -0700 + +kdeutils-cvs (4:2.0-20000306-1.0) experimental; urgency=low + + * new CVS version + * Adding in build-depends + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 06 Mar 2000 22:00:00 -0700 + +kdeutils-cvs (4:2.0-19991117-1.0) experimental; urgency=low + + * new CVS version + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 17 Nov 1999 10:45:00 -0400 + +kdeutils-cvs (4:2.0-19991008-1) experimental; urgency=low + + * new CVS version + * Fixing up dependencies + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 08 Oct 1999 12:45:00 -0400 + +kdeutils-cvs (4:2.0-19990825-1) experimental; urgency=low + + * new version + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 25 Aug 1999 08:00:48 -0400 + +kdeutils-cvs (4:2.0-19990626-1) experimental; urgency=low + + * new version + + -- Stephan Kulow <coolo@kde.org> Sat, 26 Jun 1999 20:39:48 +0200 + +kdeutils-cvs (4:2.0-19990524-1) experimental; urgency=low + + * migrating from /opt to / + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 24 May 1999 07:22:51 -0400 + +kdeutils (4:1.1-19990217-1) unstable; urgency=low + + * new upstream version + + -- Stephan Kulow <coolo@kde.org> Wed, 17 Feb 1999 19:09:43 +0100 + +kdeutils (4:1.1-19990207-2) unstable; urgency=low + + * fixed a bug with the wrong libjpeg version + + -- Stephan Kulow <coolo@kde.org> Tue, 9 Feb 1999 10:43:44 +0100 + +kdeutils (4:1.1-19990207-1) unstable; urgency=low + + * new upstream version 1.1 and new epoche + + -- Stephan Kulow <coolo@kde.org> Sun, 7 Feb 1999 12:12:59 +0100 + +kdeutils (2:980710-1.0-1) unstable; urgency=low + + * new upstream version 1.0 + + -- Stephan Kulow <coolo@kde.org> Sun, 12 Jul 1998 10:12:20 +0200 + +kdeutils (2:980419-b4-1) unstable; urgency=low + + * new upstream version Beta4 + + -- Stephan Kulow <coolo@kde.org> Sun, 19 Apr 1998 15:24:47 +0200 + +kdeutils (2:980312-6) frozen; urgency=low + + * new frozen compile with latest fixed kdelibs. This time from CVS + + -- Stephan Kulow <coolo@kde.org> Fri, 3 Apr 1998 15:10:54 +0200 + +kdeutils (2:980312-5) frozen; urgency=low + + * don't compile kcalc with long double + + -- Stephan Kulow <coolo@kde.org> Thu, 26 Mar 1998 14:35:59 +0100 + +kdeutils (2:980312-4) frozen; urgency=low + + * new compile cycle with qt-1.33 and libstdc++-2.8 + + -- Stephan Kulow <coolo@kde.org> Tue, 24 Mar 1998 20:49:33 +0100 + +kdeutils (2:980312-3) unstable; urgency=low + + * changed the maintainer field. I have missed this one ;( + + -- Stephan Kulow <coolo@kde.org> Sun, 15 Mar 1998 20:51:08 +0100 + +kdeutils (2:980312-2) unstable; urgency=low + + * fixed typo in the Description + + -- Stephan Kulow <coolo@kde.org> Sun, 15 Mar 1998 20:05:47 +0100 + +kdeutils (2:980312-1) experimental; urgency=low + + * New upstream release + + -- Stephan Kulow <coolo@kde.org> Thu, 12 Mar 1998 23:27:36 +0100 + +kdeutils (980227-1) experimental; urgency=low + + * New upstream release + + -- Stephan Kulow <coolo@kde.org> Fri, 27 Feb 1998 22:03:42 +0100 + +kdeutils (1:Beta2-2.1) experimental; urgency=low + + * New upstream release + + -- Andreas Jellinghaus <aj@debian.org> Fri, 5 Dec 1997 21:16:47 +0100 + +kdeutils (1:Beta2-2) unstable; urgency=low + + * removed virtual package names. + * fixed kcalc (compiling with long double breaks somewhere). + + -- Andreas Jellinghaus <aj@debian.org> Sat, 29 Nov 1997 14:37:17 +0100 + +kdeutils (1:Beta2-1) unstable; urgency=low + + * new upstream version + + -- Andreas Jellinghaus <aj@debian.org> Sun, 23 Nov 1997 16:02:18 +0100 + +kdeutils (1:Beta1.2-2) unstable; urgency=low + + * added /usr/bin/editor divertion + * now remove inst-apps file. + + -- Andreas Jellinghaus <aj@debian.org> Sun, 9 Nov 1997 17:44:32 +0100 + +kdeutils (1:Beta1.2-1) unstable; urgency=low + + * New upstream release + + -- Andreas Jellinghaus <aj@debian.org> Mon, 27 Oct 1997 11:23:49 +0100 + +kdeutils (1:Beta1.1-1) unstable; urgency=low + + * New upstream release + + -- Andreas Jellinghaus <aj@debian.org> Mon, 20 Oct 1997 12:32:06 +0200 + +kdeutils (971019-1) unstable; urgency=low + + * New upstream release + + -- Andreas Jellinghaus <aj@debian.org> Mon, 13 Oct 1997 08:29:18 +0200 + +kdeutils (971013-1) unstable; urgency=low + + * New upstream release + + -- Andreas Jellinghaus <aj@debian.org> Mon, 13 Oct 1997 08:29:18 +0200 + +kdeutils (971009-1) unstable; urgency=low + + * New upstream release + + -- Andreas Jellinghaus <aj@debian.org> Thu, 9 Oct 1997 10:57:54 +0200 + +kdeutils (971008-1) unstable; urgency=low + + * New upstream release + + -- Andreas Jellinghaus <aj@debian.org> Wed, 8 Oct 1997 10:14:01 +0200 + +kdeutils (971006-2) unstable; urgency=low + + * daily recompile of everything. + + -- Andreas Jellinghaus <aj@debian.org> Tue, 7 Oct 1997 12:51:04 +0200 + +kdeutils (971006-1) unstable; urgency=low + + * New upstream release + + -- Andreas Jellinghaus <aj@debian.org> Mon, 6 Oct 1997 09:30:04 +0200 + +kdeutils (971005-1) unstable; urgency=low + + * New upstream release + + -- Andreas Jellinghaus <aj@debian.org> Sun, 5 Oct 1997 17:38:07 +0200 + +kdeutils (971002-2) unstable; urgency=low + + * daily recompile of everything. + + -- Andreas Jellinghaus <aj@debian.org> Fri, 3 Oct 1997 10:38:16 +0200 + +kdeutils (971002-1) unstable; urgency=low + + * New upstream release + + -- Andreas Jellinghaus <aj@debian.org> Thu, 2 Oct 1997 08:57:52 +0200 + +kdeutils (970930-1) unstable; urgency=low + + * New upstream release + + -- Andreas Jellinghaus <aj@debian.org> Tue, 30 Sep 1997 11:59:53 +0200 + +kdeutils (970929-1) unstable; urgency=low + + * New upstream release + + -- Andreas Jellinghaus <aj@debian.org> Mon, 29 Sep 1997 09:45:28 +0200 + +kdeutils (970926-1) unstable; urgency=low + + * New upstream release + + -- Andreas Jellinghaus <aj@debian.org> Fri, 26 Sep 1997 08:12:07 +0200 + +kdeutils (970925-1) unstable; urgency=low + + * New upstream release + + -- Andreas Jellinghaus <aj@debian.org> Thu, 25 Sep 1997 08:09:30 +0200 + +kdeutils (970922-3) unstable; urgency=low + + * daily recompile of everything. + + -- Andreas Jellinghaus <aj@debian.org> Wed, 24 Sep 1997 11:46:00 +0200 + +kdeutils (970922-2) unstable; urgency=low + + * daily recompile of everything. + + -- Andreas Jellinghaus <aj@debian.org> Tue, 23 Sep 1997 09:47:14 +0200 + +kdeutils (970922-1) unstable; urgency=low + + * New upstream release + + -- Andreas Jellinghaus <aj@debian.org> Mon, 22 Sep 1997 09:49:29 +0200 + +kdeutils (970921-1) unstable; urgency=low + + * New upstream release + + -- Andreas Jellinghaus <aj@debian.org> Sun, 21 Sep 1997 13:58:12 +0200 + +kdeutils (970920-1) unstable; urgency=low + + * Initial Release. + + -- Andreas Jellinghaus <aj@debian.org> Sat, 20 Sep 1997 17:48:42 +0200 --- kdeutils-3.5.8.orig/debian/khexedit.menu +++ kdeutils-3.5.8/debian/khexedit.menu @@ -0,0 +1,11 @@ +?package(khexedit):\ + needs="X11"\ + section="Apps/Tools"\ + hints="KDE"\ + title="KHexEdit"\ + icon32x32="/usr/share/pixmaps/khexedit.xpm"\ + icon16x16="/usr/share/pixmaps/khexedit-16.xpm"\ + command="/usr/bin/khexedit" + +# Icon 32x32 khexedit/cr32-app-khexedit.png khexedit.xpm +# Icon 16x16 khexedit/cr16-app-khexedit.png khexedit-16.xpm --- kdeutils-3.5.8.orig/debian/control +++ kdeutils-3.5.8/debian/control @@ -0,0 +1,349 @@ +Source: kdeutils +Section: kde +Priority: optional +Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> +Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Fathi Boudra <fboudra@free.fr>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com> +Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.5.8), kdebase-dev (>= 4:3.5.8), libkonq4-dev (>= 4:3.5.8), libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils, sharutils +Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11, kdelibs4-doc +Standards-Version: 3.7.2 + +Package: kdeutils +Section: kde +Architecture: all +Depends: ark (>= ${Source-Version}), kcalc (>= ${Source-Version}), kcharselect (>= ${Source-Version}), kdelirc (>= ${Source-Version}), kdessh (>= ${Source-Version}), kdf (>= ${Source-Version}), kedit (>= ${Source-Version}), kfloppy (>= ${Source-Version}), kgpg (>= ${Source-Version}), khexedit (>= ${Source-Version}), kjots (>= ${Source-Version}), klaptopdaemon (>= ${Source-Version}) | kpowersave, kmilo (>= ${Source-Version}), kregexpeditor (>= ${Source-Version}), ksim (>= ${Source-Version}), ktimer (>= ${Source-Version}), kwalletmanager (>= ${Source-Version}), superkaramba (>= ${Source-Version}) +Suggests: kdeutils-doc-html (>= ${Source-Version}) +Description: general purpose utilities from the official KDE release + KDE (the K Desktop Environment) is a powerful Open Source graphical + desktop environment for Unix workstations. It combines ease of use, + contemporary functionality, and outstanding graphical design with the + technological superiority of the Unix operating system. + . + This metapackage includes a collection of general purpose utilities + provided with the official release of KDE. + +Package: kdeutils-doc +Section: doc +Architecture: all +Description: developer documentation for the KDE utilities module + This package contains documentation for the KDE utilities module, of + use more for developers creating applications than regular users. + . + This package is part of KDE, and a component of the KDE utilities module. + See the 'kde' and 'kdeutils' packages for more information. + +Package: kdeutils-doc-html +Architecture: all +Section: doc +Suggests: konqueror | www-browser, kdebase +Description: KDE utilities documentation in HTML format + By default the modules provided by KDE only provide their documentation + in KDE docbook format, which can only be read by Konqueror or KHelpCenter. + This package provides all of the KDE utilities documentation + converted to HTML format so it can be read with any web browser. + . + The documentation will be installed into the usual directories + /usr/share/doc/kde/HTML/<language>/<app>/, for instance + /usr/share/doc/kde/HTML/en/ark/. Documentation is provided for most + KDE utilities packages. + . + This package is part of KDE, as a component of the KDE utilities module. + See the 'kde' and 'kdeutils' packages for more information. + +Package: kdeutils-dev +Section: utils +Architecture: any +Depends: ark (= ${Source-Version}), kcalc (= ${Source-Version}), kdelirc (= ${Source-Version}), kedit (= ${Source-Version}), khexedit (= ${Source-Version}), klaptopdaemon (= ${Source-Version}), kmilo (= ${Source-Version}), kregexpeditor (= ${Source-Version}), ksim (= ${Source-Version}), kdelibs4-dev (>= 4:3.5.8) +Description: development files for the KDE utilities module + This package contains development files needed to compile kdeutils + applications. + . + This package is part of KDE, as a component of the KDE utilities module. + See the 'kde' and 'kdeutils' packages for more information. + +Package: ark +Section: utils +Architecture: any +Depends: ${shlibs:Depends} +Recommends: ncompress, unzip, zip, zoo, bzip2, p7zip-full +Suggests: khelpcenter, rar, unrar | unrar-free +Replaces: kdebase-data (<< 4:3.3.91) +Description: graphical archiving tool for KDE + Ark is a graphical program for managing various archive formats within the + KDE environment. Archives can be viewed, extracted, created and modified + from within Ark. + . + The program can handle various formats such as tar, gzip, bzip2, zip, rar and + lha (if appropriate command-line programs are installed). + . + Ark can work closely with Konqueror in the KDE environment to handle archives, + if you install the Konqueror Integration plugin available in the konq-plugins + package. + . + This package is part of KDE, as a component of the KDE utilities module. + See the 'kde' and 'kdeutils' packages for more information. + +Package: kcalc +Section: utils +Architecture: any +Depends: ${shlibs:Depends} +Suggests: khelpcenter +Replaces: kdebase-data (<< 4:3.3.91) +Description: calculator for KDE + KCalc is KDE's scientific calculator. + . + It provides: + * trigonometric functions, logic operations, and statistical calculations + * easy cut and paste of numbers from/into its display + * a results-stack which lets you conveniently recall previous results + * configurable precision, and number of digits after the period + . + This package is part of KDE, as a component of the KDE utilities module. + See the 'kde' and 'kdeutils' packages for more information. + +Package: kcharselect +Section: utils +Architecture: any +Depends: ${shlibs:Depends} +Suggests: khelpcenter +Description: character selector for KDE + A character set selector for KDE. + . + This package is part of KDE, as a component of the KDE utilities module. + See the 'kde' and 'kdeutils' packages for more information. + +Package: kdelirc +Section: utils +Architecture: any +Depends: ${shlibs:Depends} +Suggests: khelpcenter +Description: infrared control for KDE + This is a frontend for the LIRC suite to use infrared devices with KDE. + . + This package is part of KDE, as a component of the KDE utilities module. + See the 'kde' and 'kdeutils' packages for more information. + +Package: kdessh +Section: kde +Architecture: any +Depends: ${shlibs:Depends}, openssh-client | ssh-client +Description: ssh frontend for KDE + This package contains KDE's frontend for ssh. + . + This package is part of KDE, as a component of the KDE utilities module. + See the 'kde' and 'kdeutils' packages for more information. + +Package: kdf +Section: utils +Architecture: any +Depends: ${shlibs:Depends} +Suggests: khelpcenter +Description: disk space utility for KDE + KDiskFree displays the available file devices (hard drive partitions, floppy + and CD drives, etc.) along with information on their capacity, free space, type + and mount point. It also allows you to mount and unmount drives and view them + in a file manager. + . + This package is part of KDE, as a component of the KDE utilities module. + See the 'kde' and 'kdeutils' packages for more information. + +Package: kedit +Section: editors +Architecture: any +Depends: ${shlibs:Depends} +Suggests: khelpcenter +Description: basic text editor for KDE + A simple text editor for KDE. + . + It can be used with Konqueror for text and configuration file browsing. + KEdit also serves well for creating small plain text documents. KEdit's + functionality will intentionally remain rather limited to ensure a + reasonably fast start. + . + This package is part of KDE, as a component of the KDE utilities module. + See the 'kde' and 'kdeutils' packages for more information. + +Package: kfloppy +Section: utils +Architecture: any +Depends: ${shlibs:Depends}, dosfstools +Suggests: khelpcenter +Description: floppy formatter for KDE + Kfloppy is a utility that provides a straightforward graphical means + to format 3.5" and 5.25" floppy disks. + . + This package is part of KDE, as a component of the KDE utilities module. + See the 'kde' and 'kdeutils' packages for more information. + +Package: kgpg +Section: kde +Architecture: any +Depends: ${shlibs:Depends}, konsole (>= 4:3.5.8), gnupg +Suggests: khelpcenter +Description: GnuPG frontend for KDE + Kgpg is a frontend for GNU Privacy Guard (GnuPG). It provides file + encryption, file decryption and key management. + . + Features: + * an editor mode for easily and quickly encrypting or decrypting a file + or message which is typed, copied, pasted or dragged into the editor, + or which is double-clicked in the file manager + * Konqueror integration for encrypting or decrypting files + * a panel applet for encrypting / decrypting files or the clipboard + contents, etc. + * key management functions (generation, import, export, deletion and + signing) + * decrypting clipboard contents, including integration with Klipper + . + This package is part of KDE, as a component of the KDE utilities module. + See the 'kde' and 'kdeutils' packages for more information. + +Package: khexedit +Section: utils +Architecture: any +Depends: ${shlibs:Depends} +Suggests: khelpcenter +Description: KDE hex editor + KHexEdit is an editor for the raw data of binary files. It includes + find/replace functions, bookmarks, many configuration options, drag and drop + support and other powerful features. + . + This package is part of KDE, as a component of the KDE utilities module. + See the 'kde' and 'kdeutils' packages for more information. + +Package: kjots +Section: utils +Architecture: any +Depends: ${shlibs:Depends} +Suggests: khelpcenter +Description: note taking utility for KDE + Kjots is a small note taker program. Name and idea are taken from the jots + program included in the tkgoodstuff package. + . + This package is part of KDE, as a component of the KDE utilities module. + See the 'kde' and 'kdeutils' packages for more information. + +Package: klaptopdaemon +Section: kde +Architecture: any +Depends: ${shlibs:Depends} +Suggests: khelpcenter +Description: battery monitoring and management for laptops using KDE + This package contains utilities to monitor batteries and configure + power management, for laptops, from within KDE. + . + This package is part of KDE, as a component of the KDE utilities module. + See the 'kde' and 'kdeutils' packages for more information. + +Package: kmilo +Section: utils +Architecture: any +Depends: ${shlibs:Depends} +Description: laptop special keys support for KDE + KMilo lets you use the special keys on some keyboards and laptops. + . + Usually this includes volume keys and other features. Currently, KMilo + comes with plugins for Powerbooks, Thinkpads, Vaios and generic keyboards + with special keys. + . + This package is part of KDE, as a component of the KDE utilities module. + See the 'kde' and 'kdeutils' packages for more information. + +Package: kmilo-legacy +Section: utils +Architecture: any +Depends: kmilo, ${shlibs:Depends} +Description: non-standard plugins for KMilo + KMilo lets you use the special keys on some keyboards and laptops. + . + Usually this includes volume keys and other features. Currently, KMilo + comes with plugins for Powerbooks, Thinkpads and Vaios. + . + In Kubuntu the intention is that all laptops work with the generic kmilo + plugin, if you need this package please file a bug. + . + This package is part of KDE, as a component of the KDE utilities module. + See the 'kde' and 'kdeutils' packages for more information. + +Package: kregexpeditor +Section: kde +Architecture: any +Depends: ${shlibs:Depends} +Suggests: khelpcenter +Description: graphical regular expression editor plugin for KDE + This package contains a graphical regular expression editor plugin for use + with KDE. It let you draw your regular expression in an unambiguous way. + . + This package is part of KDE, as a component of the KDE utilities module. + See the 'kde' and 'kdeutils' packages for more information. + +Package: ksim +Section: utils +Architecture: any +Depends: ${shlibs:Depends} +Suggests: khelpcenter +Description: system information monitor for KDE + KSim is a system monitor app which has its own plugin system with support + for GKrellm skins. It allows users to follow uptime, memory usage, network + connections, power, etc. + . + This package is part of KDE, as a component of the KDE utilities module. + See the 'kde' and 'kdeutils' packages for more information. + +Package: ktimer +Section: utils +Architecture: any +Depends: ${shlibs:Depends} +Suggests: khelpcenter +Description: timer utility for KDE + This is a timer application for KDE. It allows you to execute commands after + a certain amount of time. It supports looping commands as well as delayed + command execution. + . + This package is part of KDE, as a component of the KDE utilities module. + See the 'kde' and 'kdeutils' packages for more information. + +Package: kwalletmanager +Section: utils +Architecture: any +Depends: ${shlibs:Depends} +Suggests: khelpcenter +Description: wallet manager for KDE + This program keeps various wallets for any kind of data that the user can + store encrypted with passwords and can also serve as a password manager that + keeps a master password to all wallets. + . + This package is part of KDE, as a component of the KDE utilities module. + See the 'kde' and 'kdeutils' packages for more information. + +Package: superkaramba +Section: kde +Architecture: any +Depends: ${shlibs:Depends} +Suggests: khelpcenter +Conflicts: karamba +Description: a program based on karamba improving the eyecandy of KDE + SuperKaramba is a tool based on karamba that allows anyone to easily create + and run little interactive widgets on a KDE desktop. Widgets are defined in a + simple text file and can be augmented with Python code to make them + interactive. + . + Here are just some examples of the things that can be done: + . + * Display system information such as CPU Usage, MP3 playing, etc. + * Create cool custom toolbars that work any way imaginable. + * Create little games or virtual pets that live on your desktop. + * Display information from the internet, such as weather and headlines. + . + This package is part of KDE, as a component of the KDE utilities module. + See the 'kde' and 'kdeutils' packages for more information. + +Package: kdeutils-dbg +Section: libdevel +Architecture: any +Depends: kdelibs-dbg +Priority: extra +Description: debugging symbols for kdeutils + This package contains the debugging symbols associated with kdeutils. + They will automatically be used by gdb for debugging kdeutils-related + issues. --- kdeutils-3.5.8.orig/debian/kjots.menu +++ kdeutils-3.5.8/debian/kjots.menu @@ -0,0 +1,11 @@ +?package(kjots):\ + needs="X11"\ + section="Apps/Tools"\ + hints="KDE"\ + title="KJots"\ + icon32x32="/usr/share/pixmaps/kjots.xpm"\ + icon16x16="/usr/share/pixmaps/kjots-16.xpm"\ + command="/usr/bin/kjots" + +# Icon 32x32 kjots/icons/cr32-app-kjots.png kjots.xpm +# Icon 16x16 kjots/icons/cr16-app-kjots.png kjots-16.xpm --- kdeutils-3.5.8.orig/debian/control.in +++ kdeutils-3.5.8/debian/control.in @@ -0,0 +1,333 @@ +Source: kdeutils +Section: kde +Priority: optional +Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: @@@MAINTAINER@@@ +Uploaders: @@@UPLOADERS@@@ +Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.5.8), kdebase-dev (>= 4:3.5.8), libkonq4-dev (>= 4:3.5.8), libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils, pbbuttonsd-dev [powerpc], sharutils +Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11, kdelibs4-doc +Standards-Version: 3.7.2 + +Package: kdeutils +Section: kde +Architecture: all +Depends: ark (>= ${Source-Version}), kcalc (>= ${Source-Version}), kcharselect (>= ${Source-Version}), kdelirc (>= ${Source-Version}), kdessh (>= ${Source-Version}), kdf (>= ${Source-Version}), kedit (>= ${Source-Version}), kfloppy (>= ${Source-Version}), kgpg (>= ${Source-Version}), khexedit (>= ${Source-Version}), kjots (>= ${Source-Version}), klaptopdaemon (>= ${Source-Version}) | kpowersave, kmilo (>= ${Source-Version}), kregexpeditor (>= ${Source-Version}), ksim (>= ${Source-Version}), ktimer (>= ${Source-Version}), kwalletmanager (>= ${Source-Version}), superkaramba (>= ${Source-Version}) +Suggests: kdeutils-doc-html (>= ${Source-Version}) +Description: general purpose utilities from the official KDE release + KDE (the K Desktop Environment) is a powerful Open Source graphical + desktop environment for Unix workstations. It combines ease of use, + contemporary functionality, and outstanding graphical design with the + technological superiority of the Unix operating system. + . + This metapackage includes a collection of general purpose utilities + provided with the official release of KDE. + +Package: kdeutils-doc +Section: doc +Architecture: all +Description: developer documentation for the KDE utilities module + This package contains documentation for the KDE utilities module, of + use more for developers creating applications than regular users. + . + This package is part of KDE, and a component of the KDE utilities module. + See the 'kde' and 'kdeutils' packages for more information. + +Package: kdeutils-doc-html +Architecture: all +Section: doc +Suggests: konqueror | www-browser, kdebase +Description: KDE utilities documentation in HTML format + By default the modules provided by KDE only provide their documentation + in KDE docbook format, which can only be read by Konqueror or KHelpCenter. + This package provides all of the KDE utilities documentation + converted to HTML format so it can be read with any web browser. + . + The documentation will be installed into the usual directories + /usr/share/doc/kde/HTML/<language>/<app>/, for instance + /usr/share/doc/kde/HTML/en/ark/. Documentation is provided for most + KDE utilities packages. + . + This package is part of KDE, as a component of the KDE utilities module. + See the 'kde' and 'kdeutils' packages for more information. + +Package: kdeutils-dev +Section: utils +Architecture: any +Depends: ark (= ${Source-Version}), kcalc (= ${Source-Version}), kdelirc (= ${Source-Version}), kedit (= ${Source-Version}), khexedit (= ${Source-Version}), klaptopdaemon (= ${Source-Version}), kmilo (= ${Source-Version}), kregexpeditor (= ${Source-Version}), ksim (= ${Source-Version}), kdelibs4-dev (>= 4:3.5.8) +Description: development files for the KDE utilities module + This package contains development files needed to compile kdeutils + applications. + . + This package is part of KDE, as a component of the KDE utilities module. + See the 'kde' and 'kdeutils' packages for more information. + +Package: ark +Section: utils +Architecture: any +Depends: ${shlibs:Depends} +Recommends: ncompress, unzip, zip, zoo, bzip2, p7zip-full +Suggests: khelpcenter, rar, unrar | unrar-free +Replaces: kdebase-data (<< 4:3.3.91) +Description: graphical archiving tool for KDE + Ark is a graphical program for managing various archive formats within the + KDE environment. Archives can be viewed, extracted, created and modified + from within Ark. + . + The program can handle various formats such as tar, gzip, bzip2, zip, rar and + lha (if appropriate command-line programs are installed). + . + Ark can work closely with Konqueror in the KDE environment to handle archives, + if you install the Konqueror Integration plugin available in the konq-plugins + package. + . + This package is part of KDE, as a component of the KDE utilities module. + See the 'kde' and 'kdeutils' packages for more information. + +Package: kcalc +Section: utils +Architecture: any +Depends: ${shlibs:Depends} +Suggests: khelpcenter +Replaces: kdebase-data (<< 4:3.3.91) +Description: calculator for KDE + KCalc is KDE's scientific calculator. + . + It provides: + * trigonometric functions, logic operations, and statistical calculations + * easy cut and paste of numbers from/into its display + * a results-stack which lets you conveniently recall previous results + * configurable precision, and number of digits after the period + . + This package is part of KDE, as a component of the KDE utilities module. + See the 'kde' and 'kdeutils' packages for more information. + +Package: kcharselect +Section: utils +Architecture: any +Depends: ${shlibs:Depends} +Suggests: khelpcenter +Description: character selector for KDE + A character set selector for KDE. + . + This package is part of KDE, as a component of the KDE utilities module. + See the 'kde' and 'kdeutils' packages for more information. + +Package: kdelirc +Section: utils +Architecture: any +Depends: ${shlibs:Depends} +Suggests: khelpcenter +Description: infrared control for KDE + This is a frontend for the LIRC suite to use infrared devices with KDE. + . + This package is part of KDE, as a component of the KDE utilities module. + See the 'kde' and 'kdeutils' packages for more information. + +Package: kdessh +Section: kde +Architecture: any +Depends: ${shlibs:Depends}, openssh-client | ssh-client +Description: ssh frontend for KDE + This package contains KDE's frontend for ssh. + . + This package is part of KDE, as a component of the KDE utilities module. + See the 'kde' and 'kdeutils' packages for more information. + +Package: kdf +Section: utils +Architecture: any +Depends: ${shlibs:Depends} +Suggests: khelpcenter +Description: disk space utility for KDE + KDiskFree displays the available file devices (hard drive partitions, floppy + and CD drives, etc.) along with information on their capacity, free space, type + and mount point. It also allows you to mount and unmount drives and view them + in a file manager. + . + This package is part of KDE, as a component of the KDE utilities module. + See the 'kde' and 'kdeutils' packages for more information. + +Package: kedit +Section: editors +Architecture: any +Depends: ${shlibs:Depends} +Suggests: khelpcenter +Description: basic text editor for KDE + A simple text editor for KDE. + . + It can be used with Konqueror for text and configuration file browsing. + KEdit also serves well for creating small plain text documents. KEdit's + functionality will intentionally remain rather limited to ensure a + reasonably fast start. + . + This package is part of KDE, as a component of the KDE utilities module. + See the 'kde' and 'kdeutils' packages for more information. + +Package: kfloppy +Section: utils +Architecture: any +Depends: ${shlibs:Depends}, dosfstools +Suggests: khelpcenter +Description: floppy formatter for KDE + Kfloppy is a utility that provides a straightforward graphical means + to format 3.5" and 5.25" floppy disks. + . + This package is part of KDE, as a component of the KDE utilities module. + See the 'kde' and 'kdeutils' packages for more information. + +Package: kgpg +Section: kde +Architecture: any +Depends: ${shlibs:Depends}, konsole (>= 4:3.5.8), gnupg +Suggests: khelpcenter +Description: GnuPG frontend for KDE + Kgpg is a frontend for GNU Privacy Guard (GnuPG). It provides file + encryption, file decryption and key management. + . + Features: + * an editor mode for easily and quickly encrypting or decrypting a file + or message which is typed, copied, pasted or dragged into the editor, + or which is double-clicked in the file manager + * Konqueror integration for encrypting or decrypting files + * a panel applet for encrypting / decrypting files or the clipboard + contents, etc. + * key management functions (generation, import, export, deletion and + signing) + * decrypting clipboard contents, including integration with Klipper + . + This package is part of KDE, as a component of the KDE utilities module. + See the 'kde' and 'kdeutils' packages for more information. + +Package: khexedit +Section: utils +Architecture: any +Depends: ${shlibs:Depends} +Suggests: khelpcenter +Description: KDE hex editor + KHexEdit is an editor for the raw data of binary files. It includes + find/replace functions, bookmarks, many configuration options, drag and drop + support and other powerful features. + . + This package is part of KDE, as a component of the KDE utilities module. + See the 'kde' and 'kdeutils' packages for more information. + +Package: kjots +Section: utils +Architecture: any +Depends: ${shlibs:Depends} +Suggests: khelpcenter +Description: note taking utility for KDE + Kjots is a small note taker program. Name and idea are taken from the jots + program included in the tkgoodstuff package. + . + This package is part of KDE, as a component of the KDE utilities module. + See the 'kde' and 'kdeutils' packages for more information. + +Package: klaptopdaemon +Section: kde +Architecture: any +Depends: ${shlibs:Depends} +Suggests: khelpcenter +Description: battery monitoring and management for laptops using KDE + This package contains utilities to monitor batteries and configure + power management, for laptops, from within KDE. + . + This package is part of KDE, as a component of the KDE utilities module. + See the 'kde' and 'kdeutils' packages for more information. + +Package: kmilo +Section: utils +Architecture: any +Depends: ${shlibs:Depends} +Description: laptop special keys support for KDE + KMilo lets you use the special keys on some keyboards and laptops. + . + Usually this includes volume keys and other features. Currently, KMilo + comes with plugins for Powerbooks, Thinkpads, Vaios and generic keyboards + with special keys. + . + This package is part of KDE, as a component of the KDE utilities module. + See the 'kde' and 'kdeutils' packages for more information. + +Package: kregexpeditor +Section: kde +Architecture: any +Depends: ${shlibs:Depends} +Suggests: khelpcenter +Description: graphical regular expression editor plugin for KDE + This package contains a graphical regular expression editor plugin for use + with KDE. It let you draw your regular expression in an unambiguous way. + . + This package is part of KDE, as a component of the KDE utilities module. + See the 'kde' and 'kdeutils' packages for more information. + +Package: ksim +Section: utils +Architecture: any +Depends: ${shlibs:Depends} +Suggests: khelpcenter +Description: system information monitor for KDE + KSim is a system monitor app which has its own plugin system with support + for GKrellm skins. It allows users to follow uptime, memory usage, network + connections, power, etc. + . + This package is part of KDE, as a component of the KDE utilities module. + See the 'kde' and 'kdeutils' packages for more information. + +Package: ktimer +Section: utils +Architecture: any +Depends: ${shlibs:Depends} +Suggests: khelpcenter +Description: timer utility for KDE + This is a timer application for KDE. It allows you to execute commands after + a certain amount of time. It supports looping commands as well as delayed + command execution. + . + This package is part of KDE, as a component of the KDE utilities module. + See the 'kde' and 'kdeutils' packages for more information. + +Package: kwalletmanager +Section: utils +Architecture: any +Depends: ${shlibs:Depends} +Suggests: khelpcenter +Description: wallet manager for KDE + This program keeps various wallets for any kind of data that the user can + store encrypted with passwords and can also serve as a password manager that + keeps a master password to all wallets. + . + This package is part of KDE, as a component of the KDE utilities module. + See the 'kde' and 'kdeutils' packages for more information. + +Package: superkaramba +Section: kde +Architecture: any +Depends: ${shlibs:Depends} +Suggests: khelpcenter +Conflicts: karamba +Description: a program based on karamba improving the eyecandy of KDE + SuperKaramba is a tool based on karamba that allows anyone to easily create + and run little interactive widgets on a KDE desktop. Widgets are defined in a + simple text file and can be augmented with Python code to make them + interactive. + . + Here are just some examples of the things that can be done: + . + * Display system information such as CPU Usage, MP3 playing, etc. + * Create cool custom toolbars that work any way imaginable. + * Create little games or virtual pets that live on your desktop. + * Display information from the internet, such as weather and headlines. + . + This package is part of KDE, as a component of the KDE utilities module. + See the 'kde' and 'kdeutils' packages for more information. + +Package: kdeutils-dbg +Section: libdevel +Architecture: any +Depends: kdelibs-dbg +Priority: extra +Description: debugging symbols for kdeutils + This package contains the debugging symbols associated with kdeutils. + They will automatically be used by gdb for debugging kdeutils-related + issues. --- kdeutils-3.5.8.orig/debian/compat +++ kdeutils-3.5.8/debian/compat @@ -0,0 +1 @@ +5 --- kdeutils-3.5.8.orig/debian/kdeutils-doc-html.doc-base.kgpg +++ kdeutils-3.5.8/debian/kdeutils-doc-html.doc-base.kgpg @@ -0,0 +1,10 @@ +Document: kdeutils-doc-html-kgpg +Title: KGPG Handbook +Author: Jean-Baptiste Mardelle +Abstract: KGPG is a simple graphical interface for GnuPG +Section: Tools + +Format: HTML +Index: /usr/share/doc/kde/HTML/en/kgpg/index.html +Files: /usr/share/doc/kde/HTML/en/kgpg/*.html + --- kdeutils-3.5.8.orig/debian/kedit.lintian +++ kdeutils-3.5.8/debian/kedit.lintian @@ -0,0 +1,3 @@ +kedit: no-shlibs-control-file usr/lib/libkdeinit_kedit.so +kedit: postinst-must-call-ldconfig usr/lib/libkdeinit_kedit.so +kedit: postrm-should-call-ldconfig usr/lib/libkdeinit_kedit.so --- kdeutils-3.5.8.orig/debian/kjots.install +++ kdeutils-3.5.8/debian/kjots.install @@ -0,0 +1,16 @@ +debian/tmp/usr/bin/kjots +debian/tmp/usr/share/applications/kde/Kjots.desktop +debian/tmp/usr/share/apps/kjots/kjotsui.rc +debian/tmp/usr/share/apps/kjots/pics/filedel.png +debian/tmp/usr/share/config.kcfg/kjots.kcfg +debian/tmp/usr/share/doc/kde/HTML/en/kjots/common +debian/tmp/usr/share/doc/kde/HTML/en/kjots/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kjots/index.docbook +debian/tmp/usr/share/icons/hicolor/16x16/apps/kjots.png +debian/tmp/usr/share/icons/hicolor/22x22/apps/kjots.png +debian/tmp/usr/share/icons/hicolor/32x32/apps/kjots.png +debian/tmp/usr/share/icons/hicolor/48x48/apps/kjots.png +debian/tmp/usr/share/icons/hicolor/64x64/apps/kjots.png + +debian/icons/kjots.xpm /usr/share/pixmaps +debian/icons/kjots-16.xpm /usr/share/pixmaps --- kdeutils-3.5.8.orig/debian/kdeutils-doc-html.doc-base.kwallet +++ kdeutils-3.5.8/debian/kdeutils-doc-html.doc-base.kwallet @@ -0,0 +1,10 @@ +Document: kdeutils-doc-html-kwallet +Title: KWallet Handbook +Author: George Staikos, Lauri Watts +Abstract: The wallet subsytem provides a convenient and secure way to manage all your passwords. +Section: Tools + +Format: HTML +Index: /usr/share/doc/kde/HTML/en/kwallet/index.html +Files: /usr/share/doc/kde/HTML/en/kwallet/*.html + --- kdeutils-3.5.8.orig/debian/kgpg.install +++ kdeutils-3.5.8/debian/kgpg.install @@ -0,0 +1,44 @@ +debian/tmp/usr/bin/kgpg +debian/tmp/usr/share/applications/kde/kgpg.desktop +debian/tmp/usr/share/apps/kgpg/icons/crystalsvg/16x16/actions/kgpg_key1.png +debian/tmp/usr/share/apps/kgpg/icons/crystalsvg/16x16/actions/kgpg_key2.png +debian/tmp/usr/share/apps/kgpg/icons/crystalsvg/16x16/actions/kgpg_key3.png +debian/tmp/usr/share/apps/kgpg/icons/crystalsvg/16x16/actions/kgpg_key4.png +debian/tmp/usr/share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_edit.png +debian/tmp/usr/share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_export.png +debian/tmp/usr/share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_gen.png +debian/tmp/usr/share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_identity.png +debian/tmp/usr/share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_import.png +debian/tmp/usr/share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_info.png +debian/tmp/usr/share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_photo.png +debian/tmp/usr/share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_show.png +debian/tmp/usr/share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_sign.png +debian/tmp/usr/share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_term.png +debian/tmp/usr/share/apps/kgpg/kgpg.rc +debian/tmp/usr/share/apps/kgpg/listkeys.rc +debian/tmp/usr/share/apps/kgpg/pics/kgpg_anim.gif +debian/tmp/usr/share/apps/kgpg/pics/kgpg_blank.png +debian/tmp/usr/share/apps/kgpg/pics/kgpg_docked.gif +debian/tmp/usr/share/apps/kgpg/pics/kgpg_docked.png +debian/tmp/usr/share/apps/kgpg/pics/kgpg_fill.png +debian/tmp/usr/share/apps/kgpg/tips +debian/tmp/usr/share/apps/konqueror/servicemenus/encryptfile.desktop +debian/tmp/usr/share/apps/konqueror/servicemenus/encryptfolder.desktop +debian/tmp/usr/share/autostart/kgpg.desktop +debian/tmp/usr/share/config.kcfg/kgpg.kcfg +debian/tmp/usr/share/doc/kde/HTML/en/kgpg/common +debian/tmp/usr/share/doc/kde/HTML/en/kgpg/editor.png +debian/tmp/usr/share/doc/kde/HTML/en/kgpg/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kgpg/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kgpg/keygen.png +debian/tmp/usr/share/doc/kde/HTML/en/kgpg/keymanage.png +debian/tmp/usr/share/doc/kde/HTML/en/kgpg/keys.png +debian/tmp/usr/share/doc/kde/HTML/en/kgpg/kicker.png +debian/tmp/usr/share/doc/kde/HTML/en/kgpg/options.png +debian/tmp/usr/share/icons/hicolor/16x16/apps/kgpg.png +debian/tmp/usr/share/icons/hicolor/22x22/apps/kgpg.png +debian/tmp/usr/share/icons/hicolor/32x32/apps/kgpg.png +debian/tmp/usr/share/icons/hicolor/48x48/apps/kgpg.png + +debian/icons/kgpg.xpm /usr/share/pixmaps +debian/icons/kgpg-16.xpm /usr/share/pixmaps --- kdeutils-3.5.8.orig/debian/kdeutils-doc-html.doc-base.superkaramba +++ kdeutils-3.5.8/debian/kdeutils-doc-html.doc-base.superkaramba @@ -0,0 +1,13 @@ +Document: kdeutils-doc-html-superkaramba +Title: Superkaramba API +Author: Adam Geitgey +Abstract: This Handbook documents the Superkaramba API + SuperKaramba is a tool based on karamba that allows anyone to easily create + and run little interactive widgets on a KDE desktop. Widgets are defined in a + simple text file and can be augmented with Python code to make them + interactive. +Section: Tools + +Format: HTML +Index: /usr/share/doc/kde/HTML/en/superkaramba/index.html +Files: /usr/share/doc/kde/HTML/en/superkaramba/*.html --- kdeutils-3.5.8.orig/debian/kmilo-legacy.install +++ kdeutils-3.5.8/debian/kmilo-legacy.install @@ -0,0 +1,18 @@ +debian/tmp/usr/lib/kde3/kcm_kvaio.la +debian/tmp/usr/lib/kde3/kcm_kvaio.so +debian/tmp/usr/lib/kde3/kcm_thinkpad.la +debian/tmp/usr/lib/kde3/kcm_thinkpad.so +debian/tmp/usr/lib/kde3/kmilo_asus.la +debian/tmp/usr/lib/kde3/kmilo_asus.so +debian/tmp/usr/lib/kde3/kmilo_delli8k.la +debian/tmp/usr/lib/kde3/kmilo_delli8k.so +debian/tmp/usr/lib/kde3/kmilo_kvaio.la +debian/tmp/usr/lib/kde3/kmilo_kvaio.so +debian/tmp/usr/lib/kde3/kmilo_thinkpad.la +debian/tmp/usr/lib/kde3/kmilo_thinkpad.so +debian/tmp/usr/share/applications/kde/kvaio.desktop +debian/tmp/usr/share/applications/kde/thinkpad.desktop +debian/tmp/usr/share/services/kmilo/kmilo_asus.desktop +debian/tmp/usr/share/services/kmilo/kmilo_delli8k.desktop +debian/tmp/usr/share/services/kmilo/kmilo_kvaio.desktop +debian/tmp/usr/share/services/kmilo/kmilo_thinkpad.desktop --- kdeutils-3.5.8.orig/debian/ksim.install +++ kdeutils-3.5.8/debian/ksim.install @@ -0,0 +1,39 @@ +debian/tmp/etc/kde3/ksim_panelextensionrc +debian/tmp/usr/lib/kde3/ksim_*.la +debian/tmp/usr/lib/kde3/ksim_*.so +debian/tmp/usr/lib/libksimcore.so.1 +debian/tmp/usr/lib/libksimcore.so.1.0.0 +debian/tmp/usr/share/apps/kicker/extensions/ksim.desktop +debian/tmp/usr/share/apps/ksim/monitors/DFree.desktop +debian/tmp/usr/share/apps/ksim/monitors/Lm_sensors.desktop +debian/tmp/usr/share/apps/ksim/monitors/Net.desktop +debian/tmp/usr/share/apps/ksim/monitors/Snmp.desktop +debian/tmp/usr/share/apps/ksim/monitors/cpu.desktop +debian/tmp/usr/share/apps/ksim/monitors/disk.desktop +debian/tmp/usr/share/apps/ksim/pics/clock.png +debian/tmp/usr/share/apps/ksim/pics/uptime.png +debian/tmp/usr/share/apps/ksim/themes/ksim/bg_chart.png +debian/tmp/usr/share/apps/ksim/themes/ksim/bg_grid.png +debian/tmp/usr/share/apps/ksim/themes/ksim/bg_meter.png +debian/tmp/usr/share/apps/ksim/themes/ksim/bg_panel.png +debian/tmp/usr/share/apps/ksim/themes/ksim/frame_bottom.png +debian/tmp/usr/share/apps/ksim/themes/ksim/frame_left.png +debian/tmp/usr/share/apps/ksim/themes/ksim/frame_right.png +debian/tmp/usr/share/apps/ksim/themes/ksim/frame_top.png +debian/tmp/usr/share/apps/ksim/themes/ksim/gkrellmrc +debian/tmp/usr/share/apps/ksim/themes/ksim/gkrellmrc_ksim +debian/tmp/usr/share/apps/ksim/themes/ksim/host/bg_meter.png +debian/tmp/usr/share/apps/ksim/themes/ksim/krell_meter.png +debian/tmp/usr/share/apps/ksim/themes/ksim/krell_panel.png +debian/tmp/usr/share/apps/ksim/themes/ksim/krell_slider.png +debian/tmp/usr/share/apps/ksim/themes/ksim/mail/decal_mail.png +debian/tmp/usr/share/apps/ksim/themes/ksim/mail/krell_mail.png +debian/tmp/usr/share/apps/ksim/themes/ksim/mail/krell_mail_daemon.png +debian/tmp/usr/share/apps/ksim/themes/ksim/net/decal_net_leds.png +debian/tmp/usr/share/doc/kde/HTML/en/ksim/common +debian/tmp/usr/share/doc/kde/HTML/en/ksim/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/ksim/index.docbook +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/ksim.png +debian/tmp/usr/share/icons/crystalsvg/16x16/devices/ksim_cpu.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/ksim.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/ksim.png --- kdeutils-3.5.8.orig/debian/kdeutils-doc-html.doc-base.khexedit +++ kdeutils-3.5.8/debian/kdeutils-doc-html.doc-base.khexedit @@ -0,0 +1,10 @@ +Document: kdeutils-doc-html-khexedit +Title: KHexEdit Handbook +Author: Jonathan Singer +Abstract: KHexEdit is a hexadecimal editor for KDE +Section: Tools + +Format: HTML +Index: /usr/share/doc/kde/HTML/en/khexedit/index.html +Files: /usr/share/doc/kde/HTML/en/khexedit/*.html + --- kdeutils-3.5.8.orig/debian/kdeutils-doc-html.doc-base.kjots +++ kdeutils-3.5.8/debian/kdeutils-doc-html.doc-base.kjots @@ -0,0 +1,10 @@ +Document: kdeutils-doc-html-kjots +Title: KJots Handbook +Author: Matt Johnston +Abstract: KJots is a small program which is handy for keeping miscellaneous notes. +Section: Tools + +Format: HTML +Index: /usr/share/doc/kde/HTML/en/kjots/index.html +Files: /usr/share/doc/kde/HTML/en/kjots/*.html + --- kdeutils-3.5.8.orig/debian/kcharselect.menu +++ kdeutils-3.5.8/debian/kcharselect.menu @@ -0,0 +1,11 @@ +?package(kcharselect):\ + needs="X11"\ + section="Apps/Tools"\ + hints="KDE,Characters"\ + title="KCharSelect"\ + icon32x32="/usr/share/pixmaps/kcharselect.xpm"\ + icon16x16="/usr/share/pixmaps/kcharselect-16.xpm"\ + command="/usr/bin/kcharselect" + +# Icon 32x32 kcharselect/cr48-app-kcharselect.png kcharselect.xpm +# Icon 16x16 kcharselect/cr16-app-kcharselect.png kcharselect-16.xpm --- kdeutils-3.5.8.orig/debian/kcalc.install +++ kdeutils-3.5.8/debian/kcalc.install @@ -0,0 +1,23 @@ +debian/tmp/usr/bin/kcalc +debian/tmp/usr/lib/kde3/kcalc.la +debian/tmp/usr/lib/kde3/kcalc.so +debian/tmp/usr/lib/libkdeinit_kcalc.so +debian/tmp/usr/share/applications/kde/kcalc.desktop +debian/tmp/usr/share/apps/kcalc/kcalcui.rc +debian/tmp/usr/share/apps/kconf_update/kcalcrc.upd +debian/tmp/usr/share/config.kcfg/kcalc.kcfg +debian/tmp/usr/share/doc/kde/HTML/en/kcalc/common +debian/tmp/usr/share/doc/kde/HTML/en/kcalc/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcalc/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcalc/commands.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcalc/kcalc_on_Aix.txt +debian/tmp/usr/share/doc/kde/HTML/en/kcalc/kcalc_on_OSF.txt +debian/tmp/usr/share/icons/hicolor/16x16/apps/kcalc.png +debian/tmp/usr/share/icons/hicolor/22x22/apps/kcalc.png +debian/tmp/usr/share/icons/hicolor/32x32/apps/kcalc.png +debian/tmp/usr/share/icons/hicolor/48x48/apps/kcalc.png +debian/tmp/usr/share/icons/hicolor/64x64/apps/kcalc.png +debian/tmp/usr/share/icons/hicolor/scalable/apps/kcalc.svgz + +debian/icons/kcalc.xpm /usr/share/pixmaps +debian/icons/kcalc-16.xpm /usr/share/pixmaps --- kdeutils-3.5.8.orig/debian/ark.install +++ kdeutils-3.5.8/debian/ark.install @@ -0,0 +1,37 @@ +debian/tmp/usr/bin/ark +debian/tmp/usr/lib/kde3/ark.la +debian/tmp/usr/lib/kde3/ark.so +debian/tmp/usr/lib/kde3/libarkpart.la +debian/tmp/usr/lib/kde3/libarkpart.so +debian/tmp/usr/lib/libkdeinit_ark.so +debian/tmp/usr/share/applications/kde/ark.desktop +debian/tmp/usr/share/apps/ark/ark_part.rc +debian/tmp/usr/share/apps/ark/ark_part_readonly.rc +debian/tmp/usr/share/apps/ark/arkui.rc +debian/tmp/usr/share/apps/ark/icons/crystalsvg/22x22/actions/ark_adddir.png +debian/tmp/usr/share/apps/ark/icons/crystalsvg/22x22/actions/ark_addfile.png +debian/tmp/usr/share/apps/ark/icons/crystalsvg/22x22/actions/ark_delete.png +debian/tmp/usr/share/apps/ark/icons/crystalsvg/22x22/actions/ark_extract.png +debian/tmp/usr/share/apps/ark/icons/crystalsvg/22x22/actions/ark_selectall.png +debian/tmp/usr/share/apps/ark/icons/crystalsvg/22x22/actions/ark_view.png +debian/tmp/usr/share/apps/ark/icons/crystalsvg/32x32/actions/ark_adddir.png +debian/tmp/usr/share/apps/ark/icons/crystalsvg/32x32/actions/ark_addfile.png +debian/tmp/usr/share/apps/ark/icons/crystalsvg/32x32/actions/ark_delete.png +debian/tmp/usr/share/apps/ark/icons/crystalsvg/32x32/actions/ark_extract.png +debian/tmp/usr/share/apps/ark/icons/crystalsvg/32x32/actions/ark_view.png +debian/tmp/usr/share/config.kcfg/ark.kcfg +debian/tmp/usr/share/doc/kde/HTML/en/ark/common +debian/tmp/usr/share/doc/kde/HTML/en/ark/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/ark/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/ark/man-ark.1.docbook +debian/tmp/usr/share/icons/hicolor/128x128/apps/ark.png +debian/tmp/usr/share/icons/hicolor/16x16/apps/ark.png +debian/tmp/usr/share/icons/hicolor/22x22/apps/ark.png +debian/tmp/usr/share/icons/hicolor/32x32/apps/ark.png +debian/tmp/usr/share/icons/hicolor/48x48/apps/ark.png +debian/tmp/usr/share/icons/hicolor/64x64/apps/ark.png +debian/tmp/usr/share/icons/hicolor/scalable/apps/ark.svgz +debian/tmp/usr/share/services/ark_part.desktop + +debian/icons/ark.xpm /usr/share/pixmaps +debian/icons/ark-16.xpm /usr/share/pixmaps --- kdeutils-3.5.8.orig/debian/kgpg.manpages +++ kdeutils-3.5.8/debian/kgpg.manpages @@ -0,0 +1 @@ +debian/man/kgpg.1 --- kdeutils-3.5.8.orig/debian/ark.lintian +++ kdeutils-3.5.8/debian/ark.lintian @@ -0,0 +1,3 @@ +ark: no-shlibs-control-file usr/lib/libkdeinit_ark.so +ark: postinst-must-call-ldconfig usr/lib/libkdeinit_ark.so +ark: postrm-should-call-ldconfig usr/lib/libkdeinit_ark.so --- kdeutils-3.5.8.orig/debian/kdf.menu +++ kdeutils-3.5.8/debian/kdf.menu @@ -0,0 +1,26 @@ +?package(kdf):\ + needs="X11"\ + section="Apps/System"\ + hints="KDE"\ + title="KDiskFree"\ + icon32x32="/usr/share/pixmaps/kdf.xpm"\ + icon16x16="/usr/share/pixmaps/kdf-16.xpm"\ + command="/usr/bin/kdf" + +?package(kdf):\ + needs="X11"\ + section="Apps/System"\ + hints="KDE"\ + title="kwikdisk"\ + icon32x32="/usr/share/pixmaps/kwikdisk.xpm"\ + icon16x16="/usr/share/pixmaps/kwikdisk-16.xpm"\ + command="/usr/bin/kwikdisk" + +# Icon 32x32 kdf/pics/cr32-app-kdf.png kdf.xpm +# Icon 16x16 kdf/pics/cr16-app-kdf.png kdf-16.xpm + +# Icon 32x32 kdf/pics/cr32-app-kwikdisk.png kwikdisk.xpm +# Icon 16x16 kdf/pics/cr16-app-kwikdisk.png kwikdisk-16.xpm + +# XXX Icon 32x32 kdf/pics/cr32-app-kcmdf.png +# XXX Icon 16x16 kdf/pics/cr16-app-kcmdf.png --- kdeutils-3.5.8.orig/debian/kdessh.install +++ kdeutils-3.5.8/debian/kdessh.install @@ -0,0 +1 @@ +debian/tmp/usr/bin/kdessh --- kdeutils-3.5.8.orig/debian/rules +++ kdeutils-3.5.8/debian/rules @@ -0,0 +1,26 @@ +#! /usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include debian/cdbs/debian-qt-kde.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/utils.mk + +DEB_KDE_APIDOX := yes + +DOC_HTML_PRUNE := kcontrol kinfocenter ktimer kcharselect ksim + +DEB_DH_STRIP_ARGS := --dbg-package=kdeutils-dbg + +PACKAGES_WITH_LIBS := khexedit klaptopdaemon kmilo kregexpeditor ksim + +DEB_DH_MAKESHLIBS_ARGS_khexedit := -V'khexedit (>= 4:3.5.8-1)' +DEB_DH_MAKESHLIBS_ARGS_klaptopdaemon := -V'klaptopdaemon (>= 4:3.5.8-1)' +DEB_DH_MAKESHLIBS_ARGS_kmilo := -V'kmilo (>= 4:3.5.8-1)' +DEB_DH_MAKESHLIBS_ARGS_kregexpeditor := -V'kregexpeditor (>= 4:3.5.8-1)' +DEB_DH_MAKESHLIBS_ARGS_ksim := -V'ksim (>= 4:3.5.7-1)' + +#shlibs_ver = 4:3.5.0-1 +#$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))')) + +binary-install/superkaramba:: + rm -f debian/superkaramba/usr/share/doc/superkaramba/examples/globalMouse/xcursor.so --- kdeutils-3.5.8.orig/debian/kcharselect.manpages +++ kdeutils-3.5.8/debian/kcharselect.manpages @@ -0,0 +1 @@ +debian/man/kcharselect.1 --- kdeutils-3.5.8.orig/debian/kdeutils-doc-html.doc-base.kregexpeditor +++ kdeutils-3.5.8/debian/kdeutils-doc-html.doc-base.kregexpeditor @@ -0,0 +1,9 @@ +Document: kdeutils-doc-html-kregexpeditor +Title: The Regular Expression Editor Manual +Author: Jesper K. Pedersen +Abstract: This Handbook describes the Regular Expression Editor widget +Section: Tools + +Format: HTML +Index: /usr/share/doc/kde/HTML/en/KRegExpEditor/index.html +Files: /usr/share/doc/kde/HTML/en/KRegExpEditor/*.html --- kdeutils-3.5.8.orig/debian/ark.mime +++ kdeutils-3.5.8/debian/ark.mime @@ -0,0 +1,15 @@ +application/x-archive; ark -caption "Archiver" %s; nametemplate=%s.a; test=test "$DISPLAY" != ""; priority=7 +application/x-bzip; ark -caption "Archiver" %s; nametemplate=%s.bz; test=test "$DISPLAY" != ""; priority=7 +application/x-gzip; ark -caption "Archiver" %s; nametemplate=%s.gz; test=test "$DISPLAY" != ""; priority=7 +application/x-lha; ark -caption "Archiver" %s; nametemplate=%s.lha; test=test "$DISPLAY" != ""; priority=7 +application/x-lzop; ark -caption "Archiver" %s; nametemplate=%s.lzo; test=test "$DISPLAY" != ""; priority=7 +application/x-rar; ark -caption "Archiver" %s; nametemplate=%s.rar; test=test "$DISPLAY" != ""; priority=7 +application/x-tar; ark -caption "Archiver" %s; nametemplate=%s.tar; test=test "$DISPLAY" != ""; priority=7 +application/x-tarz; ark -caption "Archiver" %s; nametemplate=%s.tar.Z; test=test "$DISPLAY" != ""; priority=7 +application/x-tbz; ark -caption "Archiver" %s; nametemplate=%s.tbz; test=test "$DISPLAY" != ""; priority=7 +application/x-tgz; ark -caption "Archiver" %s; nametemplate=%s.tgz; test=test "$DISPLAY" != ""; priority=7 +application/x-tzo; ark -caption "Archiver" %s; nametemplate=%s.tzo; test=test "$DISPLAY" != ""; priority=7 +application/x-zip; ark -caption "Archiver" %s; nametemplate=%s.zip; test=test "$DISPLAY" != ""; priority=7 +application/x-zoo; ark -caption "Archiver" %s; nametemplate=%s.zoo; test=test "$DISPLAY" != ""; priority=7 +application/gzip; ark -caption "Archiver" %s; nametemplate=%s.gz; test=test "$DISPLAY" != ""; priority=7 +application/zip; ark -caption "Archiver" %s; nametemplate=%s.zip; test=test "$DISPLAY" != ""; priority=7 --- kdeutils-3.5.8.orig/debian/kcharselect.install +++ kdeutils-3.5.8/debian/kcharselect.install @@ -0,0 +1,16 @@ +debian/tmp/usr/bin/kcharselect +debian/tmp/usr/lib/kde3/kcharselect_panelapplet.la +debian/tmp/usr/lib/kde3/kcharselect_panelapplet.so +debian/tmp/usr/share/applications/kde/KCharSelect.desktop +debian/tmp/usr/share/apps/kcharselect/kcharselectui.rc +debian/tmp/usr/share/apps/kconf_update/kcharselect.upd +debian/tmp/usr/share/apps/kicker/applets/kcharselectapplet.desktop +debian/tmp/usr/share/doc/kde/HTML/en/kcharselect/common +debian/tmp/usr/share/doc/kde/HTML/en/kcharselect/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcharselect/index.docbook +debian/tmp/usr/share/icons/hicolor/16x16/apps/kcharselect.png +debian/tmp/usr/share/icons/hicolor/32x32/apps/kcharselect.png +debian/tmp/usr/share/icons/hicolor/48x48/apps/kcharselect.png + +debian/icons/kcharselect.xpm /usr/share/pixmaps +debian/icons/kcharselect-16.xpm /usr/share/pixmaps --- kdeutils-3.5.8.orig/debian/ark.menu +++ kdeutils-3.5.8/debian/ark.menu @@ -0,0 +1,11 @@ +?package(ark):\ + needs="X11"\ + section="Apps/Tools"\ + hints="KDE"\ + title="Ark"\ + icon32x32="/usr/share/pixmaps/ark.xpm"\ + icon16x16="/usr/share/pixmaps/ark-16.xpm"\ + command="/usr/bin/ark" + +# Icon 32x32 ark/cr32-app-ark.png ark.xpm +# Icon 16x16 ark/cr16-app-ark.png ark-16.xpm --- kdeutils-3.5.8.orig/debian/kedit.manpages +++ kdeutils-3.5.8/debian/kedit.manpages @@ -0,0 +1 @@ +debian/man/kedit.1 --- kdeutils-3.5.8.orig/debian/kdf.install +++ kdeutils-3.5.8/debian/kdf.install @@ -0,0 +1,38 @@ +debian/tmp/usr/bin/kdf +debian/tmp/usr/bin/kwikdisk +debian/tmp/usr/lib/kde3/kcm_kdf.la +debian/tmp/usr/lib/kde3/kcm_kdf.so +debian/tmp/usr/share/applications/kde/kcmdf.desktop +debian/tmp/usr/share/applications/kde/kdf.desktop +debian/tmp/usr/share/applications/kde/kwikdisk.desktop +debian/tmp/usr/share/apps/kdf/kdfui.rc +debian/tmp/usr/share/apps/kdf/pics/delete.png +debian/tmp/usr/share/apps/kdf/pics/tick.png +debian/tmp/usr/share/doc/kde/HTML/en/kdf/common +debian/tmp/usr/share/doc/kde/HTML/en/kdf/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kdf/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kdf/kdf.png +debian/tmp/usr/share/doc/kde/HTML/en/kdf/kdf_config.png +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/blockdevices/common +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/blockdevices/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/blockdevices/index.docbook +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kcmdf.png +debian/tmp/usr/share/icons/crystalsvg/22x22/apps/kcmdf.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kcmdf.png +debian/tmp/usr/share/icons/hicolor/128x128/apps/kdf.png +debian/tmp/usr/share/icons/hicolor/128x128/apps/kwikdisk.png +debian/tmp/usr/share/icons/hicolor/16x16/apps/kdf.png +debian/tmp/usr/share/icons/hicolor/16x16/apps/kwikdisk.png +debian/tmp/usr/share/icons/hicolor/22x22/apps/kdf.png +debian/tmp/usr/share/icons/hicolor/22x22/apps/kwikdisk.png +debian/tmp/usr/share/icons/hicolor/32x32/apps/kdf.png +debian/tmp/usr/share/icons/hicolor/32x32/apps/kwikdisk.png +debian/tmp/usr/share/icons/hicolor/48x48/apps/kdf.png +debian/tmp/usr/share/icons/hicolor/48x48/apps/kwikdisk.png +debian/tmp/usr/share/icons/hicolor/64x64/apps/kdf.png +debian/tmp/usr/share/icons/hicolor/64x64/apps/kwikdisk.png + +debian/icons/kdf.xpm /usr/share/pixmaps +debian/icons/kdf-16.xpm /usr/share/pixmaps +debian/icons/kwikdisk.xpm /usr/share/pixmaps +debian/icons/kwikdisk-16.xpm /usr/share/pixmaps --- kdeutils-3.5.8.orig/debian/kedit.mime +++ kdeutils-3.5.8/debian/kedit.mime @@ -0,0 +1,15 @@ +application/x-shellscript; kedit -caption "Text Editor" %s; nametemplate=%s.sh; test=test "$DISPLAY" != ""; priority=7 +text/english; kedit -caption "Text Editor" %s; test=test "$DISPLAY" != ""; priority=7 +text/plain; kedit -caption "Text Editor" %s; nametemplate=%s.txt; test=test "$DISPLAY" != ""; priority=7 +text/x-c++; kedit -caption "Text Editor" %s; nametemplate=%s.cpp; test=test "$DISPLAY" != ""; priority=7 +text/x-c++hdr; kedit -caption "Text Editor" %s; nametemplate=%s.hh; test=test "$DISPLAY" != ""; priority=7 +text/x-c++src; kedit -caption "Text Editor" %s; nametemplate=%s.cpp; test=test "$DISPLAY" != ""; priority=7 +text/x-c; kedit -caption "Text Editor" %s; nametemplate=%s.c; test=test "$DISPLAY" != ""; priority=7 +text/x-chdr; kedit -caption "Text Editor" %s; nametemplate=%s.h; test=test "$DISPLAY" != ""; priority=7 +text/x-csrc; kedit -caption "Text Editor" %s; nametemplate=%s.c; test=test "$DISPLAY" != ""; priority=7 +text/x-java; kedit -caption "Text Editor" %s; nametemplate=%s.java; test=test "$DISPLAY" != ""; priority=7 +text/x-makefile; kedit -caption "Text Editor" %s; test=test "$DISPLAY" != ""; priority=7 +text/x-moc; kedit -caption "Text Editor" %s; nametemplate=%s.moc; test=test "$DISPLAY" != ""; priority=7 +text/x-pascal; kedit -caption "Text Editor" %s; nametemplate=%s.p; test=test "$DISPLAY" != ""; priority=7 +text/x-tcl; kedit -caption "Text Editor" %s; nametemplate=%s.tcl; test=test "$DISPLAY" != ""; priority=7 +text/x-tex; kedit -caption "Text Editor" %s; nametemplate=%s.tex; test=test "$DISPLAY" != ""; priority=7 --- kdeutils-3.5.8.orig/debian/klaptopdaemon.README.Debian +++ kdeutils-3.5.8/debian/klaptopdaemon.README.Debian @@ -0,0 +1,28 @@ +klaptopdaemon and SUID permissions +---------------------------------- + +To allow ordinary users to control certain power management features, +klaptopdaemon's panel in the KDE Control Center has a button which prompts +the user to enter the root password (KDE Control Center --> Power Control +--> Laptop Battery, then the ACPI Config tab, then the Setup Helper +Application button). This button changes the permissions of +/usr/bin/klaptop_acpi_helper from "0755 root.root" to "6755 root.root", +and therefore grants all regular users extra power management abilities. +This has obvious security implications, and should not be done on any +system where all users are not trusted absolutely. + +The standard klaptopdaemon changes the binary's permissions using chmod. +However, if an updated version of the Debian klaptopdaemon package +were then to be installed, it would reset the permissions, forcing the +sysadmin to reconfigure after each upgrade. + +The Debian package has therefore been patched to use dpkg-statoverride to +permanently change the permissions of /usr/bin/klaptop_acpi_helper. The +override is removed and permissions reset if the package is removed or +purged. However, if the sysadmin wishes to remove the special permissions +of /usr/bin/klaptop_acpi_helper, they can do so at any time by issuing, +as root, the following commands: + +dpkg-statoverride --remove /usr/bin/klaptop_acpi_helper +chown root:root /usr/bin/klaptop_acpi_helper +chmod 0755 /usr/bin/klaptop_acpi_helper --- kdeutils-3.5.8.orig/debian/klaptopdaemon.install +++ kdeutils-3.5.8/debian/klaptopdaemon.install @@ -0,0 +1,48 @@ +debian/tmp/usr/bin/klaptop_acpi_helper +debian/tmp/usr/bin/klaptop_check +debian/tmp/usr/lib/kde3/kcm_laptop.la +debian/tmp/usr/lib/kde3/kcm_laptop.so +debian/tmp/usr/lib/kde3/kded_klaptopdaemon.la +debian/tmp/usr/lib/kde3/kded_klaptopdaemon.so +debian/tmp/usr/lib/libkcmlaptop.so.0 +debian/tmp/usr/lib/libkcmlaptop.so.0.0.0 +debian/tmp/usr/share/applications/kde/laptop.desktop +debian/tmp/usr/share/applications/kde/pcmcia.desktop +debian/tmp/usr/share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/alt2_laptop_nobattery.png +debian/tmp/usr/share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/alt2_laptop_nocharge.png +debian/tmp/usr/share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/alt2_laptop_power.png +debian/tmp/usr/share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/alt3_laptop_nocharge.png +debian/tmp/usr/share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/alt3_laptop_power.png +debian/tmp/usr/share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/alt_laptop_nocharge.png +debian/tmp/usr/share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/alt_laptop_power.png +debian/tmp/usr/share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/laptop_charge.png +debian/tmp/usr/share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/laptop_nobattery.png +debian/tmp/usr/share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/laptop_nocharge.png +debian/tmp/usr/share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/power.png +debian/tmp/usr/share/apps/klaptopdaemon/icons/crystalsvg/22x22/actions/laptop_charge.png +debian/tmp/usr/share/apps/klaptopdaemon/icons/crystalsvg/22x22/actions/laptop_nobattery.png +debian/tmp/usr/share/apps/klaptopdaemon/icons/crystalsvg/22x22/actions/laptop_nocharge.png +debian/tmp/usr/share/apps/klaptopdaemon/icons/crystalsvg/22x22/actions/laptop_power.png +debian/tmp/usr/share/apps/klaptopdaemon/icons/crystalsvg/32x32/actions/power.png +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kcmlowbatcrit/common +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kcmlowbatcrit/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kcmlowbatcrit/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kcmlowbatwarn/common +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kcmlowbatwarn/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kcmlowbatwarn/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/laptop/common +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/laptop/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/laptop/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/powerctrl/common +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/powerctrl/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/powerctrl/index.docbook +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/laptop_battery.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/laptop_battery.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/laptop_pcmcia.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/laptop_battery.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/laptop_pcmcia.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/laptop_battery.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/laptop_pcmcia.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/laptop_battery.png +debian/tmp/usr/share/icons/crystalsvg/scalable/apps/laptop_battery.svgz +debian/tmp/usr/share/services/kded/klaptopdaemon.desktop --- kdeutils-3.5.8.orig/debian/ksim.preinst +++ kdeutils-3.5.8/debian/ksim.preinst @@ -0,0 +1,44 @@ +#! /bin/sh +# preinst script for ksim +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * <new-preinst> `install' +# * <new-preinst> `install' <old-version> +# * <new-preinst> `upgrade' <old-version> +# * <old-preinst> `abort-upgrade' <new-version> +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + install|upgrade) + if [ "$1" = "upgrade" ] + then + # Debian testing (Sarge) files + rm /etc/kde3/ksimrc > /dev/null 2>&1 || true + fi + ;; + + abort-upgrade) + + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + --- kdeutils-3.5.8.orig/debian/kedit.install +++ kdeutils-3.5.8/debian/kedit.install @@ -0,0 +1,18 @@ +debian/tmp/usr/bin/kedit +debian/tmp/usr/lib/kde3/kedit.la +debian/tmp/usr/lib/kde3/kedit.so +debian/tmp/usr/lib/libkdeinit_kedit.so +debian/tmp/usr/share/applications/kde/KEdit.desktop +debian/tmp/usr/share/apps/kedit/keditui.rc +debian/tmp/usr/share/config.kcfg/kedit.kcfg +debian/tmp/usr/share/doc/kde/HTML/en/kedit/common +debian/tmp/usr/share/doc/kde/HTML/en/kedit/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kedit/index.docbook +debian/tmp/usr/share/icons/hicolor/16x16/apps/kedit.png +debian/tmp/usr/share/icons/hicolor/22x22/apps/kedit.png +debian/tmp/usr/share/icons/hicolor/32x32/apps/kedit.png +debian/tmp/usr/share/icons/hicolor/48x48/apps/kedit.png +debian/tmp/usr/share/icons/hicolor/64x64/apps/kedit.png + +debian/icons/kedit.xpm /usr/share/pixmaps +debian/icons/kedit-16.xpm /usr/share/pixmaps --- kdeutils-3.5.8.orig/debian/kdeutils-doc-html.doc-base.ark +++ kdeutils-3.5.8/debian/kdeutils-doc-html.doc-base.ark @@ -0,0 +1,10 @@ +Document: kdeutils-doc-html-ark +Title: Ark Handbook +Author: Matt Johnston, Henrique Pinto +Abstract: Ark is an archive manager for KDE +Section: Tools + +Format: HTML +Index: /usr/share/doc/kde/HTML/en/ark/index.html +Files: /usr/share/doc/kde/HTML/en/ark/*.html + --- kdeutils-3.5.8.orig/debian/khexedit.manpages +++ kdeutils-3.5.8/debian/khexedit.manpages @@ -0,0 +1 @@ +debian/man/khexedit.1 --- kdeutils-3.5.8.orig/debian/kdelirc.lintian +++ kdeutils-3.5.8/debian/kdelirc.lintian @@ -0,0 +1,3 @@ +kdelirc: no-shlibs-control-file usr/lib/libkdeinit_irkick.so +kdelirc: postinst-must-call-ldconfig usr/lib/libkdeinit_irkick.so +kdelirc: postrm-should-call-ldconfig usr/lib/libkdeinit_irkick.so --- kdeutils-3.5.8.orig/debian/kregexpeditor.install +++ kdeutils-3.5.8/debian/kregexpeditor.install @@ -0,0 +1,60 @@ +debian/tmp/usr/bin/kregexpeditor +debian/tmp/usr/lib/kde3/libkregexpeditorgui.la +debian/tmp/usr/lib/kde3/libkregexpeditorgui.so +debian/tmp/usr/lib/libkregexpeditorcommon.so.1 +debian/tmp/usr/lib/libkregexpeditorcommon.so.1.0.0 +debian/tmp/usr/share/applications/kde/kregexpeditor.desktop +debian/tmp/usr/share/apps/kregexpeditor/pics/altn.png +debian/tmp/usr/share/apps/kregexpeditor/pics/anychar.png +debian/tmp/usr/share/apps/kregexpeditor/pics/autoverify.png +debian/tmp/usr/share/apps/kregexpeditor/pics/begline.png +debian/tmp/usr/share/apps/kregexpeditor/pics/characters.png +debian/tmp/usr/share/apps/kregexpeditor/pics/compound.png +debian/tmp/usr/share/apps/kregexpeditor/pics/endline.png +debian/tmp/usr/share/apps/kregexpeditor/pics/error.png +debian/tmp/usr/share/apps/kregexpeditor/pics/neglookahead.png +debian/tmp/usr/share/apps/kregexpeditor/pics/nonwordboundary.png +debian/tmp/usr/share/apps/kregexpeditor/pics/poslookahead.png +debian/tmp/usr/share/apps/kregexpeditor/pics/repeat.png +debian/tmp/usr/share/apps/kregexpeditor/pics/select.png +debian/tmp/usr/share/apps/kregexpeditor/pics/text.png +debian/tmp/usr/share/apps/kregexpeditor/pics/verify.png +debian/tmp/usr/share/apps/kregexpeditor/pics/wordboundary.png +debian/tmp/usr/share/apps/kregexpeditor/predefined/general/anything.regexp +debian/tmp/usr/share/apps/kregexpeditor/predefined/general/spaces.regexp +debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/altn.png +debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/altntool.png +debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/anychar.png +debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/anychartool.png +debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/begline.png +debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/boundarytools.png +debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/characters.png +debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/charactertool.png +debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/common +debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/compound.png +debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/compoundtool.png +debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/endline.png +debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/linestartendtool.png +debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/lookaheadtools.png +debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/neglookahead.png +debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/nonwordboundary.png +debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/poslookahead.png +debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/repeat.png +debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/repeattool.png +debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/select.png +debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/text.png +debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/texttool.png +debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/theEditor.png +debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/wordboundary.png +debian/tmp/usr/share/icons/hicolor/128x128/apps/kregexpeditor.png +debian/tmp/usr/share/icons/hicolor/16x16/apps/kregexpeditor.png +debian/tmp/usr/share/icons/hicolor/22x22/apps/kregexpeditor.png +debian/tmp/usr/share/icons/hicolor/32x32/apps/kregexpeditor.png +debian/tmp/usr/share/icons/hicolor/48x48/apps/kregexpeditor.png +debian/tmp/usr/share/icons/hicolor/64x64/apps/kregexpeditor.png +debian/tmp/usr/share/services/kregexpeditorgui.desktop + +debian/icons/kregexpeditor.xpm /usr/share/pixmaps +debian/icons/kregexpeditor-16.xpm /usr/share/pixmaps --- kdeutils-3.5.8.orig/debian/kdelirc.install +++ kdeutils-3.5.8/debian/kdelirc.install @@ -0,0 +1,49 @@ +debian/tmp/usr/bin/irkick +debian/tmp/usr/lib/kde3/irkick.la +debian/tmp/usr/lib/kde3/irkick.so +debian/tmp/usr/lib/kde3/kcm_kcmlirc.la +debian/tmp/usr/lib/kde3/kcm_kcmlirc.so +debian/tmp/usr/lib/libkdeinit_irkick.so +debian/tmp/usr/share/applications/kde/irkick.desktop +debian/tmp/usr/share/applications/kde/kcmlirc.desktop +debian/tmp/usr/share/apps/irkick/icons/hicolor/16x16/actions/irkick.png +debian/tmp/usr/share/apps/irkick/icons/hicolor/16x16/actions/irkickflash.png +debian/tmp/usr/share/apps/irkick/icons/hicolor/16x16/actions/irkickoff.png +debian/tmp/usr/share/apps/irkick/icons/hicolor/16x16/actions/ledblue.png +debian/tmp/usr/share/apps/irkick/icons/hicolor/16x16/actions/ledgreen.png +debian/tmp/usr/share/apps/irkick/icons/hicolor/16x16/actions/ledlightblue.png +debian/tmp/usr/share/apps/irkick/icons/hicolor/16x16/actions/ledlightgreen.png +debian/tmp/usr/share/apps/irkick/icons/hicolor/16x16/actions/ledorange.png +debian/tmp/usr/share/apps/irkick/icons/hicolor/16x16/actions/ledpurple.png +debian/tmp/usr/share/apps/irkick/icons/hicolor/16x16/actions/ledred.png +debian/tmp/usr/share/apps/irkick/icons/hicolor/16x16/actions/ledyellow.png +debian/tmp/usr/share/apps/irkick/icons/hicolor/32x32/actions/ledblue.png +debian/tmp/usr/share/apps/irkick/icons/hicolor/32x32/actions/ledgreen.png +debian/tmp/usr/share/apps/irkick/icons/hicolor/32x32/actions/ledlightblue.png +debian/tmp/usr/share/apps/irkick/icons/hicolor/32x32/actions/ledlightgreen.png +debian/tmp/usr/share/apps/irkick/icons/hicolor/32x32/actions/ledorange.png +debian/tmp/usr/share/apps/irkick/icons/hicolor/32x32/actions/ledpurple.png +debian/tmp/usr/share/apps/irkick/icons/hicolor/32x32/actions/ledred.png +debian/tmp/usr/share/apps/irkick/icons/hicolor/32x32/actions/ledyellow.png +debian/tmp/usr/share/apps/profiles/klauncher.profile.xml +debian/tmp/usr/share/apps/profiles/konqueror.profile.xml +debian/tmp/usr/share/apps/profiles/noatun.profile.xml +debian/tmp/usr/share/apps/profiles/profile.dtd +debian/tmp/usr/share/apps/remotes/RM-0010.remote.xml +debian/tmp/usr/share/apps/remotes/cimr100.remote.xml +debian/tmp/usr/share/apps/remotes/hauppauge.remote.xml +debian/tmp/usr/share/apps/remotes/remote.dtd +debian/tmp/usr/share/apps/remotes/sherwood.remote.xml +debian/tmp/usr/share/apps/remotes/sonytv.remote.xml +debian/tmp/usr/share/autostart/irkick.desktop +debian/tmp/usr/share/doc/kde/HTML/en/irkick/common +debian/tmp/usr/share/doc/kde/HTML/en/irkick/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/irkick/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcmlirc/common +debian/tmp/usr/share/doc/kde/HTML/en/kcmlirc/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcmlirc/index.docbook +debian/tmp/usr/share/icons/hicolor/16x16/apps/irkick.png +debian/tmp/usr/share/icons/hicolor/22x22/apps/irkick.png +debian/tmp/usr/share/icons/hicolor/32x32/apps/irkick.png +debian/tmp/usr/share/icons/locolor/16x16/apps/irkick.png +debian/tmp/usr/share/icons/locolor/32x32/apps/irkick.png --- kdeutils-3.5.8.orig/debian/kregexpeditor.menu +++ kdeutils-3.5.8/debian/kregexpeditor.menu @@ -0,0 +1,11 @@ +?package(kregexpeditor):\ + needs="X11"\ + section="Apps/Tools"\ + hints="KDE"\ + title="Kregexpeditor"\ + icon32x32="/usr/share/pixmaps/kregexpeditor.xpm"\ + icon16x16="/usr/share/pixmaps/kregexpeditor-16.xpm"\ + command="/usr/bin/kregexpeditor" + +# Icon 32x32 kregexpeditor/cr32-app-kregexpeditor.png kregexpeditor.xpm +# Icon 16x16 kregexpeditor/cr16-app-kregexpeditor.png kregexpeditor-16.xpm --- kdeutils-3.5.8.orig/debian/ark.manpages +++ kdeutils-3.5.8/debian/ark.manpages @@ -0,0 +1 @@ +debian/man/ark.1 --- kdeutils-3.5.8.orig/debian/ktimer.menu +++ kdeutils-3.5.8/debian/ktimer.menu @@ -0,0 +1,11 @@ +?package(ktimer):\ + needs="X11"\ + section="Apps/Tools"\ + hints="KDE"\ + title="KTimer"\ + icon32x32="/usr/share/pixmaps/ktimer.xpm"\ + icon16x16="/usr/share/pixmaps/ktimer-16.xpm"\ + command="/usr/bin/ktimer" + +# Icon 32x32 ktimer/cr32-app-ktimer.png ktimer.xpm +# Icon 16x16 ktimer/cr16-app-ktimer.png ktimer-16.xpm --- kdeutils-3.5.8.orig/debian/superkaramba.manpages +++ kdeutils-3.5.8/debian/superkaramba.manpages @@ -0,0 +1 @@ +debian/man/superkaramba.1 --- kdeutils-3.5.8.orig/debian/ktimer.install +++ kdeutils-3.5.8/debian/ktimer.install @@ -0,0 +1,12 @@ +debian/tmp/usr/bin/ktimer +debian/tmp/usr/share/applications/kde/ktimer.desktop +debian/tmp/usr/share/doc/kde/HTML/en/ktimer/common +debian/tmp/usr/share/doc/kde/HTML/en/ktimer/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/ktimer/index.docbook +debian/tmp/usr/share/icons/hicolor/128x128/apps/ktimer.png +debian/tmp/usr/share/icons/hicolor/16x16/apps/ktimer.png +debian/tmp/usr/share/icons/hicolor/32x32/apps/ktimer.png +debian/tmp/usr/share/icons/hicolor/48x48/apps/ktimer.png + +debian/icons/ktimer.xpm /usr/share/pixmaps +debian/icons/ktimer-16.xpm /usr/share/pixmaps --- kdeutils-3.5.8.orig/debian/kdeutils-doc-html.doc-base.kdf +++ kdeutils-3.5.8/debian/kdeutils-doc-html.doc-base.kdf @@ -0,0 +1,11 @@ +Document: kdeutils-doc-html-kdf +Title: KDiskFree Handbook +Author: Jonathan Singer, Michael Kropfberger +Abstract: KDiskFree displays available file devices, along with information about them. +Section: Tools + +Format: HTML +Index: /usr/share/doc/kde/HTML/en/kdf/index.html +Files: /usr/share/doc/kde/HTML/en/kdf/*.html + + --- kdeutils-3.5.8.orig/debian/klaptopdaemon.prerm +++ kdeutils-3.5.8/debian/klaptopdaemon.prerm @@ -0,0 +1,30 @@ +#! /bin/sh + +set -e + +case "$1" in + + remove) + /usr/sbin/dpkg-statoverride --quiet --remove /usr/bin/klaptop_acpi_helper > /dev/null 2>&1 || true + if [ -e /usr/bin/klaptop_acpi_helper ]; then + chown root:root /usr/bin/klaptop_acpi_helper + chmod 0755 /usr/bin/klaptop_acpi_helper + fi + ;; + + upgrade|deconfigure) + ;; + + failed-upgrade) + ;; + + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; + +esac + +#DEBHELPER# + +exit 0 --- kdeutils-3.5.8.orig/debian/kfloppy.manpages +++ kdeutils-3.5.8/debian/kfloppy.manpages @@ -0,0 +1 @@ +debian/man/kfloppy.1 --- kdeutils-3.5.8.orig/debian/kcalc.menu +++ kdeutils-3.5.8/debian/kcalc.menu @@ -0,0 +1,11 @@ +?package(kcalc):\ + needs="X11"\ + section="Apps/Math"\ + hints="KDE,Calculators"\ + title="KCalc"\ + icon32x32="/usr/share/pixmaps/kcalc.xpm"\ + icon16x16="/usr/share/pixmaps/kcalc-16.xpm"\ + command="/usr/bin/kcalc" + +# Icon 32x32 kcalc/cr32-app-kcalc.png kcalc.xpm +# Icon 16x16 kcalc/cr32-app-kcalc.png kcalc-16.xpm --- kdeutils-3.5.8.orig/debian/kwalletmanager.install +++ kdeutils-3.5.8/debian/kwalletmanager.install @@ -0,0 +1,31 @@ +debian/tmp/usr/bin/kwalletmanager +debian/tmp/usr/lib/kde3/kcm_kwallet.la +debian/tmp/usr/lib/kde3/kcm_kwallet.so +debian/tmp/usr/share/applications/kde/kwalletconfig.desktop +debian/tmp/usr/share/applications/kde/kwalletmanager.desktop +debian/tmp/usr/share/applications/kde/kwalletmanager-kwalletd.desktop +debian/tmp/usr/share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/folder_closed.png +debian/tmp/usr/share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/folder_open.png +debian/tmp/usr/share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/wallet_closed.png +debian/tmp/usr/share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/wallet_open.png +debian/tmp/usr/share/apps/kwalletmanager/kwalleteditor.rc +debian/tmp/usr/share/apps/kwalletmanager/kwalletmanager.rc +debian/tmp/usr/share/doc/kde/HTML/en/kwallet/common +debian/tmp/usr/share/doc/kde/HTML/en/kwallet/cr22-action-wallet_closed.png +debian/tmp/usr/share/doc/kde/HTML/en/kwallet/cr22-action-wallet_open.png +debian/tmp/usr/share/doc/kde/HTML/en/kwallet/edit1.png +debian/tmp/usr/share/doc/kde/HTML/en/kwallet/edit2.png +debian/tmp/usr/share/doc/kde/HTML/en/kwallet/edit3.png +debian/tmp/usr/share/doc/kde/HTML/en/kwallet/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kwallet/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kwallet/kwalletmanager.png +debian/tmp/usr/share/doc/kde/HTML/en/kwallet/password1.png +debian/tmp/usr/share/doc/kde/HTML/en/kwallet/password2.png +debian/tmp/usr/share/icons/hicolor/128x128/apps/kwalletmanager.png +debian/tmp/usr/share/icons/hicolor/16x16/apps/kwalletmanager.png +debian/tmp/usr/share/icons/hicolor/22x22/apps/kwalletmanager.png +debian/tmp/usr/share/icons/hicolor/32x32/apps/kwalletmanager.png +debian/tmp/usr/share/icons/hicolor/48x48/apps/kwalletmanager.png +debian/tmp/usr/share/icons/hicolor/64x64/apps/kwalletmanager.png +debian/tmp/usr/share/services/kwallet_config.desktop +debian/tmp/usr/share/services/kwalletmanager_show.desktop --- kdeutils-3.5.8.orig/debian/kfloppy.install +++ kdeutils-3.5.8/debian/kfloppy.install @@ -0,0 +1,15 @@ +debian/tmp/usr/bin/kfloppy +debian/tmp/usr/share/applications/kde/KFloppy.desktop +debian/tmp/usr/share/apps/konqueror/servicemenus/floppy_format.desktop +debian/tmp/usr/share/doc/kde/HTML/en/kfloppy/common +debian/tmp/usr/share/doc/kde/HTML/en/kfloppy/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kfloppy/index.docbook +debian/tmp/usr/share/icons/hicolor/128x128/apps/kfloppy.png +debian/tmp/usr/share/icons/hicolor/16x16/apps/kfloppy.png +debian/tmp/usr/share/icons/hicolor/22x22/apps/kfloppy.png +debian/tmp/usr/share/icons/hicolor/32x32/apps/kfloppy.png +debian/tmp/usr/share/icons/hicolor/48x48/apps/kfloppy.png +debian/tmp/usr/share/icons/hicolor/64x64/apps/kfloppy.png + +debian/icons/kfloppy.xpm /usr/share/pixmaps +debian/icons/kfloppy-16.xpm /usr/share/pixmaps --- kdeutils-3.5.8.orig/debian/superkaramba.install +++ kdeutils-3.5.8/debian/superkaramba.install @@ -0,0 +1,24 @@ +debian/tmp/usr/bin/superkaramba +debian/tmp/usr/share/applnk/Utilities/superkaramba.desktop +debian/tmp/usr/share/apps/superkaramba/superkarambaui.rc +debian/tmp/usr/share/doc/kde/HTML/en/superkaramba/common +debian/tmp/usr/share/doc/kde/HTML/en/superkaramba/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/superkaramba/index.docbook +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/superkaramba.png +debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/superkaramba_theme.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/superkaramba.png +debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/superkaramba_theme.png +debian/tmp/usr/share/icons/crystalsvg/22x22/apps/superkaramba.png +debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/superkaramba_theme.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/superkaramba.png +debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/superkaramba_theme.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/superkaramba.png +debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/superkaramba_theme.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/superkaramba.png +debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/superkaramba_theme.png +debian/tmp/usr/share/icons/crystalsvg/scalable/apps/superkaramba.svgz +debian/tmp/usr/share/icons/crystalsvg/scalable/mimetypes/superkaramba_theme.svgz +debian/tmp/usr/share/mimelnk/application/x-superkaramba.desktop + +debian/icons/superkaramba.xpm /usr/share/pixmaps +debian/icons/superkaramba-16.xpm /usr/share/pixmaps --- kdeutils-3.5.8.orig/debian/superkaramba.examples +++ kdeutils-3.5.8/debian/superkaramba.examples @@ -0,0 +1,12 @@ +superkaramba/examples/API +superkaramba/examples/autoHide +superkaramba/examples/globalMouse +superkaramba/examples/input_api +superkaramba/examples/input_example +superkaramba/examples/mouseDrag +superkaramba/examples/popupMenu +superkaramba/examples/README +superkaramba/examples/richtext +superkaramba/examples/taskBar +superkaramba/examples/template.py +superkaramba/examples/unicode --- kdeutils-3.5.8.orig/debian/kdeutils-doc-html.doc-base.kcalc +++ kdeutils-3.5.8/debian/kdeutils-doc-html.doc-base.kcalc @@ -0,0 +1,10 @@ +Document: kdeutils-doc-html-kcalc +Title: KCalc Handbook +Author: Bernd Johannes Wuebben, Pamela Roberts +Abstract: KCalc is a scientific calculator for KDE +Section: Tools + +Format: HTML +Index: /usr/share/doc/kde/HTML/en/kcalc/index.html +Files: /usr/share/doc/kde/HTML/en/kcalc/*.html + --- kdeutils-3.5.8.orig/debian/kdf.manpages +++ kdeutils-3.5.8/debian/kdf.manpages @@ -0,0 +1,2 @@ +debian/man/kdf.1 +debian/man/kwikdisk.1 --- kdeutils-3.5.8.orig/debian/kcalc.lintian +++ kdeutils-3.5.8/debian/kcalc.lintian @@ -0,0 +1,3 @@ +kcalc: no-shlibs-control-file usr/lib/libkdeinit_kcalc.so +kcalc: postinst-must-call-ldconfig usr/lib/libkdeinit_kcalc.so +kcalc: postrm-should-call-ldconfig usr/lib/libkdeinit_kcalc.so --- kdeutils-3.5.8.orig/debian/kgpg.menu +++ kdeutils-3.5.8/debian/kgpg.menu @@ -0,0 +1,11 @@ +?package(kgpg):\ + needs="X11"\ + section="Apps/Tools"\ + hints="KDE"\ + title="Kgpg"\ + icon32x32="/usr/share/pixmaps/kgpg.xpm"\ + icon16x16="/usr/share/pixmaps/kgpg-16.xpm"\ + command="/usr/bin/kgpg" + +# Icon 32x32 kgpg/cr32-app-kgpg.png kgpg.xpm +# Icon 16x16 kgpg/cr16-app-kgpg.png kgpg-16.xpm --- kdeutils-3.5.8.orig/debian/kmilo.install +++ kdeutils-3.5.8/debian/kmilo.install @@ -0,0 +1,9 @@ +debian/tmp/usr/lib/kde3/kded_kmilod.la +debian/tmp/usr/lib/kde3/kded_kmilod.so +debian/tmp/usr/lib/kde3/kmilo_generic.la +debian/tmp/usr/lib/kde3/kmilo_generic.so +debian/tmp/usr/lib/libkmilo.so.1 +debian/tmp/usr/lib/libkmilo.so.1.0.0 +debian/tmp/usr/share/services/kded/kmilod.desktop +debian/tmp/usr/share/services/kmilo/kmilo_generic.desktop +debian/tmp/usr/share/servicetypes/kmilo/kmilopluginsvc.desktop --- kdeutils-3.5.8.orig/debian/kdeutils-dev.install +++ kdeutils-3.5.8/debian/kdeutils-dev.install @@ -0,0 +1,29 @@ +debian/tmp/usr/include/kde/kmultiformlistbox.h +debian/tmp/usr/include/kde/kmultiformlistboxentry.h +debian/tmp/usr/include/kde/kmultiformlistboxfactory.h +debian/tmp/usr/include/kde/ksim/chart.h +debian/tmp/usr/include/kde/ksim/common.h +debian/tmp/usr/include/kde/ksim/ksimconfig.h +debian/tmp/usr/include/kde/ksim/label.h +debian/tmp/usr/include/kde/ksim/led.h +debian/tmp/usr/include/kde/ksim/pluginglobal.h +debian/tmp/usr/include/kde/ksim/pluginloader.h +debian/tmp/usr/include/kde/ksim/pluginmodule.h +debian/tmp/usr/include/kde/ksim/progress.h +debian/tmp/usr/include/kde/ksim/themeloader.h +debian/tmp/usr/include/kde/ksim/themetypes.h +debian/tmp/usr/include/kde/kwidgetstreamer.h +debian/tmp/usr/lib/libkcmlaptop.la +debian/tmp/usr/lib/libkcmlaptop.so +debian/tmp/usr/lib/libkdeinit_ark.la +debian/tmp/usr/lib/libkdeinit_irkick.la +debian/tmp/usr/lib/libkdeinit_kcalc.la +debian/tmp/usr/lib/libkdeinit_kedit.la +debian/tmp/usr/lib/libkmilo.la +debian/tmp/usr/lib/libkmilo.so +debian/tmp/usr/lib/libkregexpeditorcommon.la +debian/tmp/usr/lib/libkregexpeditorcommon.so +debian/tmp/usr/lib/libksimcore.la +debian/tmp/usr/lib/libksimcore.so +debian/tmp/usr/lib/libkhexeditcommon.la +debian/tmp/usr/lib/libkhexeditcommon.so --- kdeutils-3.5.8.orig/debian/kdeutils-doc-html.doc-base.kfloppy +++ kdeutils-3.5.8/debian/kdeutils-doc-html.doc-base.kfloppy @@ -0,0 +1,12 @@ +Document: kdeutils-doc-html-kfloppy +Title: KFloppy Formatter Handbook +Author: Thad McGinnis +Abstract: KFloppy Formatter is a utility that provides a straightforward + graphical means to format 3.5" and 5.25" floppy disks. +Section: System + +Format: HTML +Index: /usr/share/doc/kde/HTML/en/kfloppy/index.html +Files: /usr/share/doc/kde/HTML/en/kfloppy/*.html + + --- kdeutils-3.5.8.orig/debian/kcalc.manpages +++ kdeutils-3.5.8/debian/kcalc.manpages @@ -0,0 +1 @@ +debian/man/kcalc.1 --- kdeutils-3.5.8.orig/debian/kedit.menu +++ kdeutils-3.5.8/debian/kedit.menu @@ -0,0 +1,11 @@ +?package(kedit):\ + needs="X11"\ + section="Apps/Editors"\ + hints="KDE,Text"\ + title="KEdit"\ + icon32x32="/usr/share/pixmaps/kedit.xpm"\ + icon16x16="/usr/share/pixmaps/kedit-16.xpm"\ + command="/usr/bin/kedit" + +# Icon 32x32 kedit/pixmaps/cr32-app-kedit.png kedit.xpm +# Icon 16x16 kedit/pixmaps/cr16-app-kedit.png kedit-16.xpm --- kdeutils-3.5.8.orig/debian/copyright +++ kdeutils-3.5.8/debian/copyright @@ -0,0 +1,455 @@ +This package was debianized by Christopher L Cheney <ccheney@debian.org> on +Tue, 16 Apr 2002 22:00:00 -0500. + +It was downloaded from: http://www.kde.org/download + +Upstream Authors: Matthias Elter <elter@kde.org> and many others. + + +License: + +Artistic +-------- +kdepasswd, kdessh + +BSD +--- +charselectapplet +--- +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 +AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +--- + +GPL +--- +ark, kcalc, kcharselect, kdf, kedit, kfloppy, khexedit, kjots, +klaptopdaemon, kljettool, klpq, klprfax, kregexpeditor, ktimer + +On Debian systems, the complete text of the GPL license can be found in the +/usr/share/common-licenses/GPL file. + +-------------------- + +DocBook Documentation: + + Permission is granted to copy, distribute and/or modify this + document under the terms of the GNU Free Documentation License, + Version 1.1 or any later version published by the Free Software + Foundation; with no Invariant Sections, with no Front-Cover Texts, + and with no Back-Cover Texts. + + A copy of the GNU Free Documentation License (Version 1.2) is + included below. + + + GNU Free Documentation License + Version 1.2, November 2002 + + + Copyright (C) 2000,2001,2002 Free Software Foundation, Inc. + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + 0. PREAMBLE + + The purpose of this License is to make a manual, textbook, or other + functional and useful document "free" in the sense of freedom: to + assure everyone the effective freedom to copy and redistribute it, + with or without modifying it, either commercially or noncommercially. + Secondarily, this License preserves for the author and publisher a way + to get credit for their work, while not being considered responsible + for modifications made by others. + + This License is a kind of "copyleft", which means that derivative + works of the document must themselves be free in the same sense. It + complements the GNU General Public License, which is a copyleft + license designed for free software. + + We have designed this License in order to use it for manuals for free + software, because free software needs free documentation: a free + program should come with manuals providing the same freedoms that the + software does. But this License is not limited to software manuals; + it can be used for any textual work, regardless of subject matter or + whether it is published as a printed book. We recommend this License + principally for works whose purpose is instruction or reference. + + + 1. APPLICABILITY AND DEFINITIONS + + This License applies to any manual or other work, in any medium, that + contains a notice placed by the copyright holder saying it can be + distributed under the terms of this License. Such a notice grants a + world-wide, royalty-free license, unlimited in duration, to use that + work under the conditions stated herein. The "Document", below, + refers to any such manual or work. Any member of the public is a + licensee, and is addressed as "you". You accept the license if you + copy, modify or distribute the work in a way requiring permission + under copyright law. + + A "Modified Version" of the Document means any work containing the + Document or a portion of it, either copied verbatim, or with + modifications and/or translated into another language. + + A "Secondary Section" is a named appendix or a front-matter section of + the Document that deals exclusively with the relationship of the + publishers or authors of the Document to the Document's overall subject + (or to related matters) and contains nothing that could fall directly + within that overall subject. (Thus, if the Document is in part a + textbook of mathematics, a Secondary Section may not explain any + mathematics.) The relationship could be a matter of historical + connection with the subject or with related matters, or of legal, + commercial, philosophical, ethical or political position regarding + them. + + The "Invariant Sections" are certain Secondary Sections whose titles + are designated, as being those of Invariant Sections, in the notice + that says that the Document is released under this License. If a + section does not fit the above definition of Secondary then it is not + allowed to be designated as Invariant. The Document may contain zero + Invariant Sections. If the Document does not identify any Invariant + Sections then there are none. + + The "Cover Texts" are certain short passages of text that are listed, + as Front-Cover Texts or Back-Cover Texts, in the notice that says that + the Document is released under this License. A Front-Cover Text may + be at most 5 words, and a Back-Cover Text may be at most 25 words. + + A "Transparent" copy of the Document means a machine-readable copy, + represented in a format whose specification is available to the + general public, that is suitable for revising the document + straightforwardly with generic text editors or (for images composed of + pixels) generic paint programs or (for drawings) some widely available + drawing editor, and that is suitable for input to text formatters or + for automatic translation to a variety of formats suitable for input + to text formatters. A copy made in an otherwise Transparent file + format whose markup, or absence of markup, has been arranged to thwart + or discourage subsequent modification by readers is not Transparent. + An image format is not Transparent if used for any substantial amount + of text. A copy that is not "Transparent" is called "Opaque". + + Examples of suitable formats for Transparent copies include plain + ASCII without markup, Texinfo input format, LaTeX input format, SGML + or XML using a publicly available DTD, and standard-conforming simple + HTML, PostScript or PDF designed for human modification. Examples of + transparent image formats include PNG, XCF and JPG. Opaque formats + include proprietary formats that can be read and edited only by + proprietary word processors, SGML or XML for which the DTD and/or + processing tools are not generally available, and the + machine-generated HTML, PostScript or PDF produced by some word + processors for output purposes only. + + The "Title Page" means, for a printed book, the title page itself, + plus such following pages as are needed to hold, legibly, the material + this License requires to appear in the title page. For works in + formats which do not have any title page as such, "Title Page" means + the text near the most prominent appearance of the work's title, + preceding the beginning of the body of the text. + + A section "Entitled XYZ" means a named subunit of the Document whose + title either is precisely XYZ or contains XYZ in parentheses following + text that translates XYZ in another language. (Here XYZ stands for a + specific section name mentioned below, such as "Acknowledgements", + "Dedications", "Endorsements", or "History".) To "Preserve the Title" + of such a section when you modify the Document means that it remains a + section "Entitled XYZ" according to this definition. + + The Document may include Warranty Disclaimers next to the notice which + states that this License applies to the Document. These Warranty + Disclaimers are considered to be included by reference in this + License, but only as regards disclaiming warranties: any other + implication that these Warranty Disclaimers may have is void and has + no effect on the meaning of this License. + + + 2. VERBATIM COPYING + + You may copy and distribute the Document in any medium, either + commercially or noncommercially, provided that this License, the + copyright notices, and the license notice saying this License applies + to the Document are reproduced in all copies, and that you add no other + conditions whatsoever to those of this License. You may not use + technical measures to obstruct or control the reading or further + copying of the copies you make or distribute. However, you may accept + compensation in exchange for copies. If you distribute a large enough + number of copies you must also follow the conditions in section 3. + + You may also lend copies, under the same conditions stated above, and + you may publicly display copies. + + + 3. COPYING IN QUANTITY + + If you publish printed copies (or copies in media that commonly have + printed covers) of the Document, numbering more than 100, and the + Document's license notice requires Cover Texts, you must enclose the + copies in covers that carry, clearly and legibly, all these Cover + Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on + the back cover. Both covers must also clearly and legibly identify + you as the publisher of these copies. The front cover must present + the full title with all words of the title equally prominent and + visible. You may add other material on the covers in addition. + Copying with changes limited to the covers, as long as they preserve + the title of the Document and satisfy these conditions, can be treated + as verbatim copying in other respects. + + If the required texts for either cover are too voluminous to fit + legibly, you should put the first ones listed (as many as fit + reasonably) on the actual cover, and continue the rest onto adjacent + pages. + + If you publish or distribute Opaque copies of the Document numbering + more than 100, you must either include a machine-readable Transparent + copy along with each Opaque copy, or state in or with each Opaque copy + a computer-network location from which the general network-using + public has access to download using public-standard network protocols + a complete Transparent copy of the Document, free of added material. + If you use the latter option, you must take reasonably prudent steps, + when you begin distribution of Opaque copies in quantity, to ensure + that this Transparent copy will remain thus accessible at the stated + location until at least one year after the last time you distribute an + Opaque copy (directly or through your agents or retailers) of that + edition to the public. + + It is requested, but not required, that you contact the authors of the + Document well before redistributing any large number of copies, to give + them a chance to provide you with an updated version of the Document. + + + 4. MODIFICATIONS + + You may copy and distribute a Modified Version of the Document under + the conditions of sections 2 and 3 above, provided that you release + the Modified Version under precisely this License, with the Modified + Version filling the role of the Document, thus licensing distribution + and modification of the Modified Version to whoever possesses a copy + of it. In addition, you must do these things in the Modified Version: + + A. Use in the Title Page (and on the covers, if any) a title distinct + from that of the Document, and from those of previous versions + (which should, if there were any, be listed in the History section + of the Document). You may use the same title as a previous version + if the original publisher of that version gives permission. + B. List on the Title Page, as authors, one or more persons or entities + responsible for authorship of the modifications in the Modified + Version, together with at least five of the principal authors of the + Document (all of its principal authors, if it has fewer than five), + unless they release you from this requirement. + C. State on the Title page the name of the publisher of the + Modified Version, as the publisher. + D. Preserve all the copyright notices of the Document. + E. Add an appropriate copyright notice for your modifications + adjacent to the other copyright notices. + F. Include, immediately after the copyright notices, a license notice + giving the public permission to use the Modified Version under the + terms of this License, in the form shown in the Addendum below. + G. Preserve in that license notice the full lists of Invariant Sections + and required Cover Texts given in the Document's license notice. + H. Include an unaltered copy of this License. + I. Preserve the section Entitled "History", Preserve its Title, and add + to it an item stating at least the title, year, new authors, and + publisher of the Modified Version as given on the Title Page. If + there is no section Entitled "History" in the Document, create one + stating the title, year, authors, and publisher of the Document as + given on its Title Page, then add an item describing the Modified + Version as stated in the previous sentence. + J. Preserve the network location, if any, given in the Document for + public access to a Transparent copy of the Document, and likewise + the network locations given in the Document for previous versions + it was based on. These may be placed in the "History" section. + You may omit a network location for a work that was published at + least four years before the Document itself, or if the original + publisher of the version it refers to gives permission. + K. For any section Entitled "Acknowledgements" or "Dedications", + Preserve the Title of the section, and preserve in the section all + the substance and tone of each of the contributor acknowledgements + and/or dedications given therein. + L. Preserve all the Invariant Sections of the Document, + unaltered in their text and in their titles. Section numbers + or the equivalent are not considered part of the section titles. + M. Delete any section Entitled "Endorsements". Such a section + may not be included in the Modified Version. + N. Do not retitle any existing section to be Entitled "Endorsements" + or to conflict in title with any Invariant Section. + O. Preserve any Warranty Disclaimers. + + If the Modified Version includes new front-matter sections or + appendices that qualify as Secondary Sections and contain no material + copied from the Document, you may at your option designate some or all + of these sections as invariant. To do this, add their titles to the + list of Invariant Sections in the Modified Version's license notice. + These titles must be distinct from any other section titles. + + You may add a section Entitled "Endorsements", provided it contains + nothing but endorsements of your Modified Version by various + parties--for example, statements of peer review or that the text has + been approved by an organization as the authoritative definition of a + standard. + + You may add a passage of up to five words as a Front-Cover Text, and a + passage of up to 25 words as a Back-Cover Text, to the end of the list + of Cover Texts in the Modified Version. Only one passage of + Front-Cover Text and one of Back-Cover Text may be added by (or + through arrangements made by) any one entity. If the Document already + includes a cover text for the same cover, previously added by you or + by arrangement made by the same entity you are acting on behalf of, + you may not add another; but you may replace the old one, on explicit + permission from the previous publisher that added the old one. + + The author(s) and publisher(s) of the Document do not by this License + give permission to use their names for publicity for or to assert or + imply endorsement of any Modified Version. + + + 5. COMBINING DOCUMENTS + + You may combine the Document with other documents released under this + License, under the terms defined in section 4 above for modified + versions, provided that you include in the combination all of the + Invariant Sections of all of the original documents, unmodified, and + list them all as Invariant Sections of your combined work in its + license notice, and that you preserve all their Warranty Disclaimers. + + The combined work need only contain one copy of this License, and + multiple identical Invariant Sections may be replaced with a single + copy. If there are multiple Invariant Sections with the same name but + different contents, make the title of each such section unique by + adding at the end of it, in parentheses, the name of the original + author or publisher of that section if known, or else a unique number. + Make the same adjustment to the section titles in the list of + Invariant Sections in the license notice of the combined work. + + In the combination, you must combine any sections Entitled "History" + in the various original documents, forming one section Entitled + "History"; likewise combine any sections Entitled "Acknowledgements", + and any sections Entitled "Dedications". You must delete all sections + Entitled "Endorsements". + + + 6. COLLECTIONS OF DOCUMENTS + + You may make a collection consisting of the Document and other documents + released under this License, and replace the individual copies of this + License in the various documents with a single copy that is included in + the collection, provided that you follow the rules of this License for + verbatim copying of each of the documents in all other respects. + + You may extract a single document from such a collection, and distribute + it individually under this License, provided you insert a copy of this + License into the extracted document, and follow this License in all + other respects regarding verbatim copying of that document. + + + 7. AGGREGATION WITH INDEPENDENT WORKS + + A compilation of the Document or its derivatives with other separate + and independent documents or works, in or on a volume of a storage or + distribution medium, is called an "aggregate" if the copyright + resulting from the compilation is not used to limit the legal rights + of the compilation's users beyond what the individual works permit. + When the Document is included in an aggregate, this License does not + apply to the other works in the aggregate which are not themselves + derivative works of the Document. + + If the Cover Text requirement of section 3 is applicable to these + copies of the Document, then if the Document is less than one half of + the entire aggregate, the Document's Cover Texts may be placed on + covers that bracket the Document within the aggregate, or the + electronic equivalent of covers if the Document is in electronic form. + Otherwise they must appear on printed covers that bracket the whole + aggregate. + + + 8. TRANSLATION + + Translation is considered a kind of modification, so you may + distribute translations of the Document under the terms of section 4. + Replacing Invariant Sections with translations requires special + permission from their copyright holders, but you may include + translations of some or all Invariant Sections in addition to the + original versions of these Invariant Sections. You may include a + translation of this License, and all the license notices in the + Document, and any Warranty Disclaimers, provided that you also include + the original English version of this License and the original versions + of those notices and disclaimers. In case of a disagreement between + the translation and the original version of this License or a notice + or disclaimer, the original version will prevail. + + If a section in the Document is Entitled "Acknowledgements", + "Dedications", or "History", the requirement (section 4) to Preserve + its Title (section 1) will typically require changing the actual + title. + + + 9. TERMINATION + + You may not copy, modify, sublicense, or distribute the Document except + as expressly provided for under this License. Any other attempt to + copy, modify, sublicense or distribute the Document is void, and will + automatically terminate your rights under this License. However, + parties who have received copies, or rights, from you under this + License will not have their licenses terminated so long as such + parties remain in full compliance. + + + 10. FUTURE REVISIONS OF THIS LICENSE + + The Free Software Foundation may publish new, revised versions + of the GNU Free Documentation License from time to time. Such new + versions will be similar in spirit to the present version, but may + differ in detail to address new problems or concerns. See + http://www.gnu.org/copyleft/. + + Each version of the License is given a distinguishing version number. + If the Document specifies that a particular numbered version of this + License "or any later version" applies to it, you have the option of + following the terms and conditions either of that specified version or + of any later version that has been published (not as a draft) by the + Free Software Foundation. If the Document does not specify a version + number of this License, you may choose any version ever published (not + as a draft) by the Free Software Foundation. + + + ADDENDUM: How to use this License for your documents + + To use this License in a document you have written, include a copy of + the License in the document and put the following copyright and + license notices just after the title page: + + Copyright (c) YEAR YOUR NAME. + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU Free Documentation License, Version 1.2 + or any later version published by the Free Software Foundation; + with no Invariant Sections, no Front-Cover Texts, and no Back-Cover + Texts. A copy of the license is included in the section entitled + "GNU Free Documentation License". + + If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts, + replace the "with...Texts." line with this: + + with the Invariant Sections being LIST THEIR TITLES, with the + Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST. + + If you have Invariant Sections without Cover Texts, or some other + combination of the three, merge those two alternatives to suit the + situation. + + If your document contains nontrivial examples of program code, we + recommend releasing these examples in parallel under your choice of + free software license, such as the GNU General Public License, + to permit their use in free software. --- kdeutils-3.5.8.orig/debian/kdeutils-doc.install +++ kdeutils-3.5.8/debian/kdeutils-doc.install @@ -0,0 +1 @@ +debian/tmp/usr/share/doc/kde/HTML/en/kdeutils*-apidocs/* /usr/share/doc/kde/HTML/en/kdeutils-apidocs --- kdeutils-3.5.8.orig/debian/kdeutils-doc-html.doc-base.kcmlirc +++ kdeutils-3.5.8/debian/kdeutils-doc-html.doc-base.kcmlirc @@ -0,0 +1,10 @@ +Document: kdeutils-doc-html-kcmlirc +Title: KDE Infrared Remote Control Configuration +Author: Gav Wood +Abstract: The infrastructure for the KDE's Infrared Remote Control functionality. +Section: Tools + +Format: HTML +Index: /usr/share/doc/kde/HTML/en/kcmlirc/index.html +Files: /usr/share/doc/kde/HTML/en/kcmlirc/*.html + --- kdeutils-3.5.8.orig/debian/superkaramba.menu +++ kdeutils-3.5.8/debian/superkaramba.menu @@ -0,0 +1,11 @@ +?package(superkaramba):\ + needs="X11"\ + section="Apps/Tools"\ + hints="KDE"\ + title="Superkaramba"\ + icon32x32="/usr/share/pixmaps/superkaramba.xpm"\ + icon16x16="/usr/share/pixmaps/superkaramba-16.xpm"\ + command="/usr/bin/superkaramba" + +# Icon 32x32 superkaramba/icons/cr32-app-superkaramba.png superkaramba.xpm +# Icon 16x16 superkaramba/icons/cr16-app-superkaramba.png superkaramba-16.xpm --- kdeutils-3.5.8.orig/debian/kfloppy.menu +++ kdeutils-3.5.8/debian/kfloppy.menu @@ -0,0 +1,11 @@ +?package(kfloppy):\ + needs="X11"\ + section="Apps/System"\ + hints="KDE"\ + title="KFloppy"\ + icon32x32="/usr/share/pixmaps/kfloppy.xpm"\ + icon16x16="/usr/share/pixmaps/kfloppy-16.xpm"\ + command="/usr/bin/kfloppy" + +# Icon 32x32 kfloppy/cr32-app-kfloppy.png kfloppy.xpm +# Icon 16x16 kfloppy/cr16-app-kfloppy.png kfloppy-16.xpm --- kdeutils-3.5.8.orig/debian/khexedit.install +++ kdeutils-3.5.8/debian/khexedit.install @@ -0,0 +1,25 @@ +debian/tmp/usr/bin/khexedit +debian/tmp/usr/lib/kde3/libkbyteseditwidget.la +debian/tmp/usr/lib/kde3/libkbyteseditwidget.so +debian/tmp/usr/lib/kde3/libkhexedit2part.la +debian/tmp/usr/lib/kde3/libkhexedit2part.so +debian/tmp/usr/lib/libkhexeditcommon.so.0 +debian/tmp/usr/lib/libkhexeditcommon.so.0.0.0 +debian/tmp/usr/share/applications/kde/khexedit.desktop +debian/tmp/usr/share/apps/khexedit/khexeditui.rc +debian/tmp/usr/share/apps/khexedit/pics/hexdrag.png +debian/tmp/usr/share/apps/khexedit/pics/hexmask.png +debian/tmp/usr/share/apps/khexedit/pics/hexwrite.png +debian/tmp/usr/share/apps/khexedit2part/khexedit2partui.rc +debian/tmp/usr/share/doc/kde/HTML/en/khexedit/common +debian/tmp/usr/share/doc/kde/HTML/en/khexedit/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/khexedit/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khexedit/khexedit1.png +debian/tmp/usr/share/icons/hicolor/16x16/apps/khexedit.png +debian/tmp/usr/share/icons/hicolor/32x32/apps/khexedit.png +debian/tmp/usr/share/icons/hicolor/48x48/apps/khexedit.png +debian/tmp/usr/share/services/kbyteseditwidget.desktop +debian/tmp/usr/share/services/khexedit2part.desktop + +debian/icons/khexedit.xpm /usr/share/pixmaps +debian/icons/khexedit-16.xpm /usr/share/pixmaps --- kdeutils-3.5.8.orig/debian/kdeutils-doc-html.doc-base.irkick +++ kdeutils-3.5.8/debian/kdeutils-doc-html.doc-base.irkick @@ -0,0 +1,11 @@ +Document: kdeutils-doc-html-irkick +Title: IRKick: The KDE LIRC Server Handbook +Author: Gav Wood +Abstract: KDE LIRC is the infrastructure for the KDE's Infrared Remote + Control functionality; IRKick is the server component of that infrastructure. +Section: Tools + +Format: HTML +Index: /usr/share/doc/kde/HTML/en/irkick/index.html +Files: /usr/share/doc/kde/HTML/en/irkick/*.html + --- kdeutils-3.5.8.orig/debian/kdeutils-doc-html.doc-base.kedit +++ kdeutils-3.5.8/debian/kdeutils-doc-html.doc-base.kedit @@ -0,0 +1,10 @@ +Document: kdeutils-doc-html-kedit +Title: KEdit Handbook +Author: Thad McGinnis +Abstract: KEdit is a simple text editor for KDE +Section: Editors + +Format: HTML +Index: /usr/share/doc/kde/HTML/en/kedit/index.html +Files: /usr/share/doc/kde/HTML/en/kedit/*.html + --- kdeutils-3.5.8.orig/debian/KUBUNTU-DEBIAN-DIFFERENCES +++ kdeutils-3.5.8/debian/KUBUNTU-DEBIAN-DIFFERENCES @@ -0,0 +1,3 @@ +no build-dep on pbbuttonsd-dev [powerpc] +Add kmilo-legacy with old plugins, change descriptions, change .install files +remove kmilo.install.powerpc