--- amarok-1.4.9.1.orig/acinclude.m4 +++ amarok-1.4.9.1/acinclude.m4 @@ -1613,6 +1613,11 @@ fi done +# Export just Qt libs in LIB_QT, "extended" version will be exported as LIB_QT_EXT +LIB_QT_EXT="$LIB_QT" +LIB_QT="$kde_int_qt" + +AC_SUBST(LIB_QT_EXT) AC_SUBST(LIB_QT) AC_SUBST(LIB_QPE) @@ -1713,15 +1718,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) @@ -2708,7 +2704,7 @@ ], [return (TIFFOpen( "", "r") == 0); ], [ - kde_cv_libtiff_$1="-l$1 $LIBJPEG $LIBZ" + kde_cv_libtiff_$1="-l$1" ], [ kde_cv_libtiff_$1=no ]) @@ -2772,7 +2768,8 @@ EXRSTATUS=old else kde_save_LIBS="$LIBS" - LIBS="$LIBS $all_libraries $USER_LDFLAGS `pkg-config --libs OpenEXR` $LIBZ" + kde_libexr_libs="`pkg-config --libs OpenEXR | sed -e 's/-lImath//' -e 's/-lIex//' -e 's/-lz//'`" + LIBS="$LIBS $all_libraries $USER_LDFLAGS $kde_libexr_libs" AC_LANG_SAVE AC_LANG_CPLUSPLUS kde_save_CXXFLAGS="$CXXFLAGS" @@ -2788,7 +2785,7 @@ RgbaInputFile file ("dummy"); return 0; ], - eval "ac_cv_libexr='`pkg-config --libs OpenEXR`'", + eval "ac_cv_libexr='$kde_libexr_libs'", eval "ac_cv_libexr=no" ) LIBS="$kde_save_LIBS" @@ -2797,7 +2794,7 @@ ])dnl if eval "test ! \"`echo $ac_cv_libexr`\" = no"; then AC_DEFINE_UNQUOTED(HAVE_EXR, 1, [Define if you have OpenEXR]) - LIB_EXR="$ac_cv_libexr" + LIB_EXR="$kde_libexr_libs" AC_MSG_RESULT($ac_cv_libexr) else AC_MSG_RESULT(no) @@ -2864,7 +2861,7 @@ AC_CACHE_VAL(ac_cv_jasper, [ kde_save_LIBS="$LIBS" -LIBS="$LIBS $all_libraries $USER_LDFLAGS -ljasper $LIBJPEG -lm" +LIBS="$LIBS $all_libraries $USER_LDFLAGS -ljasper -lm" kde_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $all_includes $USER_INCLUDES" @@ -2875,7 +2872,7 @@ [ return( jas_init() ); ], - eval "ac_cv_jasper='-ljasper $LIBJPEG -lm'", + eval "ac_cv_jasper='-ljasper -lm'", eval "ac_cv_jasper=no" ) LIBS="$kde_save_LIBS" @@ -4498,7 +4495,7 @@ kde_save_cflags="$CFLAGS" CFLAGS="$CFLAGS $PYTHONINC" kde_save_libs="$LIBS" -LIBS="$LIBS $LIBPYTHON $2 $LIBDL $LIBSOCKET" +LIBS="$LIBS $LIBPYTHON $2 $LIBSOCKET" kde_save_ldflags="$LDFLAGS" LDFLAGS="$LDFLAGS $PYTHONLIB" @@ -4636,7 +4633,7 @@ and contact the authors to let them know about this problem]) ]) - LIBPYTHON="$LIBPYTHON $LIBDL $LIBSOCKET" + LIBPYTHON="$LIBPYTHON $LIBSOCKET" AC_SUBST(PYTHONINC) AC_SUBST(PYTHONLIB) AC_SUBST(LIBPYTHON) @@ -5996,30 +5993,15 @@ fi ]) # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -## Copyright 1996, 1997, 1998, 1999, 2000, 2001 -## Free Software Foundation, Inc. +## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007, +## 2008 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 52 Debian 1.5.26-1 AC_PROG_LIBTOOL # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) @@ -6079,7 +6061,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 @@ -6107,7 +6089,6 @@ AC_REQUIRE([AC_OBJEXT])dnl AC_REQUIRE([AC_EXEEXT])dnl dnl - AC_LIBTOOL_SYS_MAX_CMD_LEN AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE AC_LIBTOOL_OBJDIR @@ -6129,7 +6110,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. @@ -6149,7 +6130,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" @@ -6169,6 +6150,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" @@ -6181,22 +6163,24 @@ test -z "$ac_objext" && ac_objext=o # Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' old_postinstall_cmds='chmod 644 $oldlib' old_postuninstall_cmds= if test -n "$RANLIB"; then case $host_os in openbsd*) - 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*) @@ -6206,6 +6190,8 @@ ;; esac +_LT_REQUIRED_DARWIN_CHECKS + AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], enable_win32_dll=yes, enable_win32_dll=no) @@ -6237,11 +6223,129 @@ # 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_REQUIRE([LT_AC_PROG_SED])dnl +ac_outfile=conftest.$ac_objext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$rm conftest* +])# _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_REQUIRE([LT_AC_PROG_SED])dnl +ac_outfile=conftest.$ac_objext +echo "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$rm -r conftest* +])# _LT_LINKER_BOILERPLATE + +# _LT_REQUIRED_DARWIN_CHECKS +# -------------------------- +# Check for some things on darwin +AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[ + case $host_os in + rhapsody* | darwin*) + AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) + AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) + + AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], + [lt_cv_apple_cc_single_mod=no + if test -z "${LT_MULTI_MODULE}"; then + # By default we will add the -single_module flag. You can override + # by either setting the environment variable LT_MULTI_MODULE + # non-empty at configure time, or by adding -multi_module to the + # link flags. + echo "int foo(void){return 1;}" > conftest.c + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ + -dynamiclib ${wl}-single_module conftest.c + if test -f libconftest.dylib; then + lt_cv_apple_cc_single_mod=yes + rm -rf libconftest.dylib* + fi + rm conftest.c + fi]) + AC_CACHE_CHECK([for -exported_symbols_list linker flag], + [lt_cv_ld_exported_symbols_list], + [lt_cv_ld_exported_symbols_list=no + save_LDFLAGS=$LDFLAGS + echo "_main" > conftest.sym + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], + [lt_cv_ld_exported_symbols_list=yes], + [lt_cv_ld_exported_symbols_list=no]) + LDFLAGS="$save_LDFLAGS" + ]) + case $host_os in + rhapsody* | darwin1.[[0123]]) + _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + darwin1.*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + darwin*) + # if running on 10.5 or later, the deployment target defaults + # to the OS version, if on x86, and 10.4, the deployment + # target defaults to 10.4. Don't you love it? + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in + 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + 10.[[012]]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + 10.*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + esac + ;; + esac + if test "$lt_cv_apple_cc_single_mod" = "yes"; then + _lt_dar_single_mod='$single_module' + fi + if test "$lt_cv_ld_exported_symbols_list" = "yes"; then + _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + else + _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" + fi + if test "$DSYMUTIL" != ":"; then + _lt_dsymutil="~$DSYMUTIL \$lib || :" + else + _lt_dsymutil= + fi + ;; + esac +]) + # _LT_AC_SYS_LIBPATH_AIX # ---------------------- # Links a minimal program and checks the executable @@ -6251,12 +6355,20 @@ # If we don't find anything, use the default library path according # to the aix ld manual. AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], -[AC_LINK_IFELSE(AC_LANG_PROGRAM,[ -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` +[AC_REQUIRE([LT_AC_PROG_SED])dnl +AC_LINK_IFELSE(AC_LANG_PROGRAM,[ +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi],[]) +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi],[]) if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ])# _LT_AC_SYS_LIBPATH_AIX @@ -6314,15 +6426,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 @@ -6487,18 +6599,21 @@ rm -rf conftest* ;; -x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +s390*-*linux*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - 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-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_i386_fbsd" + ;; x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; - ppc64-*linux*) + ppc64-*linux*|powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -6510,8 +6625,10 @@ esac ;; *64-bit*) - LINUX_64_MODE="64" case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" + ;; x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; @@ -6544,6 +6661,26 @@ 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" ;; + *) + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then + LD="${LD-ld} -64" + fi + ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; + AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], [*-*-cygwin* | *-*-mingw* | *-*-pw32*) AC_CHECK_TOOL(DLLTOOL, dlltool, false) @@ -6567,7 +6704,7 @@ AC_CACHE_CHECK([$1], [$2], [$2=no ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$3" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -6575,7 +6712,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) @@ -6585,8 +6722,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 @@ -6606,22 +6745,28 @@ # ------------------------------------------------------------ # Check whether the given compiler option works AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], -[AC_CACHE_CHECK([$1], [$2], +[AC_REQUIRE([LT_AC_PROG_SED])dnl +AC_CACHE_CHECK([$1], [$2], [$2=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $3" - printf "$lt_simple_link_test_code" > conftest.$ac_ext + echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The compiler can only warn and ignore the option if not recognized + # The linker can only warn and ignore the option if not recognized # 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 fi - $rm conftest* + $rm -r conftest* LDFLAGS="$save_LDFLAGS" ]) @@ -6640,7 +6785,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*) @@ -6669,24 +6814,77 @@ lt_cv_sys_max_cmd_len=8192; ;; - *) - # If test is not a shell built-in, we'll probably end up computing a - # maximum length that is only half of the actual maximum length, but - # we can't tell. - while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \ - = "XX$testring") >/dev/null 2>&1 && - new_result=`expr "X$testring" : ".*" 2>&1` && - lt_cv_sys_max_cmd_len=$new_result && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` - testring=$testring$testring - done - testring= - # Add a significant safety factor because C++ compilers can tack on massive - # amounts of additional arguments before passing them to the linker. - # It appears as though 1/2 is a usable value. - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + amigaos*) + # On AmigaOS with pdksh, this test takes hours, literally. + # So we just punt and use a minimum line length of 8192. + 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 + ;; + *) + lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` + if test -n "$lt_cv_sys_max_cmd_len"; then + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + else + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} + while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ + = "XX$teststring") >/dev/null 2>&1 && + new_result=`expr "X$teststring" : ".*" 2>&1` && + lt_cv_sys_max_cmd_len=$new_result && + test $i != 17 # 1/2 MB should be enough + do + i=`expr $i + 1` + teststring=$teststring$teststring + done + teststring= + # Add a significant safety factor because C++ compilers can tack on massive + # amounts of additional arguments before passing them to the linker. + # It appears as though 1/2 is a usable value. + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + fi ;; esac ]) @@ -6699,7 +6897,7 @@ # _LT_AC_CHECK_DLFCN -# -------------------- +# ------------------ AC_DEFUN([_LT_AC_CHECK_DLFCN], [AC_CHECK_HEADERS(dlfcn.h)dnl ])# _LT_AC_CHECK_DLFCN @@ -6707,7 +6905,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 : @@ -6773,17 +6971,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 @@ -6795,7 +6995,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 @@ -6832,12 +7032,12 @@ lt_cv_dlopen_self=yes ]) ;; - + *) AC_CHECK_FUNC([shl_load], [lt_cv_dlopen="shl_load"], [AC_CHECK_LIB([dld], [shl_load], - [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], + [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], [AC_CHECK_FUNC([dlopen], [lt_cv_dlopen="dlopen"], [AC_CHECK_LIB([dl], [dlopen], @@ -6845,7 +7045,7 @@ [AC_CHECK_LIB([svld], [dlopen], [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], [AC_CHECK_LIB([dld], [dld_link], - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) + [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) ]) ]) ]) @@ -6866,7 +7066,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" @@ -6879,7 +7079,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( @@ -6911,7 +7111,8 @@ # --------------------------------- # Check to see if options -c and -o are simultaneously supported by compiler AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], -[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +[AC_REQUIRE([LT_AC_PROG_SED])dnl +AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no @@ -6919,14 +7120,7 @@ mkdir conftest cd conftest 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 . + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="-o out/conftest2.$ac_objext" # Insert the option either (1) after the last *FLAGS variable, or @@ -6934,7 +7128,7 @@ # Note that $ac_compile itself does not contain backslashes and begins # with a dollar sign (not a hyphen), so the echo should work correctly. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*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) @@ -6946,13 +7140,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* @@ -7011,8 +7210,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 && @@ -7061,6 +7260,7 @@ darwin*) if test -n "$STRIP" ; then striplib="$STRIP -x" + old_striplib="$STRIP -S" AC_MSG_RESULT([yes]) else AC_MSG_RESULT([no]) @@ -7069,7 +7269,7 @@ *) AC_MSG_RESULT([no]) ;; - esac + esac fi ])# AC_LIBTOOL_SYS_LIB_STRIP @@ -7078,11 +7278,12 @@ # ----------------------------- # PORTME Fill in your ld.so characteristics AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], -[AC_MSG_CHECKING([dynamic linker characteristics]) +[AC_REQUIRE([LT_AC_PROG_SED])dnl +AC_MSG_CHECKING([dynamic linker characteristics]) library_names_spec= libname_spec='lib$name' soname_spec= -shrext=".so" +shrext_cmds=".so" postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -7092,7 +7293,58 @@ version_type=none dynamic_linker="$host_os ld.so" sys_lib_dlsearch_path_spec="/lib /usr/lib" -sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +m4_if($1,[],[ +if test "$GCC" = yes; then + case $host_os in + darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; + *) lt_awk_arg="/^libraries:/" ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then + # if the path contains ";" then we assume it to be the separator + # otherwise default to the standard path separator (i.e. ":") - it is + # assumed that no part of a normal pathname contains ";" but that should + # okay in the real world where ";" in dirpaths is itself problematic. + lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` + else + lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + # Ok, now we have the path, separated by spaces, we can step through it + # and add multilib dir if necessary. + lt_tmp_lt_search_path_spec= + lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path/$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" + else + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi + done + lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk ' +BEGIN {RS=" "; FS="/|\n";} { + lt_foo=""; + lt_count=0; + for (lt_i = NF; lt_i > 0; lt_i--) { + if ($lt_i != "" && $lt_i != ".") { + if ($lt_i == "..") { + lt_count++; + } else { + if (lt_count == 0) { + lt_foo="/" $lt_i lt_foo; + } else { + lt_count--; + } + } + } + } + if (lt_foo != "") { lt_freq[[lt_foo]]++; } + if (lt_freq[[lt_foo]] == 1) { print lt_foo; } +}'` + sys_lib_search_path_spec=`echo $lt_search_path_spec` +else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +fi]) need_lib_prefix=unknown hardcode_into_libs=no @@ -7110,7 +7362,7 @@ soname_spec='${libname}${release}${shared_ext}$major' ;; -aix4* | aix5*) +aix[[4-9]]*) version_type=linux need_lib_prefix=no need_version=no @@ -7157,7 +7409,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*) @@ -7166,7 +7418,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}' @@ -7182,7 +7434,7 @@ cygwin* | mingw* | pw32*) version_type=windows - shrext=".dll" + shrext_cmds=".dll" need_version=no need_lib_prefix=no @@ -7194,7 +7446,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' @@ -7224,7 +7477,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 ;; @@ -7247,13 +7500,9 @@ soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH - shrext='$(test .$module = .yes && echo .so || echo .dylib)' - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` - else - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' - fi + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' + m4_if([$1], [],[ + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -7270,20 +7519,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*) @@ -7301,14 +7547,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 ;; + *) # from 4.6 on, and DragonFly + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; esac ;; @@ -7328,9 +7579,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 @@ -7345,7 +7596,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 @@ -7356,7 +7607,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 @@ -7368,6 +7619,18 @@ postinstall_cmds='chmod 555 $lib' ;; +interix[[3-9]]*) + 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 ;; @@ -7411,29 +7674,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>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + # We used to test for /lib/ld.so.1 and disable shared libraries on # powerpc, because MkLinux only supported shared libraries with the # GNU dynamic linker. Since this was broken with cross compilers, @@ -7443,6 +7703,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 @@ -7452,7 +7724,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 @@ -7480,8 +7752,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 @@ -7501,7 +7778,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' @@ -7519,11 +7796,8 @@ 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 +rdos*) + dynamic_linker=no ;; solaris*) @@ -7551,7 +7825,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' @@ -7584,6 +7858,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}' @@ -7597,13 +7894,26 @@ esac AC_MSG_RESULT([$dynamic_linker]) test "$dynamic_linker" = no && can_build_shared=no + +AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec], +[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"]) +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec], +[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"]) +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + +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 # _LT_AC_TAGCONFIG # ---------------- AC_DEFUN([_LT_AC_TAGCONFIG], -[AC_ARG_WITH([tags], +[AC_REQUIRE([LT_AC_PROG_SED])dnl +AC_ARG_WITH([tags], [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], [include additional configurations @<:@automatic@:>@])], [tagnames="$withval"]) @@ -7621,6 +7931,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. @@ -7647,7 +7960,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="" @@ -7709,7 +8024,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 @@ -7747,7 +8062,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) @@ -7859,7 +8174,7 @@ # AC_PATH_TOOL_PREFIX # ------------------- -# find a file program which can recognise shared library +# find a file program which can recognize shared library AC_DEFUN([AC_PATH_TOOL_PREFIX], [AC_REQUIRE([AC_PROG_EGREP])dnl AC_MSG_CHECKING([for $1]) @@ -7883,7 +8198,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 @@ -7922,7 +8237,7 @@ # AC_PATH_MAGIC # ------------- -# find a file program which can recognise a shared library +# find a file program which can recognize a shared library AC_DEFUN([AC_PATH_MAGIC], [AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) if test -z "$lt_cv_path_MAGIC_CMD"; then @@ -7993,7 +8308,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 2>&1; then + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + else + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + fi ;; darwin* | rhapsody*) - # 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.*` ;; @@ -8138,7 +8460,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 @@ -8154,43 +8476,27 @@ esac ;; +interix[[3-9]]*) + # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' + ;; + 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 @@ -8209,32 +8515,26 @@ ;; 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*) +rdos*) 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]]' @@ -8255,10 +8555,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 @@ -8278,36 +8581,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" @@ -8339,13 +8649,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 @@ -8364,13 +8674,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 @@ -8408,10 +8718,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 # -------------- @@ -8451,7 +8772,7 @@ # AC_LIBTOOL_RC -# -------------- +# ------------- # enable support for Windows resource files AC_DEFUN([AC_LIBTOOL_RC], [AC_REQUIRE([LT_AC_PROG_RC]) @@ -8477,43 +8798,16 @@ _LT_AC_TAGVAR(objext, $1)=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;\n" +lt_simple_compile_test_code="int some_variable = 0;" # Code to be used in simple link tests -lt_simple_link_test_code='int main(){return(0);}\n' +lt_simple_link_test_code='int main(){return(0);}' _LT_AC_SYS_COMPILER -# -# 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 @@ -8527,9 +8821,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]) @@ -8538,7 +8832,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 @@ -8547,48 +8841,11 @@ fi ;; -aix4*) +aix[[4-9]]*) 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]) @@ -8613,7 +8870,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)= @@ -8625,6 +8882,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)= @@ -8640,23 +8898,28 @@ _LT_AC_TAGVAR(predeps, $1)= _LT_AC_TAGVAR(postdeps, $1)= _LT_AC_TAGVAR(compiler_lib_search_path, $1)= +_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= # Source file extension for C++ test sources. -ac_ext=cc +ac_ext=cpp # Object file extension for compiled C++ test sources. objext=o _LT_AC_TAGVAR(objext, $1)=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;\n" +lt_simple_compile_test_code="int some_variable = 0;" # Code to be used in simple link tests -lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n' +lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' # 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 @@ -8667,18 +8930,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 @@ -8696,8 +8959,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' @@ -8723,7 +8986,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 @@ -8745,7 +9008,7 @@ # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; - aix4* | aix5*) + aix[[4-9]]*) if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. @@ -8753,8 +9016,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]].*|aix[[5-9]]*) + 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 @@ -8771,7 +9049,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` @@ -8779,7 +9057,7 @@ strings "$collect2name" | grep resolve_lib_name >/dev/null then # We have reworked collect2 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes + : else # We have old collect2 _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported @@ -8790,8 +9068,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 @@ -8800,15 +9082,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. @@ -8817,13 +9100,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 @@ -8832,16 +9114,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 *) @@ -8855,12 +9147,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 @@ -8869,70 +9161,53 @@ 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*) - 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 + darwin* | rhapsody*) + _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 + _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" + if test "$GXX" = 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_dar_single_mod${_lt_dsymutil}" + _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + if test "$lt_cv_apple_cc_single_mod" != "yes"; then + _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${_lt_dsymutil}" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed '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${_lt_dar_export_syms}${_lt_dsymutil}" + fi + else + case $cc_basename in + xlc*) + output_verbose_link_cmd='echo' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' + _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + ;; + *) + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + esac fi - ;; - esac - lt_int_apple_cc_single_mod=no - 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 - ;; + ;; 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 @@ -8943,14 +9218,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 @@ -8967,12 +9242,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. @@ -8981,11 +9256,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 @@ -8995,34 +9270,21 @@ ;; hpux10*|hpux11*) if test $with_gnu_ld = no; then - case "$host_cpu" in - hppa*64*) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - ia64*) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - ;; + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + + case $host_cpu in + hppa*64*|ia64*) ;; *) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $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, @@ -9032,17 +9294,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 @@ -9058,12 +9323,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 @@ -9074,11 +9342,25 @@ ;; esac ;; + interix[[3-9]]*) + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _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 @@ -9089,9 +9371,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 @@ -9100,16 +9382,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. @@ -9127,20 +9409,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* | pgcpp*) + # 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' @@ -9156,6 +9462,29 @@ # dependencies. output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + + # Not sure whether something based on + # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 + # would be better. + output_verbose_link_cmd='echo' + + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' + ;; + esac + ;; esac ;; lynxos*) @@ -9168,7 +9497,7 @@ ;; mvs*) case $cc_basename in - cxx) + cxx*) # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; @@ -9178,7 +9507,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= @@ -9189,15 +9518,35 @@ # Workaround some broken pre-1.5 toolchains output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' ;; + openbsd2*) + # C++ shared libraries are fairly broken + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + openbsd*) + if test -f /usr/libexec/ld.so; then + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + fi + output_verbose_link_cmd='echo' + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; 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)=: @@ -9207,14 +9556,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)=: @@ -9232,7 +9581,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)=: @@ -9251,13 +9600,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)=: @@ -9266,17 +9615,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' @@ -9295,7 +9644,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)=: @@ -9316,27 +9665,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 @@ -9349,36 +9685,28 @@ ;; 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. + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. # Supported since Solaris 2.6 (maybe 2.5.1?) - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z 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 @@ -9386,9 +9714,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' @@ -9398,9 +9726,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 @@ -9409,9 +9737,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 @@ -9420,16 +9748,73 @@ fi _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + ;; + esac fi ;; esac ;; - sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*) + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) + _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_AC_TAGVAR(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 @@ -9466,8 +9851,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) @@ -9485,12 +9868,13 @@ ])# 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 # objects, libraries and library flags. -AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[ +AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP], +[AC_REQUIRE([LT_AC_PROG_SED])dnl dnl we can't use the lt_simple_compile_test_code here, dnl because it contains code intended for an executable, dnl not a library. It's possible we should let each @@ -9539,7 +9923,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 @@ -9579,7 +9963,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 @@ -9615,13 +9999,74 @@ $rm -f confest.$objext +_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= +if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then + _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` +fi + +# PORTME: override above test on systems where it is broken +ifelse([$1],[CXX], +[case $host_os in +interix[[3-9]]*) + # Interix 3.5 installs completely hosed .la files for C++, so rather than + # hack all around it, let's just trust "g++" to DTRT. + _LT_AC_TAGVAR(predep_objects,$1)= + _LT_AC_TAGVAR(postdep_objects,$1)= + _LT_AC_TAGVAR(postdeps,$1)= + ;; + +linux*) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + # + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes + ;; + esac + if test "$solaris_use_stlport4" != yes; then + _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' + fi + ;; + esac + ;; + +solaris*) + case $cc_basename in + CC*) + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes + ;; + esac + + # Adding this requires a known-good setup of shared libraries for + # Sun compiler versions before 5.6, else PIC objects from an old + # archive will be linked into the output, leading to subtle bugs. + if test "$solaris_use_stlport4" != yes; then + _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' + fi + ;; + 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'. @@ -9657,20 +10102,31 @@ _LT_AC_TAGVAR(objext, $1)=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code=" subroutine t\n return\n end\n" +lt_simple_compile_test_code="\ + subroutine t + return + end +" # Code to be used in simple link tests -lt_simple_link_test_code=" program t\n end\n" +lt_simple_link_test_code="\ + program t + end +" # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_AC_SYS_COMPILER +# 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]) @@ -9680,7 +10136,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 @@ -9688,8 +10144,10 @@ postinstall_cmds='$RANLIB $lib' fi ;; -aix4*) - test "$enable_shared" = yes && enable_static=no +aix[[4-9]]*) + 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]) @@ -9699,8 +10157,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" @@ -9710,8 +10166,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) @@ -9737,23 +10191,30 @@ _LT_AC_TAGVAR(objext, $1)=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code="class foo {}\n" +lt_simple_compile_test_code="class foo {}" # Code to be used in simple link tests -lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n' +lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' # 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 @@ -9765,8 +10226,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) @@ -9776,7 +10235,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'. @@ -9792,7 +10251,7 @@ _LT_AC_TAGVAR(objext, $1)=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n' +lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' # Code to be used in simple link tests lt_simple_link_test_code="$lt_simple_compile_test_code" @@ -9800,11 +10259,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) @@ -9830,11 +10294,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 \ @@ -9860,6 +10325,7 @@ _LT_AC_TAGVAR(predeps, $1) \ _LT_AC_TAGVAR(postdeps, $1) \ _LT_AC_TAGVAR(compiler_lib_search_path, $1) \ + _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \ _LT_AC_TAGVAR(archive_cmds, $1) \ _LT_AC_TAGVAR(archive_expsym_cmds, $1) \ _LT_AC_TAGVAR(postinstall_cmds, $1) \ @@ -9875,6 +10341,7 @@ _LT_AC_TAGVAR(module_cmds, $1) \ _LT_AC_TAGVAR(module_expsym_cmds, $1) \ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \ + _LT_AC_TAGVAR(fix_srcfile_path, $1) \ _LT_AC_TAGVAR(exclude_expsyms, $1) \ _LT_AC_TAGVAR(include_expsyms, $1); do @@ -9884,7 +10351,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 | \ @@ -9921,7 +10388,7 @@ # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) # NOTE: Changes made to this file will be lost: look at ltmain.sh. # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 # Free Software Foundation, Inc. # # This file is part of GNU Libtool: @@ -9950,11 +10417,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= @@ -9985,6 +10452,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 @@ -9996,6 +10469,9 @@ # A C compiler. LTCC=$lt_LTCC +# LTCC compiler flags. +LTCFLAGS=$lt_LTCFLAGS + # A language-specific compiler. CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) @@ -10015,7 +10491,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 @@ -10046,7 +10522,7 @@ libext="$libext" # Shared library suffix (normally ".so"). -shrext='$shrext' +shrext_cmds='$shrext_cmds' # Executable file suffix (normally ""). exeext="$exeext" @@ -10061,7 +10537,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? @@ -10149,6 +10625,10 @@ # shared library. postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) +# The directories searched by this compiler when creating a shared +# library +compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1) + # The library search path used internally by the compiler when linking # a shared library. compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) @@ -10237,7 +10717,7 @@ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec # Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)" +fix_srcfile_path=$lt_fix_srcfile_path # Set to yes if exported symbols are required. always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1) @@ -10290,7 +10770,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 @@ -10317,6 +10800,7 @@ # --------------------------------- AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_REQUIRE([AC_CANONICAL_HOST]) +AC_REQUIRE([LT_AC_PROG_SED]) AC_REQUIRE([AC_PROG_NM]) AC_REQUIRE([AC_OBJEXT]) # Check for command to grab the raw symbol name followed by C symbol from nm. @@ -10332,9 +10816,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'" @@ -10356,14 +10837,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]]' @@ -10381,14 +10878,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 @@ -10478,7 +10978,7 @@ echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD cat conftest.$ac_ext >&5 fi - rm -f conftest* conftst* + rm -rf conftest* conftst* # Do not use the global_symbol_pipe unless it works. if test "$pipe_works" = yes; then @@ -10527,13 +11027,16 @@ # like `-m68040'. _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ;; - beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; - mingw* | os2* | pw32*) + mingw* | cygwin* | os2* | pw32*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries + m4_if([$1], [GCJ], [], + [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ;; darwin* | rhapsody*) # PIC is the default on this platform @@ -10544,6 +11047,10 @@ # DJGPP does not support shared libraries at all _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ;; + interix[[3-9]]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; sysv4*MP*) if test -d /usr/nec; then _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic @@ -10552,7 +11059,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*) ;; *) @@ -10566,7 +11073,7 @@ esac else case $host_os in - aix4* | aix5*) + aix[[4-9]]*) # All AIX code is PIC. if test "$host_cpu" = ia64; then # AIX 5 now supports IA64 processor @@ -10577,18 +11084,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' ;; @@ -10596,22 +11113,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 ;; @@ -10624,9 +11141,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. @@ -10635,20 +11156,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* | pgcpp*) + # 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. @@ -10656,6 +11183,14 @@ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; + esac ;; esac ;; @@ -10665,25 +11200,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 @@ -10697,24 +11232,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' ;; @@ -10724,12 +11250,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' ;; @@ -10739,7 +11265,7 @@ ;; tandem*) case $cc_basename in - NCC) + NCC*) # NonStop-UX NCC 3.20 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ;; @@ -10747,7 +11273,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*) ;; @@ -10778,14 +11311,17 @@ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ;; - beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; - mingw* | pw32* | os2*) + mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries + m4_if([$1], [GCJ], [], + [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ;; darwin* | rhapsody*) @@ -10794,6 +11330,11 @@ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' ;; + interix[[3-9]]*) + # 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. @@ -10810,7 +11351,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 ;; @@ -10836,18 +11377,29 @@ _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*) + mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' + m4_if([$1], [GCJ], [], + [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ;; hpux9* | hpux10* | hpux11*) _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 ;; @@ -10870,18 +11422,41 @@ _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. _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C 5.9 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + ;; + *Sun\ F*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='' + ;; + esac + ;; esac ;; @@ -10891,15 +11466,19 @@ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - sco3.2v5*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn' + rdos*) + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; solaris*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _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*) @@ -10908,7 +11487,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' @@ -10921,6 +11500,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' @@ -10939,7 +11529,7 @@ # if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], - _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1), + _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1), [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in "" | " "*) ;; @@ -10948,7 +11538,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)= @@ -10957,6 +11547,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_cv_prog_compiler_static_works, $1), + $lt_tmp_static_flag, + [], + [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) ]) @@ -10964,11 +11564,12 @@ # ------------------------------------ # See if the linker supports building shared libraries. AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS], -[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) +[AC_REQUIRE([LT_AC_PROG_SED])dnl +AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) ifelse([$1],[CXX],[ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' case $host_os in - aix4* | aix5*) + aix[[4-9]]*) # If we're using GNU nm, then we don't want the "-C" option. # -C means demangle to AIX nm, but means don't demangle with GNU nm if $NM -V 2>&1 | grep 'GNU' > /dev/null; then @@ -10981,12 +11582,16 @@ _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' ;; esac + _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] ],[ runpath_var= _LT_AC_TAGVAR(allow_undefined_flag, $1)= @@ -11007,7 +11612,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* @@ -11017,14 +11622,17 @@ # it will be wrapped by ` (' and `)$', so one must not match beginning or # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', # as well as any symbol that contains `d'. - _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_" + _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if # the symbol is explicitly referenced. Since portable code cannot # rely on this symbol name, it's probably fine to never include it in # preloaded symbol tables. + # Exclude shared library initialization/finalization symbols. +dnl Note also adjust exclude_expsyms for C++ above. 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 @@ -11034,6 +11642,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 ;; @@ -11044,9 +11656,30 @@ # 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*) + aix[[3-9]]*) # On AIX/PPC, the GNU linker is very broken if test "$host_cpu" != ia64; then _LT_AC_TAGVAR(ld_shlibs, $1)=no @@ -11081,7 +11714,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 @@ -11091,13 +11724,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/'\'' -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 @@ -11106,23 +11739,79 @@ echo EXPORTS > $output_objdir/$soname.def; cat $export_symbols >> $output_objdir/$soname.def; fi~ - $CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else - ld_shlibs=no + _LT_AC_TAGVAR(ld_shlibs, $1)=no fi ;; - netbsd*) + interix[[3-9]]*) + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _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' + ;; + + gnu* | linux* | k*bsd*-gnu) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_addflag= + case $cc_basename,$host_cpu in + 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 + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C 5.9 + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_sharedflag='-G' ;; + *Sun\ F*) # Sun Fortran 8.3 + tmp_sharedflag='-G' ;; + *) + tmp_sharedflag='-shared' ;; + esac + _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + + if test $supports_anon_versioning = yes; then + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + $echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi + _LT_AC_TAGVAR(link_all_deplibs, $1)=no + else + _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 @@ -11136,13 +11825,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= @@ -11152,24 +11868,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) @@ -11181,14 +11892,14 @@ # 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 fi ;; - aix4* | aix5*) + aix[[4-9]]*) if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. @@ -11203,9 +11914,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]].*|aix[[5-9]]*) + 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 @@ -11222,7 +11945,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` @@ -11230,7 +11953,7 @@ strings "$collect2name" | grep resolve_lib_name >/dev/null then # We have reworked collect2 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes + : else # We have old collect2 _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported @@ -11241,8 +11964,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 @@ -11250,30 +11977,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 @@ -11282,13 +12009,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 ;; @@ -11301,7 +12026,7 @@ _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; - bsdi4*) + bsdi[[45]]*) _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic ;; @@ -11311,69 +12036,68 @@ # 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(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' + _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ;; 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_dar_single_mod${_lt_dsymutil}" + _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + 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` $xlcverstring' + _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + ;; + *) + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + esac + fi ;; dgux*) @@ -11406,8 +12130,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 @@ -11415,7 +12139,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 @@ -11429,47 +12153,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' @@ -11483,7 +12222,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' @@ -11493,7 +12232,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 @@ -11513,23 +12252,28 @@ ;; openbsd*) - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + if test -f /usr/libexec/ld.so; then + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + else + case $host_os in + openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + ;; + *) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + ;; + esac + fi else - case $host_os in - openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - ;; - esac + _LT_AC_TAGVAR(ld_shlibs, $1)=no fi ;; @@ -11537,14 +12281,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' @@ -11556,13 +12300,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' @@ -11570,21 +12314,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' @@ -11593,8 +12331,17 @@ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no case $host_os in solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) # Supported since Solaris 2.6 (maybe 2.5.1?) - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; + *) + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. GCC discards it without `$wl', + # but is careful enough not to reorder. + # Supported since Solaris 2.6 (maybe 2.5.1?) + if test "$GCC" = yes; then + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + else + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' + fi + ;; esac _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ;; @@ -11603,7 +12350,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 @@ -11651,36 +12398,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* | 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 - 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*) @@ -11698,11 +12454,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? # @@ -11722,14 +12473,15 @@ # to ld, don't add -lc before -lgcc. AC_MSG_CHECKING([whether -lc should be explicitly linked in]) $rm conftest* - printf "$lt_simple_compile_test_code" > conftest.$ac_ext - + echo "$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= @@ -11824,6 +12576,30 @@ [AC_CHECK_TOOL(RC, windres, no) ]) + +# Cheap backport of AS_EXECUTABLE_P and required macros +# from Autoconf 2.59; we should not use $as_executable_p directly. + +# _AS_TEST_PREPARE +# ---------------- +m4_ifndef([_AS_TEST_PREPARE], +[m4_defun([_AS_TEST_PREPARE], +[if test -x / >/dev/null 2>&1; then + as_executable_p='test -x' +else + as_executable_p='test -f' +fi +])])# _AS_TEST_PREPARE + +# AS_EXECUTABLE_P +# --------------- +# Check whether a file is executable. +m4_ifndef([AS_EXECUTABLE_P], +[m4_defun([AS_EXECUTABLE_P], +[AS_REQUIRE([_AS_TEST_PREPARE])dnl +$as_executable_p $1[]dnl +])])# AS_EXECUTABLE_P + ############################################################ # NOTE: This macro has been submitted for inclusion into # # GNU Autoconf as AC_PROG_SED. When it is available in # @@ -11846,18 +12622,19 @@ test -z "$as_dir" && as_dir=. for lt_ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then + if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" fi done done done +IFS=$as_save_IFS lt_ac_max=0 lt_ac_count=0 # Add /usr/xpg4/bin/sed as it is typically found on Solaris # along with /bin/sed that truncates output. for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - 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 @@ -11884,6 +12661,7 @@ done ]) SED=$lt_cv_path_SED +AC_SUBST([SED]) AC_MSG_RESULT([$SED]) ]) --- amarok-1.4.9.1.orig/Makefile.in +++ amarok-1.4.9.1/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -122,6 +122,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -216,6 +217,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -225,6 +227,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -235,6 +238,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -256,6 +260,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -389,7 +394,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*) \ @@ -431,12 +436,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 @@ -448,7 +453,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 $@ @@ -540,8 +545,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -566,8 +571,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -577,13 +582,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -654,6 +658,10 @@ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) +dist-lzma: distdir + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma + $(am__remove_distdir) + dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -680,6 +688,8 @@ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ + unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ @@ -835,8 +845,8 @@ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean clean-generic \ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ - dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \ - distclean-generic distclean-hdr distclean-libtool \ + dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \ + distclean distclean-generic distclean-hdr distclean-libtool \ distclean-tags distcleancheck distdir distuninstallcheck dvi \ dvi-am html html-am info info-am install install-am \ install-data install-data-am install-data-local install-dvi \ @@ -964,7 +974,7 @@ .NOEXPORT: #>+ 2 -KDE_DIST=COPYING-DOCS subdirs Makefile.in configure.in.bot configure.files config.h.in configure.in Makefile.cvs aclocal.m4 configure.in.in configure acinclude.m4 Makefile.am Makefile.am.in +KDE_DIST=COPYING-DOCS subdirs configure.in.bot Makefile.in configure.files config.h.in configure.in Makefile.cvs aclocal.m4 configure.in.in acinclude.m4 Makefile.am configure Makefile.am.in #>+ 2 docs-am: --- amarok-1.4.9.1.orig/configure.files +++ amarok-1.4.9.1/configure.files @@ -1,5 +1,6 @@ ./admin/configure.in.min configure.in.in +./.pc/97_automake_cleanup.diff/amarok/configure.in.in ./amarok/configure.in.bot ./amarok/configure.in.in configure.in.bot --- amarok-1.4.9.1.orig/configure +++ amarok-1.4.9.1/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 @@ -885,12 +888,15 @@ KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE +SED GREP EGREP LN_S ECHO AR RANLIB +DSYMUTIL +NMEDIT F77 FFLAGS ac_ct_F77 @@ -943,6 +949,7 @@ MOC UIC UIC_TR +LIB_QT_EXT LIB_QT LIB_QPE kde_qtver @@ -1703,6 +1710,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 @@ -2712,7 +2721,7 @@ # Define the identity of the package. - PACKAGE=multimedia + PACKAGE=amarok-1.4.9.1 VERSION="3.5.9" @@ -2859,6 +2868,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 @@ -7531,179 +7563,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 @@ -7868,18 +7727,19 @@ test -z "$as_dir" && as_dir=. for lt_ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then + if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" fi done done done +IFS=$as_save_IFS lt_ac_max=0 lt_ac_count=0 # Add /usr/xpg4/bin/sed as it is typically found on Solaris # along with /bin/sed that truncates output. for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - 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 @@ -7908,6 +7768,7 @@ fi SED=$lt_cv_path_SED + { echo "$as_me:$LINENO: result: $SED" >&5 echo "${ECHO_T}$SED" >&6; } @@ -8131,7 +7992,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; } @@ -8205,36 +8075,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 @@ -8253,8 +8130,8 @@ echo "${ECHO_T}no, using $LN_S" >&6; } fi -{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5 -echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 +echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; } if test "${lt_cv_deplibs_check_method+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8273,7 +8150,7 @@ # whether `pass_all' will *always* work, you probably want this one. case $host_os in -aix4* | aix5*) +aix[4-9]*) lt_cv_deplibs_check_method=pass_all ;; @@ -8281,44 +8158,42 @@ 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', + # unless we find 'file', for example because we are cross-compiling. + if ( file / ) >/dev/null 2>&1; then + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + else + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + fi ;; darwin* | rhapsody*) - # 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.*` ;; @@ -8334,7 +8209,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 @@ -8350,43 +8225,27 @@ esac ;; +interix[3-9]*) + # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' + ;; + 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 @@ -8405,32 +8264,26 @@ ;; 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*) +rdos*) 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]' @@ -8451,10 +8304,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 @@ -8470,6 +8326,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 @@ -8504,7 +8363,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 8507 "configure"' > conftest.$ac_ext + echo '#line 8366 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8539,7 +8398,8 @@ rm -rf conftest* ;; -x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +s390*-*linux*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -8547,14 +8407,16 @@ 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-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_i386_fbsd" + ;; x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; - ppc64-*linux*) + ppc64-*linux*|powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -8566,8 +8428,10 @@ esac ;; *64-bit*) - LINUX_64_MODE="64" case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" + ;; x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; @@ -8659,6 +8523,30 @@ 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" ;; + *) + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then + LD="${LD-ld} -64" + fi + ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; + esac @@ -9049,6 +8937,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' @@ -9312,7 +9433,6 @@ # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! - # find the maximum length of command line arguments { echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; } @@ -9320,7 +9440,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else i=0 - testring="ABCD" + teststring="ABCD" case $build_os in msdosdjgpp*) @@ -9349,24 +9469,77 @@ lt_cv_sys_max_cmd_len=8192; ;; - *) - # If test is not a shell built-in, we'll probably end up computing a - # maximum length that is only half of the actual maximum length, but - # we can't tell. - while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \ - = "XX$testring") >/dev/null 2>&1 && - new_result=`expr "X$testring" : ".*" 2>&1` && - lt_cv_sys_max_cmd_len=$new_result && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` - testring=$testring$testring - done - testring= - # Add a significant safety factor because C++ compilers can tack on massive - # amounts of additional arguments before passing them to the linker. - # It appears as though 1/2 is a usable value. - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + amigaos*) + # On AmigaOS with pdksh, this test takes hours, literally. + # So we just punt and use a minimum line length of 8192. + 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 + ;; + *) + lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` + if test -n "$lt_cv_sys_max_cmd_len"; then + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + else + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} + while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \ + = "XX$teststring") >/dev/null 2>&1 && + new_result=`expr "X$teststring" : ".*" 2>&1` && + lt_cv_sys_max_cmd_len=$new_result && + test $i != 17 # 1/2 MB should be enough + do + i=`expr $i + 1` + teststring=$teststring$teststring + done + teststring= + # Add a significant safety factor because C++ compilers can tack on massive + # amounts of additional arguments before passing them to the linker. + # It appears as though 1/2 is a usable value. + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + fi ;; esac @@ -9383,6 +9556,7 @@ + # Check for command to grab the raw symbol name followed by C symbol from nm. { echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; } @@ -9399,9 +9573,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'" @@ -9423,14 +9594,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]' @@ -9448,14 +9635,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 @@ -9557,7 +9747,7 @@ echo "$progname: failed program was:" >&5 cat conftest.$ac_ext >&5 fi - rm -f conftest* conftst* + rm -rf conftest* conftst* # Do not use the global_symbol_pipe unless it works. if test "$pipe_works" = yes; then @@ -9617,7 +9807,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. @@ -9637,7 +9827,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" @@ -9942,6 +10132,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" @@ -9954,22 +10145,33 @@ test -z "$ac_objext" && ac_objext=o # Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' old_postinstall_cmds='chmod 644 $oldlib' old_postuninstall_cmds= if test -n "$RANLIB"; then case $host_os in openbsd*) - 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*) @@ -9995,7 +10197,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 @@ -10057,7 +10259,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 @@ -10105,6 +10307,318 @@ ;; esac + + case $host_os in + rhapsody* | darwin*) + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. +set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_DSYMUTIL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$DSYMUTIL"; then + ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +DSYMUTIL=$ac_cv_prog_DSYMUTIL +if test -n "$DSYMUTIL"; then + { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 +echo "${ECHO_T}$DSYMUTIL" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_DSYMUTIL"; then + ac_ct_DSYMUTIL=$DSYMUTIL + # Extract the first word of "dsymutil", so it can be a program name with args. +set dummy dsymutil; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_DSYMUTIL"; then + ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL +if test -n "$ac_ct_DSYMUTIL"; then + { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 +echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_ct_DSYMUTIL" = x; then + DSYMUTIL=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + DSYMUTIL=$ac_ct_DSYMUTIL + fi +else + DSYMUTIL="$ac_cv_prog_DSYMUTIL" +fi + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. +set dummy ${ac_tool_prefix}nmedit; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_NMEDIT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$NMEDIT"; then + ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +NMEDIT=$ac_cv_prog_NMEDIT +if test -n "$NMEDIT"; then + { echo "$as_me:$LINENO: result: $NMEDIT" >&5 +echo "${ECHO_T}$NMEDIT" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_NMEDIT"; then + ac_ct_NMEDIT=$NMEDIT + # Extract the first word of "nmedit", so it can be a program name with args. +set dummy nmedit; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_NMEDIT"; then + ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_NMEDIT="nmedit" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT +if test -n "$ac_ct_NMEDIT"; then + { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 +echo "${ECHO_T}$ac_ct_NMEDIT" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_ct_NMEDIT" = x; then + NMEDIT=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + NMEDIT=$ac_ct_NMEDIT + fi +else + NMEDIT="$ac_cv_prog_NMEDIT" +fi + + + { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 +echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; } +if test "${lt_cv_apple_cc_single_mod+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_apple_cc_single_mod=no + if test -z "${LT_MULTI_MODULE}"; then + # By default we will add the -single_module flag. You can override + # by either setting the environment variable LT_MULTI_MODULE + # non-empty at configure time, or by adding -multi_module to the + # link flags. + echo "int foo(void){return 1;}" > conftest.c + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ + -dynamiclib ${wl}-single_module conftest.c + if test -f libconftest.dylib; then + lt_cv_apple_cc_single_mod=yes + rm -rf libconftest.dylib* + fi + rm conftest.c + fi +fi +{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 +echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; } + { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 +echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; } +if test "${lt_cv_ld_exported_symbols_list+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_ld_exported_symbols_list=no + save_LDFLAGS=$LDFLAGS + echo "_main" > conftest.sym + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" + 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; +} +_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 + lt_cv_ld_exported_symbols_list=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + lt_cv_ld_exported_symbols_list=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$save_LDFLAGS" + +fi +{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 +echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; } + case $host_os in + rhapsody* | darwin1.[0123]) + _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + darwin1.*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + darwin*) + # if running on 10.5 or later, the deployment target defaults + # to the OS version, if on x86, and 10.4, the deployment + # target defaults to 10.4. Don't you love it? + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in + 10.0,*86*-darwin8*|10.0,*-darwin[91]*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + 10.[012]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + 10.*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + esac + ;; + esac + if test "$lt_cv_apple_cc_single_mod" = "yes"; then + _lt_dar_single_mod='$single_module' + fi + if test "$lt_cv_ld_exported_symbols_list" = "yes"; then + _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + else + _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" + fi + if test "$DSYMUTIL" != ":"; then + _lt_dsymutil="~$DSYMUTIL \$lib || :" + else + _lt_dsymutil= + fi + ;; + esac + + enable_dlopen=yes enable_win32_dll=no @@ -10143,77 +10657,34 @@ objext=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;\n" +lt_simple_compile_test_code="int some_variable = 0;" # Code to be used in simple link tests -lt_simple_link_test_code='int main(){return(0);}\n' +lt_simple_link_test_code='int main(){return(0);}' # 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 +echo "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$rm conftest* + +ac_outfile=conftest.$ac_objext +echo "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$rm -r conftest* ## CAVEAT EMPTOR: @@ -10234,7 +10705,7 @@ else lt_cv_prog_compiler_rtti_exceptions=no ac_outfile=conftest.$ac_objext - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="-fno-rtti -fno-exceptions" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -10242,18 +10713,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:10248: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10719: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10252: \$? = $ac_status" >&5 + echo "$as_me:10723: \$? = $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 @@ -10298,13 +10771,15 @@ lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' ;; - beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; - mingw* | pw32* | os2*) + mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries lt_prog_compiler_pic='-DDLL_EXPORT' ;; @@ -10314,6 +10789,11 @@ lt_prog_compiler_pic='-fno-common' ;; + interix[3-9]*) + # 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. @@ -10330,7 +10810,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 ;; @@ -10356,8 +10836,18 @@ 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*) + mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). lt_prog_compiler_pic='-DDLL_EXPORT' @@ -10367,7 +10857,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 ;; @@ -10390,18 +10880,41 @@ 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. lt_prog_compiler_static='-non_shared' ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C 5.9 + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='-Wl,' + ;; + *Sun\ F*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='' + ;; + esac + ;; esac ;; @@ -10411,15 +10924,19 @@ lt_prog_compiler_static='-non_shared' ;; - sco3.2v5*) - lt_prog_compiler_pic='-Kpic' - lt_prog_compiler_static='-dn' + rdos*) + lt_prog_compiler_static='-non_shared' ;; 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*) @@ -10428,7 +10945,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' @@ -10441,6 +10958,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' @@ -10462,12 +10990,12 @@ { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; } -if test "${lt_prog_compiler_pic_works+set}" = set; then +if test "${lt_cv_prog_compiler_pic_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - lt_prog_compiler_pic_works=no + lt_cv_prog_compiler_pic_works=no ac_outfile=conftest.$ac_objext - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$lt_prog_compiler_pic -DPIC" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -10475,28 +11003,30 @@ # 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:10481: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11009: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10485: \$? = $ac_status" >&5 + echo "$as_me:11013: \$? = $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 - lt_prog_compiler_pic_works=yes + # 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_pic_works=yes fi fi $rm conftest* fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; } +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; } -if test x"$lt_prog_compiler_pic_works" = xyes; then +if test x"$lt_cv_prog_compiler_pic_works" = xyes; then case $lt_prog_compiler_pic in "" | " "*) ;; *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; @@ -10507,7 +11037,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= @@ -10517,6 +11047,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_cv_prog_compiler_static_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_prog_compiler_static_works=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + echo "$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_cv_prog_compiler_static_works=yes + fi + else + lt_cv_prog_compiler_static_works=yes + fi + fi + $rm -r conftest* + LDFLAGS="$save_LDFLAGS" + +fi +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; } + +if test x"$lt_cv_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 @@ -10527,14 +11099,7 @@ mkdir conftest cd conftest 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 . + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="-o out/conftest2.$ac_objext" # Insert the option either (1) after the last *FLAGS variable, or @@ -10542,25 +11107,30 @@ # 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:10548: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11113: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10552: \$? = $ac_status" >&5 + echo "$as_me:11117: \$? = $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* @@ -10624,13 +11194,24 @@ # it will be wrapped by ` (' and `)$', so one must not match beginning or # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', # as well as any symbol that contains `d'. - exclude_expsyms="_GLOBAL_OFFSET_TABLE_" + exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if # the symbol is explicitly referenced. Since portable code cannot # rely on this symbol name, it's probably fine to never include it in # preloaded symbol tables. + # Exclude shared library initialization/finalization symbols. 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*) @@ -10641,6 +11222,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 ;; @@ -10651,9 +11236,30 @@ # 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*) + aix[3-9]*) # On AIX/PPC, the GNU linker is very broken if test "$host_cpu" != ia64; then ld_shlibs=no @@ -10688,7 +11294,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 @@ -10698,13 +11304,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/'\'' -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 @@ -10713,23 +11319,79 @@ echo EXPORTS > $output_objdir/$soname.def; cat $export_symbols >> $output_objdir/$soname.def; fi~ - $CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + ld_shlibs=no + fi + ;; + + interix[3-9]*) + 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' + ;; + + gnu* | linux* | k*bsd*-gnu) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_addflag= + case $cc_basename,$host_cpu in + 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 + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C 5.9 + whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_sharedflag='-G' ;; + *Sun\ F*) # Sun Fortran 8.3 + tmp_sharedflag='-G' ;; + *) + tmp_sharedflag='-shared' ;; + esac + archive_cmds='$CC '"$tmp_sharedflag""$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 '"$tmp_sharedflag""$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 @@ -10743,13 +11405,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= @@ -10759,24 +11448,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) @@ -10788,14 +11472,14 @@ # 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 fi ;; - aix4* | aix5*) + aix[4-9]*) if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. @@ -10810,9 +11494,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].*|aix[5-9]*) + 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 @@ -10829,7 +11525,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` @@ -10837,7 +11533,7 @@ strings "$collect2name" | grep resolve_lib_name >/dev/null then # We have reworked collect2 - hardcode_direct=yes + : else # We have old collect2 hardcode_direct=unsupported @@ -10848,8 +11544,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 @@ -10857,22 +11557,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 @@ -10906,11 +11607,18 @@ } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -10922,14 +11630,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 @@ -10966,11 +11673,18 @@ } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -10987,13 +11701,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 ;; @@ -11006,7 +11718,7 @@ ld_shlibs=no ;; - bsdi4*) + bsdi[45]*) export_dynamic_flag_spec=-rdynamic ;; @@ -11016,68 +11728,67 @@ # 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. - old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs' + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' fix_srcfile_path='`cygpath -w "$srcfile"`' enable_shared_with_static_runtimes=yes ;; 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 $_lt_dar_single_mod${_lt_dsymutil}" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" 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` $xlcverstring' + 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 $xlcverstring~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 ;; @@ -11111,8 +11822,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 @@ -11120,7 +11831,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 @@ -11134,47 +11845,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' @@ -11188,7 +11914,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' @@ -11198,7 +11924,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 @@ -11218,23 +11944,28 @@ ;; openbsd*) - 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' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' + if test -f /usr/libexec/ld.so; then + 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 $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 + case $host_os in + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-R$libdir' + ;; + *) + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + ;; + esac + fi else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-R$libdir' - ;; - *) - archive_cmds='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - esac + ld_shlibs=no fi ;; @@ -11242,14 +11973,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' @@ -11261,13 +11992,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' @@ -11275,21 +12006,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' @@ -11298,8 +12023,17 @@ 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 and reorder linker options, + # but understands `-z linker_flag'. GCC discards it without `$wl', + # but is careful enough not to reorder. + # Supported since Solaris 2.6 (maybe 2.5.1?) + if test "$GCC" = yes; then + whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + else + whole_archive_flag_spec='-z allextract$convenience -z defaultextract' + fi + ;; esac link_all_deplibs=yes ;; @@ -11308,7 +12042,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 @@ -11356,36 +12090,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* | sco3.2v5.0.[024]*) + 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*) @@ -11404,11 +12147,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? # @@ -11429,7 +12167,7 @@ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } $rm conftest* - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 @@ -11441,6 +12179,7 @@ libobjs=conftest.$ac_objext deplibs= wl=$lt_prog_compiler_wl + pic_flag=$lt_prog_compiler_pic compiler_flags=-v linker_flags=-v verstring= @@ -11476,7 +12215,7 @@ library_names_spec= libname_spec='lib$name' soname_spec= -shrext=".so" +shrext_cmds=".so" postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -11486,7 +12225,58 @@ version_type=none dynamic_linker="$host_os ld.so" sys_lib_dlsearch_path_spec="/lib /usr/lib" -sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + +if test "$GCC" = yes; then + case $host_os in + darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; + *) lt_awk_arg="/^libraries:/" ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then + # if the path contains ";" then we assume it to be the separator + # otherwise default to the standard path separator (i.e. ":") - it is + # assumed that no part of a normal pathname contains ";" but that should + # okay in the real world where ";" in dirpaths is itself problematic. + lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` + else + lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + # Ok, now we have the path, separated by spaces, we can step through it + # and add multilib dir if necessary. + lt_tmp_lt_search_path_spec= + lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path/$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" + else + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi + done + lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk ' +BEGIN {RS=" "; FS="/|\n";} { + lt_foo=""; + lt_count=0; + for (lt_i = NF; lt_i > 0; lt_i--) { + if ($lt_i != "" && $lt_i != ".") { + if ($lt_i == "..") { + lt_count++; + } else { + if (lt_count == 0) { + lt_foo="/" $lt_i lt_foo; + } else { + lt_count--; + } + } + } + } + if (lt_foo != "") { lt_freq[lt_foo]++; } + if (lt_freq[lt_foo] == 1) { print lt_foo; } +}'` + sys_lib_search_path_spec=`echo $lt_search_path_spec` +else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +fi need_lib_prefix=unknown hardcode_into_libs=no @@ -11504,7 +12294,7 @@ soname_spec='${libname}${release}${shared_ext}$major' ;; -aix4* | aix5*) +aix[4-9]*) version_type=linux need_lib_prefix=no need_version=no @@ -11551,7 +12341,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*) @@ -11560,7 +12350,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}' @@ -11576,7 +12366,7 @@ cygwin* | mingw* | pw32*) version_type=windows - shrext=".dll" + shrext_cmds=".dll" need_version=no need_lib_prefix=no @@ -11588,7 +12378,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' @@ -11618,7 +12409,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 ;; @@ -11641,13 +12432,9 @@ soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH - shrext='$(test .$module = .yes && echo .so || echo .dylib)' - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` - else - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' - fi + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' + + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -11664,20 +12451,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*) @@ -11695,14 +12479,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 ;; + *) # from 4.6 on, and DragonFly + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; esac ;; @@ -11722,9 +12511,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 @@ -11739,7 +12528,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 @@ -11750,7 +12539,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 @@ -11762,6 +12551,18 @@ postinstall_cmds='chmod 555 $lib' ;; +interix[3-9]*) + 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 ;; @@ -11805,29 +12606,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>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + # We used to test for /lib/ld.so.1 and disable shared libraries on # powerpc, because MkLinux only supported shared libraries with the # GNU dynamic linker. Since this was broken with cross compilers, @@ -11837,16 +12635,28 @@ dynamic_linker='GNU/Linux ld.so' ;; -netbsd*) - version_type=sunos +netbsdelf*-gnu) + version_type=linux 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}${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 + 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}' + 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 @@ -11874,8 +12684,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 @@ -11895,7 +12710,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' @@ -11913,11 +12728,8 @@ 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 +rdos*) + dynamic_linker=no ;; solaris*) @@ -11945,7 +12757,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' @@ -11978,6 +12790,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}' @@ -11993,12 +12828,32 @@ echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" +fi + +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" +fi + +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + +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 && @@ -12045,6 +12900,7 @@ darwin*) if test -n "$STRIP" ; then striplib="$STRIP -x" + old_striplib="$STRIP -S" { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } else @@ -12306,7 +13162,7 @@ { 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" + lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" else { echo "$as_me:$LINENO: checking for dlopen" >&5 echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } @@ -12582,7 +13438,7 @@ { 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" + lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" fi @@ -12615,7 +13471,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" @@ -12631,7 +13487,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 @@ -12717,7 +13575,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 @@ -12729,7 +13587,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 @@ -12833,7 +13693,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 @@ -12845,7 +13705,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 @@ -12854,47 +13714,10 @@ fi ;; -aix4*) +aix[4-9]*) 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 @@ -12920,7 +13743,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 \ @@ -12946,6 +13770,7 @@ predeps \ postdeps \ compiler_lib_search_path \ + compiler_lib_search_dirs \ archive_cmds \ archive_expsym_cmds \ postinstall_cmds \ @@ -12961,6 +13786,7 @@ module_cmds \ module_expsym_cmds \ lt_cv_prog_compiler_c_o \ + fix_srcfile_path \ exclude_expsyms \ include_expsyms; do @@ -13005,7 +13831,7 @@ # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) # NOTE: Changes made to this file will be lost: look at ltmain.sh. # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 # Free Software Foundation, Inc. # # This file is part of GNU Libtool: @@ -13034,11 +13860,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= @@ -13068,6 +13894,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 @@ -13079,6 +13911,9 @@ # A C compiler. LTCC=$lt_LTCC +# LTCC compiler flags. +LTCFLAGS=$lt_LTCFLAGS + # A language-specific compiler. CC=$lt_compiler @@ -13098,7 +13933,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 @@ -13129,7 +13964,7 @@ libext="$libext" # Shared library suffix (normally ".so"). -shrext='$shrext' +shrext_cmds='$shrext_cmds' # Executable file suffix (normally ""). exeext="$exeext" @@ -13144,7 +13979,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? @@ -13232,6 +14067,10 @@ # shared library. postdeps=$lt_postdeps +# The directories searched by this compiler when creating a shared +# library +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs + # The library search path used internally by the compiler when linking # a shared library. compiler_lib_search_path=$lt_compiler_lib_search_path @@ -13320,7 +14159,7 @@ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec # Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path="$fix_srcfile_path" +fix_srcfile_path=$lt_fix_srcfile_path # Set to yes if exported symbols are required. always_export_symbols=$always_export_symbols @@ -13371,7 +14210,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 @@ -13406,6 +14248,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. @@ -13436,7 +14281,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' @@ -13456,6 +14303,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= @@ -13471,29 +14319,47 @@ predeps_CXX= postdeps_CXX= compiler_lib_search_path_CXX= +compiler_lib_search_dirs_CXX= # Source file extension for C++ test sources. -ac_ext=cc +ac_ext=cpp # Object file extension for compiled C++ test sources. objext=o objext_CXX=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;\n" +lt_simple_compile_test_code="int some_variable = 0;" # Code to be used in simple link tests -lt_simple_link_test_code='int main(int, char *) { return(0); }\n' +lt_simple_link_test_code='int main(int, char *[]) { return(0); }' # 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 +echo "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$rm conftest* + +ac_outfile=conftest.$ac_objext +echo "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$rm -r conftest* + + # Allow CC to be a program name with arguments. lt_save_CC=$CC lt_save_LD=$LD @@ -13504,18 +14370,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 @@ -13586,7 +14461,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 /dev/null then # We have reworked collect2 - hardcode_direct_CXX=yes + : else # We have old collect2 hardcode_direct_CXX=unsupported @@ -13734,8 +14624,12 @@ hardcode_libdir_flag_spec_CXX='-L$libdir' hardcode_libdir_separator_CXX= 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 @@ -13744,15 +14638,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. - always_export_symbols_CXX=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_CXX=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. @@ -13792,11 +14687,18 @@ } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -13810,13 +14712,12 @@ hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_cmds_CXX="\$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_CXX="\$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" + archive_expsym_cmds_CXX="\$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_CXX='${wl}-R $libdir:/usr/lib:/lib' allow_undefined_flag_CXX="-z nodefs" - archive_expsym_cmds_CXX="\$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_CXX="\$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 @@ -13853,11 +14754,18 @@ } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -13874,16 +14782,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 *) @@ -13897,12 +14815,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 @@ -13911,70 +14829,53 @@ 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*) - 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 + darwin* | rhapsody*) + 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 + allow_undefined_flag_CXX="$_lt_dar_allow_undefined" + if test "$GXX" = yes ; then + output_verbose_link_cmd='echo' + archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + if test "$lt_cv_apple_cc_single_mod" != "yes"; then + 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${_lt_dsymutil}" + archive_expsym_cmds_CXX="sed '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${_lt_dar_export_syms}${_lt_dsymutil}" + fi + 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` $xlcverstring' + 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 $xlcverstring~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 - ;; - 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 - ;; + ;; 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 @@ -13985,14 +14886,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 @@ -14009,12 +14910,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. @@ -14023,11 +14924,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 @@ -14037,33 +14938,20 @@ ;; 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_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=: + + case $host_cpu in + hppa*64*|ia64*) ;; *) - 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 @@ -14074,17 +14962,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 @@ -14100,12 +14991,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 @@ -14116,11 +15010,25 @@ ;; esac ;; + interix[3-9]*) + 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 @@ -14131,9 +15039,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 @@ -14142,16 +15050,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. @@ -14169,20 +15077,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* | pgcpp*) + # 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' @@ -14198,6 +15130,29 @@ # dependencies. output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + no_undefined_flag_CXX=' -zdefs' + archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' + hardcode_libdir_flag_spec_CXX='-R$libdir' + whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + + # Not sure whether something based on + # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 + # would be better. + output_verbose_link_cmd='echo' + + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' + ;; + esac + ;; esac ;; lynxos*) @@ -14210,7 +15165,7 @@ ;; mvs*) case $cc_basename in - cxx) + cxx*) # FIXME: insert proper C++ library support ld_shlibs_CXX=no ;; @@ -14220,7 +15175,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= @@ -14231,15 +15186,35 @@ # Workaround some broken pre-1.5 toolchains output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' ;; + openbsd2*) + # C++ shared libraries are fairly broken + ld_shlibs_CXX=no + ;; + openbsd*) + if test -f /usr/libexec/ld.so; then + 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' + else + ld_shlibs_CXX=no + fi + ;; 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=: @@ -14249,14 +15224,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=: @@ -14274,7 +15249,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=: @@ -14293,13 +15268,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=: @@ -14308,17 +15283,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' @@ -14337,7 +15312,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=: @@ -14358,27 +15333,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 @@ -14391,36 +15353,28 @@ ;; 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. + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. # 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='-z allextract$convenience -z 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 @@ -14428,9 +15382,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' @@ -14440,9 +15394,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 @@ -14451,9 +15405,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 @@ -14462,16 +15416,73 @@ fi hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; + *) + whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + ;; + esac fi ;; esac ;; - sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) + 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 @@ -14502,7 +15513,6 @@ ## There is no encapsulation within the following macros, do not change ## the running order or otherwise move them around unless you know exactly ## what you are doing... - cat > conftest.$ac_ext <&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + # + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes + ;; + esac + if test "$solaris_use_stlport4" != yes; then + postdeps_CXX='-library=Cstd -library=Crun' + fi + ;; + esac + ;; + +solaris*) + case $cc_basename in + CC*) + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes + ;; + esac + + # Adding this requires a known-good setup of shared libraries for + # Sun compiler versions before 5.6, else PIC objects from an old + # archive will be linked into the output, leading to subtle bugs. + if test "$solaris_use_stlport4" != yes; then + postdeps_CXX='-library=Cstd -library=Crun' + fi + ;; + esac + ;; +esac + case " $postdeps_CXX " in *" -lc "*) archive_cmds_need_lc_CXX=no ;; esac @@ -14634,12 +15704,14 @@ # like `-m68040'. lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' ;; - beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; - mingw* | os2* | pw32*) + mingw* | cygwin* | os2* | pw32*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries lt_prog_compiler_pic_CXX='-DDLL_EXPORT' ;; darwin* | rhapsody*) @@ -14651,6 +15723,10 @@ # DJGPP does not support shared libraries at all lt_prog_compiler_pic_CXX= ;; + interix[3-9]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; sysv4*MP*) if test -d /usr/nec; then lt_prog_compiler_pic_CXX=-Kconform_pic @@ -14659,7 +15735,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*) ;; *) @@ -14673,7 +15749,7 @@ esac else case $host_os in - aix4* | aix5*) + aix[4-9]*) # All AIX code is PIC. if test "$host_cpu" = ia64; then # AIX 5 now supports IA64 processor @@ -14684,18 +15760,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' ;; @@ -14703,22 +15789,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 ;; @@ -14731,9 +15817,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. @@ -14742,20 +15832,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* | pgcpp*) + # 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. @@ -14763,6 +15859,14 @@ lt_prog_compiler_static_CXX='-non_shared' ;; *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + lt_prog_compiler_pic_CXX='-KPIC' + lt_prog_compiler_static_CXX='-Bstatic' + lt_prog_compiler_wl_CXX='-Qoption ld ' + ;; + esac ;; esac ;; @@ -14772,25 +15876,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 @@ -14804,24 +15908,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' ;; @@ -14831,12 +15926,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' ;; @@ -14846,7 +15941,7 @@ ;; tandem*) case $cc_basename in - NCC) + NCC*) # NonStop-UX NCC 3.20 lt_prog_compiler_pic_CXX='-KPIC' ;; @@ -14854,7 +15949,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*) ;; @@ -14874,12 +15976,12 @@ { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; } -if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then +if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - lt_prog_compiler_pic_works_CXX=no + lt_cv_prog_compiler_pic_works_CXX=no ac_outfile=conftest.$ac_objext - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -14887,28 +15989,30 @@ # 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:14893: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15995: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14897: \$? = $ac_status" >&5 + echo "$as_me:15999: \$? = $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 - lt_prog_compiler_pic_works_CXX=yes + # 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_pic_works_CXX=yes fi fi $rm conftest* fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; } +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; } -if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then +if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then case $lt_prog_compiler_pic_CXX in "" | " "*) ;; *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; @@ -14919,7 +16023,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= @@ -14929,6 +16033,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_cv_prog_compiler_static_works_CXX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_prog_compiler_static_works_CXX=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + echo "$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_cv_prog_compiler_static_works_CXX=yes + fi + else + lt_cv_prog_compiler_static_works_CXX=yes + fi + fi + $rm -r conftest* + LDFLAGS="$save_LDFLAGS" + +fi +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; } + +if test x"$lt_cv_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 @@ -14939,14 +16085,7 @@ mkdir conftest cd conftest 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 . + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="-o out/conftest2.$ac_objext" # Insert the option either (1) after the last *FLAGS variable, or @@ -14954,25 +16093,30 @@ # 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:14960: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16099: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14964: \$? = $ac_status" >&5 + echo "$as_me:16103: \$? = $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* @@ -15009,7 +16153,7 @@ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' case $host_os in - aix4* | aix5*) + aix[4-9]*) # If we're using GNU nm, then we don't want the "-C" option. # -C means demangle to AIX nm, but means don't demangle with GNU nm if $NM -V 2>&1 | grep 'GNU' > /dev/null; then @@ -15022,22 +16166,21 @@ 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' ;; esac + exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' { echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 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? # @@ -15058,7 +16201,7 @@ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } $rm conftest* - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 @@ -15070,6 +16213,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= @@ -15105,7 +16249,7 @@ library_names_spec= libname_spec='lib$name' soname_spec= -shrext=".so" +shrext_cmds=".so" postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -15115,7 +16259,7 @@ 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" + need_lib_prefix=unknown hardcode_into_libs=no @@ -15133,7 +16277,7 @@ soname_spec='${libname}${release}${shared_ext}$major' ;; -aix4* | aix5*) +aix[4-9]*) version_type=linux need_lib_prefix=no need_version=no @@ -15180,7 +16324,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*) @@ -15189,7 +16333,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}' @@ -15205,7 +16349,7 @@ cygwin* | mingw* | pw32*) version_type=windows - shrext=".dll" + shrext_cmds=".dll" need_version=no need_lib_prefix=no @@ -15217,7 +16361,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' @@ -15247,7 +16392,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 ;; @@ -15270,13 +16415,8 @@ soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH - shrext='$(test .$module = .yes && echo .so || echo .dylib)' - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` - else - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' - fi + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -15293,20 +16433,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*) @@ -15324,14 +16461,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 ;; + *) # from 4.6 on, and DragonFly + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; esac ;; @@ -15351,9 +16493,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 @@ -15368,7 +16510,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 @@ -15379,7 +16521,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 @@ -15391,6 +16533,18 @@ postinstall_cmds='chmod 555 $lib' ;; +interix[3-9]*) + 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 ;; @@ -15434,29 +16588,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>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + # We used to test for /lib/ld.so.1 and disable shared libraries on # powerpc, because MkLinux only supported shared libraries with the # GNU dynamic linker. Since this was broken with cross compilers, @@ -15466,6 +16617,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 @@ -15475,7 +16638,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 @@ -15503,8 +16666,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 @@ -15524,7 +16692,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' @@ -15542,11 +16710,8 @@ 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 +rdos*) + dynamic_linker=no ;; solaris*) @@ -15574,7 +16739,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' @@ -15607,6 +16772,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}' @@ -15622,12 +16810,32 @@ echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" +fi + +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" +fi + +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + +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 && @@ -15659,999 +16867,209 @@ 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 \ + compiler_lib_search_dirs_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 \ + fix_srcfile_path_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 +# The name of the directory that contains temporary libtool files. +objdir=$objdir - ac_cv_func_dlopen=no -fi +# How to create reloadable object files. +reload_flag=$lt_reload_flag +reload_cmds=$lt_reload_cmds -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 pass a linker flag through the compiler. +wl=$lt_lt_prog_compiler_wl_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 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 +# Object file suffix (normally "o"). +objext="$ac_objext" - ac_cv_lib_dl_dlopen=no -fi +# Old archive suffix (normally "a"). +libext="$libext" -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. */ +# Shared library suffix (normally ".so"). +shrext_cmds='$shrext_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_svld_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +# Executable file suffix (normally ""). +exeext="$exeext" - ac_cv_lib_svld_dlopen=no -fi +# Additional compiler flags for building library objects. +pic_flag=$lt_lt_prog_compiler_pic_CXX +pic_mode=$pic_mode -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_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 - - 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 - - -fi - - -fi - - -fi - - -fi - - -fi - - ;; - esac - - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else - enable_dlopen=no - 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 - -#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 - -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } - - 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* - - -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 - -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } - - 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* - - -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 +# 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 ? +# Must we lock files when doing compilation? need_locks=$lt_need_locks # Do we need the lib prefix for modules? @@ -16739,6 +17157,10 @@ # shared library. postdeps=$lt_postdeps_CXX +# The directories searched by this compiler when creating a shared +# library +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_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 @@ -16827,7 +17249,7 @@ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec # Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path="$fix_srcfile_path_CXX" +fix_srcfile_path=$lt_fix_srcfile_path # Set to yes if exported symbols are required. always_export_symbols=$always_export_symbols_CXX @@ -16853,7 +17275,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 @@ -16915,26 +17340,59 @@ objext_F77=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code=" subroutine t\n return\n end\n" +lt_simple_compile_test_code="\ + subroutine t + return + end +" # Code to be used in simple link tests -lt_simple_link_test_code=" program t\n end\n" +lt_simple_link_test_code="\ + program t + end +" # ltmain only uses $CC for tagged configurations so make sure $CC is set. # 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 +echo "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$rm conftest* + +ac_outfile=conftest.$ac_objext +echo "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$rm -r 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; } @@ -16947,7 +17405,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 @@ -16955,8 +17413,10 @@ postinstall_cmds='$RANLIB $lib' fi ;; -aix4*) - test "$enable_shared" = yes && enable_static=no +aix[4-9]*) + 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 @@ -16969,8 +17429,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" @@ -17001,13 +17459,15 @@ lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4' ;; - beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; - mingw* | pw32* | os2*) + mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries lt_prog_compiler_pic_F77='-DDLL_EXPORT' ;; @@ -17017,6 +17477,11 @@ lt_prog_compiler_pic_F77='-fno-common' ;; + interix[3-9]*) + # 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. @@ -17033,7 +17498,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 ;; @@ -17059,8 +17524,18 @@ 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*) + mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). lt_prog_compiler_pic_F77='-DDLL_EXPORT' @@ -17070,7 +17545,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 ;; @@ -17093,18 +17568,41 @@ 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. lt_prog_compiler_static_F77='-non_shared' ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C 5.9 + lt_prog_compiler_pic_F77='-KPIC' + lt_prog_compiler_static_F77='-Bstatic' + lt_prog_compiler_wl_F77='-Wl,' + ;; + *Sun\ F*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + lt_prog_compiler_pic_F77='-KPIC' + lt_prog_compiler_static_F77='-Bstatic' + lt_prog_compiler_wl_F77='' + ;; + esac + ;; esac ;; @@ -17114,15 +17612,19 @@ lt_prog_compiler_static_F77='-non_shared' ;; - sco3.2v5*) - lt_prog_compiler_pic_F77='-Kpic' - lt_prog_compiler_static_F77='-dn' + rdos*) + lt_prog_compiler_static_F77='-non_shared' ;; 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*) @@ -17131,7 +17633,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' @@ -17144,6 +17646,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' @@ -17165,12 +17678,12 @@ { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; } -if test "${lt_prog_compiler_pic_works_F77+set}" = set; then +if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - lt_prog_compiler_pic_works_F77=no + lt_cv_prog_compiler_pic_works_F77=no ac_outfile=conftest.$ac_objext - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$lt_prog_compiler_pic_F77" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -17178,28 +17691,30 @@ # 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:17184: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17697: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17188: \$? = $ac_status" >&5 + echo "$as_me:17701: \$? = $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 - lt_prog_compiler_pic_works_F77=yes + # 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_pic_works_F77=yes fi fi $rm conftest* fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; } +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; } -if test x"$lt_prog_compiler_pic_works_F77" = xyes; then +if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then case $lt_prog_compiler_pic_F77 in "" | " "*) ;; *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;; @@ -17210,7 +17725,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= @@ -17220,6 +17735,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_cv_prog_compiler_static_works_F77+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_prog_compiler_static_works_F77=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + echo "$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_cv_prog_compiler_static_works_F77=yes + fi + else + lt_cv_prog_compiler_static_works_F77=yes + fi + fi + $rm -r conftest* + LDFLAGS="$save_LDFLAGS" + +fi +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; } + +if test x"$lt_cv_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 @@ -17230,14 +17787,7 @@ mkdir conftest cd conftest 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 . + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="-o out/conftest2.$ac_objext" # Insert the option either (1) after the last *FLAGS variable, or @@ -17245,25 +17795,30 @@ # 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:17251: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17801: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17255: \$? = $ac_status" >&5 + echo "$as_me:17805: \$? = $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* @@ -17327,13 +17882,24 @@ # it will be wrapped by ` (' and `)$', so one must not match beginning or # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', # as well as any symbol that contains `d'. - exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_" + exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if # the symbol is explicitly referenced. Since portable code cannot # rely on this symbol name, it's probably fine to never include it in # preloaded symbol tables. + # Exclude shared library initialization/finalization symbols. 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*) @@ -17344,6 +17910,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 ;; @@ -17354,9 +17924,30 @@ # If archive_cmds runs LD, not CC, wlarc should be empty wlarc='${wl}' - # See if GNU ld supports shared libraries. + # 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*) + aix[3-9]*) # On AIX/PPC, the GNU linker is very broken if test "$host_cpu" != ia64; then ld_shlibs_F77=no @@ -17391,7 +17982,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 @@ -17401,13 +17992,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/'\'' -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 @@ -17416,23 +18007,79 @@ echo EXPORTS > $output_objdir/$soname.def; cat $export_symbols >> $output_objdir/$soname.def; fi~ - $CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else - ld_shlibs=no + ld_shlibs_F77=no + fi + ;; + + interix[3-9]*) + 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' + ;; + + gnu* | linux* | k*bsd*-gnu) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_addflag= + case $cc_basename,$host_cpu in + 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 + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C 5.9 + whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_sharedflag='-G' ;; + *Sun\ F*) # Sun Fortran 8.3 + tmp_sharedflag='-G' ;; + *) + tmp_sharedflag='-shared' ;; + esac + archive_cmds_F77='$CC '"$tmp_sharedflag""$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 '"$tmp_sharedflag""$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 @@ -17446,13 +18093,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= @@ -17462,24 +18136,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) @@ -17491,14 +18160,14 @@ # 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 fi ;; - aix4* | aix5*) + aix[4-9]*) if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. @@ -17513,9 +18182,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].*|aix[5-9]*) + 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 @@ -17532,7 +18213,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` @@ -17540,7 +18221,7 @@ strings "$collect2name" | grep resolve_lib_name >/dev/null then # We have reworked collect2 - hardcode_direct_F77=yes + : else # We have old collect2 hardcode_direct_F77=unsupported @@ -17551,8 +18232,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 @@ -17560,22 +18245,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 @@ -17599,11 +18285,18 @@ } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -17615,14 +18308,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 @@ -17649,11 +18341,18 @@ } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -17670,13 +18369,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 ;; @@ -17689,7 +18386,7 @@ ld_shlibs_F77=no ;; - bsdi4*) + bsdi[45]*) export_dynamic_flag_spec_F77=-rdynamic ;; @@ -17699,68 +18396,67 @@ # 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"`' + old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs' + 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 $_lt_dar_single_mod${_lt_dsymutil}" + module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" 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` $xlcverstring' + 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 $xlcverstring~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 ;; @@ -17794,8 +18490,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 @@ -17803,7 +18499,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 @@ -17817,47 +18513,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' @@ -17871,7 +18582,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' @@ -17881,7 +18592,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 @@ -17901,23 +18612,28 @@ ;; openbsd*) - 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' - hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' - export_dynamic_flag_spec_F77='${wl}-E' + if test -f /usr/libexec/ld.so; then + 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 $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 + case $host_os in + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) + archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec_F77='-R$libdir' + ;; + *) + archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' + ;; + esac + fi else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec_F77='-R$libdir' - ;; - *) - archive_cmds_F77='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs' - hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' - ;; - esac + ld_shlibs_F77=no fi ;; @@ -17925,14 +18641,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' @@ -17944,13 +18660,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' @@ -17958,21 +18674,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' @@ -17981,8 +18691,17 @@ 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 and reorder linker options, + # but understands `-z linker_flag'. GCC discards it without `$wl', + # but is careful enough not to reorder. + # Supported since Solaris 2.6 (maybe 2.5.1?) + if test "$GCC" = yes; then + whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + else + whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' + fi + ;; esac link_all_deplibs_F77=yes ;; @@ -17991,7 +18710,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 @@ -18039,36 +18758,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* | sco3.2v5.0.[024]*) + 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*) @@ -18087,11 +18815,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? # @@ -18112,7 +18835,7 @@ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } $rm conftest* - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 @@ -18124,6 +18847,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= @@ -18159,7 +18883,7 @@ library_names_spec= libname_spec='lib$name' soname_spec= -shrext=".so" +shrext_cmds=".so" postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -18169,7 +18893,7 @@ 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" + need_lib_prefix=unknown hardcode_into_libs=no @@ -18187,7 +18911,7 @@ soname_spec='${libname}${release}${shared_ext}$major' ;; -aix4* | aix5*) +aix[4-9]*) version_type=linux need_lib_prefix=no need_version=no @@ -18234,7 +18958,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*) @@ -18243,7 +18967,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}' @@ -18259,7 +18983,7 @@ cygwin* | mingw* | pw32*) version_type=windows - shrext=".dll" + shrext_cmds=".dll" need_version=no need_lib_prefix=no @@ -18271,7 +18995,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' @@ -18301,7 +19026,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 ;; @@ -18324,13 +19049,8 @@ soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH - shrext='$(test .$module = .yes && echo .so || echo .dylib)' - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` - else - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' - fi + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -18347,20 +19067,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*) @@ -18378,14 +19095,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 ;; + *) # from 4.6 on, and DragonFly + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; esac ;; @@ -18405,9 +19127,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 @@ -18422,7 +19144,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 @@ -18433,7 +19155,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 @@ -18445,6 +19167,18 @@ postinstall_cmds='chmod 555 $lib' ;; +interix[3-9]*) + 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 ;; @@ -18488,29 +19222,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>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + # We used to test for /lib/ld.so.1 and disable shared libraries on # powerpc, because MkLinux only supported shared libraries with the # GNU dynamic linker. Since this was broken with cross compilers, @@ -18520,6 +19251,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 @@ -18529,7 +19272,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 @@ -18557,8 +19300,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 @@ -18578,7 +19326,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' @@ -18596,11 +19344,8 @@ 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 +rdos*) + dynamic_linker=no ;; solaris*) @@ -18628,7 +19373,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' @@ -18661,6 +19406,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}' @@ -18676,12 +19444,32 @@ echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" +fi + +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" +fi + +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + +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 && @@ -18713,36 +19501,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 @@ -18757,7 +19515,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 \ @@ -18783,6 +19542,7 @@ predeps_F77 \ postdeps_F77 \ compiler_lib_search_path_F77 \ + compiler_lib_search_dirs_F77 \ archive_cmds_F77 \ archive_expsym_cmds_F77 \ postinstall_cmds_F77 \ @@ -18798,6 +19558,7 @@ module_cmds_F77 \ module_expsym_cmds_F77 \ lt_cv_prog_compiler_c_o_F77 \ + fix_srcfile_path_F77 \ exclude_expsyms_F77 \ include_expsyms_F77; do @@ -18857,6 +19618,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 @@ -18868,6 +19635,9 @@ # A C compiler. LTCC=$lt_LTCC +# LTCC compiler flags. +LTCFLAGS=$lt_LTCFLAGS + # A language-specific compiler. CC=$lt_compiler_F77 @@ -18887,7 +19657,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 @@ -18918,7 +19688,7 @@ libext="$libext" # Shared library suffix (normally ".so"). -shrext='$shrext' +shrext_cmds='$shrext_cmds' # Executable file suffix (normally ""). exeext="$exeext" @@ -18933,7 +19703,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? @@ -19021,6 +19791,10 @@ # shared library. postdeps=$lt_postdeps_F77 +# The directories searched by this compiler when creating a shared +# library +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77 + # The library search path used internally by the compiler when linking # a shared library. compiler_lib_search_path=$lt_compiler_lib_search_path_F77 @@ -19109,7 +19883,7 @@ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec # Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path="$fix_srcfile_path_F77" +fix_srcfile_path=$lt_fix_srcfile_path # Set to yes if exported symbols are required. always_export_symbols=$always_export_symbols_F77 @@ -19135,7 +19909,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 @@ -19164,29 +19941,58 @@ objext_GCJ=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code="class foo {}\n" +lt_simple_compile_test_code="class foo {}" # Code to be used in simple link tests -lt_simple_link_test_code='public class conftest { public static void main(String argv) {}; }\n' +lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }' # 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 +echo "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$rm conftest* + +ac_outfile=conftest.$ac_objext +echo "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$rm -r 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 @@ -19205,7 +20011,7 @@ else lt_cv_prog_compiler_rtti_exceptions=no ac_outfile=conftest.$ac_objext - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="-fno-rtti -fno-exceptions" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -19213,18 +20019,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:19219: $lt_compile\"" >&5) + (eval echo "\"\$as_me:20025: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:19223: \$? = $ac_status" >&5 + echo "$as_me:20029: \$? = $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 @@ -19269,14 +20077,16 @@ lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4' ;; - beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; - mingw* | pw32* | os2*) + mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). - lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries + ;; darwin* | rhapsody*) @@ -19285,6 +20095,11 @@ lt_prog_compiler_pic_GCJ='-fno-common' ;; + interix[3-9]*) + # 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. @@ -19301,7 +20116,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 ;; @@ -19327,18 +20142,28 @@ 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*) + mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). - lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' + ;; hpux9* | hpux10* | hpux11*) 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 ;; @@ -19361,18 +20186,41 @@ 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. lt_prog_compiler_static_GCJ='-non_shared' ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C 5.9 + lt_prog_compiler_pic_GCJ='-KPIC' + lt_prog_compiler_static_GCJ='-Bstatic' + lt_prog_compiler_wl_GCJ='-Wl,' + ;; + *Sun\ F*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + lt_prog_compiler_pic_GCJ='-KPIC' + lt_prog_compiler_static_GCJ='-Bstatic' + lt_prog_compiler_wl_GCJ='' + ;; + esac + ;; esac ;; @@ -19382,15 +20230,19 @@ lt_prog_compiler_static_GCJ='-non_shared' ;; - sco3.2v5*) - lt_prog_compiler_pic_GCJ='-Kpic' - lt_prog_compiler_static_GCJ='-dn' + rdos*) + lt_prog_compiler_static_GCJ='-non_shared' ;; 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*) @@ -19399,7 +20251,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' @@ -19412,6 +20264,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' @@ -19433,12 +20296,12 @@ { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; } -if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then +if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - lt_prog_compiler_pic_works_GCJ=no + lt_cv_prog_compiler_pic_works_GCJ=no ac_outfile=conftest.$ac_objext - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$lt_prog_compiler_pic_GCJ" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -19446,28 +20309,30 @@ # 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:19452: $lt_compile\"" >&5) + (eval echo "\"\$as_me:20315: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:19456: \$? = $ac_status" >&5 + echo "$as_me:20319: \$? = $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 - lt_prog_compiler_pic_works_GCJ=yes + # 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_pic_works_GCJ=yes fi fi $rm conftest* fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; } +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; } -if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then +if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then case $lt_prog_compiler_pic_GCJ in "" | " "*) ;; *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;; @@ -19478,7 +20343,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= @@ -19488,6 +20353,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_cv_prog_compiler_static_works_GCJ+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_prog_compiler_static_works_GCJ=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + echo "$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_cv_prog_compiler_static_works_GCJ=yes + fi + else + lt_cv_prog_compiler_static_works_GCJ=yes + fi + fi + $rm -r conftest* + LDFLAGS="$save_LDFLAGS" + +fi +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; } + +if test x"$lt_cv_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 @@ -19498,14 +20405,7 @@ mkdir conftest cd conftest 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 . + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="-o out/conftest2.$ac_objext" # Insert the option either (1) after the last *FLAGS variable, or @@ -19513,25 +20413,30 @@ # 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:19519: $lt_compile\"" >&5) + (eval echo "\"\$as_me:20419: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:19523: \$? = $ac_status" >&5 + echo "$as_me:20423: \$? = $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* @@ -19595,13 +20500,24 @@ # it will be wrapped by ` (' and `)$', so one must not match beginning or # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', # as well as any symbol that contains `d'. - exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_" + exclude_expsyms_GCJ='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if # the symbol is explicitly referenced. Since portable code cannot # rely on this symbol name, it's probably fine to never include it in # preloaded symbol tables. + # Exclude shared library initialization/finalization symbols. 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*) @@ -19612,6 +20528,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 ;; @@ -19622,9 +20542,30 @@ # 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*) + aix[3-9]*) # On AIX/PPC, the GNU linker is very broken if test "$host_cpu" != ia64; then ld_shlibs_GCJ=no @@ -19659,7 +20600,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 @@ -19669,13 +20610,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/'\'' -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 @@ -19684,23 +20625,79 @@ echo EXPORTS > $output_objdir/$soname.def; cat $export_symbols >> $output_objdir/$soname.def; fi~ - $CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else - ld_shlibs=no + ld_shlibs_GCJ=no + fi + ;; + + interix[3-9]*) + 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' + ;; + + gnu* | linux* | k*bsd*-gnu) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_addflag= + case $cc_basename,$host_cpu in + 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 + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C 5.9 + whole_archive_flag_spec_GCJ='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_sharedflag='-G' ;; + *Sun\ F*) # Sun Fortran 8.3 + tmp_sharedflag='-G' ;; + *) + tmp_sharedflag='-shared' ;; + esac + archive_cmds_GCJ='$CC '"$tmp_sharedflag""$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 '"$tmp_sharedflag""$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 @@ -19714,13 +20711,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= @@ -19730,24 +20754,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) @@ -19759,14 +20778,14 @@ # 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 fi ;; - aix4* | aix5*) + aix[4-9]*) if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. @@ -19781,9 +20800,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].*|aix[5-9]*) + 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 @@ -19800,7 +20831,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` @@ -19808,7 +20839,7 @@ strings "$collect2name" | grep resolve_lib_name >/dev/null then # We have reworked collect2 - hardcode_direct_GCJ=yes + : else # We have old collect2 hardcode_direct_GCJ=unsupported @@ -19819,8 +20850,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 @@ -19828,22 +20863,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 @@ -19877,11 +20913,18 @@ } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -19893,14 +20936,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 @@ -19937,11 +20979,18 @@ } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -19958,13 +21007,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 ;; @@ -19977,7 +21024,7 @@ ld_shlibs_GCJ=no ;; - bsdi4*) + bsdi[45]*) export_dynamic_flag_spec_GCJ=-rdynamic ;; @@ -19987,68 +21034,67 @@ # 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"`' + old_archive_cmds_GCJ='lib -OUT:$oldlib$oldobjs$old_deplibs' + 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 $_lt_dar_single_mod${_lt_dsymutil}" + module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + archive_expsym_cmds_GCJ="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds_GCJ="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" 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` $xlcverstring' + 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 $xlcverstring~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 ;; @@ -20082,8 +21128,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 @@ -20091,7 +21137,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 @@ -20105,47 +21151,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' @@ -20159,7 +21220,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' @@ -20169,7 +21230,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 @@ -20189,23 +21250,28 @@ ;; openbsd*) - 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' - hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' - export_dynamic_flag_spec_GCJ='${wl}-E' + if test -f /usr/libexec/ld.so; then + 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 $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 + case $host_os in + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) + archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec_GCJ='-R$libdir' + ;; + *) + archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' + ;; + esac + fi else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec_GCJ='-R$libdir' - ;; - *) - archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs' - hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' - ;; - esac + ld_shlibs_GCJ=no fi ;; @@ -20213,14 +21279,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' @@ -20232,13 +21298,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' @@ -20246,21 +21312,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' @@ -20269,8 +21329,17 @@ 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 and reorder linker options, + # but understands `-z linker_flag'. GCC discards it without `$wl', + # but is careful enough not to reorder. + # Supported since Solaris 2.6 (maybe 2.5.1?) + if test "$GCC" = yes; then + whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + else + whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' + fi + ;; esac link_all_deplibs_GCJ=yes ;; @@ -20279,7 +21348,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 @@ -20327,36 +21396,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* | sco3.2v5.0.[024]*) + 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*) @@ -20375,11 +21453,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? # @@ -20400,7 +21473,7 @@ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } $rm conftest* - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 @@ -20412,6 +21485,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= @@ -20447,7 +21521,7 @@ library_names_spec= libname_spec='lib$name' soname_spec= -shrext=".so" +shrext_cmds=".so" postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -20457,7 +21531,7 @@ 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" + need_lib_prefix=unknown hardcode_into_libs=no @@ -20475,7 +21549,7 @@ soname_spec='${libname}${release}${shared_ext}$major' ;; -aix4* | aix5*) +aix[4-9]*) version_type=linux need_lib_prefix=no need_version=no @@ -20522,7 +21596,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*) @@ -20531,7 +21605,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}' @@ -20547,7 +21621,7 @@ cygwin* | mingw* | pw32*) version_type=windows - shrext=".dll" + shrext_cmds=".dll" need_version=no need_lib_prefix=no @@ -20559,7 +21633,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' @@ -20589,7 +21664,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 ;; @@ -20612,13 +21687,8 @@ soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH - shrext='$(test .$module = .yes && echo .so || echo .dylib)' - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` - else - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' - fi + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -20635,20 +21705,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*) @@ -20666,14 +21733,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 ;; + *) # from 4.6 on, and DragonFly + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; esac ;; @@ -20693,9 +21765,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 @@ -20710,7 +21782,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 @@ -20721,7 +21793,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 @@ -20733,6 +21805,18 @@ postinstall_cmds='chmod 555 $lib' ;; +interix[3-9]*) + 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 ;; @@ -20776,29 +21860,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>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + # We used to test for /lib/ld.so.1 and disable shared libraries on # powerpc, because MkLinux only supported shared libraries with the # GNU dynamic linker. Since this was broken with cross compilers, @@ -20808,6 +21889,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 @@ -20817,7 +21910,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 @@ -20845,8 +21938,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 @@ -20866,7 +21964,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' @@ -20884,11 +21982,8 @@ 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 +rdos*) + dynamic_linker=no ;; solaris*) @@ -20916,7 +22011,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' @@ -20949,6 +22044,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}' @@ -20964,12 +22082,32 @@ echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" +fi + +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" +fi + +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + +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_GCJ= if test -n "$hardcode_libdir_flag_spec_GCJ" || \ - test -n "$runpath_var GCJ" || \ - test "X$hardcode_automatic_GCJ"="Xyes" ; then + test -n "$runpath_var_GCJ" || \ + test "X$hardcode_automatic_GCJ" = "Xyes" ; then # We can hardcode non-existant directories. if test "$hardcode_direct_GCJ" != no && @@ -21001,1131 +22139,345 @@ 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_GCJ \ + CC_GCJ \ + LD_GCJ \ + lt_prog_compiler_wl_GCJ \ + lt_prog_compiler_pic_GCJ \ + lt_prog_compiler_static_GCJ \ + lt_prog_compiler_no_builtin_flag_GCJ \ + export_dynamic_flag_spec_GCJ \ + thread_safe_flag_spec_GCJ \ + whole_archive_flag_spec_GCJ \ + enable_shared_with_static_runtimes_GCJ \ + old_archive_cmds_GCJ \ + old_archive_from_new_cmds_GCJ \ + predep_objects_GCJ \ + postdep_objects_GCJ \ + predeps_GCJ \ + postdeps_GCJ \ + compiler_lib_search_path_GCJ \ + compiler_lib_search_dirs_GCJ \ + archive_cmds_GCJ \ + archive_expsym_cmds_GCJ \ + postinstall_cmds_GCJ \ + postuninstall_cmds_GCJ \ + old_archive_from_expsyms_cmds_GCJ \ + allow_undefined_flag_GCJ \ + no_undefined_flag_GCJ \ + export_symbols_cmds_GCJ \ + hardcode_libdir_flag_spec_GCJ \ + hardcode_libdir_flag_spec_ld_GCJ \ + hardcode_libdir_separator_GCJ \ + hardcode_automatic_GCJ \ + module_cmds_GCJ \ + module_expsym_cmds_GCJ \ + lt_cv_prog_compiler_c_o_GCJ \ + fix_srcfile_path_GCJ \ + exclude_expsyms_GCJ \ + include_expsyms_GCJ; do + + case $var in + old_archive_cmds_GCJ | \ + old_archive_from_new_cmds_GCJ | \ + archive_cmds_GCJ | \ + archive_expsym_cmds_GCJ | \ + module_cmds_GCJ | \ + module_expsym_cmds_GCJ | \ + old_archive_from_expsyms_cmds_GCJ | \ + export_symbols_cmds_GCJ | \ + 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_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 +# 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_GCJ -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_GCJ - 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_GCJ -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 +# Is the compiler the GNU C compiler? +with_gcc=$GCC_GCJ - 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_GCJ -/* 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 +# 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_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 +# The name of the directory that contains temporary libtool files. +objdir=$objdir - ac_cv_func_dlopen=no -fi +# How to create reloadable object files. +reload_flag=$lt_reload_flag +reload_cmds=$lt_reload_cmds -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 pass a linker flag through the compiler. +wl=$lt_lt_prog_compiler_wl_GCJ -/* 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 +# Object file suffix (normally "o"). +objext="$ac_objext" - ac_cv_lib_dl_dlopen=no -fi +# Old archive suffix (normally "a"). +libext="$libext" -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. */ +# Shared library suffix (normally ".so"). +shrext_cmds='$shrext_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_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 +# Executable file suffix (normally ""). +exeext="$exeext" - ac_cv_lib_svld_dlopen=no -fi +# Additional compiler flags for building library objects. +pic_flag=$lt_lt_prog_compiler_pic_GCJ +pic_mode=$pic_mode -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. */ +# What is the maximum length of a command? +max_cmd_len=$lt_cv_sys_max_cmd_len -/* 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 +# Does compiler simultaneously support -c and -o options? +compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ - ac_cv_lib_dld_dld_link=no -fi +# Must we lock files when doing compilation? +need_locks=$lt_need_locks -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 +# 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 -fi +# Whether dlopen is supported. +dlopen_support=$enable_dlopen +# Whether dlopen of programs is supported. +dlopen_self=$enable_dlopen_self -fi +# 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_GCJ -fi +# Compiler flag to turn off builtin functions. +no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_GCJ +# Compiler flag to allow reflexive dlopens. +export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ -fi +# Compiler flag to generate shared objects directly from archives. +whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ +# Compiler flag to generate thread-safe objects. +thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ -fi +# Library versioning type. +version_type=$version_type - ;; - esac +# Format of library name prefix. +libname_spec=$lt_libname_spec - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else - enable_dlopen=no - fi +# 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 - case $lt_cv_dlopen in - dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" +# The coded name of the library, if different from the real name. +soname_spec=$lt_soname_spec - save_LDFLAGS="$LDFLAGS" - eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" +# Commands used to build and install an old-style archive. +RANLIB=$lt_RANLIB +old_archive_cmds=$lt_old_archive_cmds_GCJ +old_postinstall_cmds=$lt_old_postinstall_cmds +old_postuninstall_cmds=$lt_old_postuninstall_cmds - save_LIBS="$LIBS" - LIBS="$lt_cv_dlopen_libs $LIBS" +# Create an old-style archive from a shared archive. +old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_GCJ - { 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 +# Commands used to build and install a shared archive. +archive_cmds=$lt_archive_cmds_GCJ +archive_expsym_cmds=$lt_archive_expsym_cmds_GCJ +postinstall_cmds=$lt_postinstall_cmds +postuninstall_cmds=$lt_postuninstall_cmds -#include +# Commands used to build a loadable module (assumed same as above if empty) +module_cmds=$lt_module_cmds_GCJ +module_expsym_cmds=$lt_module_expsym_cmds_GCJ -#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 to strip libraries. +old_striplib=$lt_old_striplib +striplib=$lt_striplib -/* 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 +# Dependencies to place before the objects being linked to create a +# shared library. +predep_objects=$lt_predep_objects_GCJ -#ifdef __cplusplus -extern "C" void exit (int); -#endif +# Dependencies to place after the objects being linked to create a +# shared library. +postdep_objects=$lt_postdep_objects_GCJ -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; +# Dependencies to place before the objects being linked to create a +# shared library. +predeps=$lt_predeps_GCJ - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } +# Dependencies to place after the objects being linked to create a +# shared library. +postdeps=$lt_postdeps_GCJ - 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* +# The directories searched by this compiler when creating a shared +# library +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ +# The library search path used internally by the compiler when linking +# a shared library. +compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ -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_GCJ -#include +# Flag that forces no undefined symbols. +no_undefined_flag=$lt_no_undefined_flag_GCJ -#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 +# Is shlibpath searched before the hard-coded library search path? +shlibpath_overrides_runpath=$shlibpath_overrides_runpath - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - ;; - esac +# How to hardcode a shared library path into an executable. +hardcode_action=$hardcode_action_GCJ - 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_GCJ \ - CC_GCJ \ - LD_GCJ \ - lt_prog_compiler_wl_GCJ \ - lt_prog_compiler_pic_GCJ \ - lt_prog_compiler_static_GCJ \ - lt_prog_compiler_no_builtin_flag_GCJ \ - export_dynamic_flag_spec_GCJ \ - thread_safe_flag_spec_GCJ \ - whole_archive_flag_spec_GCJ \ - enable_shared_with_static_runtimes_GCJ \ - old_archive_cmds_GCJ \ - old_archive_from_new_cmds_GCJ \ - predep_objects_GCJ \ - postdep_objects_GCJ \ - predeps_GCJ \ - postdeps_GCJ \ - compiler_lib_search_path_GCJ \ - archive_cmds_GCJ \ - archive_expsym_cmds_GCJ \ - postinstall_cmds_GCJ \ - postuninstall_cmds_GCJ \ - old_archive_from_expsyms_cmds_GCJ \ - allow_undefined_flag_GCJ \ - no_undefined_flag_GCJ \ - export_symbols_cmds_GCJ \ - hardcode_libdir_flag_spec_GCJ \ - hardcode_libdir_flag_spec_ld_GCJ \ - hardcode_libdir_separator_GCJ \ - hardcode_automatic_GCJ \ - module_cmds_GCJ \ - module_expsym_cmds_GCJ \ - lt_cv_prog_compiler_c_o_GCJ \ - exclude_expsyms_GCJ \ - include_expsyms_GCJ; do - - case $var in - old_archive_cmds_GCJ | \ - old_archive_from_new_cmds_GCJ | \ - archive_cmds_GCJ | \ - archive_expsym_cmds_GCJ | \ - module_cmds_GCJ | \ - module_expsym_cmds_GCJ | \ - old_archive_from_expsyms_cmds_GCJ | \ - export_symbols_cmds_GCJ | \ - 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_GCJ - -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_GCJ - -# 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_GCJ - -# Is the compiler the GNU C compiler? -with_gcc=$GCC_GCJ - -# An ERE matcher. -EGREP=$lt_EGREP - -# The linker used to build libraries. -LD=$lt_LD_GCJ - -# 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_GCJ - -# 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_GCJ -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_GCJ - -# 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_GCJ - -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_GCJ - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ - -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ - -# 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_GCJ -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_GCJ - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_GCJ - -# Commands used to build and install a shared archive. -archive_cmds=$lt_archive_cmds_GCJ -archive_expsym_cmds=$lt_archive_expsym_cmds_GCJ -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_GCJ -module_expsym_cmds=$lt_module_expsym_cmds_GCJ - -# 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_GCJ - -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects=$lt_postdep_objects_GCJ - -# Dependencies to place before the objects being linked to create a -# shared library. -predeps=$lt_predeps_GCJ - -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps=$lt_postdeps_GCJ - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ - -# 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_GCJ - -# Flag that forces no undefined symbols. -no_undefined_flag=$lt_no_undefined_flag_GCJ - -# 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 - -# How to hardcode a shared library path into an executable. -hardcode_action=$hardcode_action_GCJ - -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=$hardcode_into_libs +# Whether we should hardcode library paths into libraries. +hardcode_into_libs=$hardcode_into_libs # Flag to hardcode \$libdir into a binary during linking. # This must work even if \$libdir does not exist. @@ -22169,7 +22521,7 @@ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec # Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path="$fix_srcfile_path_GCJ" +fix_srcfile_path=$lt_fix_srcfile_path # Set to yes if exported symbols are required. always_export_symbols=$always_export_symbols_GCJ @@ -22195,7 +22547,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 @@ -22223,7 +22578,7 @@ objext_RC=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n' +lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' # Code to be used in simple link tests lt_simple_link_test_code="$lt_simple_compile_test_code" @@ -22233,15 +22588,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 +echo "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$rm conftest* + +ac_outfile=conftest.$ac_objext +echo "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$rm -r 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 @@ -22257,7 +22639,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 \ @@ -22283,6 +22666,7 @@ predeps_RC \ postdeps_RC \ compiler_lib_search_path_RC \ + compiler_lib_search_dirs_RC \ archive_cmds_RC \ archive_expsym_cmds_RC \ postinstall_cmds_RC \ @@ -22298,6 +22682,7 @@ module_cmds_RC \ module_expsym_cmds_RC \ lt_cv_prog_compiler_c_o_RC \ + fix_srcfile_path_RC \ exclude_expsyms_RC \ include_expsyms_RC; do @@ -22357,6 +22742,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 @@ -22368,6 +22759,9 @@ # A C compiler. LTCC=$lt_LTCC +# LTCC compiler flags. +LTCFLAGS=$lt_LTCFLAGS + # A language-specific compiler. CC=$lt_compiler_RC @@ -22387,7 +22781,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 @@ -22418,7 +22812,7 @@ libext="$libext" # Shared library suffix (normally ".so"). -shrext='$shrext' +shrext_cmds='$shrext_cmds' # Executable file suffix (normally ""). exeext="$exeext" @@ -22433,7 +22827,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? @@ -22521,6 +22915,10 @@ # shared library. postdeps=$lt_postdeps_RC +# The directories searched by this compiler when creating a shared +# library +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC + # The library search path used internally by the compiler when linking # a shared library. compiler_lib_search_path=$lt_compiler_lib_search_path_RC @@ -22609,7 +23007,7 @@ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec # Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path="$fix_srcfile_path_RC" +fix_srcfile_path=$lt_fix_srcfile_path # Set to yes if exported symbols are required. always_export_symbols=$always_export_symbols_RC @@ -22635,7 +23033,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 @@ -22682,7 +23083,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 @@ -26395,1016 +26796,7951 @@ ac_mid=`expr 2 '*' $ac_mid` fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo= ac_hi= +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef short ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_hi=$ac_mid +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo=`expr '(' $ac_mid ')' + 1` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +done +case $ac_lo in +?*) ac_cv_sizeof_short=$ac_lo;; +'') if test "$ac_cv_type_short" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (short) +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute sizeof (short) +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_short=0 + fi ;; +esac +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef short ac__type_sizeof_; +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } +#include +#include +int +main () +{ + + FILE *f = fopen ("conftest.val", "w"); + if (! f) + return 1; + if (((long int) (sizeof (ac__type_sizeof_))) < 0) + { + long int i = longval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; + fprintf (f, "%ld\n", i); + } + else + { + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; + fprintf (f, "%lu\n", i); + } + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +rm -f 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>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (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_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sizeof_short=`cat conftest.val` +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +if test "$ac_cv_type_short" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (short) +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute sizeof (short) +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_short=0 + fi +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +rm -f conftest.val +fi +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5 +echo "${ECHO_T}$ac_cv_sizeof_short" >&6; } + + + +cat >>confdefs.h <<_ACEOF +#define SIZEOF_SHORT $ac_cv_sizeof_short +_ACEOF + + { echo "$as_me:$LINENO: checking for long" >&5 +echo $ECHO_N "checking for long... $ECHO_C" >&6; } +if test "${ac_cv_type_long+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. */ +$ac_includes_default +typedef long ac__type_new_; +int +main () +{ +if ((ac__type_new_ *) 0) + return 0; +if (sizeof (ac__type_new_)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_cv_type_long=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_type_long=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5 +echo "${ECHO_T}$ac_cv_type_long" >&6; } + +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ echo "$as_me:$LINENO: checking size of long" >&5 +echo $ECHO_N "checking size of long... $ECHO_C" >&6; } +if test "${ac_cv_sizeof_long+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef long ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef long ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_hi=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef long ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef long ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_lo=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo= ac_hi= +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef long ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_hi=$ac_mid +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo=`expr '(' $ac_mid ')' + 1` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +done +case $ac_lo in +?*) ac_cv_sizeof_long=$ac_lo;; +'') if test "$ac_cv_type_long" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (long) +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute sizeof (long) +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_long=0 + fi ;; +esac +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef long ac__type_sizeof_; +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } +#include +#include +int +main () +{ + + FILE *f = fopen ("conftest.val", "w"); + if (! f) + return 1; + if (((long int) (sizeof (ac__type_sizeof_))) < 0) + { + long int i = longval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; + fprintf (f, "%ld\n", i); + } + else + { + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; + fprintf (f, "%lu\n", i); + } + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +rm -f 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>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (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_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sizeof_long=`cat conftest.val` +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +if test "$ac_cv_type_long" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (long) +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute sizeof (long) +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_long=0 + fi +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +rm -f conftest.val +fi +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5 +echo "${ECHO_T}$ac_cv_sizeof_long" >&6; } + + + +cat >>confdefs.h <<_ACEOF +#define SIZEOF_LONG $ac_cv_sizeof_long +_ACEOF + + { echo "$as_me:$LINENO: checking for char *" >&5 +echo $ECHO_N "checking for char *... $ECHO_C" >&6; } +if test "${ac_cv_type_char_p+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. */ +$ac_includes_default +typedef char * ac__type_new_; +int +main () +{ +if ((ac__type_new_ *) 0) + return 0; +if (sizeof (ac__type_new_)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_cv_type_char_p=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_type_char_p=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_type_char_p" >&5 +echo "${ECHO_T}$ac_cv_type_char_p" >&6; } + +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ echo "$as_me:$LINENO: checking size of char *" >&5 +echo $ECHO_N "checking size of char *... $ECHO_C" >&6; } +if test "${ac_cv_sizeof_char_p+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef char * ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef char * ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_hi=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef char * ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef char * ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_lo=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo= ac_hi= +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef char * ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_hi=$ac_mid +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo=`expr '(' $ac_mid ')' + 1` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +done +case $ac_lo in +?*) ac_cv_sizeof_char_p=$ac_lo;; +'') if test "$ac_cv_type_char_p" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *) +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute sizeof (char *) +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_char_p=0 + fi ;; +esac +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef char * ac__type_sizeof_; +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } +#include +#include +int +main () +{ + + FILE *f = fopen ("conftest.val", "w"); + if (! f) + return 1; + if (((long int) (sizeof (ac__type_sizeof_))) < 0) + { + long int i = longval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; + fprintf (f, "%ld\n", i); + } + else + { + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; + fprintf (f, "%lu\n", i); + } + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +rm -f 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>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (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_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sizeof_char_p=`cat conftest.val` +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +if test "$ac_cv_type_char_p" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *) +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute sizeof (char *) +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_char_p=0 + fi +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +rm -f conftest.val +fi +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5 +echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6; } + + + +cat >>confdefs.h <<_ACEOF +#define SIZEOF_CHAR_P $ac_cv_sizeof_char_p +_ACEOF + + + +{ 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 + +LIBDL="-ldl" +ac_cv_have_dlfcn=yes + +fi + + +{ echo "$as_me:$LINENO: checking for shl_unload in -ldld" >&5 +echo $ECHO_N "checking for shl_unload in -ldld... $ECHO_C" >&6; } +if test "${ac_cv_lib_dld_shl_unload+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_unload (); +int +main () +{ +return shl_unload (); + ; + 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_unload=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_dld_shl_unload=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_unload" >&5 +echo "${ECHO_T}$ac_cv_lib_dld_shl_unload" >&6; } +if test $ac_cv_lib_dld_shl_unload = yes; then + +LIBDL="-ldld" +ac_cv_have_shload=yes + +fi + + + + + + + + { echo "$as_me:$LINENO: checking for size_t" >&5 +echo $ECHO_N "checking for size_t... $ECHO_C" >&6; } +if test "${ac_cv_type_size_t+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. */ +$ac_includes_default +typedef size_t ac__type_new_; +int +main () +{ +if ((ac__type_new_ *) 0) + return 0; +if (sizeof (ac__type_new_)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_cv_type_size_t=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_type_size_t=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 +echo "${ECHO_T}$ac_cv_type_size_t" >&6; } + +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ echo "$as_me:$LINENO: checking size of size_t" >&5 +echo $ECHO_N "checking size of size_t... $ECHO_C" >&6; } +if test "${ac_cv_sizeof_size_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef size_t ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef size_t ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_hi=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef size_t ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef size_t ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_lo=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo= ac_hi= +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef size_t ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_hi=$ac_mid +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo=`expr '(' $ac_mid ')' + 1` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +done +case $ac_lo in +?*) ac_cv_sizeof_size_t=$ac_lo;; +'') if test "$ac_cv_type_size_t" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t) +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute sizeof (size_t) +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_size_t=0 + fi ;; +esac +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef size_t ac__type_sizeof_; +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } +#include +#include +int +main () +{ + + FILE *f = fopen ("conftest.val", "w"); + if (! f) + return 1; + if (((long int) (sizeof (ac__type_sizeof_))) < 0) + { + long int i = longval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; + fprintf (f, "%ld\n", i); + } + else + { + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; + fprintf (f, "%lu\n", i); + } + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +rm -f 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>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (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_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sizeof_size_t=`cat conftest.val` +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +if test "$ac_cv_type_size_t" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t) +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute sizeof (size_t) +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_size_t=0 + fi +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +rm -f conftest.val +fi +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5 +echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6; } + + + +cat >>confdefs.h <<_ACEOF +#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t +_ACEOF + + + { echo "$as_me:$LINENO: checking for unsigned long" >&5 +echo $ECHO_N "checking for unsigned long... $ECHO_C" >&6; } +if test "${ac_cv_type_unsigned_long+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. */ +$ac_includes_default +typedef unsigned long ac__type_new_; +int +main () +{ +if ((ac__type_new_ *) 0) + return 0; +if (sizeof (ac__type_new_)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_cv_type_unsigned_long=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_type_unsigned_long=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5 +echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6; } + +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ echo "$as_me:$LINENO: checking size of unsigned long" >&5 +echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6; } +if test "${ac_cv_sizeof_unsigned_long+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef unsigned long ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef unsigned long ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_hi=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef unsigned long ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef unsigned long ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_lo=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo= ac_hi= +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef unsigned long ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_hi=$ac_mid +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo=`expr '(' $ac_mid ')' + 1` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +done +case $ac_lo in +?*) ac_cv_sizeof_unsigned_long=$ac_lo;; +'') if test "$ac_cv_type_unsigned_long" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long) +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute sizeof (unsigned long) +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_unsigned_long=0 + fi ;; +esac +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef unsigned long ac__type_sizeof_; +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } +#include +#include +int +main () +{ + + FILE *f = fopen ("conftest.val", "w"); + if (! f) + return 1; + if (((long int) (sizeof (ac__type_sizeof_))) < 0) + { + long int i = longval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; + fprintf (f, "%ld\n", i); + } + else + { + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; + fprintf (f, "%lu\n", i); + } + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +rm -f 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>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (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_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sizeof_unsigned_long=`cat conftest.val` +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +if test "$ac_cv_type_unsigned_long" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long) +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute sizeof (unsigned long) +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_unsigned_long=0 + fi +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +rm -f conftest.val +fi +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5 +echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6; } + + + +cat >>confdefs.h <<_ACEOF +#define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long +_ACEOF + + + + { echo "$as_me:$LINENO: checking sizeof size_t == sizeof unsigned long" >&5 +echo $ECHO_N "checking sizeof size_t == sizeof unsigned long... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + #if SIZEOF_SIZE_T != SIZEOF_UNSIGNED_LONG + choke me + #endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + { { echo "$as_me:$LINENO: error: + Apparently on your system our assumption sizeof size_t == sizeof unsigned long + does not apply. Please mail kde-devel@kde.org with a description of your system! + " >&5 +echo "$as_me: error: + Apparently on your system our assumption sizeof size_t == sizeof unsigned long + does not apply. Please mail kde-devel@kde.org with a description of your system! + " >&2;} + { (exit 1); exit 1; }; } + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + { echo "$as_me:$LINENO: checking for PIE support" >&5 +echo $ECHO_N "checking for PIE support... $ECHO_C" >&6; } +if test "${kde_cv_val_pie_support+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' + + + safe_CXXFLAGS=$CXXFLAGS + safe_LDFLAGS=$LDFLAGS + CXXFLAGS="$CXXFLAGS -fPIE" + LDFLAGS="$LDFLAGS -pie" + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int foo; +int +main () +{ + + ; + 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 + kde_cv_val_pie_support=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + kde_cv_val_pie_support=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + + CXXFLAGS=$safe_CXXFLAGS + LDFLAGS=$safe_LDFLAGS + 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 +{ echo "$as_me:$LINENO: result: $kde_cv_val_pie_support" >&5 +echo "${ECHO_T}$kde_cv_val_pie_support" >&6; } + + { echo "$as_me:$LINENO: checking if enabling -pie/fPIE support" >&5 +echo $ECHO_N "checking if enabling -pie/fPIE support... $ECHO_C" >&6; } + + # Check whether --enable-pie was given. +if test "${enable_pie+set}" = set; then + enableval=$enable_pie; kde_has_pie_support=$enableval +else + kde_has_pie_support=detect +fi + + + if test "$kde_has_pie_support" = "detect"; then + kde_has_pie_support=$kde_cv_val_pie_support + fi + + { echo "$as_me:$LINENO: result: $kde_has_pie_support" >&5 +echo "${ECHO_T}$kde_has_pie_support" >&6; } + + KDE_USE_FPIE="" + KDE_USE_PIE="" + + + + + if test "$kde_has_pie_support" = "yes"; then + KDE_USE_FPIE="-fPIE" + KDE_USE_PIE="-pie" + fi + + +# darwin needs this to initialize the environment + +for ac_header in crt_externs.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_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_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi + +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + + ;; +esac +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + +{ echo "$as_me:$LINENO: checking for _NSGetEnviron" >&5 +echo $ECHO_N "checking for _NSGetEnviron... $ECHO_C" >&6; } +if test "${ac_cv_func__NSGetEnviron+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 _NSGetEnviron to an innocuous variant, in case declares _NSGetEnviron. + For example, HP-UX 11i declares gettimeofday. */ +#define _NSGetEnviron innocuous__NSGetEnviron + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char _NSGetEnviron (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef _NSGetEnviron + +/* 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 _NSGetEnviron (); +/* 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__NSGetEnviron || defined __stub____NSGetEnviron +choke me +#endif + +int +main () +{ +return _NSGetEnviron (); + ; + 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__NSGetEnviron=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func__NSGetEnviron=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__NSGetEnviron" >&5 +echo "${ECHO_T}$ac_cv_func__NSGetEnviron" >&6; } +if test $ac_cv_func__NSGetEnviron = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_NSGETENVIRON 1 +_ACEOF + +fi + + + + + + + + + + +for ac_func in vsnprintf snprintf +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+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 $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* 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 $ac_func (); +/* 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_$ac_func || defined __stub___$ac_func +choke me +#endif + +int +main () +{ +return $ac_func (); + ; + 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 + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + + + + + + + + +# Check whether --enable-embedded was given. +if test "${enable_embedded+set}" = set; then + enableval=$enable_embedded; kde_use_qt_emb=$enableval +else + kde_use_qt_emb=no + +fi + + +# Check whether --enable-qtopia was given. +if test "${enable_qtopia+set}" = set; then + enableval=$enable_qtopia; kde_use_qt_emb_palm=$enableval +else + kde_use_qt_emb_palm=no + +fi + + +# Check whether --enable-mac was given. +if test "${enable_mac+set}" = set; then + enableval=$enable_mac; kde_use_qt_mac=$enableval +else + kde_use_qt_mac=no + +fi + + +# used to disable x11-specific stuff on special platforms + if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then + include_x11_TRUE= + include_x11_FALSE='#' +else + include_x11_TRUE='#' + include_x11_FALSE= +fi + + +if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then + +{ echo "$as_me:$LINENO: checking for X" >&5 +echo $ECHO_N "checking for X... $ECHO_C" >&6; } + +if test "${kde_cv_have_x+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # One or both of the vars are not set, and there is no cached value. +if test "{$x_includes+set}" = set || test "$x_includes" = NONE; then + kde_x_includes=NO +else + kde_x_includes=$x_includes +fi +if test "{$x_libraries+set}" = set || test "$x_libraries" = NONE; then + kde_x_libraries=NO +else + kde_x_libraries=$x_libraries +fi + +# below we use the standard autoconf calls +ac_x_libraries=$kde_x_libraries +ac_x_includes=$kde_x_includes + + + + +if test "$ac_x_includes" = NO; then + # Guess where to find include files, by looking for this one X11 .h file. + test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h + + # First, try using that file with no special directory specified. +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$x_direct_test_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_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + # We can compile using X headers with no special include directory. +ac_x_includes= +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Look for the header file in a standard set of common directories. +# Check X11 before X11Rn because it is often a symlink to the current release. + for ac_dir in \ + /usr/X11/include \ + /usr/X11R6/include \ + /usr/X11R5/include \ + /usr/X11R4/include \ + \ + /usr/include/X11 \ + /usr/include/X11R6 \ + /usr/include/X11R5 \ + /usr/include/X11R4 \ + \ + /usr/local/X11/include \ + /usr/local/X11R6/include \ + /usr/local/X11R5/include \ + /usr/local/X11R4/include \ + \ + /usr/local/include/X11 \ + /usr/local/include/X11R6 \ + /usr/local/include/X11R5 \ + /usr/local/include/X11R4 \ + \ + /usr/X386/include \ + /usr/x386/include \ + /usr/XFree86/include/X11 \ + \ + /usr/include \ + /usr/local/include \ + /usr/unsupported/include \ + /usr/athena/include \ + /usr/local/x11r5/include \ + /usr/lpp/Xamples/include \ + \ + /usr/openwin/include \ + /usr/openwin/share/include \ + ; \ + do + if test -r "$ac_dir/$x_direct_test_include"; then + ac_x_includes=$ac_dir + break + fi + done +fi + +rm -f conftest.err conftest.$ac_ext +fi # $ac_x_includes = NO + +if test "$ac_x_libraries" = NO; then + # Check for the libraries. + + test -z "$x_direct_test_library" && x_direct_test_library=Xt + test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc + + # See if we find them without any special options. + # Don't add to $LIBS permanently. + ac_save_LIBS="$LIBS" + LIBS="-l$x_direct_test_library $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ +${x_direct_test_function}(1) + ; + 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 + LIBS="$ac_save_LIBS" +# We can link X programs with no special library path. +ac_x_libraries= +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + LIBS="$ac_save_LIBS" +# First see if replacing the include by lib works. +# Check X11 before X11Rn because it is often a symlink to the current release. +for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \ + /usr/X11/lib${kdelibsuff} \ + /usr/X11R6/lib${kdelibsuff} \ + /usr/X11R5/lib${kdelibsuff} \ + /usr/X11R4/lib${kdelibsuff} \ + \ + /usr/lib${kdelibsuff}/X11 \ + /usr/lib${kdelibsuff}/X11R6 \ + /usr/lib${kdelibsuff}/X11R5 \ + /usr/lib${kdelibsuff}/X11R4 \ + \ + /usr/local/X11/lib${kdelibsuff} \ + /usr/local/X11R6/lib${kdelibsuff} \ + /usr/local/X11R5/lib${kdelibsuff} \ + /usr/local/X11R4/lib${kdelibsuff} \ + \ + /usr/local/lib${kdelibsuff}/X11 \ + /usr/local/lib${kdelibsuff}/X11R6 \ + /usr/local/lib${kdelibsuff}/X11R5 \ + /usr/local/lib${kdelibsuff}/X11R4 \ + \ + /usr/X386/lib${kdelibsuff} \ + /usr/x386/lib${kdelibsuff} \ + /usr/XFree86/lib${kdelibsuff}/X11 \ + \ + /usr/lib${kdelibsuff} \ + /usr/local/lib${kdelibsuff} \ + /usr/unsupported/lib${kdelibsuff} \ + /usr/athena/lib${kdelibsuff} \ + /usr/local/x11r5/lib${kdelibsuff} \ + /usr/lpp/Xamples/lib${kdelibsuff} \ + /lib/usr/lib${kdelibsuff}/X11 \ + \ + /usr/openwin/lib${kdelibsuff} \ + /usr/openwin/share/lib${kdelibsuff} \ + ; \ +do + for ac_extension in a so sl; do + if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then + ac_x_libraries=$ac_dir + break 2 + fi + done +done +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi # $ac_x_libraries = NO + +case "$host" in +mips-sgi-irix6*) + ;; +*-*-solaris*) + ;; +*) + rm -f -r conftest.dir +if mkdir conftest.dir; then + cd conftest.dir + cat >Imakefile <<'_ACEOF' +incroot: + @echo incroot='${INCROOT}' +usrlibdir: + @echo usrlibdir='${USRLIBDIR}' +libdir: + @echo libdir='${LIBDIR}' +_ACEOF + if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then + # GNU make sometimes prints "make[1]: Entering...", which would confuse us. + for ac_var in incroot usrlibdir libdir; do + eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" + done + # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. + for ac_extension in a so sl; do + if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && + test -f "$ac_im_libdir/libX11.$ac_extension"; then + ac_im_usrlibdir=$ac_im_libdir; break + fi + done + # Screen out bogus values from the imake configuration. They are + # bogus both because they are the default anyway, and because + # using them would break gcc on systems where it needs fixed includes. + case $ac_im_incroot in + /usr/include) ac_x_includes= ;; + *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; + esac + case $ac_im_usrlibdir in + /usr/lib | /lib) ;; + *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; + esac + fi + cd .. + rm -f -r conftest.dir +fi + + if test -z "$ac_x_includes"; then + ac_x_includes="." + fi + if test -z "$ac_x_libraries"; then + ac_x_libraries="/usr/lib${kdelibsuff}" + fi +esac +#from now on we use our own again + +# when the user already gave --x-includes, we ignore +# what the standard autoconf macros told us. +if test "$kde_x_includes" = NO; then + kde_x_includes=$ac_x_includes +fi + +# for --x-libraries too +if test "$kde_x_libraries" = NO; then + kde_x_libraries=$ac_x_libraries +fi + +if test "$kde_x_includes" = NO; then + { { echo "$as_me:$LINENO: error: Can't find X includes. Please check your installation and add the correct paths!" >&5 +echo "$as_me: error: Can't find X includes. Please check your installation and add the correct paths!" >&2;} + { (exit 1); exit 1; }; } +fi + +if test "$kde_x_libraries" = NO; then + { { echo "$as_me:$LINENO: error: Can't find X libraries. Please check your installation and add the correct paths!" >&5 +echo "$as_me: error: Can't find X libraries. Please check your installation and add the correct paths!" >&2;} + { (exit 1); exit 1; }; } +fi + +# Record where we found X for the cache. +kde_cv_have_x="have_x=yes \ + kde_x_includes=$kde_x_includes kde_x_libraries=$kde_x_libraries" + +fi + +eval "$kde_cv_have_x" + +if test "$have_x" != yes; then + { echo "$as_me:$LINENO: result: $have_x" >&5 +echo "${ECHO_T}$have_x" >&6; } + no_x=yes +else + { echo "$as_me:$LINENO: result: libraries $kde_x_libraries, headers $kde_x_includes" >&5 +echo "${ECHO_T}libraries $kde_x_libraries, headers $kde_x_includes" >&6; } +fi + +if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then + X_INCLUDES="" + x_includes="."; else + x_includes=$kde_x_includes + X_INCLUDES="-I$x_includes" +fi + +if test -z "$kde_x_libraries" || test "x$kde_x_libraries" = xNONE || test "$kde_x_libraries" = "/usr/lib"; then + X_LDFLAGS="" + x_libraries="/usr/lib"; else + x_libraries=$kde_x_libraries + X_LDFLAGS="-L$x_libraries" +fi +all_includes="$X_INCLUDES" +all_libraries="$X_LDFLAGS $LDFLAGS_AS_NEEDED $LDFLAGS_NEW_DTAGS" + +# Check for libraries that X11R6 Xt/Xaw programs need. +ac_save_LDFLAGS="$LDFLAGS" +LDFLAGS="$LDFLAGS $X_LDFLAGS" +# SM needs ICE to (dynamically) link under SunOS 4.x (so we have to +# check for ICE first), but we must link in the order -lSM -lICE or +# we get undefined symbols. So assume we have SM if we have ICE. +# These have to be linked with before -lX11, unlike the other +# libraries we check for below, so use a different variable. +# --interran@uluru.Stanford.EDU, kb@cs.umb.edu. +{ echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 +echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; } +if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lICE $X_EXTRA_LIBS $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 IceConnectionNumber (); +int +main () +{ +return IceConnectionNumber (); + ; + 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_ICE_IceConnectionNumber=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_ICE_IceConnectionNumber=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_ICE_IceConnectionNumber" >&5 +echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; } +if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then + LIBSM="-lSM -lICE" +fi + +LDFLAGS="$ac_save_LDFLAGS" + +LIB_X11='-lX11 $(LIBSOCKET)' + +{ echo "$as_me:$LINENO: checking for libXext" >&5 +echo $ECHO_N "checking for libXext... $ECHO_C" >&6; } +if test "${kde_cv_have_libXext+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +kde_ldflags_safe="$LDFLAGS" +kde_libs_safe="$LIBS" + +LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS" +LIBS="-lXext -lX11 $LIBSOCKET" + +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#ifdef STDC_HEADERS +# include +#endif + +int +main () +{ + +printf("hello Xext\n"); + + ; + 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 + kde_cv_have_libXext=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + kde_cv_have_libXext=no + +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + +LDFLAGS=$kde_ldflags_safe +LIBS=$kde_libs_safe + +fi + + +{ echo "$as_me:$LINENO: result: $kde_cv_have_libXext" >&5 +echo "${ECHO_T}$kde_cv_have_libXext" >&6; } + +if test "$kde_cv_have_libXext" = "no"; then + { { echo "$as_me:$LINENO: error: We need a working libXext to proceed. Since configure +can't find it itself, we stop here assuming that make wouldn't find +them either." >&5 +echo "$as_me: error: We need a working libXext to proceed. Since configure +can't find it itself, we stop here assuming that make wouldn't find +them either." >&2;} + { (exit 1); exit 1; }; } +fi + +LIB_XEXT="-lXext" +QTE_NORTTI="" + +elif test "$kde_use_qt_emb" = "yes"; then + CPPFLAGS=-DQWS + CXXFLAGS="$CXXFLAGS -fno-rtti" + QTE_NORTTI="-fno-rtti -DQWS" + X_PRE_LIBS="" + LIB_X11="" + LIB_XEXT="" + LIB_XRENDER="" + LIBSM="" + X_INCLUDES="" + X_LDFLAGS="" + x_includes="" + x_libraries="" +elif test "$kde_use_qt_mac" = "yes"; then + CXXFLAGS="$CXXFLAGS -DQT_MAC -no-cpp-precomp" + CFLAGS="$CFLAGS -DQT_MAC -no-cpp-precomp" + X_PRE_LIBS="" + LIB_X11="" + LIB_XEXT="" + LIB_XRENDER="" + LIBSM="" + X_INCLUDES="" + X_LDFLAGS="" + x_includes="" + x_libraries="" +fi + + + + + + + + + + + + + + LIBPTHREAD="" + + if test -n "$PTHREAD_LIBS"; then + if test "x$PTHREAD_LIBS" = "x-pthread" ; then + LIBPTHREAD="PTHREAD" + else + PTHREAD_LIBS_save="$PTHREAD_LIBS" + PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'` + { echo "$as_me:$LINENO: checking for pthread_create in $PTHREAD_LIBS" >&5 +echo $ECHO_N "checking for pthread_create in $PTHREAD_LIBS... $ECHO_C" >&6; } + + kde_save_LDFLAGS="$LDFLAGS" + kde_save_LIBS="$LIBS" + LDFLAGS="$LDFLAGS $all_libraries" + case $host_os in + aix*) LDFLAGS="-brtl $LDFLAGS" + test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS" + ;; + esac + as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for pthread_create in -l$PTHREAD_LIBS" >&5 +echo $ECHO_N "checking for pthread_create in -l$PTHREAD_LIBS... $ECHO_C" >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-l$PTHREAD_LIBS $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 pthread_create (); +int +main () +{ +return pthread_create (); + ; + 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 + eval "$as_ac_Lib=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_Lib=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 +ac_res=`eval echo '${'$as_ac_Lib'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Lib'}'` = yes; then + LIBPTHREAD="$PTHREAD_LIBS_save" +fi + + LDFLAGS="$kde_save_LDFLAGS" + LIBS="$kde_save_LIBS" + + PTHREAD_LIBS="$PTHREAD_LIBS_save" + fi + fi + + if test -z "$LIBPTHREAD"; then + { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 +echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; } +if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpthread $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 pthread_create (); +int +main () +{ +return pthread_create (); + ; + 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_pthread_pthread_create=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_pthread_pthread_create=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_pthread_pthread_create" >&5 +echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; } +if test $ac_cv_lib_pthread_pthread_create = yes; then + LIBPTHREAD="-lpthread" +fi + + fi + + if test -z "$LIBPTHREAD" ; then + { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 +echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; } + kde_safe_libs=$LIBS + LIBS="$LIBS -lpthread" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ +(void)pthread_create(0,0,0,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_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + LIBPTHREAD="-lpthread" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$kde_safe_libs + fi + + if test "x$LIBPTHREAD" = "xPTHREAD" ; then + LIBPTHREAD="" + fi + + + + + USE_THREADS="" + if test -z "$LIBPTHREAD"; then + +{ echo "$as_me:$LINENO: checking whether $CXX supports -pthread" >&5 +echo $ECHO_N "checking whether $CXX supports -pthread... $ECHO_C" >&6; } +kde_cache=`echo pthread | 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 -pthread" + 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; } + : + USE_THREADS="-D_THREAD_SAFE -pthread" +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + : + +fi + + fi + + + + case $host_os in + solaris*) + +{ echo "$as_me:$LINENO: checking whether $CXX supports -mt" >&5 +echo $ECHO_N "checking whether $CXX supports -mt... $ECHO_C" >&6; } +kde_cache=`echo mt | 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 -mt" + 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; } + : + USE_THREADS="-mt" +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + : + +fi + + CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DUSE_SOLARIS -DSVR4" + ;; + freebsd*) + CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE $PTHREAD_CFLAGS" + ;; + aix*) + CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" + LIBPTHREAD="$LIBPTHREAD -lc_r" + ;; + linux*) CPPFLAGS="$CPPFLAGS -D_REENTRANT" + if test "$CXX" = "KCC"; then + CXXFLAGS="$CXXFLAGS --thread_safe" + NOOPT_CXXFLAGS="$NOOPT_CXXFLAGS --thread_safe" + fi + ;; + *) + ;; + esac + + + + +{ echo "$as_me:$LINENO: checking for extra includes" >&5 +echo $ECHO_N "checking for extra includes... $ECHO_C" >&6; } + +# Check whether --with-extra-includes was given. +if test "${with_extra_includes+set}" = set; then + withval=$with_extra_includes; kde_use_extra_includes="$withval" +else + kde_use_extra_includes=NONE + +fi + +kde_extra_includes= +if test -n "$kde_use_extra_includes" && \ + test "$kde_use_extra_includes" != "NONE"; then + + ac_save_ifs=$IFS + IFS=':' + for dir in $kde_use_extra_includes; do + kde_extra_includes="$kde_extra_includes $dir" + USER_INCLUDES="$USER_INCLUDES -I$dir" + done + IFS=$ac_save_ifs + kde_use_extra_includes="added" +else + kde_use_extra_includes="no" +fi + + +{ echo "$as_me:$LINENO: result: $kde_use_extra_includes" >&5 +echo "${ECHO_T}$kde_use_extra_includes" >&6; } + +kde_extra_libs= +{ echo "$as_me:$LINENO: checking for extra libs" >&5 +echo $ECHO_N "checking for extra libs... $ECHO_C" >&6; } + +# Check whether --with-extra-libs was given. +if test "${with_extra_libs+set}" = set; then + withval=$with_extra_libs; kde_use_extra_libs=$withval +else + kde_use_extra_libs=NONE + +fi + +if test -n "$kde_use_extra_libs" && \ + test "$kde_use_extra_libs" != "NONE"; then + + ac_save_ifs=$IFS + IFS=':' + for dir in $kde_use_extra_libs; do + kde_extra_libs="$kde_extra_libs $dir" + KDE_EXTRA_RPATH="$KDE_EXTRA_RPATH -R $dir" + USER_LDFLAGS="$USER_LDFLAGS -L$dir" + done + IFS=$ac_save_ifs + kde_use_extra_libs="added" +else + kde_use_extra_libs="no" +fi + + + +{ echo "$as_me:$LINENO: result: $kde_use_extra_libs" >&5 +echo "${ECHO_T}$kde_use_extra_libs" >&6; } + + + + +{ echo "$as_me:$LINENO: checking for libz" >&5 +echo $ECHO_N "checking for libz... $ECHO_C" >&6; } +if test "${ac_cv_lib_z+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +kde_save_LIBS="$LIBS" +LIBS="$all_libraries $USER_LDFLAGS -lz $LIBSOCKET" +kde_save_CFLAGS="$CFLAGS" +CFLAGS="$CFLAGS $all_includes $USER_INCLUDES" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#include + +int +main () +{ + + char buf[42]; + gzFile f = (gzFile) 0; + /* this would segfault.. but we only link, don't run */ + (void) gzgets(f, buf, sizeof(buf)); + + return (strcmp(zlibVersion(), ZLIB_VERSION) == 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_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "ac_cv_lib_z='-lz'" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "ac_cv_lib_z=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS="$kde_save_LIBS" +CFLAGS="$kde_save_CFLAGS" + +fi +if test ! "$ac_cv_lib_z" = no; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_LIBZ 1 +_ACEOF + + LIBZ="$ac_cv_lib_z" + { echo "$as_me:$LINENO: result: $ac_cv_lib_z" >&5 +echo "${ECHO_T}$ac_cv_lib_z" >&6; } +else + { { echo "$as_me:$LINENO: error: not found. + Possibly configure picks up an outdated version + installed by XFree86. Remove it from your system. + + Check your installation and look into config.log" >&5 +echo "$as_me: error: not found. + Possibly configure picks up an outdated version + installed by XFree86. Remove it from your system. + + Check your installation and look into config.log" >&2;} + { (exit 1); exit 1; }; } + LIBZ="" +fi + + + + + +{ echo "$as_me:$LINENO: checking for libpng" >&5 +echo $ECHO_N "checking for libpng... $ECHO_C" >&6; } +if test "${ac_cv_lib_png+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +kde_save_LIBS="$LIBS" +if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then +LIBS="$LIBS $all_libraries $USER_LDFLAGS -lpng $LIBZ -lm -lX11 $LIBSOCKET" +else +LIBS="$LIBS $all_libraries $USER_LDFLAGS -lpng $LIBZ -lm" +fi +kde_save_CFLAGS="$CFLAGS" +CFLAGS="$CFLAGS $all_includes $USER_INCLUDES" + +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + #include + +int +main () +{ + + png_structp png_ptr = png_create_read_struct( /* image ptr */ + PNG_LIBPNG_VER_STRING, 0, 0, 0 ); + return( png_ptr != 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_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "ac_cv_lib_png='-lpng $LIBZ -lm'" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "ac_cv_lib_png=no" + +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS="$kde_save_LIBS" +CFLAGS="$kde_save_CFLAGS" + +fi +if eval "test ! \"`echo $ac_cv_lib_png`\" = no"; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_LIBPNG 1 +_ACEOF + + LIBPNG="$ac_cv_lib_png" + + { echo "$as_me:$LINENO: result: $ac_cv_lib_png" >&5 +echo "${ECHO_T}$ac_cv_lib_png" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + LIBPNG="" + +fi + + + +{ echo "$as_me:$LINENO: checking for libjpeg6b" >&5 +echo $ECHO_N "checking for libjpeg6b... $ECHO_C" >&6; } +if test "${ac_cv_lib_jpeg_6b+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +ac_save_LIBS="$LIBS" +LIBS="$all_libraries $USER_LDFLAGS -ljpeg6b -lm" +ac_save_CFLAGS="$CFLAGS" +CFLAGS="$CFLAGS $all_includes $USER_INCLUDES" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#ifdef __cplusplus +extern "C" { +#endif +void jpeg_CreateDecompress(); +#ifdef __cplusplus +} +#endif + +int +main () +{ +jpeg_CreateDecompress(); + ; + 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 + eval "ac_cv_lib_jpeg_6b=-ljpeg6b" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "ac_cv_lib_jpeg_6b=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS="$ac_save_LIBS" +CFLAGS="$ac_save_CFLAGS" + +fi + + +if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then + LIBJPEG="$ac_cv_lib_jpeg_6b" + { echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_6b" >&5 +echo "${ECHO_T}$ac_cv_lib_jpeg_6b" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + +{ echo "$as_me:$LINENO: checking for libjpeg" >&5 +echo $ECHO_N "checking for libjpeg... $ECHO_C" >&6; } +if test "${ac_cv_lib_jpeg_normal+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +ac_save_LIBS="$LIBS" +LIBS="$all_libraries $USER_LDFLAGS -ljpeg -lm" +ac_save_CFLAGS="$CFLAGS" +CFLAGS="$CFLAGS $all_includes $USER_INCLUDES" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#ifdef __cplusplus +extern "C" { +#endif +void jpeg_CreateDecompress(); +#ifdef __cplusplus +} +#endif + +int +main () +{ +jpeg_CreateDecompress(); + ; + 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 + eval "ac_cv_lib_jpeg_normal=-ljpeg" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "ac_cv_lib_jpeg_normal=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS="$ac_save_LIBS" +CFLAGS="$ac_save_CFLAGS" + +fi + + +if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then + LIBJPEG="$ac_cv_lib_jpeg_normal" + { echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_normal" >&5 +echo "${ECHO_T}$ac_cv_lib_jpeg_normal" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + + LIBJPEG= + + +fi + + + +fi + + + +jpeg_incdirs="$includedir /usr/include /usr/local/include $kde_extra_includes" + +jpeg_incdir=NO +for i in $jpeg_incdirs; +do + for j in jpeglib.h; + do + echo "configure: 30641: $i/$j" >&5 + if test -r "$i/$j"; then + echo "taking that" >&5 + jpeg_incdir=$i + break 2 + fi + done +done + +test "x$jpeg_incdir" = xNO && jpeg_incdir= + +if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_LIBJPEG 1 +_ACEOF + +else + if test -n "$jpeg_incdir" || test -n "$LIBJPEG" ; then + { echo "$as_me:$LINENO: WARNING: +There is an installation error in jpeg support. You seem to have only one +of either the headers _or_ the libraries installed. You may need to either +provide correct --with-extra-... options, or the development package of +libjpeg6b. You can get a source package of libjpeg from http://www.ijg.org/ +Disabling JPEG support. +" >&5 +echo "$as_me: WARNING: +There is an installation error in jpeg support. You seem to have only one +of either the headers _or_ the libraries installed. You may need to either +provide correct --with-extra-... options, or the development package of +libjpeg6b. You can get a source package of libjpeg from http://www.ijg.org/ +Disabling JPEG support. +" >&2;} + else + { echo "$as_me:$LINENO: WARNING: libjpeg not found. disable JPEG support." >&5 +echo "$as_me: WARNING: libjpeg not found. disable JPEG support." >&2;} + fi + jpeg_incdir= + LIBJPEG= +fi + + + + + + + + { echo "$as_me:$LINENO: checking for perl" >&5 +echo $ECHO_N "checking for perl... $ECHO_C" >&6; } + if test -n "$PERL"; then + kde_cv_path="$PERL"; + else + kde_cache=`echo perl | sed 'y%./+-%__p_%'` + + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + kde_cv_path="NONE" + kde_save_IFS=$IFS + IFS=':' + dirs="" + for dir in $PATH; do + dirs="$dirs $dir" + done + if test -z ""; then dirs="$bindir $exec_prefix/bin $prefix/bin $dirs" + else dirs="$dirs $bindir $exec_prefix/bin $prefix/bin" + fi + IFS=$kde_save_IFS + + for dir in $dirs; do + if test -x "$dir/perl"; then + if test -n "" + then + evalstr="$dir/perl 2>&1 " + if eval $evalstr; then + kde_cv_path="$dir/perl" + break + fi + else + kde_cv_path="$dir/perl" + break + fi + fi + done + + eval "kde_cv_path_$kde_cache=$kde_cv_path" + + +fi + + + eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\"" + + fi + + if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } + + { { echo "$as_me:$LINENO: error: No Perl found in your $PATH. +We need perl to generate some code." >&5 +echo "$as_me: error: No Perl found in your $PATH. +We need perl to generate some code." >&2;} + { (exit 1); exit 1; }; } + + else + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } + PERL=$kde_cv_path + + fi + + + + + + + + + + +# Check whether --enable-mt was given. +if test "${enable_mt+set}" = set; then + enableval=$enable_mt; kde_use_qt_mt=$enableval +else + + if test $kde_qtver = 3; then + kde_use_qt_mt=yes + else + kde_use_qt_mt=no + fi + + +fi + + +USING_QT_MT="" + + +KDE_MT_LDFLAGS= +KDE_MT_LIBS= +if test "x$kde_use_qt_mt" = "xyes"; then + + + + if test -z "$LIBPTHREAD"; then + if test -z "$USE_THREADS"; then + kde_check_threading_default=no + else + kde_check_threading_default=yes + fi + else + kde_check_threading_default=yes + fi + # Check whether --enable-threading was given. +if test "${enable_threading+set}" = set; then + enableval=$enable_threading; kde_use_threading=$enableval +else + kde_use_threading=$kde_check_threading_default +fi + + if test "x$kde_use_threading" = "xyes"; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBPTHREAD 1 +_ACEOF + + fi + + if test "x$kde_use_threading" = "xyes"; then + CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS" + KDE_MT_LDFLAGS="$USE_THREADS" + KDE_MT_LIBS="$LIBPTHREAD" + else + kde_use_qt_mt=no + fi +fi + + + +kde_qt_was_given=yes + +if test -z "$LIBQT_GLOB"; then + if test "x$kde_use_qt_emb" = "xyes"; then + LIBQT_GLOB="libqte.*" + else + LIBQT_GLOB="libqt.*" + fi +fi + +if test "x$kde_use_qt_emb" = "xyes"; then + qtlib="qte" +else + qtlib="qt" +fi + +kde_int_qt="-l$qtlib" + +if test -z "$LIBQPE"; then + if test "x$kde_use_qt_emb" = "xyes"; then + if test "x$kde_use_qt_emb_palm" = "xyes"; then + LIB_QPE="-lqpe" + else + LIB_QPE="" + fi + else + LIB_QPE="" + fi +fi + + +if test "x$kde_use_qt_mt" = "xyes"; then + LIBQT="-l$qtlib-mt" + kde_int_qt="-l$qtlib-mt" + LIBQT_GLOB="lib$qtlib-mt.*" + USING_QT_MT="using -mt" +else + LIBQT="-l$qtlib" +fi + +if test $kde_qtver != 1; then + + + + LIBQT="$LIBQT $LIBPNG $LIBJPEG" +fi + +if test $kde_qtver = 3; then + + LIBQT="$LIBQT $LIBDL" +fi + +{ echo "$as_me:$LINENO: checking for Qt" >&5 +echo $ECHO_N "checking for Qt... $ECHO_C" >&6; } + +if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then +LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET" +fi +ac_qt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO +qt_libraries="" +qt_includes="" + +# Check whether --with-qt-dir was given. +if test "${with_qt_dir+set}" = set; then + withval=$with_qt_dir; ac_qt_includes="$withval"/include + ac_qt_libraries="$withval"/lib${kdelibsuff} + ac_qt_bindir="$withval"/bin + +fi + + + +# Check whether --with-qt-includes was given. +if test "${with_qt_includes+set}" = set; then + withval=$with_qt_includes; + ac_qt_includes="$withval" + +fi + + +kde_qt_libs_given=no + + +# Check whether --with-qt-libraries was given. +if test "${with_qt_libraries+set}" = set; then + withval=$with_qt_libraries; ac_qt_libraries="$withval" + kde_qt_libs_given=yes + +fi + + +if test "${ac_cv_have_qt+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + #try to guess Qt locations + +qt_incdirs="" +for dir in $kde_qt_dirs; do + qt_incdirs="$qt_incdirs $dir/include $dir" +done +if test -z "$PKG_CONFIG"; then + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test "$PKG_CONFIG" != "no" ; then + if $PKG_CONFIG --exists qt-mt ; then + qt_incdirs="$qt_incdirs `$PKG_CONFIG --variable=includedir qt-mt`" + fi +fi +qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 /usr/include/qt3 $x_includes" +if test ! "$ac_qt_includes" = "NO"; then + qt_incdirs="$ac_qt_includes $qt_incdirs" +fi + +if test "$kde_qtver" != "1"; then + kde_qt_header=qstyle.h +else + kde_qt_header=qglobal.h +fi + + +qt_incdir=NO +for i in $qt_incdirs; +do + for j in $kde_qt_header; + do + echo "configure: 30987: $i/$j" >&5 + if test -r "$i/$j"; then + echo "taking that" >&5 + qt_incdir=$i + break 2 + fi + done +done + +ac_qt_includes="$qt_incdir" + +qt_libdirs="" +for dir in $kde_qt_dirs; do + qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir/lib $dir" +done +if test -z "$PKG_CONFIG"; then + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test "$PKG_CONFIG" != "no" ; then + if $PKG_CONFIG --exists qt-mt ; then + qt_libdirs="$qt_incdirs `$PKG_CONFIG --variable=libdir qt-mt`" + fi +fi +qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries" +if test ! "$ac_qt_libraries" = "NO"; then + qt_libdir=$ac_qt_libraries +else + qt_libdirs="$ac_qt_libraries $qt_libdirs" + # if the Qt was given, the chance is too big that libqt.* doesn't exist + qt_libdir=NONE + for dir in $qt_libdirs; do + try="ls -1 $dir/${LIBQT_GLOB}" + if test -n "`$try 2> /dev/null`"; then qt_libdir=$dir; break; else echo "tried $dir" >&5 ; fi + done +fi +for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do + if test -e "$a"; then + LIBQT="$LIBQT ${kde_int_qt}_incremental" + break + fi +done + +ac_qt_libraries="$qt_libdir" + + + 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' + + + +ac_cxxflags_safe="$CXXFLAGS" +ac_ldflags_safe="$LDFLAGS" +ac_libs_safe="$LIBS" + +CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes" +LDFLAGS="$LDFLAGS -L$qt_libdir $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS" +LIBS="$LIBS $LIBQT $KDE_MT_LIBS" + + + +cat > conftest.$ac_ext < +#include +EOF +if test "$kde_qtver" = "2"; then +cat >> conftest.$ac_ext < +#include +#include +EOF + +if test $kde_qtsubver -gt 0; then +cat >> conftest.$ac_ext <> conftest.$ac_ext < +#include +#include +EOF +fi + +echo "#if ! ($kde_qt_verstring)" >> conftest.$ac_ext +cat >> conftest.$ac_ext <> conftest.$ac_ext <> conftest.$ac_ext <> conftest.$ac_ext <> conftest.$ac_ext <&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s conftest; then + rm -f conftest* +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_qt_libraries="NO" +fi +rm -f conftest* +CXXFLAGS="$ac_cxxflags_safe" +LDFLAGS="$ac_ldflags_safe" +LIBS="$ac_libs_safe" + +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 + +if test "$ac_qt_includes" = NO || test "$ac_qt_libraries" = NO; then + ac_cv_have_qt="have_qt=no" + ac_qt_notfound="" + missing_qt_mt="" + if test "$ac_qt_includes" = NO; then + if test "$ac_qt_libraries" = NO; then + ac_qt_notfound="(headers and libraries)"; + else + ac_qt_notfound="(headers)"; + fi + else + if test "x$kde_use_qt_mt" = "xyes"; then + missing_qt_mt=" +Make sure that you have compiled Qt with thread support!" + ac_qt_notfound="(library $qtlib-mt)"; + else + ac_qt_notfound="(library $qtlib)"; + fi + fi + + { { echo "$as_me:$LINENO: error: Qt ($kde_qt_minversion) $ac_qt_notfound not found. Please check your installation! +For more details about this problem, look at the end of config.log.$missing_qt_mt" >&5 +echo "$as_me: error: Qt ($kde_qt_minversion) $ac_qt_notfound not found. Please check your installation! +For more details about this problem, look at the end of config.log.$missing_qt_mt" >&2;} + { (exit 1); exit 1; }; } +else + have_qt="yes" +fi + +fi + + +eval "$ac_cv_have_qt" + +if test "$have_qt" != yes; then + { echo "$as_me:$LINENO: result: $have_qt" >&5 +echo "${ECHO_T}$have_qt" >&6; }; +else + ac_cv_have_qt="have_qt=yes \ + ac_qt_includes=$ac_qt_includes ac_qt_libraries=$ac_qt_libraries" + { echo "$as_me:$LINENO: result: libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&5 +echo "${ECHO_T}libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&6; } + + qt_libraries="$ac_qt_libraries" + qt_includes="$ac_qt_includes" +fi + +if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then + + +{ echo "$as_me:$LINENO: checking if Qt compiles without flags" >&5 +echo $ECHO_N "checking if Qt compiles without flags... $ECHO_C" >&6; } +if test "${kde_cv_qt_direct+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' + + +ac_LD_LIBRARY_PATH_safe=$LD_LIBRARY_PATH +ac_LIBRARY_PATH="$LIBRARY_PATH" +ac_cxxflags_safe="$CXXFLAGS" +ac_ldflags_safe="$LDFLAGS" +ac_libs_safe="$LIBS" + +CXXFLAGS="$CXXFLAGS -I$qt_includes" +LDFLAGS="$LDFLAGS $X_LDFLAGS" +if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then +LIBS="$LIBQT -lXext -lX11 $LIBSOCKET" +else +LIBS="$LIBQT $LIBSOCKET" +fi +LD_LIBRARY_PATH= +export LD_LIBRARY_PATH +LIBRARY_PATH= +export LIBRARY_PATH + + + +cat > conftest.$ac_ext < +#include +EOF +if test "$kde_qtver" = "2"; then +cat >> conftest.$ac_ext < +#include +#include +EOF + +if test $kde_qtsubver -gt 0; then +cat >> conftest.$ac_ext <> conftest.$ac_ext < +#include +#include +EOF +fi + +echo "#if ! ($kde_qt_verstring)" >> conftest.$ac_ext +cat >> conftest.$ac_ext <> conftest.$ac_ext <> conftest.$ac_ext <> conftest.$ac_ext <> conftest.$ac_ext <&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s conftest; then + kde_cv_qt_direct="yes" +else + kde_cv_qt_direct="no" + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +fi + +rm -f conftest* +CXXFLAGS="$ac_cxxflags_safe" +LDFLAGS="$ac_ldflags_safe" +LIBS="$ac_libs_safe" + +LD_LIBRARY_PATH="$ac_LD_LIBRARY_PATH_safe" +export LD_LIBRARY_PATH +LIBRARY_PATH="$ac_LIBRARY_PATH" +export LIBRARY_PATH +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 test "$kde_cv_qt_direct" = "yes"; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + qt_libraries= +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + +fi + +fi + + + + +if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then + QT_INCLUDES="" +else + QT_INCLUDES="-I$qt_includes" + all_includes="$QT_INCLUDES $all_includes" +fi + +if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then + QT_LDFLAGS="" +else + QT_LDFLAGS="-L$qt_libraries" + all_libraries="$QT_LDFLAGS $all_libraries" +fi +test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS" + + + + + + qt_bindirs="" + for dir in $kde_qt_dirs; do + qt_bindirs="$qt_bindirs $dir/bin $dir/src/moc" + done + qt_bindirs="$qt_bindirs /usr/bin /usr/X11R6/bin /usr/local/qt/bin" + if test ! "$ac_qt_bindir" = "NO"; then + qt_bindirs="$ac_qt_bindir $qt_bindirs" + fi + + + { echo "$as_me:$LINENO: checking for moc" >&5 +echo $ECHO_N "checking for moc... $ECHO_C" >&6; } + if test -n "$MOC"; then + kde_cv_path="$MOC"; + else + kde_cache=`echo moc | sed 'y%./+-%__p_%'` + + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + kde_cv_path="NONE" + kde_save_IFS=$IFS + IFS=':' + dirs="" + for dir in $PATH; do + dirs="$dirs $dir" + done + if test -z ""; then dirs="$qt_bindirs $dirs" + else dirs="$dirs $qt_bindirs" + fi + IFS=$kde_save_IFS + + for dir in $dirs; do + if test -x "$dir/moc"; then + if test -n "" + then + evalstr="$dir/moc 2>&1 " + if eval $evalstr; then + kde_cv_path="$dir/moc" + break + fi + else + kde_cv_path="$dir/moc" + break + fi + fi + done + + eval "kde_cv_path_$kde_cache=$kde_cv_path" + + +fi + + + eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\"" + + fi + + if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } + + { { echo "$as_me:$LINENO: error: No Qt meta object compiler (moc) found! +Please check whether you installed Qt correctly. +You need to have a running moc binary. +configure tried to run $ac_cv_path_moc and the test didn't +succeed. If configure shouldn't have tried this one, set +the environment variable MOC to the right one before running +configure. +" >&5 +echo "$as_me: error: No Qt meta object compiler (moc) found! +Please check whether you installed Qt correctly. +You need to have a running moc binary. +configure tried to run $ac_cv_path_moc and the test didn't +succeed. If configure shouldn't have tried this one, set +the environment variable MOC to the right one before running +configure. +" >&2;} + { (exit 1); exit 1; }; } + + else + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } + MOC=$kde_cv_path + + fi + + if test -z "$UIC_NOT_NEEDED"; then + + { echo "$as_me:$LINENO: checking for uic" >&5 +echo $ECHO_N "checking for uic... $ECHO_C" >&6; } + if test -n "$UIC_PATH"; then + kde_cv_path="$UIC_PATH"; + else + kde_cache=`echo uic | sed 'y%./+-%__p_%'` + + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + kde_cv_path="NONE" + kde_save_IFS=$IFS + IFS=':' + dirs="" + for dir in $PATH; do + dirs="$dirs $dir" + done + if test -z ""; then dirs="$qt_bindirs $dirs" + else dirs="$dirs $qt_bindirs" + fi + IFS=$kde_save_IFS + + for dir in $dirs; do + if test -x "$dir/uic"; then + if test -n "" + then + evalstr="$dir/uic 2>&1 " + if eval $evalstr; then + kde_cv_path="$dir/uic" + break + fi + else + kde_cv_path="$dir/uic" + break + fi + fi + done + + eval "kde_cv_path_$kde_cache=$kde_cv_path" + + +fi + + + eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\"" + + fi + + if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } + UIC_PATH="" + else + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } + UIC_PATH=$kde_cv_path + + fi + + if test -z "$UIC_PATH" ; then + + { echo "$as_me:$LINENO: WARNING: No Qt ui compiler (uic) found! +Please check whether you installed Qt correctly. +You need to have a running uic binary. +configure tried to run $ac_cv_path_uic and the test didn't +succeed. If configure shouldn't have tried this one, set +the environment variable UIC to the right one before running +configure. +" >&5 +echo "$as_me: WARNING: No Qt ui compiler (uic) found! +Please check whether you installed Qt correctly. +You need to have a running uic binary. +configure tried to run $ac_cv_path_uic and the test didn't +succeed. If configure shouldn't have tried this one, set +the environment variable UIC to the right one before running +configure. +" >&2;} + + exit 1 + else + UIC=$UIC_PATH + + if test $kde_qtver = 3; then + + { echo "$as_me:$LINENO: checking whether uic supports -L " >&5 +echo $ECHO_N "checking whether uic supports -L ... $ECHO_C" >&6; } + kde_cache=`echo L | sed 'y% .=/+-%____p_%'` + if { as_var=kde_cv_prog_uic_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cat >conftest.ui < +EOT + ac_uic_testrun="$UIC_PATH -L /nonexistent conftest.ui >/dev/null" + if { (eval echo "$as_me:$LINENO: \"$ac_uic_testrun\"") >&5 + (eval $ac_uic_testrun) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + eval "kde_cv_prog_uic_$kde_cache=yes" + else + eval "kde_cv_prog_uic_$kde_cache=no" + fi + rm -f conftest* + +fi + + + if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + : + ac_uic_supports_libpath=yes + else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + : + ac_uic_supports_libpath=no + fi + + + { echo "$as_me:$LINENO: checking whether uic supports -nounload " >&5 +echo $ECHO_N "checking whether uic supports -nounload ... $ECHO_C" >&6; } + kde_cache=`echo nounload | sed 'y% .=/+-%____p_%'` + if { as_var=kde_cv_prog_uic_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cat >conftest.ui < +EOT + ac_uic_testrun="$UIC_PATH -nounload conftest.ui >/dev/null" + if { (eval echo "$as_me:$LINENO: \"$ac_uic_testrun\"") >&5 + (eval $ac_uic_testrun) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + eval "kde_cv_prog_uic_$kde_cache=yes" + else + eval "kde_cv_prog_uic_$kde_cache=no" + fi + rm -f conftest* + +fi + + + if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + : + ac_uic_supports_nounload=yes + else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + : + ac_uic_supports_nounload=no + fi + + + if test x$ac_uic_supports_libpath = xyes; then + UIC="$UIC -L \$(kde_widgetdir)" + fi + if test x$ac_uic_supports_nounload = xyes; then + UIC="$UIC -nounload" + fi + fi + fi + else + UIC="echo uic not available: " + fi + + + + + UIC_TR="i18n" + if test $kde_qtver = 3; then + UIC_TR="tr2i18n" + fi + + + + + +if test -n "$LIBJPEG"; then +{ echo "$as_me:$LINENO: checking if Qt needs $LIBJPEG" >&5 +echo $ECHO_N "checking if Qt needs $LIBJPEG... $ECHO_C" >&6; } +if test "${kde_cv_qt_jpeg+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' + + +ac_save_LIBS="$LIBS" +LIBS="$all_libraries $USER_LDFLAGS $LIBQT" +LIBS=`echo $LIBS | sed "s/$LIBJPEG//"` +ac_save_CXXFLAGS="$CXXFLAGS" +CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ + + int argc; + char** argv; + QApplication app(argc, argv); + ; + 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_qt_jpeg=no" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "kde_cv_qt_jpeg=yes" +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS="$ac_save_LIBS" +CXXFLAGS="$ac_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 + +fi + + +if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + LIBJPEG_QT='$(LIBJPEG)' +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + LIBJPEG_QT= +fi + + + +if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then +LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)' +else +LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)' +fi +test -z "$KDE_MT_LIBS" || LIB_QT="$LIB_QT $KDE_MT_LIBS" +for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do + if test -e "$a"; then + LIB_QT="$LIB_QT ${kde_int_qt}_incremental" + break + fi +done + +# Export just Qt libs in LIB_QT, "extended" version will be exported as LIB_QT_EXT +LIB_QT_EXT="$LIB_QT" +LIB_QT="$kde_int_qt" + + + + + + + + + + + + + + +{ echo "$as_me:$LINENO: checking for rpath" >&5 +echo $ECHO_N "checking for rpath... $ECHO_C" >&6; } +# Check whether --enable-rpath was given. +if test "${enable_rpath+set}" = set; then + enableval=$enable_rpath; USE_RPATH=$enableval +else + USE_RPATH=yes +fi + + +if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then + + KDE_RPATH="-R \$(libdir)" + + if test "$kde_libraries" != "$libdir"; then + KDE_RPATH="$KDE_RPATH -R \$(kde_libraries)" + fi + + if test -n "$qt_libraries"; then + KDE_RPATH="$KDE_RPATH -R \$(qt_libraries)" + fi + if test -n "$X_LDFLAGS"; then + X_RPATH="-R \$(x_libraries)" + KDE_RPATH="$KDE_RPATH $X_RPATH" + fi + if test -n "$KDE_EXTRA_RPATH"; then + KDE_RPATH="$KDE_RPATH \$(KDE_EXTRA_RPATH)" + fi +fi + + + +{ echo "$as_me:$LINENO: result: $USE_RPATH" >&5 +echo "${ECHO_T}$USE_RPATH" >&6; } + +{ echo "$as_me:$LINENO: checking for KDE" >&5 +echo $ECHO_N "checking for KDE... $ECHO_C" >&6; } + +if test "${prefix}" != NONE; then + kde_includes=${includedir} + +savex=$exec_prefix +test "x$exec_prefix" = xNONE && exec_prefix=$prefix +tmp=$includedir +while ac_kde_includes=`eval echo "$tmp"`; test "x$ac_kde_includes" != "x$tmp"; do tmp=$ac_kde_includes; done +exec_prefix=$savex + + + kde_libraries=${libdir} + +savex=$exec_prefix +test "x$exec_prefix" = xNONE && exec_prefix=$prefix +tmp=$libdir +while ac_kde_libraries=`eval echo "$tmp"`; test "x$ac_kde_libraries" != "x$tmp"; do tmp=$ac_kde_libraries; done +exec_prefix=$savex + + +else + ac_kde_includes= + ac_kde_libraries= + kde_libraries="" + kde_includes="" +fi + +if test "${ac_cv_have_kde+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + #try to guess kde locations + +if test "$kde_qtver" = 1; then + kde_check_header="ksock.h" + kde_check_lib="libkdecore.la" +else + kde_check_header="ksharedptr.h" + kde_check_lib="libkio.la" +fi + +if test -z ""; then + +kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" +test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs" +kde_incdirs="$ac_kde_includes $kde_incdirs" + +kde_incdir=NO +for i in $kde_incdirs; +do + for j in $kde_check_header; + do + echo "configure: 31871: $i/$j" >&5 + if test -r "$i/$j"; then + echo "taking that" >&5 + kde_incdir=$i + break 2 + fi + done +done + +ac_kde_includes="$kde_incdir" + +if test -n "$ac_kde_includes" && test ! -r "$ac_kde_includes/$kde_check_header"; then + { { echo "$as_me:$LINENO: error: +in the prefix, you've chosen, are no KDE headers installed. This will fail. +So, check this please and use another prefix!" >&5 +echo "$as_me: error: +in the prefix, you've chosen, are no KDE headers installed. This will fail. +So, check this please and use another prefix!" >&2;} + { (exit 1); exit 1; }; } +fi + +kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}" +test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs" +kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" + +kde_libdir=NO +for i in $kde_libdirs; +do + for j in $kde_check_lib; + do + echo "configure: 31901: $i/$j" >&5 + if test -r "$i/$j"; then + echo "taking that" >&5 + kde_libdir=$i + break 2 + fi + done +done + +ac_kde_libraries="$kde_libdir" + +kde_widgetdir=NO + +kde_widgetdir=NO +for i in $kde_libdirs; +do + for j in "kde3/plugins/designer/kdewidgets.la"; + do + echo "configure: 31919: $i/$j" >&5 + if test -r "$i/$j"; then + echo "taking that" >&5 + kde_widgetdir=$i + break 2 + fi + done +done + + +if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then +{ { echo "$as_me:$LINENO: error: +in the prefix, you've chosen, are no KDE libraries installed. This will fail. +So, check this please and use another prefix!" >&5 +echo "$as_me: error: +in the prefix, you've chosen, are no KDE libraries installed. This will fail. +So, check this please and use another prefix!" >&2;} + { (exit 1); exit 1; }; } +fi + +if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then +{ { echo "$as_me:$LINENO: error: +I can't find the designer plugins. These are required and should have been installed +by kdelibs" >&5 +echo "$as_me: error: +I can't find the designer plugins. These are required and should have been installed +by kdelibs" >&2;} + { (exit 1); exit 1; }; } +fi + +if test -n "$kde_widgetdir"; then + kde_widgetdir="$kde_widgetdir/kde3/plugins/designer" +fi + + +if test "$ac_kde_includes" = NO || test "$ac_kde_libraries" = NO || test "$kde_widgetdir" = NO; then + ac_cv_have_kde="have_kde=no" +else + ac_cv_have_kde="have_kde=yes \ + ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries" +fi + +else + ac_cv_have_kde="have_kde=no" + +fi + +fi + +eval "$ac_cv_have_kde" + +if test "$have_kde" != "yes"; then + if test "${prefix}" = NONE; then + ac_kde_prefix="$ac_default_prefix" + else + ac_kde_prefix="$prefix" + fi + if test "$exec_prefix" = NONE; then + ac_kde_exec_prefix="$ac_kde_prefix" + { echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix" >&5 +echo "${ECHO_T}will be installed in $ac_kde_prefix" >&6; } + else + ac_kde_exec_prefix="$exec_prefix" + { echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&5 +echo "${ECHO_T}will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&6; } + fi + + kde_libraries="${libdir}" + kde_includes="${includedir}" + +else + ac_cv_have_kde="have_kde=yes \ + ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries" + { echo "$as_me:$LINENO: result: libraries $ac_kde_libraries, headers $ac_kde_includes" >&5 +echo "${ECHO_T}libraries $ac_kde_libraries, headers $ac_kde_includes" >&6; } + + kde_libraries="$ac_kde_libraries" + kde_includes="$ac_kde_includes" +fi + + + +if test "$kde_includes" = "$x_includes" || test "$kde_includes" = "$qt_includes" || test "$kde_includes" = "/usr/include"; then + KDE_INCLUDES="" +else + KDE_INCLUDES="-I$kde_includes" + all_includes="$KDE_INCLUDES $all_includes" +fi + +KDE_DEFAULT_CXXFLAGS="-DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST -DQT_NO_STL -DQT_NO_COMPAT -DQT_NO_TRANSLATION" + +KDE_LDFLAGS="-L$kde_libraries" +if test ! "$kde_libraries" = "$x_libraries" && test ! "$kde_libraries" = "$qt_libraries" ; then + all_libraries="$KDE_LDFLAGS $all_libraries" +fi + + + + + + +all_libraries="$all_libraries $USER_LDFLAGS" +all_includes="$all_includes $USER_INCLUDES" + + + +if test -z ""; then + + + +if test x$ac_uic_supports_libpath = xyes; then + +{ echo "$as_me:$LINENO: checking if UIC has KDE plugins available" >&5 +echo $ECHO_N "checking if UIC has KDE plugins available... $ECHO_C" >&6; } +if test "${kde_cv_uic_plugins+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +cat > actest.ui << EOF + +NewConnectionDialog + + + + testInput + + + + +EOF + + + +kde_cv_uic_plugins=no +kde_line="$UIC_PATH -L $kde_widgetdir" +if test x$ac_uic_supports_nounload = xyes; then + kde_line="$kde_line -nounload" +fi +kde_line="$kde_line -impl actest.h actest.ui > actest.cpp" +if { (eval echo "$as_me:$LINENO: \"$kde_line\"") >&5 + (eval $kde_line) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # if you're trying to debug this check and think it's incorrect, + # better check your installation. The check _is_ correct - your + # installation is not. + if test -f actest.cpp && grep klineedit actest.cpp > /dev/null; then + kde_cv_uic_plugins=yes + fi +fi +rm -f actest.ui actest.cpp + +fi + + +{ echo "$as_me:$LINENO: result: $kde_cv_uic_plugins" >&5 +echo "${ECHO_T}$kde_cv_uic_plugins" >&6; } +if test "$kde_cv_uic_plugins" != yes; then + { { echo "$as_me:$LINENO: error: +you need to install kdelibs first. + +If you did install kdelibs, then the Qt version that is picked up by +this configure is not the same version you used to compile kdelibs. +The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the +_same Qt version_, compiled with the _same compiler_ and the same Qt +configuration settings. +" >&5 +echo "$as_me: error: +you need to install kdelibs first. + +If you did install kdelibs, then the Qt version that is picked up by +this configure is not the same version you used to compile kdelibs. +The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the +_same Qt version_, compiled with the _same compiler_ and the same Qt +configuration settings. +" >&2;} + { (exit 1); exit 1; }; } +fi +fi + +fi + +ac_kde_libraries="$kde_libdir" + + + + + + # Check whether --enable-path-check was given. +if test "${enable_path_check+set}" = set; then + enableval=$enable_path_check; + if test "$enableval" = "no"; + then ac_use_path_checking="default" + else ac_use_path_checking="" + fi + +else + + if test "$kde_qtver" = 1; + then ac_use_path_checking="" + else ac_use_path_checking="default" + fi + + +fi + + + + + +{ echo "$as_me:$LINENO: checking for KDE paths" >&5 +echo $ECHO_N "checking for KDE paths... $ECHO_C" >&6; } +kde_result="" +kde_cached_paths=yes +if test "${kde_cv_all_paths+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + +if test "$ac_use_path_checking" = "default"; then + + if test -z "$kde_htmldir"; then + kde_htmldir='\${datadir}/doc/HTML' + fi + if test -z "$kde_appsdir"; then + kde_appsdir='\${datadir}/applnk' + fi + if test -z "$kde_icondir"; then + kde_icondir='\${datadir}/icons' + fi + if test -z "$kde_sounddir"; then + kde_sounddir='\${datadir}/sounds' + fi + if test -z "$kde_datadir"; then + kde_datadir='\${datadir}/apps' + fi + if test -z "$kde_locale"; then + kde_locale='\${datadir}/locale' + fi + if test -z "$kde_cgidir"; then + kde_cgidir='\${exec_prefix}/cgi-bin' + fi + if test -z "$kde_confdir"; then + kde_confdir='\${datadir}/config' + fi + if test -z "$kde_kcfgdir"; then + kde_kcfgdir='\${datadir}/config.kcfg' + fi + if test -z "$kde_mimedir"; then + kde_mimedir='\${datadir}/mimelnk' + fi + if test -z "$kde_toolbardir"; then + kde_toolbardir='\${datadir}/toolbar' + fi + if test -z "$kde_wallpaperdir"; then + kde_wallpaperdir='\${datadir}/wallpapers' + fi + if test -z "$kde_templatesdir"; then + kde_templatesdir='\${datadir}/templates' + fi + if test -z "$kde_bindir"; then + kde_bindir='\${exec_prefix}/bin' + fi + if test -z "$kde_servicesdir"; then + kde_servicesdir='\${datadir}/services' + fi + if test -z "$kde_servicetypesdir"; then + kde_servicetypesdir='\${datadir}/servicetypes' + fi + if test -z "$kde_moduledir"; then + if test "$kde_qtver" = "2"; then + kde_moduledir='\${libdir}/kde2' + else + kde_moduledir='\${libdir}/kde3' + fi + fi + if test -z "$kde_styledir"; then + kde_styledir='\${libdir}/kde3/plugins/styles' + fi + if test -z "$kde_widgetdir"; then + kde_widgetdir='\${libdir}/kde3/plugins/designer' + fi + if test -z "$xdg_appsdir"; then + xdg_appsdir='\${datadir}/applications/kde' + fi + if test -z "$xdg_menudir"; then + xdg_menudir='\${sysconfdir}/xdg/menus' + fi + if test -z "$xdg_directorydir"; then + xdg_directorydir='\${datadir}/desktop-directories' + fi + + + kde_cv_all_paths="kde_have_all_paths=\"yes\" \ + kde_htmldir=\"$kde_htmldir\" \ + kde_appsdir=\"$kde_appsdir\" \ + kde_icondir=\"$kde_icondir\" \ + kde_sounddir=\"$kde_sounddir\" \ + kde_datadir=\"$kde_datadir\" \ + kde_locale=\"$kde_locale\" \ + kde_cgidir=\"$kde_cgidir\" \ + kde_confdir=\"$kde_confdir\" \ + kde_kcfgdir=\"$kde_kcfgdir\" \ + kde_mimedir=\"$kde_mimedir\" \ + kde_toolbardir=\"$kde_toolbardir\" \ + kde_wallpaperdir=\"$kde_wallpaperdir\" \ + kde_templatesdir=\"$kde_templatesdir\" \ + kde_bindir=\"$kde_bindir\" \ + kde_servicesdir=\"$kde_servicesdir\" \ + kde_servicetypesdir=\"$kde_servicetypesdir\" \ + kde_moduledir=\"$kde_moduledir\" \ + kde_styledir=\"$kde_styledir\" \ + kde_widgetdir=\"$kde_widgetdir\" \ + xdg_appsdir=\"$xdg_appsdir\" \ + xdg_menudir=\"$xdg_menudir\" \ + xdg_directorydir=\"$xdg_directorydir\" \ + kde_result=defaults" + + +else + + if test $kde_qtver = 1; then + { echo "$as_me:$LINENO: result: compiling" >&5 +echo "${ECHO_T}compiling" >&6; } + + + { echo "$as_me:$LINENO: checking for KDE headers installed" >&5 +echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6; } + + 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' + + +cat > conftest.$ac_ext < +#endif +#include +#include "confdefs.h" +#include + +int main() { + printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data()); + printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data()); + printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data()); + printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data()); + printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data()); + printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data()); + printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data()); + printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data()); + printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data()); + printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data()); + printf("kde_wallpaperdir=\\"%s\\"\n", + KApplication::kde_wallpaperdir().data()); + printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data()); + printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data()); + printf("kde_servicesdir=\\"/tmp/dummy\\"\n"); + printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n"); + printf("kde_moduledir=\\"/tmp/dummy\\"\n"); + printf("kde_styledir=\\"/tmp/dummy\\"\n"); + printf("kde_widgetdir=\\"/tmp/dummy\\"\n"); + printf("xdg_appsdir=\\"/tmp/dummy\\"\n"); + printf("xdg_menudir=\\"/tmp/dummy\\"\n"); + printf("xdg_directorydir=\\"/tmp/dummy\\"\n"); + printf("kde_kcfgdir=\\"/tmp/dummy\\"\n"); + return 0; + } +EOF + + ac_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$all_includes $CPPFLAGS" + 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 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + else + { { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application! +Check, if you installed the KDE header files correctly. +For more details about this problem, look at the end of config.log." >&5 +echo "$as_me: error: your system is not able to compile a small KDE application! +Check, if you installed the KDE header files correctly. +For more details about this problem, look at the end of config.log." >&2;} + { (exit 1); exit 1; }; } + fi + CPPFLAGS=$ac_save_CPPFLAGS + + 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 + + + + KDE_TEST_RPATH= + + if test -n "$USE_RPATH"; then + + if test -n "$kde_libraries"; then + KDE_TEST_RPATH="-R $kde_libraries" + fi + + if test -n "$qt_libraries"; then + KDE_TEST_RPATH="$KDE_TEST_RPATH -R $qt_libraries" + fi + + if test -n "$x_libraries"; then + KDE_TEST_RPATH="$KDE_TEST_RPATH -R $x_libraries" + fi + + KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH" + fi + +{ echo "$as_me:$LINENO: checking for KDE libraries installed" >&5 +echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6; } +ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5' + +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; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } +else + { { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application! +Check, if your compiler is installed correctly and if you have used the +same compiler to compile Qt and kdelibs as you did use now. +For more details about this problem, look at the end of config.log." >&5 +echo "$as_me: error: your system fails at linking a small KDE application! +Check, if your compiler is installed correctly and if you have used the +same compiler to compile Qt and kdelibs as you did use now. +For more details about this problem, look at the end of config.log." >&2;} + { (exit 1); exit 1; }; } +fi + +if eval `KDEDIR= ./conftest 2>&5`; then + kde_result=done +else + kde_result=problems +fi + +KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log +kde_have_all_paths=yes + + + kde_cv_all_paths="kde_have_all_paths=\"yes\" \ + kde_htmldir=\"$kde_htmldir\" \ + kde_appsdir=\"$kde_appsdir\" \ + kde_icondir=\"$kde_icondir\" \ + kde_sounddir=\"$kde_sounddir\" \ + kde_datadir=\"$kde_datadir\" \ + kde_locale=\"$kde_locale\" \ + kde_cgidir=\"$kde_cgidir\" \ + kde_confdir=\"$kde_confdir\" \ + kde_kcfgdir=\"$kde_kcfgdir\" \ + kde_mimedir=\"$kde_mimedir\" \ + kde_toolbardir=\"$kde_toolbardir\" \ + kde_wallpaperdir=\"$kde_wallpaperdir\" \ + kde_templatesdir=\"$kde_templatesdir\" \ + kde_bindir=\"$kde_bindir\" \ + kde_servicesdir=\"$kde_servicesdir\" \ + kde_servicetypesdir=\"$kde_servicetypesdir\" \ + kde_moduledir=\"$kde_moduledir\" \ + kde_styledir=\"$kde_styledir\" \ + kde_widgetdir=\"$kde_widgetdir\" \ + xdg_appsdir=\"$xdg_appsdir\" \ + xdg_menudir=\"$xdg_menudir\" \ + xdg_directorydir=\"$xdg_directorydir\" \ + kde_result=$kde_result" + + + + else + { { echo "$as_me:$LINENO: error: path checking not yet supported for KDE 2" >&5 +echo "$as_me: error: path checking not yet supported for KDE 2" >&2;} + { (exit 1); exit 1; }; } + fi + +fi + + kde_cached_paths=no + +fi + +eval "$kde_cv_all_paths" + if test -z "$kde_htmldir" || test -z "$kde_appsdir" || + test -z "$kde_icondir" || test -z "$kde_sounddir" || + test -z "$kde_datadir" || test -z "$kde_locale" || + test -z "$kde_cgidir" || test -z "$kde_confdir" || + test -z "$kde_kcfgdir" || + test -z "$kde_mimedir" || test -z "$kde_toolbardir" || + test -z "$kde_wallpaperdir" || test -z "$kde_templatesdir" || + test -z "$kde_bindir" || test -z "$kde_servicesdir" || + test -z "$kde_servicetypesdir" || test -z "$kde_moduledir" || + test -z "$kde_styledir" || test -z "kde_widgetdir" || + test -z "$xdg_appsdir" || test -z "$xdg_menudir" || test -z "$xdg_directorydir" || + test "x$kde_have_all_paths" != "xyes"; then + kde_have_all_paths=no + fi + +if test "$kde_have_all_paths" = "no" && test "$kde_cached_paths" = "yes"; then + # wrong values were cached, may be, we can set better ones + kde_result= + kde_htmldir= kde_appsdir= kde_icondir= kde_sounddir= + kde_datadir= kde_locale= kde_cgidir= kde_confdir= kde_kcfgdir= + kde_mimedir= kde_toolbardir= kde_wallpaperdir= kde_templatesdir= + kde_bindir= kde_servicesdir= kde_servicetypesdir= kde_moduledir= + kde_have_all_paths= + kde_styledir= + kde_widgetdir= + xdg_appsdir = xdg_menudir= xdg_directorydir= + +if test "$ac_use_path_checking" = "default"; then + + if test -z "$kde_htmldir"; then + kde_htmldir='\${datadir}/doc/HTML' + fi + if test -z "$kde_appsdir"; then + kde_appsdir='\${datadir}/applnk' + fi + if test -z "$kde_icondir"; then + kde_icondir='\${datadir}/icons' + fi + if test -z "$kde_sounddir"; then + kde_sounddir='\${datadir}/sounds' + fi + if test -z "$kde_datadir"; then + kde_datadir='\${datadir}/apps' + fi + if test -z "$kde_locale"; then + kde_locale='\${datadir}/locale' + fi + if test -z "$kde_cgidir"; then + kde_cgidir='\${exec_prefix}/cgi-bin' + fi + if test -z "$kde_confdir"; then + kde_confdir='\${datadir}/config' + fi + if test -z "$kde_kcfgdir"; then + kde_kcfgdir='\${datadir}/config.kcfg' + fi + if test -z "$kde_mimedir"; then + kde_mimedir='\${datadir}/mimelnk' + fi + if test -z "$kde_toolbardir"; then + kde_toolbardir='\${datadir}/toolbar' + fi + if test -z "$kde_wallpaperdir"; then + kde_wallpaperdir='\${datadir}/wallpapers' + fi + if test -z "$kde_templatesdir"; then + kde_templatesdir='\${datadir}/templates' + fi + if test -z "$kde_bindir"; then + kde_bindir='\${exec_prefix}/bin' + fi + if test -z "$kde_servicesdir"; then + kde_servicesdir='\${datadir}/services' + fi + if test -z "$kde_servicetypesdir"; then + kde_servicetypesdir='\${datadir}/servicetypes' + fi + if test -z "$kde_moduledir"; then + if test "$kde_qtver" = "2"; then + kde_moduledir='\${libdir}/kde2' + else + kde_moduledir='\${libdir}/kde3' + fi + fi + if test -z "$kde_styledir"; then + kde_styledir='\${libdir}/kde3/plugins/styles' + fi + if test -z "$kde_widgetdir"; then + kde_widgetdir='\${libdir}/kde3/plugins/designer' + fi + if test -z "$xdg_appsdir"; then + xdg_appsdir='\${datadir}/applications/kde' + fi + if test -z "$xdg_menudir"; then + xdg_menudir='\${sysconfdir}/xdg/menus' + fi + if test -z "$xdg_directorydir"; then + xdg_directorydir='\${datadir}/desktop-directories' + fi + + + kde_cv_all_paths="kde_have_all_paths=\"yes\" \ + kde_htmldir=\"$kde_htmldir\" \ + kde_appsdir=\"$kde_appsdir\" \ + kde_icondir=\"$kde_icondir\" \ + kde_sounddir=\"$kde_sounddir\" \ + kde_datadir=\"$kde_datadir\" \ + kde_locale=\"$kde_locale\" \ + kde_cgidir=\"$kde_cgidir\" \ + kde_confdir=\"$kde_confdir\" \ + kde_kcfgdir=\"$kde_kcfgdir\" \ + kde_mimedir=\"$kde_mimedir\" \ + kde_toolbardir=\"$kde_toolbardir\" \ + kde_wallpaperdir=\"$kde_wallpaperdir\" \ + kde_templatesdir=\"$kde_templatesdir\" \ + kde_bindir=\"$kde_bindir\" \ + kde_servicesdir=\"$kde_servicesdir\" \ + kde_servicetypesdir=\"$kde_servicetypesdir\" \ + kde_moduledir=\"$kde_moduledir\" \ + kde_styledir=\"$kde_styledir\" \ + kde_widgetdir=\"$kde_widgetdir\" \ + xdg_appsdir=\"$xdg_appsdir\" \ + xdg_menudir=\"$xdg_menudir\" \ + xdg_directorydir=\"$xdg_directorydir\" \ + kde_result=defaults" + + +else + + if test $kde_qtver = 1; then + { echo "$as_me:$LINENO: result: compiling" >&5 +echo "${ECHO_T}compiling" >&6; } + + + { echo "$as_me:$LINENO: checking for KDE headers installed" >&5 +echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6; } + + 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' + + +cat > conftest.$ac_ext < +#endif +#include +#include "confdefs.h" +#include + +int main() { + printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data()); + printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data()); + printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data()); + printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data()); + printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data()); + printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data()); + printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data()); + printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data()); + printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data()); + printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data()); + printf("kde_wallpaperdir=\\"%s\\"\n", + KApplication::kde_wallpaperdir().data()); + printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data()); + printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data()); + printf("kde_servicesdir=\\"/tmp/dummy\\"\n"); + printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n"); + printf("kde_moduledir=\\"/tmp/dummy\\"\n"); + printf("kde_styledir=\\"/tmp/dummy\\"\n"); + printf("kde_widgetdir=\\"/tmp/dummy\\"\n"); + printf("xdg_appsdir=\\"/tmp/dummy\\"\n"); + printf("xdg_menudir=\\"/tmp/dummy\\"\n"); + printf("xdg_directorydir=\\"/tmp/dummy\\"\n"); + printf("kde_kcfgdir=\\"/tmp/dummy\\"\n"); + return 0; + } +EOF + + ac_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$all_includes $CPPFLAGS" + 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 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + else + { { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application! +Check, if you installed the KDE header files correctly. +For more details about this problem, look at the end of config.log." >&5 +echo "$as_me: error: your system is not able to compile a small KDE application! +Check, if you installed the KDE header files correctly. +For more details about this problem, look at the end of config.log." >&2;} + { (exit 1); exit 1; }; } + fi + CPPFLAGS=$ac_save_CPPFLAGS + + 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 + + + + KDE_TEST_RPATH= + + if test -n "$USE_RPATH"; then + + if test -n "$kde_libraries"; then + KDE_TEST_RPATH="-R $kde_libraries" + fi + + if test -n "$qt_libraries"; then + KDE_TEST_RPATH="$KDE_TEST_RPATH -R $qt_libraries" + fi + + if test -n "$x_libraries"; then + KDE_TEST_RPATH="$KDE_TEST_RPATH -R $x_libraries" + fi + + KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH" + fi + +{ echo "$as_me:$LINENO: checking for KDE libraries installed" >&5 +echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6; } +ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5' + +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; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } +else + { { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application! +Check, if your compiler is installed correctly and if you have used the +same compiler to compile Qt and kdelibs as you did use now. +For more details about this problem, look at the end of config.log." >&5 +echo "$as_me: error: your system fails at linking a small KDE application! +Check, if your compiler is installed correctly and if you have used the +same compiler to compile Qt and kdelibs as you did use now. +For more details about this problem, look at the end of config.log." >&2;} + { (exit 1); exit 1; }; } +fi + +if eval `KDEDIR= ./conftest 2>&5`; then + kde_result=done +else + kde_result=problems +fi + +KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log +kde_have_all_paths=yes + + + kde_cv_all_paths="kde_have_all_paths=\"yes\" \ + kde_htmldir=\"$kde_htmldir\" \ + kde_appsdir=\"$kde_appsdir\" \ + kde_icondir=\"$kde_icondir\" \ + kde_sounddir=\"$kde_sounddir\" \ + kde_datadir=\"$kde_datadir\" \ + kde_locale=\"$kde_locale\" \ + kde_cgidir=\"$kde_cgidir\" \ + kde_confdir=\"$kde_confdir\" \ + kde_kcfgdir=\"$kde_kcfgdir\" \ + kde_mimedir=\"$kde_mimedir\" \ + kde_toolbardir=\"$kde_toolbardir\" \ + kde_wallpaperdir=\"$kde_wallpaperdir\" \ + kde_templatesdir=\"$kde_templatesdir\" \ + kde_bindir=\"$kde_bindir\" \ + kde_servicesdir=\"$kde_servicesdir\" \ + kde_servicetypesdir=\"$kde_servicetypesdir\" \ + kde_moduledir=\"$kde_moduledir\" \ + kde_styledir=\"$kde_styledir\" \ + kde_widgetdir=\"$kde_widgetdir\" \ + xdg_appsdir=\"$xdg_appsdir\" \ + xdg_menudir=\"$xdg_menudir\" \ + xdg_directorydir=\"$xdg_directorydir\" \ + kde_result=$kde_result" + + + + else + { { echo "$as_me:$LINENO: error: path checking not yet supported for KDE 2" >&5 +echo "$as_me: error: path checking not yet supported for KDE 2" >&2;} + { (exit 1); exit 1; }; } + fi + +fi + + eval "$kde_cv_all_paths" + if test -z "$kde_htmldir" || test -z "$kde_appsdir" || + test -z "$kde_icondir" || test -z "$kde_sounddir" || + test -z "$kde_datadir" || test -z "$kde_locale" || + test -z "$kde_cgidir" || test -z "$kde_confdir" || + test -z "$kde_kcfgdir" || + test -z "$kde_mimedir" || test -z "$kde_toolbardir" || + test -z "$kde_wallpaperdir" || test -z "$kde_templatesdir" || + test -z "$kde_bindir" || test -z "$kde_servicesdir" || + test -z "$kde_servicetypesdir" || test -z "$kde_moduledir" || + test -z "$kde_styledir" || test -z "kde_widgetdir" || + test -z "$xdg_appsdir" || test -z "$xdg_menudir" || test -z "$xdg_directorydir" || + test "x$kde_have_all_paths" != "xyes"; then + kde_have_all_paths=no + fi + + kde_result="$kde_result (cache overridden)" +fi +if test "$kde_have_all_paths" = "no"; then + { { echo "$as_me:$LINENO: error: configure could not run a little KDE program to test the environment. +Since it had compiled and linked before, it must be a strange problem on your system. +Look at config.log for details. If you are not able to fix this, look at +http://www.kde.org/faq/installation.html or any www.kde.org mirror. +(If you're using an egcs version on Linux, you may update binutils!) +" >&5 +echo "$as_me: error: configure could not run a little KDE program to test the environment. +Since it had compiled and linked before, it must be a strange problem on your system. +Look at config.log for details. If you are not able to fix this, look at +http://www.kde.org/faq/installation.html or any www.kde.org mirror. +(If you're using an egcs version on Linux, you may update binutils!) +" >&2;} + { (exit 1); exit 1; }; } +else + rm -f conftest* + { echo "$as_me:$LINENO: result: $kde_result" >&5 +echo "${ECHO_T}$kde_result" >&6; } +fi + +bindir=$kde_bindir + + + +# Check whether --with-arts was given. +if test "${with_arts+set}" = set; then + withval=$with_arts; build_arts=$withval +else + build_arts=yes + +fi + + if test "$build_arts" '!=' "no"; then + include_ARTS_TRUE= + include_ARTS_FALSE='#' +else + include_ARTS_TRUE='#' + include_ARTS_FALSE= +fi + + if test "$build_arts" = "no"; then + +cat >>confdefs.h <<\_ACEOF +#define WITHOUT_ARTS 1 +_ACEOF + + fi + + + kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin" + test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs" + if test -n "$KDEDIRS"; then + kde_save_IFS=$IFS + IFS=: + for dir in $KDEDIRS; do + kde_default_bindirs="$dir/bin $kde_default_bindirs " + done + IFS=$kde_save_IFS + fi + + kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs" + + { echo "$as_me:$LINENO: checking for dcopidl" >&5 +echo $ECHO_N "checking for dcopidl... $ECHO_C" >&6; } + if test -n "$DCOPIDL"; then + kde_cv_path="$DCOPIDL"; + else + kde_cache=`echo dcopidl | sed 'y%./+-%__p_%'` + + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + kde_cv_path="NONE" + kde_save_IFS=$IFS + IFS=':' + dirs="" + for dir in $PATH; do + dirs="$dirs $dir" + done + if test -z ""; then dirs="$kde_default_bindirs $dirs" + else dirs="$dirs $kde_default_bindirs" + fi + IFS=$kde_save_IFS + + for dir in $dirs; do + if test -x "$dir/dcopidl"; then + if test -n "" + then + evalstr="$dir/dcopidl 2>&1 " + if eval $evalstr; then + kde_cv_path="$dir/dcopidl" + break + fi + else + kde_cv_path="$dir/dcopidl" + break + fi + fi + done + + eval "kde_cv_path_$kde_cache=$kde_cv_path" + + +fi + + + eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\"" + + fi + + if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } + + { { echo "$as_me:$LINENO: error: The important program dcopidl was not found! +Please check whether you installed KDE correctly. +" >&5 +echo "$as_me: error: The important program dcopidl was not found! +Please check whether you installed KDE correctly. +" >&2;} + { (exit 1); exit 1; }; } + + else + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } + DCOPIDL=$kde_cv_path + + fi + + + { echo "$as_me:$LINENO: checking for dcopidl2cpp" >&5 +echo $ECHO_N "checking for dcopidl2cpp... $ECHO_C" >&6; } + if test -n "$DCOPIDL2CPP"; then + kde_cv_path="$DCOPIDL2CPP"; + else + kde_cache=`echo dcopidl2cpp | sed 'y%./+-%__p_%'` + + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + kde_cv_path="NONE" + kde_save_IFS=$IFS + IFS=':' + dirs="" + for dir in $PATH; do + dirs="$dirs $dir" + done + if test -z ""; then dirs="$kde_default_bindirs $dirs" + else dirs="$dirs $kde_default_bindirs" + fi + IFS=$kde_save_IFS + + for dir in $dirs; do + if test -x "$dir/dcopidl2cpp"; then + if test -n "" + then + evalstr="$dir/dcopidl2cpp 2>&1 " + if eval $evalstr; then + kde_cv_path="$dir/dcopidl2cpp" + break + fi + else + kde_cv_path="$dir/dcopidl2cpp" + break + fi + fi + done + + eval "kde_cv_path_$kde_cache=$kde_cv_path" + + +fi + + + eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\"" + + fi + + if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } + + { { echo "$as_me:$LINENO: error: The important program dcopidl2cpp was not found! +Please check whether you installed KDE correctly. +" >&5 +echo "$as_me: error: The important program dcopidl2cpp was not found! +Please check whether you installed KDE correctly. +" >&2;} + { (exit 1); exit 1; }; } + + else + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } + DCOPIDL2CPP=$kde_cv_path + + fi + + if test "$build_arts" '!=' "no"; then + + { echo "$as_me:$LINENO: checking for mcopidl" >&5 +echo $ECHO_N "checking for mcopidl... $ECHO_C" >&6; } + if test -n "$MCOPIDL"; then + kde_cv_path="$MCOPIDL"; + else + kde_cache=`echo mcopidl | sed 'y%./+-%__p_%'` + + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + kde_cv_path="NONE" + kde_save_IFS=$IFS + IFS=':' + dirs="" + for dir in $PATH; do + dirs="$dirs $dir" + done + if test -z ""; then dirs="$kde_default_bindirs $dirs" + else dirs="$dirs $kde_default_bindirs" + fi + IFS=$kde_save_IFS + + for dir in $dirs; do + if test -x "$dir/mcopidl"; then + if test -n "" + then + evalstr="$dir/mcopidl 2>&1 " + if eval $evalstr; then + kde_cv_path="$dir/mcopidl" + break + fi + else + kde_cv_path="$dir/mcopidl" + break + fi + fi + done + + eval "kde_cv_path_$kde_cache=$kde_cv_path" + + +fi + + + eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\"" + + fi + + if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } + + { { echo "$as_me:$LINENO: error: The important program mcopidl was not found! +Please check whether you installed aRts correctly or use +--without-arts to compile without aRts support (this will remove functionality). +" >&5 +echo "$as_me: error: The important program mcopidl was not found! +Please check whether you installed aRts correctly or use +--without-arts to compile without aRts support (this will remove functionality). +" >&2;} + { (exit 1); exit 1; }; } + + else + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } + MCOPIDL=$kde_cv_path + + fi + + + { echo "$as_me:$LINENO: checking for artsc-config" >&5 +echo $ECHO_N "checking for artsc-config... $ECHO_C" >&6; } + if test -n "$ARTSCCONFIG"; then + kde_cv_path="$ARTSCCONFIG"; + else + kde_cache=`echo artsc-config | sed 'y%./+-%__p_%'` + + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + kde_cv_path="NONE" + kde_save_IFS=$IFS + IFS=':' + dirs="" + for dir in $PATH; do + dirs="$dirs $dir" + done + if test -z ""; then dirs="$kde_default_bindirs $dirs" + else dirs="$dirs $kde_default_bindirs" + fi + IFS=$kde_save_IFS + + for dir in $dirs; do + if test -x "$dir/artsc-config"; then + if test -n "" + then + evalstr="$dir/artsc-config 2>&1 " + if eval $evalstr; then + kde_cv_path="$dir/artsc-config" + break + fi + else + kde_cv_path="$dir/artsc-config" + break + fi + fi + done + + eval "kde_cv_path_$kde_cache=$kde_cv_path" + + +fi + + + eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\"" + + fi + + if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } + + { { echo "$as_me:$LINENO: error: The important program artsc-config was not found! +Please check whether you installed aRts correctly or use +--without-arts to compile without aRts support (this will remove functionality). +" >&5 +echo "$as_me: error: The important program artsc-config was not found! +Please check whether you installed aRts correctly or use +--without-arts to compile without aRts support (this will remove functionality). +" >&2;} + { (exit 1); exit 1; }; } + + else + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } + ARTSCCONFIG=$kde_cv_path + + fi + + fi + + { echo "$as_me:$LINENO: checking for meinproc" >&5 +echo $ECHO_N "checking for meinproc... $ECHO_C" >&6; } + if test -n "$MEINPROC"; then + kde_cv_path="$MEINPROC"; + else + kde_cache=`echo meinproc | sed 'y%./+-%__p_%'` + + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + kde_cv_path="NONE" + kde_save_IFS=$IFS + IFS=':' + dirs="" + for dir in $PATH; do + dirs="$dirs $dir" + done + if test -z ""; then dirs="$kde_default_bindirs $dirs" + else dirs="$dirs $kde_default_bindirs" + fi + IFS=$kde_save_IFS + + for dir in $dirs; do + if test -x "$dir/meinproc"; then + if test -n "" + then + evalstr="$dir/meinproc 2>&1 " + if eval $evalstr; then + kde_cv_path="$dir/meinproc" + break + fi + else + kde_cv_path="$dir/meinproc" + break + fi + fi + done + + eval "kde_cv_path_$kde_cache=$kde_cv_path" + + +fi + + + eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\"" + + fi + + if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } + + else + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } + MEINPROC=$kde_cv_path + + fi + + + kde32ornewer=1 + kde33ornewer=1 + if test -n "$kde_qtver" && test "$kde_qtver" -lt 3; then + kde32ornewer= + kde33ornewer= + else + if test "$kde_qtver" = "3"; then + if test "$kde_qtsubver" -le 1; then + kde32ornewer= + fi + if test "$kde_qtsubver" -le 2; then + kde33ornewer= + fi + if test "$KDECONFIG" != "compiled"; then + if test `$KDECONFIG --version | grep KDE | sed 's/KDE: \(...\).*/\1/'` = 3.2; then + kde33ornewer= + fi + fi + fi + fi + + if test -n "$kde32ornewer"; then + + { echo "$as_me:$LINENO: checking for kconfig_compiler" >&5 +echo $ECHO_N "checking for kconfig_compiler... $ECHO_C" >&6; } + if test -n "$KCONFIG_COMPILER"; then + kde_cv_path="$KCONFIG_COMPILER"; + else + kde_cache=`echo kconfig_compiler | sed 'y%./+-%__p_%'` + + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + kde_cv_path="NONE" + kde_save_IFS=$IFS + IFS=':' + dirs="" + for dir in $PATH; do + dirs="$dirs $dir" + done + if test -z ""; then dirs="$kde_default_bindirs $dirs" + else dirs="$dirs $kde_default_bindirs" + fi + IFS=$kde_save_IFS + + for dir in $dirs; do + if test -x "$dir/kconfig_compiler"; then + if test -n "" + then + evalstr="$dir/kconfig_compiler 2>&1 " + if eval $evalstr; then + kde_cv_path="$dir/kconfig_compiler" + break + fi + else + kde_cv_path="$dir/kconfig_compiler" + break + fi + fi + done + + eval "kde_cv_path_$kde_cache=$kde_cv_path" + + +fi + + + eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\"" + + fi + + if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } + + { { echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found! +Please check whether you installed KDE correctly. +" >&5 +echo "$as_me: error: The important program kconfig_compiler was not found! +Please check whether you installed KDE correctly. +" >&2;} + { (exit 1); exit 1; }; } + + else + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } + KCONFIG_COMPILER=$kde_cv_path + + fi + + + { echo "$as_me:$LINENO: checking for dcopidlng" >&5 +echo $ECHO_N "checking for dcopidlng... $ECHO_C" >&6; } + if test -n "$DCOPIDLNG"; then + kde_cv_path="$DCOPIDLNG"; + else + kde_cache=`echo dcopidlng | sed 'y%./+-%__p_%'` + + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + kde_cv_path="NONE" + kde_save_IFS=$IFS + IFS=':' + dirs="" + for dir in $PATH; do + dirs="$dirs $dir" + done + if test -z ""; then dirs="$kde_default_bindirs $dirs" + else dirs="$dirs $kde_default_bindirs" + fi + IFS=$kde_save_IFS + + for dir in $dirs; do + if test -x "$dir/dcopidlng"; then + if test -n "" + then + evalstr="$dir/dcopidlng 2>&1 " + if eval $evalstr; then + kde_cv_path="$dir/dcopidlng" + break + fi + else + kde_cv_path="$dir/dcopidlng" + break + fi + fi + done + + eval "kde_cv_path_$kde_cache=$kde_cv_path" + + +fi + + + eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\"" + + fi + + if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } + + { { echo "$as_me:$LINENO: error: The important program dcopidlng was not found! +Please check whether you installed KDE correctly. +" >&5 +echo "$as_me: error: The important program dcopidlng was not found! +Please check whether you installed KDE correctly. +" >&2;} + { (exit 1); exit 1; }; } + + else + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } + DCOPIDLNG=$kde_cv_path + + fi + + fi + if test -n "$kde33ornewer"; then + + { echo "$as_me:$LINENO: checking for makekdewidgets" >&5 +echo $ECHO_N "checking for makekdewidgets... $ECHO_C" >&6; } + if test -n "$MAKEKDEWIDGETS"; then + kde_cv_path="$MAKEKDEWIDGETS"; + else + kde_cache=`echo makekdewidgets | sed 'y%./+-%__p_%'` + + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + kde_cv_path="NONE" + kde_save_IFS=$IFS + IFS=':' + dirs="" + for dir in $PATH; do + dirs="$dirs $dir" + done + if test -z ""; then dirs="$kde_default_bindirs $dirs" + else dirs="$dirs $kde_default_bindirs" + fi + IFS=$kde_save_IFS + + for dir in $dirs; do + if test -x "$dir/makekdewidgets"; then + if test -n "" + then + evalstr="$dir/makekdewidgets 2>&1 " + if eval $evalstr; then + kde_cv_path="$dir/makekdewidgets" + break + fi + else + kde_cv_path="$dir/makekdewidgets" + break + fi + fi + done + + eval "kde_cv_path_$kde_cache=$kde_cv_path" + + +fi + + + eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\"" + + fi + + if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } + + { { echo "$as_me:$LINENO: error: The important program makekdewidgets was not found! +Please check whether you installed KDE correctly. +" >&5 +echo "$as_me: error: The important program makekdewidgets was not found! +Please check whether you installed KDE correctly. +" >&2;} + { (exit 1); exit 1; }; } + + else + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } + MAKEKDEWIDGETS=$kde_cv_path + + fi + + + fi + + { echo "$as_me:$LINENO: checking for xmllint" >&5 +echo $ECHO_N "checking for xmllint... $ECHO_C" >&6; } + if test -n "$XMLLINT"; then + kde_cv_path="$XMLLINT"; + else + kde_cache=`echo xmllint | sed 'y%./+-%__p_%'` + + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + kde_cv_path="NONE" + kde_save_IFS=$IFS + IFS=':' + dirs="" + for dir in $PATH; do + dirs="$dirs $dir" + done + if test -z ""; then dirs="${prefix}/bin ${exec_prefix}/bin $dirs" + else dirs="$dirs ${prefix}/bin ${exec_prefix}/bin" + fi + IFS=$kde_save_IFS + + for dir in $dirs; do + if test -x "$dir/xmllint"; then + if test -n "" + then + evalstr="$dir/xmllint 2>&1 " + if eval $evalstr; then + kde_cv_path="$dir/xmllint" + break + fi + else + kde_cv_path="$dir/xmllint" + break + fi + fi + done + + eval "kde_cv_path_$kde_cache=$kde_cv_path" + + +fi + + + eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\"" + + fi + + if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } + XMLLINT="" + else + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } + XMLLINT=$kde_cv_path + + fi + + + if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then + kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share" + test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs" + +KDE_XSL_STYLESHEET=NO +for i in $kde_sharedirs; +do + for j in apps/ksgmltools2/customization/kde-chunk.xsl; + do + echo "configure: 33438: $i/$j" >&5 + if test -r "$i/$j"; then + echo "taking that" >&5 + KDE_XSL_STYLESHEET=$i + break 2 + fi + done +done + + if test "$KDE_XSL_STYLESHEET" = "NO"; then + KDE_XSL_STYLESHEET="" + else + KDE_XSL_STYLESHEET="$KDE_XSL_STYLESHEET/apps/ksgmltools2/customization/kde-chunk.xsl" + fi + fi + + DCOP_DEPENDENCIES='$(DCOPIDL)' + if test -n "$kde32ornewer"; then + KCFG_DEPENDENCIES='$(KCONFIG_COMPILER)' + DCOP_DEPENDENCIES='$(DCOPIDL) $(DCOPIDLNG)' + + + + fi + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +kdeinitdir='$(kde_moduledir)' + + + +if test "$kde_qtver" = 1; then + kde_minidir="$kde_icondir/mini" +else +# for KDE 1 - this breaks KDE2 apps using minidir, but +# that's the plan ;-/ + kde_minidir="/dev/null" +fi + + + + + + +if test $kde_qtver = 3; then + case $host in + *cygwin*) lib_kded="-lkdeinit_kded" ;; + *) lib_kded="" ;; + esac + LIB_KDED=$lib_kded + + LIB_KDECORE="-lkdecore" + + LIB_KDEUI="-lkdeui" + + LIB_KIO="-lkio" + + LIB_KJS="-lkjs" + + LIB_SMB="-lsmb" + + LIB_KAB="-lkab" + + LIB_KABC="-lkabc" + + LIB_KHTML="-lkhtml" + + LIB_KSPELL="-lkspell" + + LIB_KPARTS="-lkparts" + + LIB_KDEPRINT="-lkdeprint" + + LIB_KUTILS="-lkutils" + + LIB_KDEPIM="-lkdepim" + + LIB_KIMPROXY="-lkimproxy" + + LIB_KNEWSTUFF="-lknewstuff" + + LIB_KDNSSD="-lkdnssd" + + LIB_KUNITTEST="-lkunittest" + +# these are for backward compatibility + LIB_KSYCOCA="-lkio" + + LIB_KFILE="-lkio" + +elif test $kde_qtver = 2; then + LIB_KDECORE="-lkdecore" + + LIB_KDEUI="-lkdeui" + + LIB_KIO="-lkio" + + LIB_KSYCOCA="-lksycoca" + + LIB_SMB="-lsmb" + + LIB_KFILE="-lkfile" + + LIB_KAB="-lkab" + + LIB_KHTML="-lkhtml" + + LIB_KSPELL="-lkspell" + + LIB_KPARTS="-lkparts" + + LIB_KDEPRINT="-lkdeprint" + +else + LIB_KDECORE="-lkdecore -lXext $(LIB_QT)" + + LIB_KDEUI="-lkdeui $(LIB_KDECORE)" + + LIB_KFM="-lkfm $(LIB_KDECORE)" + + LIB_KFILE="-lkfile $(LIB_KFM) $(LIB_KDEUI)" + + LIB_KAB="-lkab $(LIB_KIMGIO) $(LIB_KDECORE)" + +fi + + + +#MIN_CONFIG(3.3) +CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS" + +if test "$build_arts" = "yes"; then + +cat >>confdefs.h <<\_ACEOF +#define USE_ARTS 1 +_ACEOF + + LIB_ARTS="-lartskde" + +fi + + +{ echo "$as_me:$LINENO: checking for Qt docs" >&5 +echo $ECHO_N "checking for Qt docs... $ECHO_C" >&6; } +kde_qtdir= +if test "${with_qt_dir+set}" = set; then + kde_qtdir="$with_qt_dir" +fi + + +QTDOCDIR=NO +for i in $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ; +do + for j in qsql.html; + do + echo "configure: 33621: $i/$j" >&5 + if test -r "$i/$j"; then + echo "taking that" >&5 + QTDOCDIR=$i + break 2 + fi + done +done + +{ echo "$as_me:$LINENO: result: $QTDOCDIR" >&5 +echo "${ECHO_T}$QTDOCDIR" >&6; } + + + + + { echo "$as_me:$LINENO: checking for dot" >&5 +echo $ECHO_N "checking for dot... $ECHO_C" >&6; } + if test -n "$DOT"; then + kde_cv_path="$DOT"; + else + kde_cache=`echo dot | sed 'y%./+-%__p_%'` + + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + kde_cv_path="NONE" + kde_save_IFS=$IFS + IFS=':' + dirs="" + for dir in $PATH; do + dirs="$dirs $dir" + done + if test -z ""; then dirs=" $dirs" + else dirs="$dirs " + fi + IFS=$kde_save_IFS + + for dir in $dirs; do + if test -x "$dir/dot"; then + if test -n "" + then + evalstr="$dir/dot 2>&1 " + if eval $evalstr; then + kde_cv_path="$dir/dot" + break + fi + else + kde_cv_path="$dir/dot" + break + fi + fi + done + + eval "kde_cv_path_$kde_cache=$kde_cv_path" + + +fi + + + eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\"" + + fi + + if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } + + else + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } + DOT=$kde_cv_path + + fi + +if test -n "$DOT"; then + KDE_HAVE_DOT="YES" +else + KDE_HAVE_DOT="NO" +fi + + + { echo "$as_me:$LINENO: checking for doxygen" >&5 +echo $ECHO_N "checking for doxygen... $ECHO_C" >&6; } + if test -n "$DOXYGEN"; then + kde_cv_path="$DOXYGEN"; + else + kde_cache=`echo doxygen | sed 'y%./+-%__p_%'` + + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + kde_cv_path="NONE" + kde_save_IFS=$IFS + IFS=':' + dirs="" + for dir in $PATH; do + dirs="$dirs $dir" + done + if test -z ""; then dirs=" $dirs" + else dirs="$dirs " + fi + IFS=$kde_save_IFS + + for dir in $dirs; do + if test -x "$dir/doxygen"; then + if test -n "" + then + evalstr="$dir/doxygen 2>&1 " + if eval $evalstr; then + kde_cv_path="$dir/doxygen" + break + fi + else + kde_cv_path="$dir/doxygen" + break + fi + fi + done + + eval "kde_cv_path_$kde_cache=$kde_cv_path" + + +fi + + + eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\"" + + fi + + if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } + + else + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } + DOXYGEN=$kde_cv_path + + fi + + + +DOXYGEN_PROJECT_NAME="The API Reference" +DOXYGEN_PROJECT_NUMBER="Version $VERSION" + + + +KDE_HAS_DOXYGEN=no +if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $QTDOCDIR/qsql.html; then + KDE_HAS_DOXYGEN=yes +fi + + + + + + +############################################################################### +# BEGIN PKG-CONFIG CHECK +############################################################################### + + +# Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_PKGCONFIGFOUND+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$PKGCONFIGFOUND"; then + ac_cv_prog_PKGCONFIGFOUND="$PKGCONFIGFOUND" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_PKGCONFIGFOUND="yes" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +PKGCONFIGFOUND=$ac_cv_prog_PKGCONFIGFOUND +if test -n "$PKGCONFIGFOUND"; then + { echo "$as_me:$LINENO: result: $PKGCONFIGFOUND" >&5 +echo "${ECHO_T}$PKGCONFIGFOUND" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + + +############################################################################### +# END PKG-CONFIG CHECK +############################################################################### + + + +############################################################################### +# BEGIN TAGLIB CHECK +############################################################################### + + + succeeded=no + + if test -z "$PKG_CONFIG"; then + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + + fi + + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + { echo "$as_me:$LINENO: checking for taglib >= 1.5" >&5 +echo $ECHO_N "checking for taglib >= 1.5... $ECHO_C" >&6; } + + if $PKG_CONFIG --exists "taglib >= 1.5" ; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + succeeded=yes + + { echo "$as_me:$LINENO: checking TAGLIB_CFLAGS" >&5 +echo $ECHO_N "checking TAGLIB_CFLAGS... $ECHO_C" >&6; } + TAGLIB_CFLAGS=`$PKG_CONFIG --cflags "taglib >= 1.5"` + { echo "$as_me:$LINENO: result: $TAGLIB_CFLAGS" >&5 +echo "${ECHO_T}$TAGLIB_CFLAGS" >&6; } + + { echo "$as_me:$LINENO: checking TAGLIB_LIBS" >&5 +echo $ECHO_N "checking TAGLIB_LIBS... $ECHO_C" >&6; } + TAGLIB_LIBS=`$PKG_CONFIG --libs "taglib >= 1.5"` + { echo "$as_me:$LINENO: result: $TAGLIB_LIBS" >&5 +echo "${ECHO_T}$TAGLIB_LIBS" >&6; } + else + TAGLIB_CFLAGS="" + TAGLIB_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + TAGLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "taglib >= 1.5"` + + fi + + + + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + taglib_15_found=yes + else + + succeeded=no + + if test -z "$PKG_CONFIG"; then + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + + fi + + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + { echo "$as_me:$LINENO: checking for taglib >= 1.4" >&5 +echo $ECHO_N "checking for taglib >= 1.4... $ECHO_C" >&6; } + + if $PKG_CONFIG --exists "taglib >= 1.4" ; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + succeeded=yes + + { echo "$as_me:$LINENO: checking TAGLIB_CFLAGS" >&5 +echo $ECHO_N "checking TAGLIB_CFLAGS... $ECHO_C" >&6; } + TAGLIB_CFLAGS=`$PKG_CONFIG --cflags "taglib >= 1.4"` + { echo "$as_me:$LINENO: result: $TAGLIB_CFLAGS" >&5 +echo "${ECHO_T}$TAGLIB_CFLAGS" >&6; } + + { echo "$as_me:$LINENO: checking TAGLIB_LIBS" >&5 +echo $ECHO_N "checking TAGLIB_LIBS... $ECHO_C" >&6; } + TAGLIB_LIBS=`$PKG_CONFIG --libs "taglib >= 1.4"` + { echo "$as_me:$LINENO: result: $TAGLIB_LIBS" >&5 +echo "${ECHO_T}$TAGLIB_LIBS" >&6; } + else + TAGLIB_CFLAGS="" + TAGLIB_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + TAGLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "taglib >= 1.4"` + echo $TAGLIB_PKG_ERRORS + fi + + + + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + : + else + { { echo "$as_me:$LINENO: error: Library requirements (taglib >= 1.4) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +echo "$as_me: error: Library requirements (taglib >= 1.4) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { (exit 1); exit 1; }; } + fi + + fi + + + if test "x$taglib_15_found" = "xyes"; then + TAGLIB_15_FOUND_TRUE= + TAGLIB_15_FOUND_FALSE='#' +else + TAGLIB_15_FOUND_TRUE='#' + TAGLIB_15_FOUND_FALSE= +fi + - ac_lo= ac_hi= -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -# Binary search between lo and hi bounds. -while test "x$ac_lo" != "x$ac_hi"; do - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef short ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; -test_array [0] = 0 +if test "x$taglib_15_found" = "xyes"; then - ; - return 0; -} +cat >>confdefs.h <<\_ACEOF +#define TAGLIB_15 1 _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - ac_hi=$ac_mid -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_lo=`expr '(' $ac_mid ')' + 1` fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -done -case $ac_lo in -?*) ac_cv_sizeof_short=$ac_lo;; -'') if test "$ac_cv_type_short" = yes; then - { { echo "$as_me:$LINENO: error: cannot compute sizeof (short) -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (short) -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } - else - ac_cv_sizeof_short=0 - fi ;; -esac -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef short ac__type_sizeof_; -static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } -static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } -#include -#include -int -main () -{ +############################################################################### +# END TAGLIB CHECK +############################################################################### - FILE *f = fopen ("conftest.val", "w"); - if (! f) - return 1; - if (((long int) (sizeof (ac__type_sizeof_))) < 0) - { - long int i = longval (); - if (i != ((long int) (sizeof (ac__type_sizeof_)))) - return 1; - fprintf (f, "%ld\n", i); - } - else - { - unsigned long int i = ulongval (); - if (i != ((long int) (sizeof (ac__type_sizeof_)))) - return 1; - fprintf (f, "%lu\n", i); - } - return ferror (f) || fclose (f) != 0; - ; - return 0; -} -_ACEOF -rm -f 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>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (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_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sizeof_short=`cat conftest.val` + +############################################################################### +# BEGIN GSTREAMER-0.10 CHECK +############################################################################### + +#AC_ARG_WITH(gstreamer10, +# AC_HELP_STRING([--with-gstreamer10],[build Amarok with GStreamer 0.10-engine]), +# [build_gstreamer10=$withval], +# [build_gstreamer10=no] +#) +# +#if test "$build_gstreamer10" != "no"; then +# if test "$PKGCONFIGFOUND" = "yes" ; then +# # check for GStreamer +# dnl Now we're ready to ask for gstreamer libs and cflags +# dnl And we can also ask for the right version of gstreamer +# have_gst10=no +# +# GST10_MAJORMINOR=0.10 +# GST10_REQ=0.10.0 +# +# PKG_CHECK_MODULES(GST10, gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR, +# have_gst10=yes,have_gst10=no) +# +# dnl Give error if we don't have gstreamer +# if test "x$have_gst10" = "xno"; then +# LIB_GST10="" +# CFLAGS_GST10="" +# else +# LIB_GST10=$GST10_LIBS +# CFLAGS_GST10=$GST10_CFLAGS +# AC_SUBST(LIB_GST10) +# AC_SUBST(CFLAGS_GST10) +# AC_SUBST(GST10_MAJORMINOR) +# AC_DEFINE(HAVE_GSTREAMER10, 1, [have GStreamer10]) +# fi +# fi +#fi +# +#AM_CONDITIONAL(with_gst10, [test x$have_gst10 = xyes]) + +############################################################################### +# END GSTREAMER-0.10 CHECK +############################################################################### + + + +############################################################################### +# BEGIN XINE CHECK +############################################################################### + + +# Check whether --with-xine was given. +if test "${with_xine+set}" = set; then + withval=$with_xine; build_xine=$withval else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + build_xine=yes -( exit $ac_status ) -if test "$ac_cv_type_short" = yes; then - { { echo "$as_me:$LINENO: error: cannot compute sizeof (short) -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (short) -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } - else - ac_cv_sizeof_short=0 - fi -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -rm -f conftest.val fi -{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5 -echo "${ECHO_T}$ac_cv_sizeof_short" >&6; } +if test "$build_xine" != "no"; then -cat >>confdefs.h <<_ACEOF -#define SIZEOF_SHORT $ac_cv_sizeof_short -_ACEOF + succeeded=no - { echo "$as_me:$LINENO: checking for long" >&5 -echo $ECHO_N "checking for long... $ECHO_C" >&6; } -if test "${ac_cv_type_long+set}" = set; then + if test -z "$PKG_CONFIG"; then + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_PKG_CONFIG+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. */ -$ac_includes_default -typedef long ac__type_new_; -int -main () -{ -if ((ac__type_new_ *) 0) - return 0; -if (sizeof (ac__type_new_)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 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_objext; then - ac_cv_type_long=yes +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_long=no + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5 -echo "${ECHO_T}$ac_cv_type_long" >&6; } -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ echo "$as_me:$LINENO: checking size of long" >&5 -echo $ECHO_N "checking size of long... $ECHO_C" >&6; } -if test "${ac_cv_sizeof_long+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef long ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; -test_array [0] = 0 + fi - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - ac_lo=0 ac_mid=0 - while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef long ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; -test_array [0] = 0 + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + { echo "$as_me:$LINENO: checking for libxine >= 1.0.2" >&5 +echo $ECHO_N "checking for libxine >= 1.0.2... $ECHO_C" >&6; } - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - ac_hi=$ac_mid; break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + if $PKG_CONFIG --exists "libxine >= 1.0.2" ; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + succeeded=yes + + { echo "$as_me:$LINENO: checking XINE_CFLAGS" >&5 +echo $ECHO_N "checking XINE_CFLAGS... $ECHO_C" >&6; } + XINE_CFLAGS=`$PKG_CONFIG --cflags "libxine >= 1.0.2"` + { echo "$as_me:$LINENO: result: $XINE_CFLAGS" >&5 +echo "${ECHO_T}$XINE_CFLAGS" >&6; } + + { echo "$as_me:$LINENO: checking XINE_LIBS" >&5 +echo $ECHO_N "checking XINE_LIBS... $ECHO_C" >&6; } + XINE_LIBS=`$PKG_CONFIG --libs "libxine >= 1.0.2"` + { echo "$as_me:$LINENO: result: $XINE_LIBS" >&5 +echo "${ECHO_T}$XINE_LIBS" >&6; } + else + XINE_CFLAGS="" + XINE_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + XINE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxine >= 1.0.2"` + + fi + + + + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + : + else + build_xine=no + fi - ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done + if test x$build_xine = xyes; then + with_xine_TRUE= + with_xine_FALSE='#' else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + with_xine_TRUE='#' + with_xine_FALSE= +fi - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef long ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; -test_array [0] = 0 - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - ac_hi=-1 ac_mid=-1 - while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef long ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; -test_array [0] = 0 - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - ac_lo=$ac_mid; break + +############################################################################### +# END XINE CHECK +############################################################################### + + + +############################################################################### +# BEGIN AKODE CHECK +############################################################################### + +#AC_ARG_WITH(akode, +# AC_HELP_STRING([--without-akode],[build Amarok without akode-engine]), +# [build_akode=$withval], +# [build_akode=yes] +#) +# +#if test "$build_akode" != "no"; then +# +# AC_CHECK_PROG(AKODE_CONFIG, akode-config, yes) +# +# if test x$AKODE_CONFIG = xyes ; then +# AC_DEFINE(HAVE_AKODE, 1, [have aKode]) +# CFLAGS_AKODE=[`akode-config --cflags`] +# LIBS_AKODE=[`akode-config --libs`] +# +# akode_version=`akode-config --version` +# akode_version=VERSION_TO_NUMBER(echo $akode_version) +# akode_version_min="2.0.0" +# akode_version_min=VERSION_TO_NUMBER(echo $akode_version_min) +# +# AC_MSG_CHECKING([for akode-lib version >= 2.0]) +# +# if test $akode_version -eq $akode_version_min \ +# -o $akode_version -gt $akode_version_min; then +# +# echo "yes" +# +# else +# echo "no" +# +# build_akode=no +# fi +# else +# build_akode=no +# fi +#fi +# +#AM_CONDITIONAL(with_akode, test x$build_akode = xyes) +#AC_SUBST(CFLAGS_AKODE) +#AC_SUBST(LIBS_AKODE) + +############################################################################### +# END AKODE CHECK +############################################################################### + + + +############################################################################### +# BEGIN NMM CHECK +############################################################################### + + +# Check whether --with-nmm was given. +if test "${with_nmm+set}" = set; then + withval=$with_nmm; build_nmm=$withval else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + build_nmm=no - ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done + + +# Check whether --with-nmm-dir was given. +if test "${with_nmm_dir+set}" = set; then + withval=$with_nmm_dir; nmm_dir="$withval" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + nmm_dir=/usr/local - ac_lo= ac_hi= fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -# Binary search between lo and hi bounds. -while test "x$ac_lo" != "x$ac_hi"; do - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef long ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; -test_array [0] = 0 +if test "$build_nmm" != "no"; then - ; - return 0; -} + CFLAGS_NMM="-I$nmm_dir/include" + LDFLAGS_NMM="-L$nmm_dir/lib" + +cat >>confdefs.h <<\_ACEOF +#define HAVE_NMM 1 _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - ac_hi=$ac_mid -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_lo=`expr '(' $ac_mid ')' + 1` fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -done -case $ac_lo in -?*) ac_cv_sizeof_long=$ac_lo;; -'') if test "$ac_cv_type_long" = yes; then - { { echo "$as_me:$LINENO: error: cannot compute sizeof (long) -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (long) -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } - else - ac_cv_sizeof_long=0 - fi ;; -esac + if test x$build_nmm = xyes; then + with_nmm_TRUE= + with_nmm_FALSE='#' else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef long ac__type_sizeof_; -static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } -static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } -#include -#include -int -main () -{ + with_nmm_TRUE='#' + with_nmm_FALSE= +fi - FILE *f = fopen ("conftest.val", "w"); - if (! f) - return 1; - if (((long int) (sizeof (ac__type_sizeof_))) < 0) - { - long int i = longval (); - if (i != ((long int) (sizeof (ac__type_sizeof_)))) - return 1; - fprintf (f, "%ld\n", i); - } - else - { - unsigned long int i = ulongval (); - if (i != ((long int) (sizeof (ac__type_sizeof_)))) - return 1; - fprintf (f, "%lu\n", i); - } - return ferror (f) || fclose (f) != 0; - ; - return 0; -} -_ACEOF -rm -f 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>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (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_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sizeof_long=`cat conftest.val` + + +############################################################################### +# END NMM CHECK +############################################################################### + + + +############################################################################### +# BEGIN MAS CHECK +############################################################################### + +#AC_ARG_WITH(mas, +# AC_HELP_STRING([--with-mas],[build Amarok with MAS-engine]), +# [build_mas=$withval], +# [build_mas=no] +#) +# +# +#if test "$build_mas" != "no"; then +# +# AC_PATH_PROG(MAS_CONFIG, mas-config, no) +# +# if test $MAS_CONFIG = "no" +# then +# amarok_warning_mas_notfound=yes +# echo "amarok_warning_mas_notfound: $amarok_warning_mas_notfound" +# build_mas=no +# else +# AC_DEFINE(HAVE_MAS, 1, [have MAS]) +# +# CFLAGS_MAS=[`$MAS_CONFIG --cflags`] +# LIBS_MAS=[`$MAS_CONFIG --libs`] +# +# build_mas=yes +# fi +#fi +# +#AM_CONDITIONAL(with_mas, test x$build_mas = xyes) +#AC_SUBST(CFLAGS_MAS) +#AC_SUBST(LIBS_MAS) + +############################################################################### +# END MAS CHECK +############################################################################### + + + +############################################################################### +# BEGIN HELIX CHECK +############################################################################### + + +# Check whether --with-helix was given. +if test "${with_helix+set}" = set; then + withval=$with_helix; build_helix=$withval else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + build_helix=no -( exit $ac_status ) -if test "$ac_cv_type_long" = yes; then - { { echo "$as_me:$LINENO: error: cannot compute sizeof (long) -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (long) -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } - else - ac_cv_sizeof_long=0 - fi -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -rm -f conftest.val fi -{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5 -echo "${ECHO_T}$ac_cv_sizeof_long" >&6; } +if test "$build_helix" != "no"; then + { echo "$as_me:$LINENO: checking for RealPlayer or HelixPlayer" >&5 +echo $ECHO_N "checking for RealPlayer or HelixPlayer... $ECHO_C" >&6; } + + if test "$build_helix" = "yes"; then + HXPLAY=`type -p hxplay` + RPLAY=`type -p realplay` + if test "$RPLAY" != "" -a -x "$RPLAY"; then + HELIX_LINK=`readlink -f $RPLAY` + HELIX_LINK=`dirname $HELIX_LINK` + HELIX_LIBS=`unset CDPATH; cd $HELIX_LINK && pwd` + if test -e "$HELIX_LIBS/common/clntcore.so"; then + { echo "$as_me:$LINENO: result: found RealPlayer in $HELIX_LIBS" >&5 +echo "${ECHO_T}found RealPlayer in $HELIX_LIBS" >&6; } + build_helix=$HELIX_LIBS + fi + elif test "$HXPLAY" != "" -a -x "$HXPLAY"; then + HELIX_LINK=`readlink -f $HXPLAY` + HELIX_LINK=`dirname $HELIX_LINK` + HELIX_LIBS=`unset CDPATH; cd $HELIX_LINK && pwd` + if test -e "$HELIX_LIBS/common/clntcore.so"; then + { echo "$as_me:$LINENO: result: found HelixPlayer in $HELIX_LIBS" >&5 +echo "${ECHO_T}found HelixPlayer in $HELIX_LIBS" >&6; } + build_helix=$HELIX_LIBS + fi + fi + else + if test -n "$build_helix" -a -d "$build_helix"; then + HELIX_LIBS=`unset CDPATH; cd $build_helix && pwd` + else + HELIX_LIBS="$build_helix" + fi + build_helix=$HELIX_LIBS + { echo "$as_me:$LINENO: result: using $HELIX_LIBS" >&5 +echo "${ECHO_T}using $HELIX_LIBS" >&6; } + fi + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_HELIX 1 +_ACEOF + + if test "$build_helix" = "yes"; then + HELIX_LIBS="/usr/local/RealPlayer" + { echo "$as_me:$LINENO: result: \"not found, using default dir\"" >&5 +echo "${ECHO_T}\"not found, using default dir\"" >&6; } + fi cat >>confdefs.h <<_ACEOF -#define SIZEOF_LONG $ac_cv_sizeof_long +#define HELIX_LIBS "${HELIX_LIBS}" _ACEOF - { echo "$as_me:$LINENO: checking for char *" >&5 -echo $ECHO_N "checking for char *... $ECHO_C" >&6; } -if test "${ac_cv_type_char_p+set}" = set; then + if test "$PKGCONFIGFOUND" = "yes" ; then + + succeeded=no + + if test -z "$PKG_CONFIG"; then + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_PKG_CONFIG+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. */ -$ac_includes_default -typedef char * ac__type_new_; -int -main () -{ -if ((ac__type_new_ *) 0) - return 0; -if (sizeof (ac__type_new_)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 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_objext; then - ac_cv_type_char_p=yes +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_char_p=no + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_char_p" >&5 -echo "${ECHO_T}$ac_cv_type_char_p" >&6; } -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ echo "$as_me:$LINENO: checking size of char *" >&5 -echo $ECHO_N "checking size of char *... $ECHO_C" >&6; } -if test "${ac_cv_sizeof_char_p+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef char * ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; -test_array [0] = 0 + fi - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - ac_lo=0 ac_mid=0 - while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef char * ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; -test_array [0] = 0 + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + { echo "$as_me:$LINENO: checking for alsa" >&5 +echo $ECHO_N "checking for alsa... $ECHO_C" >&6; } + + if $PKG_CONFIG --exists "alsa" ; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + succeeded=yes + + { echo "$as_me:$LINENO: checking ALSALIB_CFLAGS" >&5 +echo $ECHO_N "checking ALSALIB_CFLAGS... $ECHO_C" >&6; } + ALSALIB_CFLAGS=`$PKG_CONFIG --cflags "alsa"` + { echo "$as_me:$LINENO: result: $ALSALIB_CFLAGS" >&5 +echo "${ECHO_T}$ALSALIB_CFLAGS" >&6; } + + { echo "$as_me:$LINENO: checking ALSALIB_LIBS" >&5 +echo $ECHO_N "checking ALSALIB_LIBS... $ECHO_C" >&6; } + ALSALIB_LIBS=`$PKG_CONFIG --libs "alsa"` + { echo "$as_me:$LINENO: result: $ALSALIB_LIBS" >&5 +echo "${ECHO_T}$ALSALIB_LIBS" >&6; } + else + ALSALIB_CFLAGS="" + ALSALIB_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + ALSALIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "alsa"` - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - ac_hi=$ac_mid; break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + fi - ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef char * ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; -test_array [0] = 0 + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - ac_hi=-1 ac_mid=-1 - while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef char * ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; -test_array [0] = 0 + if test $succeeded = yes; then + have_alsa=yes + else + have_alsa=no + fi - ; - return 0; -} + if test "$have_alsa" = "yes" ; then + +cat >>confdefs.h <<\_ACEOF +#define USE_HELIX_ALSA 1 _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - ac_lo=$ac_mid; break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` + fi + fi fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done + if test x$build_helix != xno; then + with_helix_TRUE= + with_helix_FALSE='#' else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_lo= ac_hi= + with_helix_TRUE='#' + with_helix_FALSE= fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -# Binary search between lo and hi bounds. -while test "x$ac_lo" != "x$ac_hi"; do - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef char * ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; -test_array [0] = 0 +############################################################################### +# END HELIX CHECK +############################################################################### - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - ac_hi=$ac_mid +############################################################################### +# BEGIN yauap CHECK +############################################################################### + + +# Check whether --with-yauap was given. +if test "${with_yauap+set}" = set; then + withval=$with_yauap; build_yauap=$withval else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + build_yauap=no - ac_lo=`expr '(' $ac_mid ')' + 1` fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +if test "$build_yauap" != "no"; then + if test "$PKGCONFIGFOUND" = "yes" ; then + # check for dbus-glib + have_yauap=no + + + succeeded=no + + if test -z "$PKG_CONFIG"; then + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi done -case $ac_lo in -?*) ac_cv_sizeof_char_p=$ac_lo;; -'') if test "$ac_cv_type_char_p" = yes; then - { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *) -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (char *) -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } - else - ac_cv_sizeof_char_p=0 - fi ;; +done +IFS=$as_save_IFS + + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef char * ac__type_sizeof_; -static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } -static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } -#include -#include -int -main () -{ + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi - FILE *f = fopen ("conftest.val", "w"); - if (! f) - return 1; - if (((long int) (sizeof (ac__type_sizeof_))) < 0) - { - long int i = longval (); - if (i != ((long int) (sizeof (ac__type_sizeof_)))) - return 1; - fprintf (f, "%ld\n", i); - } + + fi + + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." else - { - unsigned long int i = ulongval (); - if (i != ((long int) (sizeof (ac__type_sizeof_)))) - return 1; - fprintf (f, "%lu\n", i); - } - return ferror (f) || fclose (f) != 0; + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + { echo "$as_me:$LINENO: checking for dbus-1" >&5 +echo $ECHO_N "checking for dbus-1... $ECHO_C" >&6; } - ; - return 0; -} + if $PKG_CONFIG --exists "dbus-1" ; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + succeeded=yes + + { echo "$as_me:$LINENO: checking DBUS_CFLAGS" >&5 +echo $ECHO_N "checking DBUS_CFLAGS... $ECHO_C" >&6; } + DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1"` + { echo "$as_me:$LINENO: result: $DBUS_CFLAGS" >&5 +echo "${ECHO_T}$DBUS_CFLAGS" >&6; } + + { echo "$as_me:$LINENO: checking DBUS_LIBS" >&5 +echo $ECHO_N "checking DBUS_LIBS... $ECHO_C" >&6; } + DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1"` + { echo "$as_me:$LINENO: result: $DBUS_LIBS" >&5 +echo "${ECHO_T}$DBUS_LIBS" >&6; } + else + DBUS_CFLAGS="" + DBUS_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-1"` + + fi + + + + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + have_yauap=yes + else + have_yauap=no + fi + + + + if test "x$have_yauap" = "xno"; then + LIB_YAUAP="" + CFLAGS_YAUAP="" + else + LIB_YAUAP="$DBUS_LIBS -ldbus-qt-1" + CFLAGS_YAUAP="$DBUS_CFLAGS" + + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_YAUAP 1 _ACEOF -rm -f 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>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (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_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sizeof_char_p=`cat conftest.val` -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -( exit $ac_status ) -if test "$ac_cv_type_char_p" = yes; then - { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *) -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (char *) -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } - else - ac_cv_sizeof_char_p=0 - fi -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi + fi fi -rm -f conftest.val + + if test x$have_yauap = xyes; then + with_yauap_TRUE= + with_yauap_FALSE='#' +else + with_yauap_TRUE='#' + with_yauap_FALSE= fi -{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5 -echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6; } +############################################################################### +# END yauap CHECK +############################################################################### -cat >>confdefs.h <<_ACEOF -#define SIZEOF_CHAR_P $ac_cv_sizeof_char_p -_ACEOF +############################################################################### +# BEGIN stdint.h CHECK +############################################################################### -{ 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 +if test "${ac_cv_header_stdint_h+set}" = set; then + { echo "$as_me:$LINENO: checking for stdint.h" >&5 +echo $ECHO_N "checking for stdint.h... $ECHO_C" >&6; } +if test "${ac_cv_header_stdint_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_stdint_h" >&5 +echo "${ECHO_T}$ac_cv_header_stdint_h" >&6; } else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" + # Is the header compilable? +{ echo "$as_me:$LINENO: checking stdint.h usability" >&5 +echo $ECHO_N "checking stdint.h usability... $ECHO_C" >&6; } 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; -} +$ac_includes_default +#include _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" 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 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -27413,107 +34749,109 @@ (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 + } && test -s conftest.$ac_objext; then + ac_header_compiler=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 - -LIBDL="-ldl" -ac_cv_have_dlfcn=yes - + ac_header_compiler=no fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } -{ echo "$as_me:$LINENO: checking for shl_unload in -ldld" >&5 -echo $ECHO_N "checking for shl_unload in -ldld... $ECHO_C" >&6; } -if test "${ac_cv_lib_dld_shl_unload+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" +# Is the header present? +{ echo "$as_me:$LINENO: checking stdint.h presence" >&5 +echo $ECHO_N "checking stdint.h presence... $ECHO_C" >&6; } 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_unload (); -int -main () -{ -return shl_unload (); - ; - return 0; -} +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +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_link") 2>conftest.er1 + (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); } && { - test -z "$ac_c_werror_flag" || + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$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_unload=yes + }; then + ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_dld_shl_unload=no + ac_header_preproc=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_unload" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_shl_unload" >&6; } -if test $ac_cv_lib_dld_shl_unload = yes; then +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } -LIBDL="-ldld" -ac_cv_have_shload=yes +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: stdint.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: stdint.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: stdint.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: stdint.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: stdint.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: stdint.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: stdint.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: stdint.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: stdint.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: stdint.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: stdint.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: stdint.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: stdint.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: stdint.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: stdint.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: stdint.h: in the future, the compiler will take precedence" >&2;} + ;; +esac +{ echo "$as_me:$LINENO: checking for stdint.h" >&5 +echo $ECHO_N "checking for stdint.h... $ECHO_C" >&6; } +if test "${ac_cv_header_stdint_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_stdint_h=$ac_header_preproc fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_stdint_h" >&5 +echo "${ECHO_T}$ac_cv_header_stdint_h" >&6; } +fi +############################################################################### +# END stdint.h CHECK +############################################################################### +############################################################################### +# BEGIN fabsf CHECK +############################################################################### - { echo "$as_me:$LINENO: checking for size_t" >&5 -echo $ECHO_N "checking for size_t... $ECHO_C" >&6; } -if test "${ac_cv_type_size_t+set}" = set; then +{ echo "$as_me:$LINENO: checking whether fabsf is declared" >&5 +echo $ECHO_N "checking whether fabsf is declared... $ECHO_C" >&6; } +if test "${ac_cv_have_decl_fabsf+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -27522,15 +34860,15 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default -typedef size_t ac__type_new_; +#include + int main () { -if ((ac__type_new_ *) 0) - return 0; -if (sizeof (ac__type_new_)) - return 0; +#ifndef fabsf + (void) fabsf; +#endif + ; return 0; } @@ -27552,44 +34890,46 @@ test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_type_size_t=yes + ac_cv_have_decl_fabsf=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_type_size_t=no + ac_cv_have_decl_fabsf=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 -echo "${ECHO_T}$ac_cv_type_size_t" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_fabsf" >&5 +echo "${ECHO_T}$ac_cv_have_decl_fabsf" >&6; } +if test $ac_cv_have_decl_fabsf = yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_FABSF 1 +_ACEOF + -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ echo "$as_me:$LINENO: checking size of size_t" >&5 -echo $ECHO_N "checking size of size_t... $ECHO_C" >&6; } -if test "${ac_cv_sizeof_size_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. -cat >conftest.$ac_ext <<_ACEOF + cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_FABSF 0 +_ACEOF + + +fi + + +if test "$ac_cv_have_decl_fabsf" = "yes"; then + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default - typedef size_t ac__type_sizeof_; +#include int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; -test_array [0] = 0 - +return (int)fabsf(1.f); ; return 0; } @@ -27611,25 +34951,58 @@ test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_lo=0 ac_mid=0 - while :; do - cat >conftest.$ac_ext <<_ACEOF + +cat >>confdefs.h <<\_ACEOF +#define HAVE_FABSF 1 +_ACEOF + +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +############################################################################### +# END fabsf CHECK +############################################################################### + + + + + +############################################################################### +# BEGIN INOTIFY CHECK +############################################################################### + + +for ac_header in linux/inotify.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default - typedef size_t ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; -test_array [0] = 0 - - ; - return 0; -} +#include <$ac_header> _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -27648,277 +35021,384 @@ test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_hi=$ac_mid; break + ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` + ac_header_compiler=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } - cat >conftest.$ac_ext <<_ACEOF +# Is the header present? +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default - typedef size_t ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; -test_array [0] = 0 - - ; - return 0; -} +#include <$ac_header> _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +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_compile") 2>conftest.er1 + (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); } && { - test -z "$ac_c_werror_flag" || + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_hi=-1 ac_mid=-1 - while :; do + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi + +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + + ;; +esac +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + +if test x"$ac_cv_header_linux_inotify_h" = x"yes"; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_INOTIFY 1 +_ACEOF + +fi + +############################################################################### +# END INOTIFY CHECK +############################################################################### + + + +############################################################################### +# BEGIN QT OPENGL CHECK +############################################################################### + + +# Check whether --with-opengl was given. +if test "${with_opengl+set}" = set; then + withval=$with_opengl; build_opengl=$withval +else + build_opengl=yes + +fi + + +if test "$build_opengl" != "no"; then + { echo "$as_me:$LINENO: checking for Qt with OpenGL support" >&5 +echo $ECHO_N "checking for Qt with OpenGL support... $ECHO_C" >&6; } + if test "${ac_cv_kde_qt_has_opengl+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" + save_LIBS="$LIBS" + save_LDFLAGS="$LDFLAGS" + + CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes" + LDFLAGS="$LDFLAGS -L$qt_libdir $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS" + LIBS="$LIBS $LIBQT $KDE_MT_LIBS" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default - typedef size_t ac__type_sizeof_; + + #include + int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; -test_array [0] = 0 + + (void)new QGLWidget((QWidget*)0, "qgl"); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +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_compile") 2>conftest.er1 + (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 -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_lo=$ac_mid; break + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_kde_qt_has_opengl=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` + ac_cv_kde_qt_has_opengl=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + + CXXFLAGS="$save_CXXFLAGS" + LIBS="$save_LIBS" + LDFLAGS="$save_LDFLAGS" + 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 + + { echo "$as_me:$LINENO: result: $ac_cv_kde_qt_has_opengl" >&5 +echo "${ECHO_T}$ac_cv_kde_qt_has_opengl" >&6; } + + if test x$ac_cv_kde_qt_has_opengl = xyes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_QGLWIDGET 1 +_ACEOF + + gl_libs="-lGL" + else + gl_libs="" + fi + + +fi + +############################################################################### +# END QT OPENGL CHECK +############################################################################### + + + +############################################################################### +# BEGIN SQLITE CHECK +############################################################################### + +LIB_SQLITE="" + + +# Check whether --with-included-sqlite was given. +if test "${with_included_sqlite+set}" = set; then + withval=$with_included_sqlite; included_sqlite=$withval +else + included_sqlite=yes + +fi + + +if test x$included_sqlite = xno; then + if test x$PKGCONFIGFOUND = xyes; then + + succeeded=no + + if test -z "$PKG_CONFIG"; then + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_lo= ac_hi= -fi + fi + + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + { echo "$as_me:$LINENO: checking for sqlite3 >= 3.0" >&5 +echo $ECHO_N "checking for sqlite3 >= 3.0... $ECHO_C" >&6; } + + if $PKG_CONFIG --exists "sqlite3 >= 3.0" ; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + succeeded=yes + + { echo "$as_me:$LINENO: checking SQLITE_CFLAGS" >&5 +echo $ECHO_N "checking SQLITE_CFLAGS... $ECHO_C" >&6; } + SQLITE_CFLAGS=`$PKG_CONFIG --cflags "sqlite3 >= 3.0"` + { echo "$as_me:$LINENO: result: $SQLITE_CFLAGS" >&5 +echo "${ECHO_T}$SQLITE_CFLAGS" >&6; } + + { echo "$as_me:$LINENO: checking SQLITE_LIBS" >&5 +echo $ECHO_N "checking SQLITE_LIBS... $ECHO_C" >&6; } + SQLITE_LIBS=`$PKG_CONFIG --libs "sqlite3 >= 3.0"` + { echo "$as_me:$LINENO: result: $SQLITE_LIBS" >&5 +echo "${ECHO_T}$SQLITE_LIBS" >&6; } + else + SQLITE_CFLAGS="" + SQLITE_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + SQLITE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "sqlite3 >= 3.0"` + + fi + -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -# Binary search between lo and hi bounds. -while test "x$ac_lo" != "x$ac_hi"; do - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef size_t ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; -test_array [0] = 0 + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - ac_hi=$ac_mid -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + if test $succeeded = yes; then + have_sqlite=yes + else + have_sqlite=no + fi - ac_lo=`expr '(' $ac_mid ')' + 1` -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -done -case $ac_lo in -?*) ac_cv_sizeof_size_t=$ac_lo;; -'') if test "$ac_cv_type_size_t" = yes; then - { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t) -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (size_t) -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } - else - ac_cv_sizeof_size_t=0 - fi ;; -esac -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef size_t ac__type_sizeof_; -static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } -static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } -#include -#include -int -main () -{ + if test x$have_sqlite = xyes; then + ## AC_DEFINE(HAVE_SQLITE, 1, [have SQLite database library]) + LIB_SQLITE=`pkg-config --libs sqlite3` + else + # We don't support not having sqlite anymore + DO_NOT_COMPILE="$DO_NOT_COMPILE amarok" + no_amarok=yes + fi + fi +fi - FILE *f = fopen ("conftest.val", "w"); - if (! f) - return 1; - if (((long int) (sizeof (ac__type_sizeof_))) < 0) - { - long int i = longval (); - if (i != ((long int) (sizeof (ac__type_sizeof_)))) - return 1; - fprintf (f, "%ld\n", i); - } - else - { - unsigned long int i = ulongval (); - if (i != ((long int) (sizeof (ac__type_sizeof_)))) - return 1; - fprintf (f, "%lu\n", i); - } - return ferror (f) || fclose (f) != 0; - ; - return 0; -} -_ACEOF -rm -f 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>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (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_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sizeof_size_t=`cat conftest.val` + if test x$included_sqlite = xyes; then + with_included_sqlite_TRUE= + with_included_sqlite_FALSE='#' else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -if test "$ac_cv_type_size_t" = yes; then - { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t) -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (size_t) -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } - else - ac_cv_sizeof_size_t=0 - fi -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -rm -f conftest.val + with_included_sqlite_TRUE='#' + with_included_sqlite_FALSE= fi -{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5 -echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6; } -cat >>confdefs.h <<_ACEOF -#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t -_ACEOF - +# Determine pointer size for sqlite - { echo "$as_me:$LINENO: checking for unsigned long" >&5 -echo $ECHO_N "checking for unsigned long... $ECHO_C" >&6; } -if test "${ac_cv_type_unsigned_long+set}" = set; then + { echo "$as_me:$LINENO: checking for int" >&5 +echo $ECHO_N "checking for int... $ECHO_C" >&6; } +if test "${ac_cv_type_int+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -27928,7 +35408,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -typedef unsigned long ac__type_new_; +typedef int ac__type_new_; int main () { @@ -27957,26 +35437,26 @@ test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_type_unsigned_long=yes + ac_cv_type_int=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_type_unsigned_long=no + ac_cv_type_int=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5 -echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5 +echo "${ECHO_T}$ac_cv_type_int" >&6; } # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. -{ echo "$as_me:$LINENO: checking size of unsigned long" >&5 -echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6; } -if test "${ac_cv_sizeof_unsigned_long+set}" = set; then +{ echo "$as_me:$LINENO: checking size of int" >&5 +echo $ECHO_N "checking size of int... $ECHO_C" >&6; } +if test "${ac_cv_sizeof_int+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$cross_compiling" = yes; then @@ -27988,7 +35468,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default - typedef unsigned long ac__type_sizeof_; + typedef int ac__type_sizeof_; int main () { @@ -28025,7 +35505,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default - typedef unsigned long ac__type_sizeof_; + typedef int ac__type_sizeof_; int main () { @@ -28079,7 +35559,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default - typedef unsigned long ac__type_sizeof_; + typedef int ac__type_sizeof_; int main () { @@ -28100,424 +35580,96 @@ (eval "$ac_compile") 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_objext; then - ac_hi=-1 ac_mid=-1 - while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef unsigned long ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - ac_lo=$ac_mid; break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_lo= ac_hi= -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -# Binary search between lo and hi bounds. -while test "x$ac_lo" != "x$ac_hi"; do - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef unsigned long ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - ac_hi=$ac_mid -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_lo=`expr '(' $ac_mid ')' + 1` -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -done -case $ac_lo in -?*) ac_cv_sizeof_unsigned_long=$ac_lo;; -'') if test "$ac_cv_type_unsigned_long" = yes; then - { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long) -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (unsigned long) -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } - else - ac_cv_sizeof_unsigned_long=0 - fi ;; -esac -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef unsigned long ac__type_sizeof_; -static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } -static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } -#include -#include -int -main () -{ - - FILE *f = fopen ("conftest.val", "w"); - if (! f) - return 1; - if (((long int) (sizeof (ac__type_sizeof_))) < 0) - { - long int i = longval (); - if (i != ((long int) (sizeof (ac__type_sizeof_)))) - return 1; - fprintf (f, "%ld\n", i); - } - else - { - unsigned long int i = ulongval (); - if (i != ((long int) (sizeof (ac__type_sizeof_)))) - return 1; - fprintf (f, "%lu\n", i); - } - return ferror (f) || fclose (f) != 0; - - ; - return 0; -} -_ACEOF -rm -f 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>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (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_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sizeof_unsigned_long=`cat conftest.val` -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -if test "$ac_cv_type_unsigned_long" = yes; then - { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long) -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (unsigned long) -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } - else - ac_cv_sizeof_unsigned_long=0 - fi -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -rm -f conftest.val -fi -{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5 -echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6; } - - - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long -_ACEOF - - - - { echo "$as_me:$LINENO: checking sizeof size_t == sizeof unsigned long" >&5 -echo $ECHO_N "checking sizeof size_t == sizeof unsigned long... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - #if SIZEOF_SIZE_T != SIZEOF_UNSIGNED_LONG - choke me - #endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - { { echo "$as_me:$LINENO: error: - Apparently on your system our assumption sizeof size_t == sizeof unsigned long - does not apply. Please mail kde-devel@kde.org with a description of your system! - " >&5 -echo "$as_me: error: - Apparently on your system our assumption sizeof size_t == sizeof unsigned long - does not apply. Please mail kde-devel@kde.org with a description of your system! - " >&2;} - { (exit 1); exit 1; }; } - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - - { echo "$as_me:$LINENO: checking for PIE support" >&5 -echo $ECHO_N "checking for PIE support... $ECHO_C" >&6; } -if test "${kde_cv_val_pie_support+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' - - - safe_CXXFLAGS=$CXXFLAGS - safe_LDFLAGS=$LDFLAGS - CXXFLAGS="$CXXFLAGS -fPIE" - LDFLAGS="$LDFLAGS -pie" - + 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_objext; then + ac_hi=-1 ac_mid=-1 + while :; do cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -int foo; +$ac_includes_default + typedef int ac__type_sizeof_; int main () { +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; +test_array [0] = 0 ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" 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 + (eval "$ac_compile") 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 -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - kde_cv_val_pie_support=yes + } && test -s conftest.$ac_objext; then + ac_lo=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - kde_cv_val_pie_support=no + ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - - CXXFLAGS=$safe_CXXFLAGS - LDFLAGS=$safe_LDFLAGS - 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 - +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_lo= ac_hi= fi -{ echo "$as_me:$LINENO: result: $kde_cv_val_pie_support" >&5 -echo "${ECHO_T}$kde_cv_val_pie_support" >&6; } - - { echo "$as_me:$LINENO: checking if enabling -pie/fPIE support" >&5 -echo $ECHO_N "checking if enabling -pie/fPIE support... $ECHO_C" >&6; } - # Check whether --enable-pie was given. -if test "${enable_pie+set}" = set; then - enableval=$enable_pie; kde_has_pie_support=$enableval -else - kde_has_pie_support=detect +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - - if test "$kde_has_pie_support" = "detect"; then - kde_has_pie_support=$kde_cv_val_pie_support - fi - - { echo "$as_me:$LINENO: result: $kde_has_pie_support" >&5 -echo "${ECHO_T}$kde_has_pie_support" >&6; } - - KDE_USE_FPIE="" - KDE_USE_PIE="" - - - - - if test "$kde_has_pie_support" = "yes"; then - KDE_USE_FPIE="-fPIE" - KDE_USE_PIE="-pie" - fi - - -# darwin needs this to initialize the environment - -for ac_header in crt_externs.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include <$ac_header> + typedef int ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -28536,106 +35688,121 @@ test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_header_compiler=yes + ac_hi=$ac_mid else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no + ac_lo=`expr '(' $ac_mid ')' + 1` fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF +done +case $ac_lo in +?*) ac_cv_sizeof_int=$ac_lo;; +'') if test "$ac_cv_type_int" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (int) +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute sizeof (int) +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_int=0 + fi ;; +esac +else + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <$ac_header> +$ac_includes_default + typedef int ac__type_sizeof_; +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } +#include +#include +int +main () +{ + + FILE *f = fopen ("conftest.val", "w"); + if (! f) + return 1; + if (((long int) (sizeof (ac__type_sizeof_))) < 0) + { + long int i = longval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; + fprintf (f, "%ld\n", i); + } + else + { + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; + fprintf (f, "%lu\n", i); + } + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" +rm -f 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_cpp conftest.$ac_ext") 2>conftest.er1 + (eval "$ac_link") 2>&5 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_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (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_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sizeof_int=`cat conftest.val` else - echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no +( exit $ac_status ) +if test "$ac_cv_type_int" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (int) +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute sizeof (int) +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_int=0 + fi fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - +rm -f conftest.val fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5 +echo "${ECHO_T}$ac_cv_sizeof_int" >&6; } -fi -done -{ echo "$as_me:$LINENO: checking for _NSGetEnviron" >&5 -echo $ECHO_N "checking for _NSGetEnviron... $ECHO_C" >&6; } -if test "${ac_cv_func__NSGetEnviron+set}" = set; then +cat >>confdefs.h <<_ACEOF +#define SIZEOF_INT $ac_cv_sizeof_int +_ACEOF + + { echo "$as_me:$LINENO: checking for short" >&5 +echo $ECHO_N "checking for short... $ECHO_C" >&6; } +if test "${ac_cv_type_short+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -28644,53 +35811,27 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define _NSGetEnviron to an innocuous variant, in case declares _NSGetEnviron. - For example, HP-UX 11i declares gettimeofday. */ -#define _NSGetEnviron innocuous__NSGetEnviron - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char _NSGetEnviron (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef _NSGetEnviron - -/* 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 _NSGetEnviron (); -/* 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__NSGetEnviron || defined __stub____NSGetEnviron -choke me -#endif - +$ac_includes_default +typedef short ac__type_new_; int main () { -return _NSGetEnviron (); +if ((ac__type_new_ *) 0) + return 0; +if (sizeof (ac__type_new_)) + return 0; ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" 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 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -28699,319 +35840,148 @@ (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__NSGetEnviron=yes + } && test -s conftest.$ac_objext; then + ac_cv_type_short=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_func__NSGetEnviron=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext + ac_cv_type_short=no fi -{ echo "$as_me:$LINENO: result: $ac_cv_func__NSGetEnviron" >&5 -echo "${ECHO_T}$ac_cv_func__NSGetEnviron" >&6; } -if test $ac_cv_func__NSGetEnviron = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_NSGETENVIRON 1 -_ACEOF +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi +{ echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5 +echo "${ECHO_T}$ac_cv_type_short" >&6; } - - - - - - - - - -for ac_func in vsnprintf snprintf -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ echo "$as_me:$LINENO: checking size of short" >&5 +echo $ECHO_N "checking size of short... $ECHO_C" >&6; } +if test "${ac_cv_sizeof_short+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* 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 $ac_func (); -/* 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_$ac_func || defined __stub___$ac_func -choke me -#endif - +$ac_includes_default + typedef short ac__type_sizeof_; int main () { -return $ac_func (); +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; +test_array [0] = 0 + ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" 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 + (eval "$ac_compile") 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 - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - - - - - - - - - -# Check whether --enable-embedded was given. -if test "${enable_embedded+set}" = set; then - enableval=$enable_embedded; kde_use_qt_emb=$enableval -else - kde_use_qt_emb=no - -fi - - -# Check whether --enable-qtopia was given. -if test "${enable_qtopia+set}" = set; then - enableval=$enable_qtopia; kde_use_qt_emb_palm=$enableval -else - kde_use_qt_emb_palm=no - -fi - - -# Check whether --enable-mac was given. -if test "${enable_mac+set}" = set; then - enableval=$enable_mac; kde_use_qt_mac=$enableval -else - kde_use_qt_mac=no - -fi - - -# used to disable x11-specific stuff on special platforms - if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then - include_x11_TRUE= - include_x11_FALSE='#' -else - include_x11_TRUE='#' - include_x11_FALSE= -fi - - -if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then - -{ echo "$as_me:$LINENO: checking for X" >&5 -echo $ECHO_N "checking for X... $ECHO_C" >&6; } - -if test "${kde_cv_have_x+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # One or both of the vars are not set, and there is no cached value. -if test "{$x_includes+set}" = set || test "$x_includes" = NONE; then - kde_x_includes=NO -else - kde_x_includes=$x_includes -fi -if test "{$x_libraries+set}" = set || test "$x_libraries" = NONE; then - kde_x_libraries=NO -else - kde_x_libraries=$x_libraries -fi - -# below we use the standard autoconf calls -ac_x_libraries=$kde_x_libraries -ac_x_includes=$kde_x_includes - - - - -if test "$ac_x_includes" = NO; then - # Guess where to find include files, by looking for this one X11 .h file. - test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h - - # First, try using that file with no special directory specified. -cat >conftest.$ac_ext <<_ACEOF + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <$x_direct_test_include> +$ac_includes_default + typedef short ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" 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 + (eval "$ac_compile") 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_c_preproc_warn_flag$ac_c_werror_flag" || + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || test ! -s conftest.err - }; then - # We can compile using X headers with no special include directory. -ac_x_includes= + } && test -s conftest.$ac_objext; then + ac_hi=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - # Look for the header file in a standard set of common directories. -# Check X11 before X11Rn because it is often a symlink to the current release. - for ac_dir in \ - /usr/X11/include \ - /usr/X11R6/include \ - /usr/X11R5/include \ - /usr/X11R4/include \ - \ - /usr/include/X11 \ - /usr/include/X11R6 \ - /usr/include/X11R5 \ - /usr/include/X11R4 \ - \ - /usr/local/X11/include \ - /usr/local/X11R6/include \ - /usr/local/X11R5/include \ - /usr/local/X11R4/include \ - \ - /usr/local/include/X11 \ - /usr/local/include/X11R6 \ - /usr/local/include/X11R5 \ - /usr/local/include/X11R4 \ - \ - /usr/X386/include \ - /usr/x386/include \ - /usr/XFree86/include/X11 \ - \ - /usr/include \ - /usr/local/include \ - /usr/unsupported/include \ - /usr/athena/include \ - /usr/local/x11r5/include \ - /usr/lpp/Xamples/include \ - \ - /usr/openwin/include \ - /usr/openwin/share/include \ - ; \ - do - if test -r "$ac_dir/$x_direct_test_include"; then - ac_x_includes=$ac_dir - break - fi - done + ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi -rm -f conftest.err conftest.$ac_ext -fi # $ac_x_includes = NO - -if test "$ac_x_libraries" = NO; then - # Check for the libraries. - - test -z "$x_direct_test_library" && x_direct_test_library=Xt - test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - # See if we find them without any special options. - # Don't add to $LIBS permanently. - ac_save_LIBS="$LIBS" - LIBS="-l$x_direct_test_library $LIBS" -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +$ac_includes_default + typedef short ac__type_sizeof_; int main () { -${x_direct_test_function}(1) +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; +test_array [0] = 0 + ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" 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 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -29020,224 +35990,35 @@ (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 - LIBS="$ac_save_LIBS" -# We can link X programs with no special library path. -ac_x_libraries= -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - LIBS="$ac_save_LIBS" -# First see if replacing the include by lib works. -# Check X11 before X11Rn because it is often a symlink to the current release. -for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \ - /usr/X11/lib${kdelibsuff} \ - /usr/X11R6/lib${kdelibsuff} \ - /usr/X11R5/lib${kdelibsuff} \ - /usr/X11R4/lib${kdelibsuff} \ - \ - /usr/lib${kdelibsuff}/X11 \ - /usr/lib${kdelibsuff}/X11R6 \ - /usr/lib${kdelibsuff}/X11R5 \ - /usr/lib${kdelibsuff}/X11R4 \ - \ - /usr/local/X11/lib${kdelibsuff} \ - /usr/local/X11R6/lib${kdelibsuff} \ - /usr/local/X11R5/lib${kdelibsuff} \ - /usr/local/X11R4/lib${kdelibsuff} \ - \ - /usr/local/lib${kdelibsuff}/X11 \ - /usr/local/lib${kdelibsuff}/X11R6 \ - /usr/local/lib${kdelibsuff}/X11R5 \ - /usr/local/lib${kdelibsuff}/X11R4 \ - \ - /usr/X386/lib${kdelibsuff} \ - /usr/x386/lib${kdelibsuff} \ - /usr/XFree86/lib${kdelibsuff}/X11 \ - \ - /usr/lib${kdelibsuff} \ - /usr/local/lib${kdelibsuff} \ - /usr/unsupported/lib${kdelibsuff} \ - /usr/athena/lib${kdelibsuff} \ - /usr/local/x11r5/lib${kdelibsuff} \ - /usr/lpp/Xamples/lib${kdelibsuff} \ - /lib/usr/lib${kdelibsuff}/X11 \ - \ - /usr/openwin/lib${kdelibsuff} \ - /usr/openwin/share/lib${kdelibsuff} \ - ; \ -do - for ac_extension in a so sl; do - if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then - ac_x_libraries=$ac_dir - break 2 - fi - done -done -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi # $ac_x_libraries = NO - -case "$host" in -mips-sgi-irix6*) - ;; -*-*-solaris*) - ;; -*) - rm -f -r conftest.dir -if mkdir conftest.dir; then - cd conftest.dir - cat >Imakefile <<'_ACEOF' -incroot: - @echo incroot='${INCROOT}' -usrlibdir: - @echo usrlibdir='${USRLIBDIR}' -libdir: - @echo libdir='${LIBDIR}' -_ACEOF - if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then - # GNU make sometimes prints "make[1]: Entering...", which would confuse us. - for ac_var in incroot usrlibdir libdir; do - eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" - done - # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. - for ac_extension in a so sl; do - if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && - test -f "$ac_im_libdir/libX11.$ac_extension"; then - ac_im_usrlibdir=$ac_im_libdir; break - fi - done - # Screen out bogus values from the imake configuration. They are - # bogus both because they are the default anyway, and because - # using them would break gcc on systems where it needs fixed includes. - case $ac_im_incroot in - /usr/include) ac_x_includes= ;; - *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; - esac - case $ac_im_usrlibdir in - /usr/lib | /lib) ;; - *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; - esac - fi - cd .. - rm -f -r conftest.dir -fi - - if test -z "$ac_x_includes"; then - ac_x_includes="." - fi - if test -z "$ac_x_libraries"; then - ac_x_libraries="/usr/lib${kdelibsuff}" - fi -esac -#from now on we use our own again - -# when the user already gave --x-includes, we ignore -# what the standard autoconf macros told us. -if test "$kde_x_includes" = NO; then - kde_x_includes=$ac_x_includes -fi - -# for --x-libraries too -if test "$kde_x_libraries" = NO; then - kde_x_libraries=$ac_x_libraries -fi - -if test "$kde_x_includes" = NO; then - { { echo "$as_me:$LINENO: error: Can't find X includes. Please check your installation and add the correct paths!" >&5 -echo "$as_me: error: Can't find X includes. Please check your installation and add the correct paths!" >&2;} - { (exit 1); exit 1; }; } -fi - -if test "$kde_x_libraries" = NO; then - { { echo "$as_me:$LINENO: error: Can't find X libraries. Please check your installation and add the correct paths!" >&5 -echo "$as_me: error: Can't find X libraries. Please check your installation and add the correct paths!" >&2;} - { (exit 1); exit 1; }; } -fi - -# Record where we found X for the cache. -kde_cv_have_x="have_x=yes \ - kde_x_includes=$kde_x_includes kde_x_libraries=$kde_x_libraries" - -fi - -eval "$kde_cv_have_x" - -if test "$have_x" != yes; then - { echo "$as_me:$LINENO: result: $have_x" >&5 -echo "${ECHO_T}$have_x" >&6; } - no_x=yes -else - { echo "$as_me:$LINENO: result: libraries $kde_x_libraries, headers $kde_x_includes" >&5 -echo "${ECHO_T}libraries $kde_x_libraries, headers $kde_x_includes" >&6; } -fi - -if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then - X_INCLUDES="" - x_includes="."; else - x_includes=$kde_x_includes - X_INCLUDES="-I$x_includes" -fi - -if test -z "$kde_x_libraries" || test "x$kde_x_libraries" = xNONE || test "$kde_x_libraries" = "/usr/lib"; then - X_LDFLAGS="" - x_libraries="/usr/lib"; else - x_libraries=$kde_x_libraries - X_LDFLAGS="-L$x_libraries" -fi -all_includes="$X_INCLUDES" -all_libraries="$X_LDFLAGS $LDFLAGS_AS_NEEDED $LDFLAGS_NEW_DTAGS" - -# Check for libraries that X11R6 Xt/Xaw programs need. -ac_save_LDFLAGS="$LDFLAGS" -LDFLAGS="$LDFLAGS $X_LDFLAGS" -# SM needs ICE to (dynamically) link under SunOS 4.x (so we have to -# check for ICE first), but we must link in the order -lSM -lICE or -# we get undefined symbols. So assume we have SM if we have ICE. -# These have to be linked with before -lX11, unlike the other -# libraries we check for below, so use a different variable. -# --interran@uluru.Stanford.EDU, kb@cs.umb.edu. -{ echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 -echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; } -if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lICE $X_EXTRA_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF + } && test -s conftest.$ac_objext; then + ac_hi=-1 ac_mid=-1 + while :; do + 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 IceConnectionNumber (); +$ac_includes_default + typedef short ac__type_sizeof_; int main () { -return IceConnectionNumber (); +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; +test_array [0] = 0 + ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" 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 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -29246,72 +36027,62 @@ (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_ICE_IceConnectionNumber=yes + } && test -s conftest.$ac_objext; then + ac_lo=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_ICE_IceConnectionNumber=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_ICE_IceConnectionNumber" >&5 -echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; } -if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then - LIBSM="-lSM -lICE" + ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` fi -LDFLAGS="$ac_save_LDFLAGS" - -LIB_X11='-lX11 $(LIBSOCKET)' - -{ echo "$as_me:$LINENO: checking for libXext" >&5 -echo $ECHO_N "checking for libXext... $ECHO_C" >&6; } -if test "${kde_cv_have_libXext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -kde_ldflags_safe="$LDFLAGS" -kde_libs_safe="$LIBS" + ac_lo= ac_hi= +fi -LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS" -LIBS="-lXext -lX11 $LIBSOCKET" +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi -cat >conftest.$ac_ext <<_ACEOF +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -#include -#ifdef STDC_HEADERS -# include -#endif - +$ac_includes_default + typedef short ac__type_sizeof_; int main () { - -printf("hello Xext\n"); +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; +test_array [0] = 0 ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" 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 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -29320,138 +36091,151 @@ (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 - kde_cv_have_libXext=yes + } && test -s conftest.$ac_objext; then + ac_hi=$ac_mid else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - kde_cv_have_libXext=no - -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - -LDFLAGS=$kde_ldflags_safe -LIBS=$kde_libs_safe - -fi - - -{ echo "$as_me:$LINENO: result: $kde_cv_have_libXext" >&5 -echo "${ECHO_T}$kde_cv_have_libXext" >&6; } - -if test "$kde_cv_have_libXext" = "no"; then - { { echo "$as_me:$LINENO: error: We need a working libXext to proceed. Since configure -can't find it itself, we stop here assuming that make wouldn't find -them either." >&5 -echo "$as_me: error: We need a working libXext to proceed. Since configure -can't find it itself, we stop here assuming that make wouldn't find -them either." >&2;} - { (exit 1); exit 1; }; } -fi - -LIB_XEXT="-lXext" -QTE_NORTTI="" - -elif test "$kde_use_qt_emb" = "yes"; then - CPPFLAGS=-DQWS - CXXFLAGS="$CXXFLAGS -fno-rtti" - QTE_NORTTI="-fno-rtti -DQWS" - X_PRE_LIBS="" - LIB_X11="" - LIB_XEXT="" - LIB_XRENDER="" - LIBSM="" - X_INCLUDES="" - X_LDFLAGS="" - x_includes="" - x_libraries="" -elif test "$kde_use_qt_mac" = "yes"; then - CXXFLAGS="$CXXFLAGS -DQT_MAC -no-cpp-precomp" - CFLAGS="$CFLAGS -DQT_MAC -no-cpp-precomp" - X_PRE_LIBS="" - LIB_X11="" - LIB_XEXT="" - LIB_XRENDER="" - LIBSM="" - X_INCLUDES="" - X_LDFLAGS="" - x_includes="" - x_libraries="" + ac_lo=`expr '(' $ac_mid ')' + 1` fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +done +case $ac_lo in +?*) ac_cv_sizeof_short=$ac_lo;; +'') if test "$ac_cv_type_short" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (short) +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute sizeof (short) +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_short=0 + fi ;; +esac +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef short ac__type_sizeof_; +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } +#include +#include +int +main () +{ + FILE *f = fopen ("conftest.val", "w"); + if (! f) + return 1; + if (((long int) (sizeof (ac__type_sizeof_))) < 0) + { + long int i = longval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; + fprintf (f, "%ld\n", i); + } + else + { + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; + fprintf (f, "%lu\n", i); + } + return ferror (f) || fclose (f) != 0; + ; + return 0; +} +_ACEOF +rm -f 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>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (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_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sizeof_short=`cat conftest.val` +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 +( exit $ac_status ) +if test "$ac_cv_type_short" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (short) +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute sizeof (short) +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_short=0 + fi +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +rm -f conftest.val +fi +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5 +echo "${ECHO_T}$ac_cv_sizeof_short" >&6; } +cat >>confdefs.h <<_ACEOF +#define SIZEOF_SHORT $ac_cv_sizeof_short +_ACEOF - - - - - - LIBPTHREAD="" - - if test -n "$PTHREAD_LIBS"; then - if test "x$PTHREAD_LIBS" = "x-pthread" ; then - LIBPTHREAD="PTHREAD" - else - PTHREAD_LIBS_save="$PTHREAD_LIBS" - PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'` - { echo "$as_me:$LINENO: checking for pthread_create in $PTHREAD_LIBS" >&5 -echo $ECHO_N "checking for pthread_create in $PTHREAD_LIBS... $ECHO_C" >&6; } - - kde_save_LDFLAGS="$LDFLAGS" - kde_save_LIBS="$LIBS" - LDFLAGS="$LDFLAGS $all_libraries" - case $host_os in - aix*) LDFLAGS="-brtl $LDFLAGS" - test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS" - ;; - esac - as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for pthread_create in -l$PTHREAD_LIBS" >&5 -echo $ECHO_N "checking for pthread_create in -l$PTHREAD_LIBS... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for long" >&5 +echo $ECHO_N "checking for long... $ECHO_C" >&6; } +if test "${ac_cv_type_long+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-l$PTHREAD_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF + 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 pthread_create (); +$ac_includes_default +typedef long ac__type_new_; int main () { -return pthread_create (); +if ((ac__type_new_ *) 0) + return 0; +if (sizeof (ac__type_new_)) + return 0; ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" 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 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -29460,72 +36244,57 @@ (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 - eval "$as_ac_Lib=yes" + } && test -s conftest.$ac_objext; then + ac_cv_type_long=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - eval "$as_ac_Lib=no" + ac_cv_type_long=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 -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then - LIBPTHREAD="$PTHREAD_LIBS_save" +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi +{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5 +echo "${ECHO_T}$ac_cv_type_long" >&6; } - LDFLAGS="$kde_save_LDFLAGS" - LIBS="$kde_save_LIBS" - - PTHREAD_LIBS="$PTHREAD_LIBS_save" - fi - fi - - if test -z "$LIBPTHREAD"; then - { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 -echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; } -if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ echo "$as_me:$LINENO: checking size of long" >&5 +echo $ECHO_N "checking size of long... $ECHO_C" >&6; } +if test "${ac_cv_sizeof_long+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lpthread $LIBS" + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. 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 pthread_create (); +$ac_includes_default + typedef long ac__type_sizeof_; int main () { -return pthread_create (); +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; +test_array [0] = 0 + ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" 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 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -29534,56 +36303,35 @@ (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_pthread_pthread_create=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_pthread_pthread_create=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_pthread_pthread_create" >&5 -echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; } -if test $ac_cv_lib_pthread_pthread_create = yes; then - LIBPTHREAD="-lpthread" -fi - - fi - - if test -z "$LIBPTHREAD" ; then - { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 -echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; } - kde_safe_libs=$LIBS - LIBS="$LIBS -lpthread" + } && test -s conftest.$ac_objext; then + ac_lo=0 ac_mid=0 + while :; do cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +$ac_includes_default + typedef long ac__type_sizeof_; int main () { -(void)pthread_create(0,0,0,0); +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; +test_array [0] = 0 + ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" 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 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -29592,343 +36340,306 @@ (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 - - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - LIBPTHREAD="-lpthread" + } && test -s conftest.$ac_objext; then + ac_hi=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$kde_safe_libs - fi - - if test "x$LIBPTHREAD" = "xPTHREAD" ; then - LIBPTHREAD="" - fi - - - - - USE_THREADS="" - if test -z "$LIBPTHREAD"; then - -{ echo "$as_me:$LINENO: checking whether $CXX supports -pthread" >&5 -echo $ECHO_N "checking whether $CXX supports -pthread... $ECHO_C" >&6; } -kde_cache=`echo pthread | 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 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - - 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 -pthread" - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +$ac_includes_default + typedef long ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; +test_array [0] = 0 + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef long ac__type_sizeof_; int main () { - return 0; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; +test_array [0] = 0 + ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" 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 + (eval "$ac_compile") 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 -z "$ac_c_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" + } && test -s conftest.$ac_objext; then + ac_lo=$ac_mid; break 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 - - + ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` 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; } - : - USE_THREADS="-D_THREAD_SAFE -pthread" +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - : + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_lo= ac_hi= fi - fi - - - - case $host_os in - solaris*) - -{ echo "$as_me:$LINENO: checking whether $CXX supports -mt" >&5 -echo $ECHO_N "checking whether $CXX supports -mt... $ECHO_C" >&6; } -kde_cache=`echo mt | 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' - +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi - save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -mt" +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - +$ac_includes_default + typedef long ac__type_sizeof_; int main () { - return 0; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; +test_array [0] = 0 + ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" 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 + (eval "$ac_compile") 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 -z "$ac_c_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" + } && test -s conftest.$ac_objext; then + ac_hi=$ac_mid 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; } - : - USE_THREADS="-mt" -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - : - -fi - - CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DUSE_SOLARIS -DSVR4" - ;; - freebsd*) - CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE $PTHREAD_CFLAGS" - ;; - aix*) - CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" - LIBPTHREAD="$LIBPTHREAD -lc_r" - ;; - linux*) CPPFLAGS="$CPPFLAGS -D_REENTRANT" - if test "$CXX" = "KCC"; then - CXXFLAGS="$CXXFLAGS --thread_safe" - NOOPT_CXXFLAGS="$NOOPT_CXXFLAGS --thread_safe" - fi - ;; - *) - ;; - esac - - - - -{ echo "$as_me:$LINENO: checking for extra includes" >&5 -echo $ECHO_N "checking for extra includes... $ECHO_C" >&6; } - -# Check whether --with-extra-includes was given. -if test "${with_extra_includes+set}" = set; then - withval=$with_extra_includes; kde_use_extra_includes="$withval" -else - kde_use_extra_includes=NONE - + ac_lo=`expr '(' $ac_mid ')' + 1` fi -kde_extra_includes= -if test -n "$kde_use_extra_includes" && \ - test "$kde_use_extra_includes" != "NONE"; then - - ac_save_ifs=$IFS - IFS=':' - for dir in $kde_use_extra_includes; do - kde_extra_includes="$kde_extra_includes $dir" - USER_INCLUDES="$USER_INCLUDES -I$dir" - done - IFS=$ac_save_ifs - kde_use_extra_includes="added" +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +done +case $ac_lo in +?*) ac_cv_sizeof_long=$ac_lo;; +'') if test "$ac_cv_type_long" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (long) +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute sizeof (long) +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_long=0 + fi ;; +esac else - kde_use_extra_includes="no" -fi - - -{ echo "$as_me:$LINENO: result: $kde_use_extra_includes" >&5 -echo "${ECHO_T}$kde_use_extra_includes" >&6; } + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef long ac__type_sizeof_; +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } +#include +#include +int +main () +{ -kde_extra_libs= -{ echo "$as_me:$LINENO: checking for extra libs" >&5 -echo $ECHO_N "checking for extra libs... $ECHO_C" >&6; } + FILE *f = fopen ("conftest.val", "w"); + if (! f) + return 1; + if (((long int) (sizeof (ac__type_sizeof_))) < 0) + { + long int i = longval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; + fprintf (f, "%ld\n", i); + } + else + { + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; + fprintf (f, "%lu\n", i); + } + return ferror (f) || fclose (f) != 0; -# Check whether --with-extra-libs was given. -if test "${with_extra_libs+set}" = set; then - withval=$with_extra_libs; kde_use_extra_libs=$withval + ; + return 0; +} +_ACEOF +rm -f 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>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (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_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sizeof_long=`cat conftest.val` else - kde_use_extra_libs=NONE + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 +( exit $ac_status ) +if test "$ac_cv_type_long" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (long) +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute sizeof (long) +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_long=0 + fi fi - -if test -n "$kde_use_extra_libs" && \ - test "$kde_use_extra_libs" != "NONE"; then - - ac_save_ifs=$IFS - IFS=':' - for dir in $kde_use_extra_libs; do - kde_extra_libs="$kde_extra_libs $dir" - KDE_EXTRA_RPATH="$KDE_EXTRA_RPATH -R $dir" - USER_LDFLAGS="$USER_LDFLAGS -L$dir" - done - IFS=$ac_save_ifs - kde_use_extra_libs="added" -else - kde_use_extra_libs="no" +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi +rm -f conftest.val +fi +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5 +echo "${ECHO_T}$ac_cv_sizeof_long" >&6; } -{ echo "$as_me:$LINENO: result: $kde_use_extra_libs" >&5 -echo "${ECHO_T}$kde_use_extra_libs" >&6; } - - - +cat >>confdefs.h <<_ACEOF +#define SIZEOF_LONG $ac_cv_sizeof_long +_ACEOF -{ echo "$as_me:$LINENO: checking for libz" >&5 -echo $ECHO_N "checking for libz... $ECHO_C" >&6; } -if test "${ac_cv_lib_z+set}" = set; then + { echo "$as_me:$LINENO: checking for char *" >&5 +echo $ECHO_N "checking for char *... $ECHO_C" >&6; } +if test "${ac_cv_type_char_p+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - -kde_save_LIBS="$LIBS" -LIBS="$all_libraries $USER_LDFLAGS -lz $LIBSOCKET" -kde_save_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS $all_includes $USER_INCLUDES" -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -#include -#include - +$ac_includes_default +typedef char * ac__type_new_; int main () { - - char buf[42]; - gzFile f = (gzFile) 0; - /* this would segfault.. but we only link, don't run */ - (void) gzgets(f, buf, sizeof(buf)); - - return (strcmp(zlibVersion(), ZLIB_VERSION) == 0); - +if ((ac__type_new_ *) 0) + return 0; +if (sizeof (ac__type_new_)) + return 0; ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" 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 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -29937,94 +36648,94 @@ (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 - eval "ac_cv_lib_z='-lz'" + } && test -s conftest.$ac_objext; then + ac_cv_type_char_p=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - eval "ac_cv_lib_z=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS="$kde_save_LIBS" -CFLAGS="$kde_save_CFLAGS" - + ac_cv_type_char_p=no fi -if test ! "$ac_cv_lib_z" = no; then - -cat >>confdefs.h <<_ACEOF -#define HAVE_LIBZ 1 -_ACEOF - - LIBZ="$ac_cv_lib_z" - { echo "$as_me:$LINENO: result: $ac_cv_lib_z" >&5 -echo "${ECHO_T}$ac_cv_lib_z" >&6; } -else - { { echo "$as_me:$LINENO: error: not found. - Possibly configure picks up an outdated version - installed by XFree86. Remove it from your system. - - Check your installation and look into config.log" >&5 -echo "$as_me: error: not found. - Possibly configure picks up an outdated version - installed by XFree86. Remove it from your system. - Check your installation and look into config.log" >&2;} - { (exit 1); exit 1; }; } - LIBZ="" +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi +{ echo "$as_me:$LINENO: result: $ac_cv_type_char_p" >&5 +echo "${ECHO_T}$ac_cv_type_char_p" >&6; } - - - - -{ echo "$as_me:$LINENO: checking for libpng" >&5 -echo $ECHO_N "checking for libpng... $ECHO_C" >&6; } -if test "${ac_cv_lib_png+set}" = set; then +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ echo "$as_me:$LINENO: checking size of char *" >&5 +echo $ECHO_N "checking size of char *... $ECHO_C" >&6; } +if test "${ac_cv_sizeof_char_p+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - -kde_save_LIBS="$LIBS" -if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then -LIBS="$LIBS $all_libraries $USER_LDFLAGS -lpng $LIBZ -lm -lX11 $LIBSOCKET" -else -LIBS="$LIBS $all_libraries $USER_LDFLAGS -lpng $LIBZ -lm" -fi -kde_save_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS $all_includes $USER_INCLUDES" - + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - - #include - +$ac_includes_default + typedef char * ac__type_sizeof_; int main () { +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; +test_array [0] = 0 - png_structp png_ptr = png_create_read_struct( /* image ptr */ - PNG_LIBPNG_VER_STRING, 0, 0, 0 ); - return( png_ptr != 0 ); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef char * ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; +test_array [0] = 0 ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" 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 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -30033,83 +36744,89 @@ (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 - eval "ac_cv_lib_png='-lpng $LIBZ -lm'" + } && test -s conftest.$ac_objext; then + ac_hi=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - eval "ac_cv_lib_png=no" - -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS="$kde_save_LIBS" -CFLAGS="$kde_save_CFLAGS" - -fi -if eval "test ! \"`echo $ac_cv_lib_png`\" = no"; then - -cat >>confdefs.h <<_ACEOF -#define HAVE_LIBPNG 1 -_ACEOF - - LIBPNG="$ac_cv_lib_png" - - { echo "$as_me:$LINENO: result: $ac_cv_lib_png" >&5 -echo "${ECHO_T}$ac_cv_lib_png" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - LIBPNG="" - + ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi - - -{ echo "$as_me:$LINENO: checking for libjpeg6b" >&5 -echo $ECHO_N "checking for libjpeg6b... $ECHO_C" >&6; } -if test "${ac_cv_lib_jpeg_6b+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -ac_save_LIBS="$LIBS" -LIBS="$all_libraries $USER_LDFLAGS -ljpeg6b -lm" -ac_save_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS $all_includes $USER_INCLUDES" -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +$ac_includes_default + typedef char * ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; +test_array [0] = 0 -#ifdef __cplusplus -extern "C" { -#endif -void jpeg_CreateDecompress(); -#ifdef __cplusplus + ; + return 0; } -#endif - +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef char * ac__type_sizeof_; int main () { -jpeg_CreateDecompress(); +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; +test_array [0] = 0 + ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" 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 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -30118,73 +36835,62 @@ (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 - eval "ac_cv_lib_jpeg_6b=-ljpeg6b" + } && test -s conftest.$ac_objext; then + ac_lo=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - eval "ac_cv_lib_jpeg_6b=no" + ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS="$ac_save_LIBS" -CFLAGS="$ac_save_CFLAGS" +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_lo= ac_hi= fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi -if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then - LIBJPEG="$ac_cv_lib_jpeg_6b" - { echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_6b" >&5 -echo "${ECHO_T}$ac_cv_lib_jpeg_6b" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - -{ echo "$as_me:$LINENO: checking for libjpeg" >&5 -echo $ECHO_N "checking for libjpeg... $ECHO_C" >&6; } -if test "${ac_cv_lib_jpeg_normal+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - -ac_save_LIBS="$LIBS" -LIBS="$all_libraries $USER_LDFLAGS -ljpeg -lm" -ac_save_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS $all_includes $USER_INCLUDES" -cat >conftest.$ac_ext <<_ACEOF +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -#ifdef __cplusplus -extern "C" { -#endif -void jpeg_CreateDecompress(); -#ifdef __cplusplus -} -#endif - +$ac_includes_default + typedef char * ac__type_sizeof_; int main () { -jpeg_CreateDecompress(); +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; +test_array [0] = 0 + ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" 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 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -30193,352 +36899,338 @@ (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 - eval "ac_cv_lib_jpeg_normal=-ljpeg" + } && test -s conftest.$ac_objext; then + ac_hi=$ac_mid else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - eval "ac_cv_lib_jpeg_normal=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS="$ac_save_LIBS" -CFLAGS="$ac_save_CFLAGS" - + ac_lo=`expr '(' $ac_mid ')' + 1` fi - -if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then - LIBJPEG="$ac_cv_lib_jpeg_normal" - { echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_normal" >&5 -echo "${ECHO_T}$ac_cv_lib_jpeg_normal" >&6; } +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +done +case $ac_lo in +?*) ac_cv_sizeof_char_p=$ac_lo;; +'') if test "$ac_cv_type_char_p" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *) +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute sizeof (char *) +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_char_p=0 + fi ;; +esac else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef char * ac__type_sizeof_; +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } +#include +#include +int +main () +{ - LIBJPEG= + FILE *f = fopen ("conftest.val", "w"); + if (! f) + return 1; + if (((long int) (sizeof (ac__type_sizeof_))) < 0) + { + long int i = longval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; + fprintf (f, "%ld\n", i); + } + else + { + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; + fprintf (f, "%lu\n", i); + } + return ferror (f) || fclose (f) != 0; + ; + return 0; +} +_ACEOF +rm -f 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>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (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_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sizeof_char_p=`cat conftest.val` +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 +( exit $ac_status ) +if test "$ac_cv_type_char_p" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *) +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute sizeof (char *) +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_char_p=0 + fi +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - - - +rm -f conftest.val fi +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5 +echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6; } -jpeg_incdirs="$includedir /usr/include /usr/local/include $kde_extra_includes" - -jpeg_incdir=NO -for i in $jpeg_incdirs; -do - for j in jpeglib.h; - do - echo "configure: 30240: $i/$j" >&5 - if test -r "$i/$j"; then - echo "taking that" >&5 - jpeg_incdir=$i - break 2 - fi - done -done - -test "x$jpeg_incdir" = xNO && jpeg_incdir= - -if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBJPEG 1 +#define SIZEOF_CHAR_P $ac_cv_sizeof_char_p _ACEOF -else - if test -n "$jpeg_incdir" || test -n "$LIBJPEG" ; then - { echo "$as_me:$LINENO: WARNING: -There is an installation error in jpeg support. You seem to have only one -of either the headers _or_ the libraries installed. You may need to either -provide correct --with-extra-... options, or the development package of -libjpeg6b. You can get a source package of libjpeg from http://www.ijg.org/ -Disabling JPEG support. -" >&5 -echo "$as_me: WARNING: -There is an installation error in jpeg support. You seem to have only one -of either the headers _or_ the libraries installed. You may need to either -provide correct --with-extra-... options, or the development package of -libjpeg6b. You can get a source package of libjpeg from http://www.ijg.org/ -Disabling JPEG support. -" >&2;} - else - { echo "$as_me:$LINENO: WARNING: libjpeg not found. disable JPEG support." >&5 -echo "$as_me: WARNING: libjpeg not found. disable JPEG support." >&2;} - fi - jpeg_incdir= - LIBJPEG= -fi +cat >>confdefs.h <<\_ACEOF +#define SQLITE_PTR_SZ SIZEOF_CHAR_P +_ACEOF +############################################################################### +# END SQLITE CHECK +############################################################################### - { echo "$as_me:$LINENO: checking for perl" >&5 -echo $ECHO_N "checking for perl... $ECHO_C" >&6; } - if test -n "$PERL"; then - kde_cv_path="$PERL"; - else - kde_cache=`echo perl | sed 'y%./+-%__p_%'` +############################################################################### +# BEGIN MYSQL CHECK +############################################################################### - if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +# Check whether --enable-mysql was given. +if test "${enable_mysql+set}" = set; then + enableval=$enable_mysql; enable_mysql=$enableval else - - kde_cv_path="NONE" - kde_save_IFS=$IFS - IFS=':' - dirs="" - for dir in $PATH; do - dirs="$dirs $dir" - done - if test -z ""; then dirs="$bindir $exec_prefix/bin $prefix/bin $dirs" - else dirs="$dirs $bindir $exec_prefix/bin $prefix/bin" - fi - IFS=$kde_save_IFS - - for dir in $dirs; do - if test -x "$dir/perl"; then - if test -n "" - then - evalstr="$dir/perl 2>&1 " - if eval $evalstr; then - kde_cv_path="$dir/perl" - break - fi - else - kde_cv_path="$dir/perl" - break - fi - fi - done - - eval "kde_cv_path_$kde_cache=$kde_cv_path" - + enable_mysql=no fi - eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\"" - - fi - - if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - { echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6; } - - { { echo "$as_me:$LINENO: error: No Perl found in your $PATH. -We need perl to generate some code." >&5 -echo "$as_me: error: No Perl found in your $PATH. -We need perl to generate some code." >&2;} - { (exit 1); exit 1; }; } - - else - { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6; } - PERL=$kde_cv_path - - fi - - - +if test "$enable_mysql" = "yes"; then + # Extract the first word of "mysql_config", so it can be a program name with args. +set dummy mysql_config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_MYSQL_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$MYSQL_CONFIG"; then + ac_cv_prog_MYSQL_CONFIG="$MYSQL_CONFIG" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_MYSQL_CONFIG="yes" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS +fi +fi +MYSQL_CONFIG=$ac_cv_prog_MYSQL_CONFIG +if test -n "$MYSQL_CONFIG"; then + { echo "$as_me:$LINENO: result: $MYSQL_CONFIG" >&5 +echo "${ECHO_T}$MYSQL_CONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + if test x$MYSQL_CONFIG = xyes; then +cat >>confdefs.h <<\_ACEOF +#define USE_MYSQL 1 +_ACEOF -# Check whether --enable-mt was given. -if test "${enable_mt+set}" = set; then - enableval=$enable_mt; kde_use_qt_mt=$enableval -else - if test $kde_qtver = 3; then - kde_use_qt_mt=yes + mysql_includes=`mysql_config --cflags` + mysql_libs=`mysql_config --libs` else - kde_use_qt_mt=no + amarok_warning_mysql_notfound=yes + enable_mysql=no fi - fi - -USING_QT_MT="" + if test x$enable_mysql = xyes; then + enable_mysql_TRUE= + enable_mysql_FALSE='#' +else + enable_mysql_TRUE='#' + enable_mysql_FALSE= +fi -KDE_MT_LDFLAGS= -KDE_MT_LIBS= -if test "x$kde_use_qt_mt" = "xyes"; then +############################################################################### +# END MYSQL CHECK +############################################################################### - if test -z "$LIBPTHREAD"; then - if test -z "$USE_THREADS"; then - kde_check_threading_default=no - else - kde_check_threading_default=yes - fi - else - kde_check_threading_default=yes - fi - # Check whether --enable-threading was given. -if test "${enable_threading+set}" = set; then - enableval=$enable_threading; kde_use_threading=$enableval -else - kde_use_threading=$kde_check_threading_default -fi - if test "x$kde_use_threading" = "xyes"; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBPTHREAD 1 -_ACEOF +############################################################################### +# BEGIN POSTGRESQL CHECK +############################################################################### - fi +# Check whether --enable-postgresql was given. +if test "${enable_postgresql+set}" = set; then + enableval=$enable_postgresql; enable_postgresql=$enableval +else + enable_postgresql=no - if test "x$kde_use_threading" = "xyes"; then - CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS" - KDE_MT_LDFLAGS="$USE_THREADS" - KDE_MT_LIBS="$LIBPTHREAD" - else - kde_use_qt_mt=no - fi fi +if test "$enable_postgresql" = "yes"; then -kde_qt_was_given=yes - -if test -z "$LIBQT_GLOB"; then - if test "x$kde_use_qt_emb" = "xyes"; then - LIBQT_GLOB="libqte.*" - else - LIBQT_GLOB="libqt.*" + # Extract the first word of "pg_config", so it can be a program name with args. +set dummy pg_config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_POSTGRESQL_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$POSTGRESQL_CONFIG"; then + ac_cv_prog_POSTGRESQL_CONFIG="$POSTGRESQL_CONFIG" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_POSTGRESQL_CONFIG="yes" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 fi -fi +done +done +IFS=$as_save_IFS -if test "x$kde_use_qt_emb" = "xyes"; then - qtlib="qte" -else - qtlib="qt" fi - -kde_int_qt="-l$qtlib" - -if test -z "$LIBQPE"; then - if test "x$kde_use_qt_emb" = "xyes"; then - if test "x$kde_use_qt_emb_palm" = "xyes"; then - LIB_QPE="-lqpe" - else - LIB_QPE="" - fi - else - LIB_QPE="" - fi fi - - -if test "x$kde_use_qt_mt" = "xyes"; then - LIBQT="-l$qtlib-mt" - kde_int_qt="-l$qtlib-mt" - LIBQT_GLOB="lib$qtlib-mt.*" - USING_QT_MT="using -mt" +POSTGRESQL_CONFIG=$ac_cv_prog_POSTGRESQL_CONFIG +if test -n "$POSTGRESQL_CONFIG"; then + { echo "$as_me:$LINENO: result: $POSTGRESQL_CONFIG" >&5 +echo "${ECHO_T}$POSTGRESQL_CONFIG" >&6; } else - LIBQT="-l$qtlib" + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -if test $kde_qtver != 1; then - - LIBQT="$LIBQT $LIBPNG $LIBJPEG" -fi + if test x$POSTGRESQL_CONFIG = xyes; then -if test $kde_qtver = 3; then +cat >>confdefs.h <<\_ACEOF +#define USE_POSTGRESQL 1 +_ACEOF - LIBQT="$LIBQT $LIBDL" -fi -{ echo "$as_me:$LINENO: checking for Qt" >&5 -echo $ECHO_N "checking for Qt... $ECHO_C" >&6; } + postgresql_includes=-I`pg_config --includedir` + postgresql_libs="-L`pg_config --libdir` -lpq" + else + amarok_warning_postgresql_notfound=yes + enable_postgresql=no + fi -if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then -LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET" fi -ac_qt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO -qt_libraries="" -qt_includes="" - -# Check whether --with-qt-dir was given. -if test "${with_qt_dir+set}" = set; then - withval=$with_qt_dir; ac_qt_includes="$withval"/include - ac_qt_libraries="$withval"/lib${kdelibsuff} - ac_qt_bindir="$withval"/bin + if test x$enable_postgresql = xyes; then + enable_postgresql_TRUE= + enable_postgresql_FALSE='#' +else + enable_postgresql_TRUE='#' + enable_postgresql_FALSE= fi -# Check whether --with-qt-includes was given. -if test "${with_qt_includes+set}" = set; then - withval=$with_qt_includes; - ac_qt_includes="$withval" -fi +############################################################################### +# END POSTGRESQL CHECK +############################################################################### -kde_qt_libs_given=no + +############################################################################### +# BEGIN LIBVISUAL CHECK +############################################################################### -# Check whether --with-qt-libraries was given. -if test "${with_qt_libraries+set}" = set; then - withval=$with_qt_libraries; ac_qt_libraries="$withval" - kde_qt_libs_given=yes +# Check whether --with-libvisual was given. +if test "${with_libvisual+set}" = set; then + withval=$with_libvisual; with_libvisual=$withval +else + with_libvisual=yes fi -if test "${ac_cv_have_qt+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - #try to guess Qt locations - -qt_incdirs="" -for dir in $kde_qt_dirs; do - qt_incdirs="$qt_incdirs $dir/include $dir" -done -if test -z "$PKG_CONFIG"; then - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 +if test "$with_libvisual" = "yes"; then + ## libvisual plugin depends on sdl + # Extract the first word of "sdl-config", so it can be a program name with args. +set dummy sdl-config; ac_word=$2 { echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then +if test "${ac_cv_prog_SDL_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + if test -n "$SDL_CONFIG"; then + ac_cv_prog_SDL_CONFIG="$SDL_CONFIG" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + ac_cv_prog_SDL_CONFIG="yes" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -30546,59 +37238,33 @@ done IFS=$as_save_IFS - test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" - ;; -esac fi -PKG_CONFIG=$ac_cv_path_PKG_CONFIG -if test -n "$PKG_CONFIG"; then - { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6; } +fi +SDL_CONFIG=$ac_cv_prog_SDL_CONFIG +if test -n "$SDL_CONFIG"; then + { echo "$as_me:$LINENO: result: $SDL_CONFIG" >&5 +echo "${ECHO_T}$SDL_CONFIG" >&6; } else { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } fi -fi -if test "$PKG_CONFIG" != "no" ; then - if $PKG_CONFIG --exists qt-mt ; then - qt_incdirs="$qt_incdirs `$PKG_CONFIG --variable=includedir qt-mt`" - fi -fi -qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 /usr/include/qt3 $x_includes" -if test ! "$ac_qt_includes" = "NO"; then - qt_incdirs="$ac_qt_includes $qt_incdirs" -fi -if test "$kde_qtver" != "1"; then - kde_qt_header=qstyle.h -else - kde_qt_header=qglobal.h -fi + if test x$SDL_CONFIG = xyes; then + sdl_cflags=`sdl-config --cflags` + sdl_libs=`sdl-config --libs` + fi -qt_incdir=NO -for i in $qt_incdirs; -do - for j in $kde_qt_header; - do - echo "configure: 30586: $i/$j" >&5 - if test -r "$i/$j"; then - echo "taking that" >&5 - qt_incdir=$i - break 2 - fi - done -done -ac_qt_includes="$qt_incdir" -qt_libdirs="" -for dir in $kde_qt_dirs; do - qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir/lib $dir" -done -if test -z "$PKG_CONFIG"; then + if test x$PKGCONFIGFOUND = xyes -a x$SDL_CONFIG = xyes; then + + + succeeded=no + + if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 { echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -30640,658 +37306,912 @@ fi -fi -if test "$PKG_CONFIG" != "no" ; then - if $PKG_CONFIG --exists qt-mt ; then - qt_libdirs="$qt_incdirs `$PKG_CONFIG --variable=libdir qt-mt`" fi -fi -qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries" -if test ! "$ac_qt_libraries" = "NO"; then - qt_libdir=$ac_qt_libraries -else - qt_libdirs="$ac_qt_libraries $qt_libdirs" - # if the Qt was given, the chance is too big that libqt.* doesn't exist - qt_libdir=NONE - for dir in $qt_libdirs; do - try="ls -1 $dir/${LIBQT_GLOB}" - if test -n "`$try 2> /dev/null`"; then qt_libdir=$dir; break; else echo "tried $dir" >&5 ; fi - done -fi -for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do - if test -e "$a"; then - LIBQT="$LIBQT ${kde_int_qt}_incremental" - break + + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + { echo "$as_me:$LINENO: checking for libvisual-0.4 >= 0.4.0" >&5 +echo $ECHO_N "checking for libvisual-0.4 >= 0.4.0... $ECHO_C" >&6; } + + if $PKG_CONFIG --exists "libvisual-0.4 >= 0.4.0" ; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + succeeded=yes + + { echo "$as_me:$LINENO: checking LIBVISUAL_CFLAGS" >&5 +echo $ECHO_N "checking LIBVISUAL_CFLAGS... $ECHO_C" >&6; } + LIBVISUAL_CFLAGS=`$PKG_CONFIG --cflags "libvisual-0.4 >= 0.4.0"` + { echo "$as_me:$LINENO: result: $LIBVISUAL_CFLAGS" >&5 +echo "${ECHO_T}$LIBVISUAL_CFLAGS" >&6; } + + { echo "$as_me:$LINENO: checking LIBVISUAL_LIBS" >&5 +echo $ECHO_N "checking LIBVISUAL_LIBS... $ECHO_C" >&6; } + LIBVISUAL_LIBS=`$PKG_CONFIG --libs "libvisual-0.4 >= 0.4.0"` + { echo "$as_me:$LINENO: result: $LIBVISUAL_LIBS" >&5 +echo "${ECHO_T}$LIBVISUAL_LIBS" >&6; } + else + LIBVISUAL_CFLAGS="" + LIBVISUAL_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + LIBVISUAL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libvisual-0.4 >= 0.4.0"` + + fi + + + + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi fi -done -ac_qt_libraries="$qt_libdir" + if test $succeeded = yes; then + build_libvisual="yes" + else + build_libvisual="no" + fi + + + + + + if test x$build_libvisual = xyes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBVISUAL 1 +_ACEOF + + fi + fi +fi + if test x$build_libvisual = xyes; then + with_libvisual_TRUE= + with_libvisual_FALSE='#' +else + with_libvisual_TRUE='#' + with_libvisual_FALSE= +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 -ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +############################################################################### +# END LIBVISUAL CHECK +############################################################################### -ac_cxxflags_safe="$CXXFLAGS" -ac_ldflags_safe="$LDFLAGS" -ac_libs_safe="$LIBS" +############################################################################### +# BEGIN TUNEPIMP CHECK +############################################################################### -CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes" -LDFLAGS="$LDFLAGS -L$qt_libdir $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS" -LIBS="$LIBS $LIBQT $KDE_MT_LIBS" +# Check whether --with-musicbrainz was given. +if test "${with_musicbrainz+set}" = set; then + withval=$with_musicbrainz; with_musicbrainz=$withval +else + with_musicbrainz=yes +fi -cat > conftest.$ac_ext < -#include -EOF -if test "$kde_qtver" = "2"; then -cat >> conftest.$ac_ext < -#include -#include -EOF -if test $kde_qtsubver -gt 0; then -cat >> conftest.$ac_ext <&5 +echo $ECHO_N "checking for tunepimp-0.5/tp_c.h... $ECHO_C" >&6; } +if test "${ac_cv_header_tunepimp_0_5_tp_c_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_tunepimp_0_5_tp_c_h" >&5 +echo "${ECHO_T}$ac_cv_header_tunepimp_0_5_tp_c_h" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking tunepimp-0.5/tp_c.h usability" >&5 +echo $ECHO_N "checking tunepimp-0.5/tp_c.h usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no fi -if test "$kde_qtver" = "3"; then -cat >> conftest.$ac_ext < -#include -#include -EOF +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking tunepimp-0.5/tp_c.h presence" >&5 +echo $ECHO_N "checking tunepimp-0.5/tp_c.h presence... $ECHO_C" >&6; } +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_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no fi -echo "#if ! ($kde_qt_verstring)" >> conftest.$ac_ext -cat >> conftest.$ac_ext <&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: tunepimp-0.5/tp_c.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: tunepimp-0.5/tp_c.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: tunepimp-0.5/tp_c.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: tunepimp-0.5/tp_c.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: tunepimp-0.5/tp_c.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: tunepimp-0.5/tp_c.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: tunepimp-0.5/tp_c.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: tunepimp-0.5/tp_c.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: tunepimp-0.5/tp_c.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: tunepimp-0.5/tp_c.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: tunepimp-0.5/tp_c.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: tunepimp-0.5/tp_c.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: tunepimp-0.5/tp_c.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: tunepimp-0.5/tp_c.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: tunepimp-0.5/tp_c.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: tunepimp-0.5/tp_c.h: in the future, the compiler will take precedence" >&2;} + + ;; +esac +{ echo "$as_me:$LINENO: checking for tunepimp-0.5/tp_c.h" >&5 +echo $ECHO_N "checking for tunepimp-0.5/tp_c.h... $ECHO_C" >&6; } +if test "${ac_cv_header_tunepimp_0_5_tp_c_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_tunepimp_0_5_tp_c_h=$ac_header_preproc +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_tunepimp_0_5_tp_c_h" >&5 +echo "${ECHO_T}$ac_cv_header_tunepimp_0_5_tp_c_h" >&6; } -int main() { -EOF -if test "$kde_qtver" = "2"; then -cat >> conftest.$ac_ext <> conftest.$ac_ext <&5 +echo $ECHO_N "checking for tunepimp/tp_c.h... $ECHO_C" >&6; } +if test "${ac_cv_header_tunepimp_tp_c_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 fi -if test "$kde_qtver" = "3"; then -cat >> conftest.$ac_ext <&5 +echo "${ECHO_T}$ac_cv_header_tunepimp_tp_c_h" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking tunepimp/tp_c.h usability" >&5 +echo $ECHO_N "checking tunepimp/tp_c.h usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no fi -cat >> conftest.$ac_ext <&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +# Is the header present? +{ echo "$as_me:$LINENO: checking tunepimp/tp_c.h presence" >&5 +echo $ECHO_N "checking tunepimp/tp_c.h presence... $ECHO_C" >&6; } +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); } && test -s conftest; then - rm -f conftest* + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_qt_libraries="NO" + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no fi -rm -f conftest* -CXXFLAGS="$ac_cxxflags_safe" -LDFLAGS="$ac_ldflags_safe" -LIBS="$ac_libs_safe" -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 +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } -if test "$ac_qt_includes" = NO || test "$ac_qt_libraries" = NO; then - ac_cv_have_qt="have_qt=no" - ac_qt_notfound="" - missing_qt_mt="" - if test "$ac_qt_includes" = NO; then - if test "$ac_qt_libraries" = NO; then - ac_qt_notfound="(headers and libraries)"; - else - ac_qt_notfound="(headers)"; - fi - else - if test "x$kde_use_qt_mt" = "xyes"; then - missing_qt_mt=" -Make sure that you have compiled Qt with thread support!" - ac_qt_notfound="(library $qtlib-mt)"; - else - ac_qt_notfound="(library $qtlib)"; - fi - fi +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: tunepimp/tp_c.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: tunepimp/tp_c.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: tunepimp/tp_c.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: tunepimp/tp_c.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: tunepimp/tp_c.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: tunepimp/tp_c.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: tunepimp/tp_c.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: tunepimp/tp_c.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: tunepimp/tp_c.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: tunepimp/tp_c.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: tunepimp/tp_c.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: tunepimp/tp_c.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: tunepimp/tp_c.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: tunepimp/tp_c.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: tunepimp/tp_c.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: tunepimp/tp_c.h: in the future, the compiler will take precedence" >&2;} - { { echo "$as_me:$LINENO: error: Qt ($kde_qt_minversion) $ac_qt_notfound not found. Please check your installation! -For more details about this problem, look at the end of config.log.$missing_qt_mt" >&5 -echo "$as_me: error: Qt ($kde_qt_minversion) $ac_qt_notfound not found. Please check your installation! -For more details about this problem, look at the end of config.log.$missing_qt_mt" >&2;} - { (exit 1); exit 1; }; } + ;; +esac +{ echo "$as_me:$LINENO: checking for tunepimp/tp_c.h" >&5 +echo $ECHO_N "checking for tunepimp/tp_c.h... $ECHO_C" >&6; } +if test "${ac_cv_header_tunepimp_tp_c_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - have_qt="yes" + ac_cv_header_tunepimp_tp_c_h=$ac_header_preproc fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_tunepimp_tp_c_h" >&5 +echo "${ECHO_T}$ac_cv_header_tunepimp_tp_c_h" >&6; } fi - - -eval "$ac_cv_have_qt" - -if test "$have_qt" != yes; then - { echo "$as_me:$LINENO: result: $have_qt" >&5 -echo "${ECHO_T}$have_qt" >&6; }; +if test $ac_cv_header_tunepimp_tp_c_h = yes; then + build_musicbrainz="yes" else - ac_cv_have_qt="have_qt=yes \ - ac_qt_includes=$ac_qt_includes ac_qt_libraries=$ac_qt_libraries" - { echo "$as_me:$LINENO: result: libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&5 -echo "${ECHO_T}libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&6; } + build_musicbrainz="no" +fi + - qt_libraries="$ac_qt_libraries" - qt_includes="$ac_qt_includes" fi -if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then +fi -{ echo "$as_me:$LINENO: checking if Qt compiles without flags" >&5 -echo $ECHO_N "checking if Qt compiles without flags... $ECHO_C" >&6; } -if test "${kde_cv_qt_direct+set}" = set; then +if test "$build_musicbrainz" = "yes"; then + { echo "$as_me:$LINENO: checking for tr_GetPUID in -ltunepimp" >&5 +echo $ECHO_N "checking for tr_GetPUID in -ltunepimp... $ECHO_C" >&6; } +if test "${ac_cv_lib_tunepimp_tr_GetPUID+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ltunepimp $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 tr_GetPUID (); +int +main () +{ +return tr_GetPUID (); + ; + 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_tunepimp_tr_GetPUID=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - 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_cv_lib_tunepimp_tr_GetPUID=no +fi -ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +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_tunepimp_tr_GetPUID" >&5 +echo "${ECHO_T}$ac_cv_lib_tunepimp_tr_GetPUID" >&6; } +if test $ac_cv_lib_tunepimp_tr_GetPUID = yes; then +cat >>confdefs.h <<\_ACEOF +#define HAVE_TUNEPIMP 5 +_ACEOF -ac_LD_LIBRARY_PATH_safe=$LD_LIBRARY_PATH -ac_LIBRARY_PATH="$LIBRARY_PATH" -ac_cxxflags_safe="$CXXFLAGS" -ac_ldflags_safe="$LDFLAGS" -ac_libs_safe="$LIBS" +else + { echo "$as_me:$LINENO: checking for tp_SetFileNameEncoding in -ltunepimp" >&5 +echo $ECHO_N "checking for tp_SetFileNameEncoding in -ltunepimp... $ECHO_C" >&6; } +if test "${ac_cv_lib_tunepimp_tp_SetFileNameEncoding+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ltunepimp $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -CXXFLAGS="$CXXFLAGS -I$qt_includes" -LDFLAGS="$LDFLAGS $X_LDFLAGS" -if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then -LIBS="$LIBQT -lXext -lX11 $LIBSOCKET" +/* 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 tp_SetFileNameEncoding (); +int +main () +{ +return tp_SetFileNameEncoding (); + ; + 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_tunepimp_tp_SetFileNameEncoding=yes else -LIBS="$LIBQT $LIBSOCKET" + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_tunepimp_tp_SetFileNameEncoding=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 -LD_LIBRARY_PATH= -export LD_LIBRARY_PATH -LIBRARY_PATH= -export LIBRARY_PATH +{ echo "$as_me:$LINENO: result: $ac_cv_lib_tunepimp_tp_SetFileNameEncoding" >&5 +echo "${ECHO_T}$ac_cv_lib_tunepimp_tp_SetFileNameEncoding" >&6; } +if test $ac_cv_lib_tunepimp_tp_SetFileNameEncoding = yes; then +cat >>confdefs.h <<\_ACEOF +#define HAVE_TUNEPIMP 4 +_ACEOF +else -cat > conftest.$ac_ext < -#include -EOF -if test "$kde_qtver" = "2"; then -cat >> conftest.$ac_ext < -#include -#include -EOF +cat >>confdefs.h <<\_ACEOF +#define HAVE_TUNEPIMP 1 +_ACEOF -if test $kde_qtsubver -gt 0; then -cat >> conftest.$ac_ext <> conftest.$ac_ext < -#include -#include -EOF fi -echo "#if ! ($kde_qt_verstring)" >> conftest.$ac_ext -cat >> conftest.$ac_ext <> conftest.$ac_ext <> conftest.$ac_ext <> conftest.$ac_ext <> conftest.$ac_ext <>confdefs.h <<\_ACEOF +#define HAVE_TUNEPIMP 0 +_ACEOF -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; then - kde_cv_qt_direct="yes" -else - kde_cv_qt_direct="no" - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + LIB_TUNEPIMP="" + have_tunepimp=no fi -rm -f conftest* -CXXFLAGS="$ac_cxxflags_safe" -LDFLAGS="$ac_ldflags_safe" -LIBS="$ac_libs_safe" -LD_LIBRARY_PATH="$ac_LD_LIBRARY_PATH_safe" -export LD_LIBRARY_PATH -LIBRARY_PATH="$ac_LIBRARY_PATH" -export LIBRARY_PATH -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 +############################################################################### +# END TUNEPIMP CHECK +############################################################################### -fi -if test "$kde_cv_qt_direct" = "yes"; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - qt_libraries= +############################################################################### +# BEGIN AMAZON CHECK +############################################################################### + +# Check whether --enable-amazon was given. +if test "${enable_amazon+set}" = set; then + enableval=$enable_amazon; enable_amazon=$enableval else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + enable_amazon=yes fi + +if test "$enable_amazon" != "no"; then + +cat >>confdefs.h <<\_ACEOF +#define AMAZON_SUPPORT 1 +_ACEOF + fi +############################################################################### +# END AMAZON CHECK +############################################################################### -if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then - QT_INCLUDES="" -else - QT_INCLUDES="-I$qt_includes" - all_includes="$QT_INCLUDES $all_includes" -fi +############################################################################### +# BEGIN SCHED_SETAFFINITY BUGGY GLIBC CHECK +############################################################################### -if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then - QT_LDFLAGS="" -else - QT_LDFLAGS="-L$qt_libraries" - all_libraries="$QT_LDFLAGS $all_libraries" -fi -test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS" +{ echo "$as_me:$LINENO: checking if sched_setaffinity should be enabled" >&5 +echo $ECHO_N "checking if sched_setaffinity should be enabled... $ECHO_C" >&6; } + 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' - qt_bindirs="" - for dir in $kde_qt_dirs; do - qt_bindirs="$qt_bindirs $dir/bin $dir/src/moc" - done - qt_bindirs="$qt_bindirs /usr/bin /usr/X11R6/bin /usr/local/qt/bin" - if test ! "$ac_qt_bindir" = "NO"; then - qt_bindirs="$ac_qt_bindir $qt_bindirs" - fi +amarok_glibcsched_works=no - { echo "$as_me:$LINENO: checking for moc" >&5 -echo $ECHO_N "checking for moc... $ECHO_C" >&6; } - if test -n "$MOC"; then - kde_cv_path="$MOC"; - else - kde_cache=`echo moc | sed 'y%./+-%__p_%'` +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ - if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else + #include - kde_cv_path="NONE" - kde_save_IFS=$IFS - IFS=':' - dirs="" - for dir in $PATH; do - dirs="$dirs $dir" - done - if test -z ""; then dirs="$qt_bindirs $dirs" - else dirs="$dirs $qt_bindirs" - fi - IFS=$kde_save_IFS +int +main () +{ - for dir in $dirs; do - if test -x "$dir/moc"; then - if test -n "" - then - evalstr="$dir/moc 2>&1 " - if eval $evalstr; then - kde_cv_path="$dir/moc" - break - fi - else - kde_cv_path="$dir/moc" - break - fi - fi - done + cpu_set_t mask; + CPU_ZERO( &mask ); + CPU_SET( 0, &mask ); + sched_setaffinity( 0, sizeof(mask), &mask ); - eval "kde_cv_path_$kde_cache=$kde_cv_path" + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + amarok_sched_3params=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + amarok_sched_3params=no fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\"" +if test "x$amarok_sched_3params" = "xyes"; then - fi +cat >>confdefs.h <<\_ACEOF +#define SCHEDAFFINITY_SUPPORT 1 +_ACEOF - if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - { echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6; } - { { echo "$as_me:$LINENO: error: No Qt meta object compiler (moc) found! -Please check whether you installed Qt correctly. -You need to have a running moc binary. -configure tried to run $ac_cv_path_moc and the test didn't -succeed. If configure shouldn't have tried this one, set -the environment variable MOC to the right one before running -configure. -" >&5 -echo "$as_me: error: No Qt meta object compiler (moc) found! -Please check whether you installed Qt correctly. -You need to have a running moc binary. -configure tried to run $ac_cv_path_moc and the test didn't -succeed. If configure shouldn't have tried this one, set -the environment variable MOC to the right one before running -configure. -" >&2;} - { (exit 1); exit 1; }; } +cat >>confdefs.h <<\_ACEOF +#define SCHEDAFFINITY_3PARAMS 1 +_ACEOF - else - { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6; } - MOC=$kde_cv_path + amarok_glibcsched_works=yes +fi - fi +if test "x$amarok_sched_3params" = "xno"; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ - if test -z "$UIC_NOT_NEEDED"; then + #include - { echo "$as_me:$LINENO: checking for uic" >&5 -echo $ECHO_N "checking for uic... $ECHO_C" >&6; } - if test -n "$UIC_PATH"; then - kde_cv_path="$UIC_PATH"; - else - kde_cache=`echo uic | sed 'y%./+-%__p_%'` +int +main () +{ - if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + cpu_set_t mask; + CPU_ZERO( &mask ); + CPU_SET( 0, &mask ); + sched_setaffinity( 0, &mask ); + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + amarok_sched_2params=yes else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - kde_cv_path="NONE" - kde_save_IFS=$IFS - IFS=':' - dirs="" - for dir in $PATH; do - dirs="$dirs $dir" - done - if test -z ""; then dirs="$qt_bindirs $dirs" - else dirs="$dirs $qt_bindirs" - fi - IFS=$kde_save_IFS + amarok_sched_2params=no - for dir in $dirs; do - if test -x "$dir/uic"; then - if test -n "" - then - evalstr="$dir/uic 2>&1 " - if eval $evalstr; then - kde_cv_path="$dir/uic" - break - fi - else - kde_cv_path="$dir/uic" - break - fi - fi - done +fi - eval "kde_cv_path_$kde_cache=$kde_cv_path" +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + if test "x$amarok_sched_2params" = "xyes"; then +cat >>confdefs.h <<\_ACEOF +#define SCHEDAFFINITY_SUPPORT 1 +_ACEOF + amarok_glibcsched_works=yes + fi fi +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 - eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\"" - fi +{ echo "$as_me:$LINENO: result: $amarok_glibcsched_works" >&5 +echo "${ECHO_T}$amarok_glibcsched_works" >&6; } - if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - { echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6; } - UIC_PATH="" - else - { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6; } - UIC_PATH=$kde_cv_path +############################################################################### +# END SCHED_SETAFFINITY BUGGY GLIBC CHECK +############################################################################### - fi - if test -z "$UIC_PATH" ; then - { echo "$as_me:$LINENO: WARNING: No Qt ui compiler (uic) found! -Please check whether you installed Qt correctly. -You need to have a running uic binary. -configure tried to run $ac_cv_path_uic and the test didn't -succeed. If configure shouldn't have tried this one, set -the environment variable UIC to the right one before running -configure. -" >&5 -echo "$as_me: WARNING: No Qt ui compiler (uic) found! -Please check whether you installed Qt correctly. -You need to have a running uic binary. -configure tried to run $ac_cv_path_uic and the test didn't -succeed. If configure shouldn't have tried this one, set -the environment variable UIC to the right one before running -configure. -" >&2;} +############################################################################### +# BEGIN KDEBASE CHECK +############################################################################### - exit 1 - else - UIC=$UIC_PATH - if test $kde_qtver = 3; then - { echo "$as_me:$LINENO: checking whether uic supports -L " >&5 -echo $ECHO_N "checking whether uic supports -L ... $ECHO_C" >&6; } - kde_cache=`echo L | sed 'y% .=/+-%____p_%'` - if { as_var=kde_cv_prog_uic_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then + kde_safe_cppflags=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $all_includes" + + 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' + + + if test "${ac_cv_header_konqsidebarplugin_h+set}" = set; then + { echo "$as_me:$LINENO: checking for konqsidebarplugin.h" >&5 +echo $ECHO_N "checking for konqsidebarplugin.h... $ECHO_C" >&6; } +if test "${ac_cv_header_konqsidebarplugin_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_konqsidebarplugin_h" >&5 +echo "${ECHO_T}$ac_cv_header_konqsidebarplugin_h" >&6; } else - - cat >conftest.ui < -EOT - ac_uic_testrun="$UIC_PATH -L /nonexistent conftest.ui >/dev/null" - if { (eval echo "$as_me:$LINENO: \"$ac_uic_testrun\"") >&5 - (eval $ac_uic_testrun) 2>&5 + # Is the header compilable? +{ echo "$as_me:$LINENO: checking konqsidebarplugin.h usability" >&5 +echo $ECHO_N "checking konqsidebarplugin.h usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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); }; then - eval "kde_cv_prog_uic_$kde_cache=yes" - else - eval "kde_cv_prog_uic_$kde_cache=no" - fi - rm -f conftest* + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_compiler=no fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } - if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - : - ac_uic_supports_libpath=yes - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - : - ac_uic_supports_libpath=no - fi - - - { echo "$as_me:$LINENO: checking whether uic supports -nounload " >&5 -echo $ECHO_N "checking whether uic supports -nounload ... $ECHO_C" >&6; } - kde_cache=`echo nounload | sed 'y% .=/+-%____p_%'` - if { as_var=kde_cv_prog_uic_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - cat >conftest.ui < -EOT - ac_uic_testrun="$UIC_PATH -nounload conftest.ui >/dev/null" - if { (eval echo "$as_me:$LINENO: \"$ac_uic_testrun\"") >&5 - (eval $ac_uic_testrun) 2>&5 +# Is the header present? +{ echo "$as_me:$LINENO: checking konqsidebarplugin.h presence" >&5 +echo $ECHO_N "checking konqsidebarplugin.h presence... $ECHO_C" >&6; } +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); }; then - eval "kde_cv_prog_uic_$kde_cache=yes" - else - eval "kde_cv_prog_uic_$kde_cache=no" - fi - rm -f conftest* + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_preproc=no fi +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } - if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - : - ac_uic_supports_nounload=yes - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - : - ac_uic_supports_nounload=no - fi - - - if test x$ac_uic_supports_libpath = xyes; then - UIC="$UIC -L \$(kde_widgetdir)" - fi - if test x$ac_uic_supports_nounload = xyes; then - UIC="$UIC -nounload" - fi - fi - fi - else - UIC="echo uic not available: " - fi - - +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: konqsidebarplugin.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: konqsidebarplugin.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: konqsidebarplugin.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: konqsidebarplugin.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: konqsidebarplugin.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: konqsidebarplugin.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: konqsidebarplugin.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: konqsidebarplugin.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: konqsidebarplugin.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: konqsidebarplugin.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: konqsidebarplugin.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: konqsidebarplugin.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: konqsidebarplugin.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: konqsidebarplugin.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: konqsidebarplugin.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: konqsidebarplugin.h: in the future, the compiler will take precedence" >&2;} + ;; +esac +{ echo "$as_me:$LINENO: checking for konqsidebarplugin.h" >&5 +echo $ECHO_N "checking for konqsidebarplugin.h... $ECHO_C" >&6; } +if test "${ac_cv_header_konqsidebarplugin_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_konqsidebarplugin_h=$ac_header_preproc +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_konqsidebarplugin_h" >&5 +echo "${ECHO_T}$ac_cv_header_konqsidebarplugin_h" >&6; } - UIC_TR="i18n" - if test $kde_qtver = 3; then - UIC_TR="tr2i18n" - fi +fi +if test $ac_cv_header_konqsidebarplugin_h = yes; then + have_konqsidebar=yes +else + have_konqsidebar=no +fi + 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 + CPPFLAGS=$kde_safe_cppflags -if test -n "$LIBJPEG"; then -{ echo "$as_me:$LINENO: checking if Qt needs $LIBJPEG" >&5 -echo $ECHO_N "checking if Qt needs $LIBJPEG... $ECHO_C" >&6; } -if test "${kde_cv_qt_jpeg+set}" = set; then + kde_save_LDFLAGS="$LDFLAGS" + kde_save_LIBS="$LIBS" + LDFLAGS="$LDFLAGS $all_libraries" + case $host_os in + aix*) LDFLAGS="-brtl $LDFLAGS" + test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS" + ;; + esac + { echo "$as_me:$LINENO: checking for _init in -lkonqsidebarplugin" >&5 +echo $ECHO_N "checking for _init in -lkonqsidebarplugin... $ECHO_C" >&6; } +if test "${ac_cv_lib_konqsidebarplugin__init+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' - - -ac_save_LIBS="$LIBS" -LIBS="$all_libraries $USER_LDFLAGS $LIBQT" -LIBS=`echo $LIBS | sed "s/$LIBJPEG//"` -ac_save_CXXFLAGS="$CXXFLAGS" -CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES" + ac_check_lib_save_LIBS=$LIBS +LIBS="-lkonqsidebarplugin $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include + +/* 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 _init (); int main () { - - int argc; - char** argv; - QApplication app(argc, argv); +return _init (); ; return 0; } @@ -31310,2064 +38230,3238 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || + test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - eval "kde_cv_qt_jpeg=no" + ac_cv_lib_konqsidebarplugin__init=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - eval "kde_cv_qt_jpeg=yes" + ac_cv_lib_konqsidebarplugin__init=no fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext -LIBS="$ac_save_LIBS" -CXXFLAGS="$ac_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 - +LIBS=$ac_check_lib_save_LIBS fi - - -if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - LIBJPEG_QT='$(LIBJPEG)' +{ echo "$as_me:$LINENO: result: $ac_cv_lib_konqsidebarplugin__init" >&5 +echo "${ECHO_T}$ac_cv_lib_konqsidebarplugin__init" >&6; } +if test $ac_cv_lib_konqsidebarplugin__init = yes; then + have_konqsidebar=$have_konqsidebar else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - LIBJPEG_QT= + have_konqsidebar=no fi + LDFLAGS="$kde_save_LDFLAGS" + LIBS="$kde_save_LIBS" -if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then -LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)' + if test x$have_konqsidebar = xyes; then + with_konqsidebar_TRUE= + with_konqsidebar_FALSE='#' else -LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)' + with_konqsidebar_TRUE='#' + with_konqsidebar_FALSE= fi -test -z "$KDE_MT_LIBS" || LIB_QT="$LIB_QT $KDE_MT_LIBS" -for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do - if test -e "$a"; then - LIB_QT="$LIB_QT ${kde_int_qt}_incremental" - break - fi -done +############################################################################### +# END KDEBASE CHECK +############################################################################### +############################################################################### +# BEGIN NJB CHECK +############################################################################### +### mediabrowser.cpp can use libnjb if available +# Check whether --with-libnjb was given. +if test "${with_libnjb+set}" = set; then + withval=$with_libnjb; build_libnjb=$withval +else + build_libnjb=yes +fi +if test "$build_libnjb" != "no"; then + if test "$PKGCONFIGFOUND" = "yes" ; then + # check for libnjb + have_libnjb=no -{ echo "$as_me:$LINENO: checking for rpath" >&5 -echo $ECHO_N "checking for rpath... $ECHO_C" >&6; } -# Check whether --enable-rpath was given. -if test "${enable_rpath+set}" = set; then - enableval=$enable_rpath; USE_RPATH=$enableval -else - USE_RPATH=yes -fi + succeeded=no + if test -z "$PKG_CONFIG"; then + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS -if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi - KDE_RPATH="-R \$(libdir)" - if test "$kde_libraries" != "$libdir"; then - KDE_RPATH="$KDE_RPATH -R \$(kde_libraries)" fi - if test -n "$qt_libraries"; then - KDE_RPATH="$KDE_RPATH -R \$(qt_libraries)" - fi - if test -n "$X_LDFLAGS"; then - X_RPATH="-R \$(x_libraries)" - KDE_RPATH="$KDE_RPATH $X_RPATH" - fi - if test -n "$KDE_EXTRA_RPATH"; then - KDE_RPATH="$KDE_RPATH \$(KDE_EXTRA_RPATH)" - fi -fi + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + { echo "$as_me:$LINENO: checking for libnjb" >&5 +echo $ECHO_N "checking for libnjb... $ECHO_C" >&6; } + if $PKG_CONFIG --exists "libnjb" ; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + succeeded=yes + { echo "$as_me:$LINENO: checking LIBNJB_CFLAGS" >&5 +echo $ECHO_N "checking LIBNJB_CFLAGS... $ECHO_C" >&6; } + LIBNJB_CFLAGS=`$PKG_CONFIG --cflags "libnjb"` + { echo "$as_me:$LINENO: result: $LIBNJB_CFLAGS" >&5 +echo "${ECHO_T}$LIBNJB_CFLAGS" >&6; } -{ echo "$as_me:$LINENO: result: $USE_RPATH" >&5 -echo "${ECHO_T}$USE_RPATH" >&6; } + { echo "$as_me:$LINENO: checking LIBNJB_LIBS" >&5 +echo $ECHO_N "checking LIBNJB_LIBS... $ECHO_C" >&6; } + LIBNJB_LIBS=`$PKG_CONFIG --libs "libnjb"` + { echo "$as_me:$LINENO: result: $LIBNJB_LIBS" >&5 +echo "${ECHO_T}$LIBNJB_LIBS" >&6; } + else + LIBNJB_CFLAGS="" + LIBNJB_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + LIBNJB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libnjb"` -{ echo "$as_me:$LINENO: checking for KDE" >&5 -echo $ECHO_N "checking for KDE... $ECHO_C" >&6; } + fi -if test "${prefix}" != NONE; then - kde_includes=${includedir} -savex=$exec_prefix -test "x$exec_prefix" = xNONE && exec_prefix=$prefix -tmp=$includedir -while ac_kde_includes=`eval echo "$tmp"`; test "x$ac_kde_includes" != "x$tmp"; do tmp=$ac_kde_includes; done -exec_prefix=$savex + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi - kde_libraries=${libdir} + if test $succeeded = yes; then + have_libnjb=yes + else + have_libnjb=no + fi -savex=$exec_prefix -test "x$exec_prefix" = xNONE && exec_prefix=$prefix -tmp=$libdir -while ac_kde_libraries=`eval echo "$tmp"`; test "x$ac_kde_libraries" != "x$tmp"; do tmp=$ac_kde_libraries; done -exec_prefix=$savex + if test "x$have_libnjb" != "xno"; then +cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBNJB 1 +_ACEOF -else - ac_kde_includes= - ac_kde_libraries= - kde_libraries="" - kde_includes="" + fi + fi fi -if test "${ac_cv_have_kde+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - #try to guess kde locations - -if test "$kde_qtver" = 1; then - kde_check_header="ksock.h" - kde_check_lib="libkdecore.la" + if test x$have_libnjb = xyes; then + with_libnjb_TRUE= + with_libnjb_FALSE='#' else - kde_check_header="ksharedptr.h" - kde_check_lib="libkio.la" + with_libnjb_TRUE='#' + with_libnjb_FALSE= fi -if test -z ""; then -kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" -test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs" -kde_incdirs="$ac_kde_includes $kde_incdirs" +############################################################################### +# END NJB CHECK +############################################################################### -kde_incdir=NO -for i in $kde_incdirs; -do - for j in $kde_check_header; - do - echo "configure: 31465: $i/$j" >&5 - if test -r "$i/$j"; then - echo "taking that" >&5 - kde_incdir=$i - break 2 - fi - done -done -ac_kde_includes="$kde_incdir" -if test -n "$ac_kde_includes" && test ! -r "$ac_kde_includes/$kde_check_header"; then - { { echo "$as_me:$LINENO: error: -in the prefix, you've chosen, are no KDE headers installed. This will fail. -So, check this please and use another prefix!" >&5 -echo "$as_me: error: -in the prefix, you've chosen, are no KDE headers installed. This will fail. -So, check this please and use another prefix!" >&2;} - { (exit 1); exit 1; }; } -fi +############################################################################### +# BEGIN MTP CHECK +############################################################################### +### mediabrowser.cpp can use libmtp if available -kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}" -test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs" -kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" -kde_libdir=NO -for i in $kde_libdirs; -do - for j in $kde_check_lib; - do - echo "configure: 31495: $i/$j" >&5 - if test -r "$i/$j"; then - echo "taking that" >&5 - kde_libdir=$i - break 2 - fi - done -done +# Check whether --with-libmtp was given. +if test "${with_libmtp+set}" = set; then + withval=$with_libmtp; build_libmtp=$withval +else + build_libmtp=yes -ac_kde_libraries="$kde_libdir" +fi -kde_widgetdir=NO +if test "$build_libmtp" != "no"; then + if test "$PKGCONFIGFOUND" = "yes" ; then -kde_widgetdir=NO -for i in $kde_libdirs; + succeeded=no + + if test -z "$PKG_CONFIG"; then + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH do - for j in "kde3/plugins/designer/kdewidgets.la"; - do - echo "configure: 31513: $i/$j" >&5 - if test -r "$i/$j"; then - echo "taking that" >&5 - kde_widgetdir=$i - break 2 - fi - done + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi done +done +IFS=$as_save_IFS - -if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then -{ { echo "$as_me:$LINENO: error: -in the prefix, you've chosen, are no KDE libraries installed. This will fail. -So, check this please and use another prefix!" >&5 -echo "$as_me: error: -in the prefix, you've chosen, are no KDE libraries installed. This will fail. -So, check this please and use another prefix!" >&2;} - { (exit 1); exit 1; }; } + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; +esac fi - -if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then -{ { echo "$as_me:$LINENO: error: -I can't find the designer plugins. These are required and should have been installed -by kdelibs" >&5 -echo "$as_me: error: -I can't find the designer plugins. These are required and should have been installed -by kdelibs" >&2;} - { (exit 1); exit 1; }; } +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -if test -n "$kde_widgetdir"; then - kde_widgetdir="$kde_widgetdir/kde3/plugins/designer" -fi + fi -if test "$ac_kde_includes" = NO || test "$ac_kde_libraries" = NO || test "$kde_widgetdir" = NO; then - ac_cv_have_kde="have_kde=no" -else - ac_cv_have_kde="have_kde=yes \ - ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries" -fi + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + { echo "$as_me:$LINENO: checking for libmtp >= 0.1.1" >&5 +echo $ECHO_N "checking for libmtp >= 0.1.1... $ECHO_C" >&6; } -else - ac_cv_have_kde="have_kde=no" + if $PKG_CONFIG --exists "libmtp >= 0.1.1" ; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + succeeded=yes -fi + { echo "$as_me:$LINENO: checking LIBMTP_CFLAGS" >&5 +echo $ECHO_N "checking LIBMTP_CFLAGS... $ECHO_C" >&6; } + LIBMTP_CFLAGS=`$PKG_CONFIG --cflags "libmtp >= 0.1.1"` + { echo "$as_me:$LINENO: result: $LIBMTP_CFLAGS" >&5 +echo "${ECHO_T}$LIBMTP_CFLAGS" >&6; } -fi + { echo "$as_me:$LINENO: checking LIBMTP_LIBS" >&5 +echo $ECHO_N "checking LIBMTP_LIBS... $ECHO_C" >&6; } + LIBMTP_LIBS=`$PKG_CONFIG --libs "libmtp >= 0.1.1"` + { echo "$as_me:$LINENO: result: $LIBMTP_LIBS" >&5 +echo "${ECHO_T}$LIBMTP_LIBS" >&6; } + else + LIBMTP_CFLAGS="" + LIBMTP_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + LIBMTP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libmtp >= 0.1.1"` -eval "$ac_cv_have_kde" + fi -if test "$have_kde" != "yes"; then - if test "${prefix}" = NONE; then - ac_kde_prefix="$ac_default_prefix" - else - ac_kde_prefix="$prefix" - fi - if test "$exec_prefix" = NONE; then - ac_kde_exec_prefix="$ac_kde_prefix" - { echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix" >&5 -echo "${ECHO_T}will be installed in $ac_kde_prefix" >&6; } - else - ac_kde_exec_prefix="$exec_prefix" - { echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&5 -echo "${ECHO_T}will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&6; } - fi - kde_libraries="${libdir}" - kde_includes="${includedir}" -else - ac_cv_have_kde="have_kde=yes \ - ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries" - { echo "$as_me:$LINENO: result: libraries $ac_kde_libraries, headers $ac_kde_includes" >&5 -echo "${ECHO_T}libraries $ac_kde_libraries, headers $ac_kde_includes" >&6; } + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi - kde_libraries="$ac_kde_libraries" - kde_includes="$ac_kde_includes" -fi + if test $succeeded = yes; then + have_libmtp=yes + else -if test "$kde_includes" = "$x_includes" || test "$kde_includes" = "$qt_includes" || test "$kde_includes" = "/usr/include"; then - KDE_INCLUDES="" -else - KDE_INCLUDES="-I$kde_includes" - all_includes="$KDE_INCLUDES $all_includes" -fi + have_libmtp=no -KDE_DEFAULT_CXXFLAGS="-DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST -DQT_NO_STL -DQT_NO_COMPAT -DQT_NO_TRANSLATION" + fi -KDE_LDFLAGS="-L$kde_libraries" -if test ! "$kde_libraries" = "$x_libraries" && test ! "$kde_libraries" = "$qt_libraries" ; then - all_libraries="$KDE_LDFLAGS $all_libraries" -fi + fi + if test "x$have_libmtp" != "xno"; then +cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBMTP 1 +_ACEOF + fi +fi + if test x$have_libmtp = xyes; then + with_libmtp_TRUE= + with_libmtp_FALSE='#' +else + with_libmtp_TRUE='#' + with_libmtp_FALSE= +fi -all_libraries="$all_libraries $USER_LDFLAGS" -all_includes="$all_includes $USER_INCLUDES" +############################################################################### +# END MTP CHECK +############################################################################### +############################################################################### +# BEGIN RIO KARMA CHECK +############################################################################### +### mediabrowser.cpp can use libkarma if available -if test -z ""; then +# Check whether --with-libkarma was given. +if test "${with_libkarma+set}" = set; then + withval=$with_libkarma; build_libkarma=$withval +else + build_libkarma=yes +fi -if test x$ac_uic_supports_libpath = xyes; then +if test "$build_libkarma" != "no"; then -{ echo "$as_me:$LINENO: checking if UIC has KDE plugins available" >&5 -echo $ECHO_N "checking if UIC has KDE plugins available... $ECHO_C" >&6; } -if test "${kde_cv_uic_plugins+set}" = set; then +for ac_header in libkarma/lkarma.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -cat > actest.ui << EOF - -NewConnectionDialog - - - - testInput - - - - -EOF - + ac_header_compiler=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } -kde_cv_uic_plugins=no -kde_line="$UIC_PATH -L $kde_widgetdir" -if test x$ac_uic_supports_nounload = xyes; then - kde_line="$kde_line -nounload" -fi -kde_line="$kde_line -impl actest.h actest.ui > actest.cpp" -if { (eval echo "$as_me:$LINENO: \"$kde_line\"") >&5 - (eval $kde_line) 2>&5 +# Is the header present? +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_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); }; then - # if you're trying to debug this check and think it's incorrect, - # better check your installation. The check _is_ correct - your - # installation is not. - if test -f actest.cpp && grep klineedit actest.cpp > /dev/null; then - kde_cv_uic_plugins=yes - fi -fi -rm -f actest.ui actest.cpp + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_preproc=no fi +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } -{ echo "$as_me:$LINENO: result: $kde_cv_uic_plugins" >&5 -echo "${ECHO_T}$kde_cv_uic_plugins" >&6; } -if test "$kde_cv_uic_plugins" != yes; then - { { echo "$as_me:$LINENO: error: -you need to install kdelibs first. - -If you did install kdelibs, then the Qt version that is picked up by -this configure is not the same version you used to compile kdelibs. -The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the -_same Qt version_, compiled with the _same compiler_ and the same Qt -configuration settings. -" >&5 -echo "$as_me: error: -you need to install kdelibs first. +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -If you did install kdelibs, then the Qt version that is picked up by -this configure is not the same version you used to compile kdelibs. -The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the -_same Qt version_, compiled with the _same compiler_ and the same Qt -configuration settings. -" >&2;} - { (exit 1); exit 1; }; } -fi + ;; +esac +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + have_libkarma=yes +fi -ac_kde_libraries="$kde_libdir" - +done +for ac_header in usb.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_compiler=no +fi - # Check whether --enable-path-check was given. -if test "${enable_path_check+set}" = set; then - enableval=$enable_path_check; - if test "$enableval" = "no"; - then ac_use_path_checking="default" - else ac_use_path_checking="" - fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } +# Is the header present? +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_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_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - if test "$kde_qtver" = 1; - then ac_use_path_checking="" - else ac_use_path_checking="default" - fi - - + ac_header_preproc=no fi +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - - -{ echo "$as_me:$LINENO: checking for KDE paths" >&5 -echo $ECHO_N "checking for KDE paths... $ECHO_C" >&6; } -kde_result="" -kde_cached_paths=yes -if test "${kde_cv_all_paths+set}" = set; then + ;; +esac +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else + eval "$as_ac_Header=\$ac_header_preproc" +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + have_usb=yes +fi + +done + + + if test "$have_libkarma" = "yes"; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBKARMA 1 +_ACEOF + else + { echo "$as_me:$LINENO: result: $have_libkarma" >&5 +echo "${ECHO_T}$have_libkarma" >&6; } + have_libkarma=no + fi +fi -if test "$ac_use_path_checking" = "default"; then - - if test -z "$kde_htmldir"; then - kde_htmldir='\${datadir}/doc/HTML' - fi - if test -z "$kde_appsdir"; then - kde_appsdir='\${datadir}/applnk' - fi - if test -z "$kde_icondir"; then - kde_icondir='\${datadir}/icons' - fi - if test -z "$kde_sounddir"; then - kde_sounddir='\${datadir}/sounds' - fi - if test -z "$kde_datadir"; then - kde_datadir='\${datadir}/apps' - fi - if test -z "$kde_locale"; then - kde_locale='\${datadir}/locale' - fi - if test -z "$kde_cgidir"; then - kde_cgidir='\${exec_prefix}/cgi-bin' - fi - if test -z "$kde_confdir"; then - kde_confdir='\${datadir}/config' - fi - if test -z "$kde_kcfgdir"; then - kde_kcfgdir='\${datadir}/config.kcfg' - fi - if test -z "$kde_mimedir"; then - kde_mimedir='\${datadir}/mimelnk' - fi - if test -z "$kde_toolbardir"; then - kde_toolbardir='\${datadir}/toolbar' - fi - if test -z "$kde_wallpaperdir"; then - kde_wallpaperdir='\${datadir}/wallpapers' - fi - if test -z "$kde_templatesdir"; then - kde_templatesdir='\${datadir}/templates' - fi - if test -z "$kde_bindir"; then - kde_bindir='\${exec_prefix}/bin' - fi - if test -z "$kde_servicesdir"; then - kde_servicesdir='\${datadir}/services' - fi - if test -z "$kde_servicetypesdir"; then - kde_servicetypesdir='\${datadir}/servicetypes' - fi - if test -z "$kde_moduledir"; then - if test "$kde_qtver" = "2"; then - kde_moduledir='\${libdir}/kde2' - else - kde_moduledir='\${libdir}/kde3' - fi - fi - if test -z "$kde_styledir"; then - kde_styledir='\${libdir}/kde3/plugins/styles' - fi - if test -z "$kde_widgetdir"; then - kde_widgetdir='\${libdir}/kde3/plugins/designer' - fi - if test -z "$xdg_appsdir"; then - xdg_appsdir='\${datadir}/applications/kde' - fi - if test -z "$xdg_menudir"; then - xdg_menudir='\${sysconfdir}/xdg/menus' - fi - if test -z "$xdg_directorydir"; then - xdg_directorydir='\${datadir}/desktop-directories' - fi - - - kde_cv_all_paths="kde_have_all_paths=\"yes\" \ - kde_htmldir=\"$kde_htmldir\" \ - kde_appsdir=\"$kde_appsdir\" \ - kde_icondir=\"$kde_icondir\" \ - kde_sounddir=\"$kde_sounddir\" \ - kde_datadir=\"$kde_datadir\" \ - kde_locale=\"$kde_locale\" \ - kde_cgidir=\"$kde_cgidir\" \ - kde_confdir=\"$kde_confdir\" \ - kde_kcfgdir=\"$kde_kcfgdir\" \ - kde_mimedir=\"$kde_mimedir\" \ - kde_toolbardir=\"$kde_toolbardir\" \ - kde_wallpaperdir=\"$kde_wallpaperdir\" \ - kde_templatesdir=\"$kde_templatesdir\" \ - kde_bindir=\"$kde_bindir\" \ - kde_servicesdir=\"$kde_servicesdir\" \ - kde_servicetypesdir=\"$kde_servicetypesdir\" \ - kde_moduledir=\"$kde_moduledir\" \ - kde_styledir=\"$kde_styledir\" \ - kde_widgetdir=\"$kde_widgetdir\" \ - xdg_appsdir=\"$xdg_appsdir\" \ - xdg_menudir=\"$xdg_menudir\" \ - xdg_directorydir=\"$xdg_directorydir\" \ - kde_result=defaults" - - + if test x$have_libkarma = xyes; then + with_libkarma_TRUE= + with_libkarma_FALSE='#' else + with_libkarma_TRUE='#' + with_libkarma_FALSE= +fi - if test $kde_qtver = 1; then - { echo "$as_me:$LINENO: result: compiling" >&5 -echo "${ECHO_T}compiling" >&6; } +############################################################################### +# END RIO KARMA CHECK +############################################################################### - { echo "$as_me:$LINENO: checking for KDE headers installed" >&5 -echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6; } +############################################################################### +# BEGIN IFP CHECK +############################################################################### +### mediabrowser.cpp can use libifp if available - 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' +# Check whether --with-ifp was given. +if test "${with_ifp+set}" = set; then + withval=$with_ifp; build_ifp=$withval +else + build_ifp=yes +fi -cat > conftest.$ac_ext < -#endif -#include -#include "confdefs.h" -#include -int main() { - printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data()); - printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data()); - printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data()); - printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data()); - printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data()); - printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data()); - printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data()); - printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data()); - printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data()); - printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data()); - printf("kde_wallpaperdir=\\"%s\\"\n", - KApplication::kde_wallpaperdir().data()); - printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data()); - printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data()); - printf("kde_servicesdir=\\"/tmp/dummy\\"\n"); - printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n"); - printf("kde_moduledir=\\"/tmp/dummy\\"\n"); - printf("kde_styledir=\\"/tmp/dummy\\"\n"); - printf("kde_widgetdir=\\"/tmp/dummy\\"\n"); - printf("xdg_appsdir=\\"/tmp/dummy\\"\n"); - printf("xdg_menudir=\\"/tmp/dummy\\"\n"); - printf("xdg_directorydir=\\"/tmp/dummy\\"\n"); - printf("kde_kcfgdir=\\"/tmp/dummy\\"\n"); - return 0; - } -EOF +if test "$build_ifp" != "no"; then - ac_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$all_includes $CPPFLAGS" - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + +for ac_header in ifp.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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); }; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - else - { { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application! -Check, if you installed the KDE header files correctly. -For more details about this problem, look at the end of config.log." >&5 -echo "$as_me: error: your system is not able to compile a small KDE application! -Check, if you installed the KDE header files correctly. -For more details about this problem, look at the end of config.log." >&2;} - { (exit 1); exit 1; }; } - fi - CPPFLAGS=$ac_save_CPPFLAGS + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - 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 + ac_header_compiler=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } +# Is the header present? +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_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_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - KDE_TEST_RPATH= + ac_header_preproc=no +fi - if test -n "$USE_RPATH"; then +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } - if test -n "$kde_libraries"; then - KDE_TEST_RPATH="-R $kde_libraries" - fi +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - if test -n "$qt_libraries"; then - KDE_TEST_RPATH="$KDE_TEST_RPATH -R $qt_libraries" - fi + ;; +esac +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } - if test -n "$x_libraries"; then - KDE_TEST_RPATH="$KDE_TEST_RPATH -R $x_libraries" - fi +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + have_ifp=yes +fi - KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH" - fi +done -{ echo "$as_me:$LINENO: checking for KDE libraries installed" >&5 -echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6; } -ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5' -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +for ac_header in usb.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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 -s conftest; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes else - { { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application! -Check, if your compiler is installed correctly and if you have used the -same compiler to compile Qt and kdelibs as you did use now. -For more details about this problem, look at the end of config.log." >&5 -echo "$as_me: error: your system fails at linking a small KDE application! -Check, if your compiler is installed correctly and if you have used the -same compiler to compile Qt and kdelibs as you did use now. -For more details about this problem, look at the end of config.log." >&2;} - { (exit 1); exit 1; }; } -fi + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -if eval `KDEDIR= ./conftest 2>&5`; then - kde_result=done -else - kde_result=problems + ac_header_compiler=no fi -KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log -kde_have_all_paths=yes - +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } - kde_cv_all_paths="kde_have_all_paths=\"yes\" \ - kde_htmldir=\"$kde_htmldir\" \ - kde_appsdir=\"$kde_appsdir\" \ - kde_icondir=\"$kde_icondir\" \ - kde_sounddir=\"$kde_sounddir\" \ - kde_datadir=\"$kde_datadir\" \ - kde_locale=\"$kde_locale\" \ - kde_cgidir=\"$kde_cgidir\" \ - kde_confdir=\"$kde_confdir\" \ - kde_kcfgdir=\"$kde_kcfgdir\" \ - kde_mimedir=\"$kde_mimedir\" \ - kde_toolbardir=\"$kde_toolbardir\" \ - kde_wallpaperdir=\"$kde_wallpaperdir\" \ - kde_templatesdir=\"$kde_templatesdir\" \ - kde_bindir=\"$kde_bindir\" \ - kde_servicesdir=\"$kde_servicesdir\" \ - kde_servicetypesdir=\"$kde_servicetypesdir\" \ - kde_moduledir=\"$kde_moduledir\" \ - kde_styledir=\"$kde_styledir\" \ - kde_widgetdir=\"$kde_widgetdir\" \ - xdg_appsdir=\"$xdg_appsdir\" \ - xdg_menudir=\"$xdg_menudir\" \ - xdg_directorydir=\"$xdg_directorydir\" \ - kde_result=$kde_result" +# Is the header present? +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_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_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } - else - { { echo "$as_me:$LINENO: error: path checking not yet supported for KDE 2" >&5 -echo "$as_me: error: path checking not yet supported for KDE 2" >&2;} - { (exit 1); exit 1; }; } - fi +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ;; +esac +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } - kde_cached_paths=no - +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + have_usb=yes fi -eval "$kde_cv_all_paths" - if test -z "$kde_htmldir" || test -z "$kde_appsdir" || - test -z "$kde_icondir" || test -z "$kde_sounddir" || - test -z "$kde_datadir" || test -z "$kde_locale" || - test -z "$kde_cgidir" || test -z "$kde_confdir" || - test -z "$kde_kcfgdir" || - test -z "$kde_mimedir" || test -z "$kde_toolbardir" || - test -z "$kde_wallpaperdir" || test -z "$kde_templatesdir" || - test -z "$kde_bindir" || test -z "$kde_servicesdir" || - test -z "$kde_servicetypesdir" || test -z "$kde_moduledir" || - test -z "$kde_styledir" || test -z "kde_widgetdir" || - test -z "$xdg_appsdir" || test -z "$xdg_menudir" || test -z "$xdg_directorydir" || - test "x$kde_have_all_paths" != "xyes"; then - kde_have_all_paths=no - fi +done -if test "$kde_have_all_paths" = "no" && test "$kde_cached_paths" = "yes"; then - # wrong values were cached, may be, we can set better ones - kde_result= - kde_htmldir= kde_appsdir= kde_icondir= kde_sounddir= - kde_datadir= kde_locale= kde_cgidir= kde_confdir= kde_kcfgdir= - kde_mimedir= kde_toolbardir= kde_wallpaperdir= kde_templatesdir= - kde_bindir= kde_servicesdir= kde_servicetypesdir= kde_moduledir= - kde_have_all_paths= - kde_styledir= - kde_widgetdir= - xdg_appsdir = xdg_menudir= xdg_directorydir= -if test "$ac_use_path_checking" = "default"; then + if test "$have_ifp" = "yes"; then - if test -z "$kde_htmldir"; then - kde_htmldir='\${datadir}/doc/HTML' - fi - if test -z "$kde_appsdir"; then - kde_appsdir='\${datadir}/applnk' - fi - if test -z "$kde_icondir"; then - kde_icondir='\${datadir}/icons' - fi - if test -z "$kde_sounddir"; then - kde_sounddir='\${datadir}/sounds' - fi - if test -z "$kde_datadir"; then - kde_datadir='\${datadir}/apps' - fi - if test -z "$kde_locale"; then - kde_locale='\${datadir}/locale' - fi - if test -z "$kde_cgidir"; then - kde_cgidir='\${exec_prefix}/cgi-bin' - fi - if test -z "$kde_confdir"; then - kde_confdir='\${datadir}/config' - fi - if test -z "$kde_kcfgdir"; then - kde_kcfgdir='\${datadir}/config.kcfg' - fi - if test -z "$kde_mimedir"; then - kde_mimedir='\${datadir}/mimelnk' - fi - if test -z "$kde_toolbardir"; then - kde_toolbardir='\${datadir}/toolbar' - fi - if test -z "$kde_wallpaperdir"; then - kde_wallpaperdir='\${datadir}/wallpapers' - fi - if test -z "$kde_templatesdir"; then - kde_templatesdir='\${datadir}/templates' - fi - if test -z "$kde_bindir"; then - kde_bindir='\${exec_prefix}/bin' - fi - if test -z "$kde_servicesdir"; then - kde_servicesdir='\${datadir}/services' - fi - if test -z "$kde_servicetypesdir"; then - kde_servicetypesdir='\${datadir}/servicetypes' - fi - if test -z "$kde_moduledir"; then - if test "$kde_qtver" = "2"; then - kde_moduledir='\${libdir}/kde2' +cat >>confdefs.h <<\_ACEOF +#define HAVE_IFP 1 +_ACEOF + + IFP_LIBS="-lifp -lusb" else - kde_moduledir='\${libdir}/kde3' + { echo "$as_me:$LINENO: result: $have_ifp" >&5 +echo "${ECHO_T}$have_ifp" >&6; } + have_ifp=no fi - fi - if test -z "$kde_styledir"; then - kde_styledir='\${libdir}/kde3/plugins/styles' - fi - if test -z "$kde_widgetdir"; then - kde_widgetdir='\${libdir}/kde3/plugins/designer' - fi - if test -z "$xdg_appsdir"; then - xdg_appsdir='\${datadir}/applications/kde' - fi - if test -z "$xdg_menudir"; then - xdg_menudir='\${sysconfdir}/xdg/menus' - fi - if test -z "$xdg_directorydir"; then - xdg_directorydir='\${datadir}/desktop-directories' - fi +fi - kde_cv_all_paths="kde_have_all_paths=\"yes\" \ - kde_htmldir=\"$kde_htmldir\" \ - kde_appsdir=\"$kde_appsdir\" \ - kde_icondir=\"$kde_icondir\" \ - kde_sounddir=\"$kde_sounddir\" \ - kde_datadir=\"$kde_datadir\" \ - kde_locale=\"$kde_locale\" \ - kde_cgidir=\"$kde_cgidir\" \ - kde_confdir=\"$kde_confdir\" \ - kde_kcfgdir=\"$kde_kcfgdir\" \ - kde_mimedir=\"$kde_mimedir\" \ - kde_toolbardir=\"$kde_toolbardir\" \ - kde_wallpaperdir=\"$kde_wallpaperdir\" \ - kde_templatesdir=\"$kde_templatesdir\" \ - kde_bindir=\"$kde_bindir\" \ - kde_servicesdir=\"$kde_servicesdir\" \ - kde_servicetypesdir=\"$kde_servicetypesdir\" \ - kde_moduledir=\"$kde_moduledir\" \ - kde_styledir=\"$kde_styledir\" \ - kde_widgetdir=\"$kde_widgetdir\" \ - xdg_appsdir=\"$xdg_appsdir\" \ - xdg_menudir=\"$xdg_menudir\" \ - xdg_directorydir=\"$xdg_directorydir\" \ - kde_result=defaults" -else - if test $kde_qtver = 1; then - { echo "$as_me:$LINENO: result: compiling" >&5 -echo "${ECHO_T}compiling" >&6; } + if test x$have_ifp = xyes; then + with_ifp_TRUE= + with_ifp_FALSE='#' +else + with_ifp_TRUE='#' + with_ifp_FALSE= +fi - { echo "$as_me:$LINENO: checking for KDE headers installed" >&5 -echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6; } +############################################################################### +# END IFP CHECK +############################################################################### - 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' +############################################################################### +# BEGIN LIBGPOD CHECK +############################################################################### -cat > conftest.$ac_ext < -#endif -#include -#include "confdefs.h" -#include -int main() { - printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data()); - printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data()); - printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data()); - printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data()); - printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data()); - printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data()); - printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data()); - printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data()); - printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data()); - printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data()); - printf("kde_wallpaperdir=\\"%s\\"\n", - KApplication::kde_wallpaperdir().data()); - printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data()); - printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data()); - printf("kde_servicesdir=\\"/tmp/dummy\\"\n"); - printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n"); - printf("kde_moduledir=\\"/tmp/dummy\\"\n"); - printf("kde_styledir=\\"/tmp/dummy\\"\n"); - printf("kde_widgetdir=\\"/tmp/dummy\\"\n"); - printf("xdg_appsdir=\\"/tmp/dummy\\"\n"); - printf("xdg_menudir=\\"/tmp/dummy\\"\n"); - printf("xdg_directorydir=\\"/tmp/dummy\\"\n"); - printf("kde_kcfgdir=\\"/tmp/dummy\\"\n"); - return 0; - } -EOF +# Check whether --with-libgpod was given. +if test "${with_libgpod+set}" = set; then + withval=$with_libgpod; build_libgpod=$withval +else + build_libgpod=yes - ac_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$all_includes $CPPFLAGS" - 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 - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - else - { { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application! -Check, if you installed the KDE header files correctly. -For more details about this problem, look at the end of config.log." >&5 -echo "$as_me: error: your system is not able to compile a small KDE application! -Check, if you installed the KDE header files correctly. -For more details about this problem, look at the end of config.log." >&2;} - { (exit 1); exit 1; }; } - fi - CPPFLAGS=$ac_save_CPPFLAGS +fi - 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 +if test "$build_libgpod" != "no"; then + if test "$PKGCONFIGFOUND" = "yes" ; then + # check for libgpod + have_libgpod=no - KDE_TEST_RPATH= - if test -n "$USE_RPATH"; then + succeeded=no - if test -n "$kde_libraries"; then - KDE_TEST_RPATH="-R $kde_libraries" - fi + if test -z "$PKG_CONFIG"; then + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS - if test -n "$qt_libraries"; then - KDE_TEST_RPATH="$KDE_TEST_RPATH -R $qt_libraries" - fi + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi - if test -n "$x_libraries"; then - KDE_TEST_RPATH="$KDE_TEST_RPATH -R $x_libraries" - fi - KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH" fi -{ echo "$as_me:$LINENO: checking for KDE libraries installed" >&5 -echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6; } -ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5' + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + { echo "$as_me:$LINENO: checking for libgpod-1.0" >&5 +echo $ECHO_N "checking for libgpod-1.0... $ECHO_C" >&6; } -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; then - { echo "$as_me:$LINENO: result: yes" >&5 + if $PKG_CONFIG --exists "libgpod-1.0" ; then + { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } -else - { { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application! -Check, if your compiler is installed correctly and if you have used the -same compiler to compile Qt and kdelibs as you did use now. -For more details about this problem, look at the end of config.log." >&5 -echo "$as_me: error: your system fails at linking a small KDE application! -Check, if your compiler is installed correctly and if you have used the -same compiler to compile Qt and kdelibs as you did use now. -For more details about this problem, look at the end of config.log." >&2;} - { (exit 1); exit 1; }; } -fi + succeeded=yes -if eval `KDEDIR= ./conftest 2>&5`; then - kde_result=done -else - kde_result=problems -fi + { echo "$as_me:$LINENO: checking LIBGPOD_CFLAGS" >&5 +echo $ECHO_N "checking LIBGPOD_CFLAGS... $ECHO_C" >&6; } + LIBGPOD_CFLAGS=`$PKG_CONFIG --cflags "libgpod-1.0"` + { echo "$as_me:$LINENO: result: $LIBGPOD_CFLAGS" >&5 +echo "${ECHO_T}$LIBGPOD_CFLAGS" >&6; } -KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log -kde_have_all_paths=yes + { echo "$as_me:$LINENO: checking LIBGPOD_LIBS" >&5 +echo $ECHO_N "checking LIBGPOD_LIBS... $ECHO_C" >&6; } + LIBGPOD_LIBS=`$PKG_CONFIG --libs "libgpod-1.0"` + { echo "$as_me:$LINENO: result: $LIBGPOD_LIBS" >&5 +echo "${ECHO_T}$LIBGPOD_LIBS" >&6; } + else + LIBGPOD_CFLAGS="" + LIBGPOD_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + LIBGPOD_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgpod-1.0"` + fi - kde_cv_all_paths="kde_have_all_paths=\"yes\" \ - kde_htmldir=\"$kde_htmldir\" \ - kde_appsdir=\"$kde_appsdir\" \ - kde_icondir=\"$kde_icondir\" \ - kde_sounddir=\"$kde_sounddir\" \ - kde_datadir=\"$kde_datadir\" \ - kde_locale=\"$kde_locale\" \ - kde_cgidir=\"$kde_cgidir\" \ - kde_confdir=\"$kde_confdir\" \ - kde_kcfgdir=\"$kde_kcfgdir\" \ - kde_mimedir=\"$kde_mimedir\" \ - kde_toolbardir=\"$kde_toolbardir\" \ - kde_wallpaperdir=\"$kde_wallpaperdir\" \ - kde_templatesdir=\"$kde_templatesdir\" \ - kde_bindir=\"$kde_bindir\" \ - kde_servicesdir=\"$kde_servicesdir\" \ - kde_servicetypesdir=\"$kde_servicetypesdir\" \ - kde_moduledir=\"$kde_moduledir\" \ - kde_styledir=\"$kde_styledir\" \ - kde_widgetdir=\"$kde_widgetdir\" \ - xdg_appsdir=\"$xdg_appsdir\" \ - xdg_menudir=\"$xdg_menudir\" \ - xdg_directorydir=\"$xdg_directorydir\" \ - kde_result=$kde_result" + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + if test $succeeded = yes; then + have_libgpod=yes else - { { echo "$as_me:$LINENO: error: path checking not yet supported for KDE 2" >&5 -echo "$as_me: error: path checking not yet supported for KDE 2" >&2;} - { (exit 1); exit 1; }; } + have_libgpod=no fi -fi - eval "$kde_cv_all_paths" - if test -z "$kde_htmldir" || test -z "$kde_appsdir" || - test -z "$kde_icondir" || test -z "$kde_sounddir" || - test -z "$kde_datadir" || test -z "$kde_locale" || - test -z "$kde_cgidir" || test -z "$kde_confdir" || - test -z "$kde_kcfgdir" || - test -z "$kde_mimedir" || test -z "$kde_toolbardir" || - test -z "$kde_wallpaperdir" || test -z "$kde_templatesdir" || - test -z "$kde_bindir" || test -z "$kde_servicesdir" || - test -z "$kde_servicetypesdir" || test -z "$kde_moduledir" || - test -z "$kde_styledir" || test -z "kde_widgetdir" || - test -z "$xdg_appsdir" || test -z "$xdg_menudir" || test -z "$xdg_directorydir" || - test "x$kde_have_all_paths" != "xyes"; then - kde_have_all_paths=no - fi + if test "x$have_libgpod" = "xyes"; then + ac_cppflags_save=$CPPFLAGS + ac_cflags_save=$CFLAGS + ac_libs_save=$LIBS + CPPFLAGS="$CPPFLAGS $LIBGPOD_INCLUDES" + CFLAGS="$CFLAGS $LIBGPOD_CFLAGS" + LIBS="$LIBS $LIBGPOD_LIBS" - kde_result="$kde_result (cache overridden)" -fi -if test "$kde_have_all_paths" = "no"; then - { { echo "$as_me:$LINENO: error: configure could not run a little KDE program to test the environment. -Since it had compiled and linked before, it must be a strange problem on your system. -Look at config.log for details. If you are not able to fix this, look at -http://www.kde.org/faq/installation.html or any www.kde.org mirror. -(If you're using an egcs version on Linux, you may update binutils!) -" >&5 -echo "$as_me: error: configure could not run a little KDE program to test the environment. -Since it had compiled and linked before, it must be a strange problem on your system. -Look at config.log for details. If you are not able to fix this, look at -http://www.kde.org/faq/installation.html or any www.kde.org mirror. -(If you're using an egcs version on Linux, you may update binutils!) -" >&2;} - { (exit 1); exit 1; }; } + +for ac_func in itdb_track_set_thumbnails +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - rm -f conftest* - { echo "$as_me:$LINENO: result: $kde_result" >&5 -echo "${ECHO_T}$kde_result" >&6; } -fi + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func -bindir=$kde_bindir +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif +#undef $ac_func +/* 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 $ac_func (); +/* 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_$ac_func || defined __stub___$ac_func +choke me +#endif -# Check whether --with-arts was given. -if test "${with_arts+set}" = set; then - withval=$with_arts; build_arts=$withval +int +main () +{ +return $ac_func (); + ; + 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 + eval "$as_ac_var=yes" else - build_arts=yes + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + eval "$as_ac_var=no" fi - if test "$build_arts" '!=' "no"; then - include_ARTS_TRUE= - include_ARTS_FALSE='#' +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + else - include_ARTS_TRUE='#' - include_ARTS_FALSE= + have_libgpod_042=no fi +done - if test "$build_arts" = "no"; then -cat >>confdefs.h <<\_ACEOF -#define WITHOUT_ARTS 1 +for ac_func in itdb_get_mountpoint +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+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 $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func - fi - +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ - kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin" - test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs" - if test -n "$KDEDIRS"; then - kde_save_IFS=$IFS - IFS=: - for dir in $KDEDIRS; do - kde_default_bindirs="$dir/bin $kde_default_bindirs " - done - IFS=$kde_save_IFS - fi +#ifdef __STDC__ +# include +#else +# include +#endif - kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs" +#undef $ac_func - { echo "$as_me:$LINENO: checking for dcopidl" >&5 -echo $ECHO_N "checking for dcopidl... $ECHO_C" >&6; } - if test -n "$DCOPIDL"; then - kde_cv_path="$DCOPIDL"; - else - kde_cache=`echo dcopidl | sed 'y%./+-%__p_%'` +/* 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 $ac_func (); +/* 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_$ac_func || defined __stub___$ac_func +choke me +#endif - if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +int +main () +{ +return $ac_func (); + ; + 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 + eval "$as_ac_var=yes" else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - kde_cv_path="NONE" - kde_save_IFS=$IFS - IFS=':' - dirs="" - for dir in $PATH; do - dirs="$dirs $dir" - done - if test -z ""; then dirs="$kde_default_bindirs $dirs" - else dirs="$dirs $kde_default_bindirs" - fi - IFS=$kde_save_IFS + eval "$as_ac_var=no" +fi - for dir in $dirs; do - if test -x "$dir/dcopidl"; then - if test -n "" - then - evalstr="$dir/dcopidl 2>&1 " - if eval $evalstr; then - kde_cv_path="$dir/dcopidl" - break - fi - else - kde_cv_path="$dir/dcopidl" - break - fi - fi - done +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF - eval "kde_cv_path_$kde_cache=$kde_cv_path" +else + have_libgpod_042=no +fi +done -fi +for ac_func in itdb_device_get_ipod_info +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+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 $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ - eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\"" +#ifdef __STDC__ +# include +#else +# include +#endif - fi +#undef $ac_func - if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - { echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6; } +/* 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 $ac_func (); +/* 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_$ac_func || defined __stub___$ac_func +choke me +#endif - { { echo "$as_me:$LINENO: error: The important program dcopidl was not found! -Please check whether you installed KDE correctly. -" >&5 -echo "$as_me: error: The important program dcopidl was not found! -Please check whether you installed KDE correctly. -" >&2;} - { (exit 1); exit 1; }; } +int +main () +{ +return $ac_func (); + ; + 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 + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - else - { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6; } - DCOPIDL=$kde_cv_path + eval "$as_ac_var=no" +fi - fi +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF +else + have_libgpod_042=no +fi +done - { echo "$as_me:$LINENO: checking for dcopidl2cpp" >&5 -echo $ECHO_N "checking for dcopidl2cpp... $ECHO_C" >&6; } - if test -n "$DCOPIDL2CPP"; then - kde_cv_path="$DCOPIDL2CPP"; - else - kde_cache=`echo dcopidl2cpp | sed 'y%./+-%__p_%'` - if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for struct _Itdb_Track.movie_flag" >&5 +echo $ECHO_N "checking for struct _Itdb_Track.movie_flag... $ECHO_C" >&6; } +if test "${ac_cv_member_struct__Itdb_Track_movie_flag+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. */ +#include - kde_cv_path="NONE" - kde_save_IFS=$IFS - IFS=':' - dirs="" - for dir in $PATH; do - dirs="$dirs $dir" - done - if test -z ""; then dirs="$kde_default_bindirs $dirs" - else dirs="$dirs $kde_default_bindirs" - fi - IFS=$kde_save_IFS - - for dir in $dirs; do - if test -x "$dir/dcopidl2cpp"; then - if test -n "" - then - evalstr="$dir/dcopidl2cpp 2>&1 " - if eval $evalstr; then - kde_cv_path="$dir/dcopidl2cpp" - break - fi - else - kde_cv_path="$dir/dcopidl2cpp" - break - fi - fi - done +int +main () +{ +static struct _Itdb_Track ac_aggr; +if (ac_aggr.movie_flag) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_cv_member_struct__Itdb_Track_movie_flag=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - eval "kde_cv_path_$kde_cache=$kde_cv_path" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ +static struct _Itdb_Track ac_aggr; +if (sizeof ac_aggr.movie_flag) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_cv_member_struct__Itdb_Track_movie_flag=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_member_struct__Itdb_Track_movie_flag=no fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi - eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\"" - - fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_member_struct__Itdb_Track_movie_flag" >&5 +echo "${ECHO_T}$ac_cv_member_struct__Itdb_Track_movie_flag" >&6; } +if test $ac_cv_member_struct__Itdb_Track_movie_flag = yes; then - if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - { echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6; } +cat >>confdefs.h <<\_ACEOF +#define HAVE_ITDB_MOVIE_FLAG 1 +_ACEOF - { { echo "$as_me:$LINENO: error: The important program dcopidl2cpp was not found! -Please check whether you installed KDE correctly. -" >&5 -echo "$as_me: error: The important program dcopidl2cpp was not found! -Please check whether you installed KDE correctly. -" >&2;} - { (exit 1); exit 1; }; } +else + have_libgpod_042=no +fi - else - { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6; } - DCOPIDL2CPP=$kde_cv_path - fi + { echo "$as_me:$LINENO: checking for struct _Itdb_Track.skip_when_shuffling" >&5 +echo $ECHO_N "checking for struct _Itdb_Track.skip_when_shuffling... $ECHO_C" >&6; } +if test "${ac_cv_member_struct__Itdb_Track_skip_when_shuffling+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. */ +#include - if test "$build_arts" '!=' "no"; then +int +main () +{ +static struct _Itdb_Track ac_aggr; +if (ac_aggr.skip_when_shuffling) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_cv_member_struct__Itdb_Track_skip_when_shuffling=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - { echo "$as_me:$LINENO: checking for mcopidl" >&5 -echo $ECHO_N "checking for mcopidl... $ECHO_C" >&6; } - if test -n "$MCOPIDL"; then - kde_cv_path="$MCOPIDL"; - else - kde_cache=`echo mcopidl | sed 'y%./+-%__p_%'` + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include - if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +int +main () +{ +static struct _Itdb_Track ac_aggr; +if (sizeof ac_aggr.skip_when_shuffling) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_cv_member_struct__Itdb_Track_skip_when_shuffling=yes else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - kde_cv_path="NONE" - kde_save_IFS=$IFS - IFS=':' - dirs="" - for dir in $PATH; do - dirs="$dirs $dir" - done - if test -z ""; then dirs="$kde_default_bindirs $dirs" - else dirs="$dirs $kde_default_bindirs" - fi - IFS=$kde_save_IFS + ac_cv_member_struct__Itdb_Track_skip_when_shuffling=no +fi - for dir in $dirs; do - if test -x "$dir/mcopidl"; then - if test -n "" - then - evalstr="$dir/mcopidl 2>&1 " - if eval $evalstr; then - kde_cv_path="$dir/mcopidl" - break - fi - else - kde_cv_path="$dir/mcopidl" - break - fi - fi - done +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi - eval "kde_cv_path_$kde_cache=$kde_cv_path" +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_member_struct__Itdb_Track_skip_when_shuffling" >&5 +echo "${ECHO_T}$ac_cv_member_struct__Itdb_Track_skip_when_shuffling" >&6; } +if test $ac_cv_member_struct__Itdb_Track_skip_when_shuffling = yes; then +cat >>confdefs.h <<\_ACEOF +#define HAVE_ITDB_SKIP_SHUFFLE_FLAG 1 +_ACEOF +else + have_libgpod_042=no fi - eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\"" + { echo "$as_me:$LINENO: checking for struct _Itdb_Track.mark_unplayed" >&5 +echo $ECHO_N "checking for struct _Itdb_Track.mark_unplayed... $ECHO_C" >&6; } +if test "${ac_cv_member_struct__Itdb_Track_mark_unplayed+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. */ +#include - fi +int +main () +{ +static struct _Itdb_Track ac_aggr; +if (ac_aggr.mark_unplayed) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_cv_member_struct__Itdb_Track_mark_unplayed=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - { echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6; } + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +int +main () +{ +static struct _Itdb_Track ac_aggr; +if (sizeof ac_aggr.mark_unplayed) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_cv_member_struct__Itdb_Track_mark_unplayed=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - { { echo "$as_me:$LINENO: error: The important program mcopidl was not found! -Please check whether you installed aRts correctly or use ---without-arts to compile without aRts support (this will remove functionality). -" >&5 -echo "$as_me: error: The important program mcopidl was not found! -Please check whether you installed aRts correctly or use ---without-arts to compile without aRts support (this will remove functionality). -" >&2;} - { (exit 1); exit 1; }; } + ac_cv_member_struct__Itdb_Track_mark_unplayed=no +fi - else - { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6; } - MCOPIDL=$kde_cv_path +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi - fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_member_struct__Itdb_Track_mark_unplayed" >&5 +echo "${ECHO_T}$ac_cv_member_struct__Itdb_Track_mark_unplayed" >&6; } +if test $ac_cv_member_struct__Itdb_Track_mark_unplayed = yes; then +cat >>confdefs.h <<\_ACEOF +#define HAVE_ITDB_MARK_UNPLAYED 1 +_ACEOF - { echo "$as_me:$LINENO: checking for artsc-config" >&5 -echo $ECHO_N "checking for artsc-config... $ECHO_C" >&6; } - if test -n "$ARTSCCONFIG"; then - kde_cv_path="$ARTSCCONFIG"; - else - kde_cache=`echo artsc-config | sed 'y%./+-%__p_%'` +else + have_libgpod_042=no +fi - if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then + + { echo "$as_me:$LINENO: checking for struct _Itdb_Track.mediatype" >&5 +echo $ECHO_N "checking for struct _Itdb_Track.mediatype... $ECHO_C" >&6; } +if test "${ac_cv_member_struct__Itdb_Track_mediatype+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. */ +#include - kde_cv_path="NONE" - kde_save_IFS=$IFS - IFS=':' - dirs="" - for dir in $PATH; do - dirs="$dirs $dir" - done - if test -z ""; then dirs="$kde_default_bindirs $dirs" - else dirs="$dirs $kde_default_bindirs" - fi - IFS=$kde_save_IFS - - for dir in $dirs; do - if test -x "$dir/artsc-config"; then - if test -n "" - then - evalstr="$dir/artsc-config 2>&1 " - if eval $evalstr; then - kde_cv_path="$dir/artsc-config" - break - fi - else - kde_cv_path="$dir/artsc-config" - break - fi - fi - done +int +main () +{ +static struct _Itdb_Track ac_aggr; +if (ac_aggr.mediatype) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_cv_member_struct__Itdb_Track_mediatype=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - eval "kde_cv_path_$kde_cache=$kde_cv_path" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ +static struct _Itdb_Track ac_aggr; +if (sizeof ac_aggr.mediatype) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_cv_member_struct__Itdb_Track_mediatype=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_member_struct__Itdb_Track_mediatype=no fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi - eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\"" +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_member_struct__Itdb_Track_mediatype" >&5 +echo "${ECHO_T}$ac_cv_member_struct__Itdb_Track_mediatype" >&6; } +if test $ac_cv_member_struct__Itdb_Track_mediatype = yes; then - fi +cat >>confdefs.h <<\_ACEOF +#define HAVE_ITDB_MEDIATYPE 1 +_ACEOF - if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - { echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6; } +else + have_libgpod_042=no +fi - { { echo "$as_me:$LINENO: error: The important program artsc-config was not found! -Please check whether you installed aRts correctly or use ---without-arts to compile without aRts support (this will remove functionality). -" >&5 -echo "$as_me: error: The important program artsc-config was not found! -Please check whether you installed aRts correctly or use ---without-arts to compile without aRts support (this will remove functionality). -" >&2;} - { (exit 1); exit 1; }; } - else - { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6; } - ARTSCCONFIG=$kde_cv_path + { echo "$as_me:$LINENO: checking whether ITDB_IPOD_MODEL_TOUCH_BLACK is declared" >&5 +echo $ECHO_N "checking whether ITDB_IPOD_MODEL_TOUCH_BLACK is declared... $ECHO_C" >&6; } +if test "${ac_cv_have_decl_ITDB_IPOD_MODEL_TOUCH_BLACK+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. */ +#include - fi +int +main () +{ +#ifndef ITDB_IPOD_MODEL_TOUCH_BLACK + (void) ITDB_IPOD_MODEL_TOUCH_BLACK; +#endif - fi + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_cv_have_decl_ITDB_IPOD_MODEL_TOUCH_BLACK=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - { echo "$as_me:$LINENO: checking for meinproc" >&5 -echo $ECHO_N "checking for meinproc... $ECHO_C" >&6; } - if test -n "$MEINPROC"; then - kde_cv_path="$MEINPROC"; - else - kde_cache=`echo meinproc | sed 'y%./+-%__p_%'` + ac_cv_have_decl_ITDB_IPOD_MODEL_TOUCH_BLACK=no +fi - if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_ITDB_IPOD_MODEL_TOUCH_BLACK" >&5 +echo "${ECHO_T}$ac_cv_have_decl_ITDB_IPOD_MODEL_TOUCH_BLACK" >&6; } +if test $ac_cv_have_decl_ITDB_IPOD_MODEL_TOUCH_BLACK = yes; then - kde_cv_path="NONE" - kde_save_IFS=$IFS - IFS=':' - dirs="" - for dir in $PATH; do - dirs="$dirs $dir" - done - if test -z ""; then dirs="$kde_default_bindirs $dirs" - else dirs="$dirs $kde_default_bindirs" - fi - IFS=$kde_save_IFS +cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBGPOD_060 1 +_ACEOF - for dir in $dirs; do - if test -x "$dir/meinproc"; then - if test -n "" - then - evalstr="$dir/meinproc 2>&1 " - if eval $evalstr; then - kde_cv_path="$dir/meinproc" - break - fi - else - kde_cv_path="$dir/meinproc" - break - fi - fi - done +else + have_libgpod_060=no +fi - eval "kde_cv_path_$kde_cache=$kde_cv_path" + CPPFLAGS=$ac_cppflags_save + CFLAGS=$ac_cflags_save + LIBS=$ac_libs_save + fi -fi + if test "x$have_libgpod_042" = "xno"; then + have_libgpod=no + { echo "$as_me:$LINENO: result: Your libgpod version is too old: at least 0.4.2 is required" >&5 +echo "${ECHO_T}Your libgpod version is too old: at least 0.4.2 is required" >&6; } + fi + if test "x$have_libgpod" != "xno"; then - eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\"" +cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBGPOD 1 +_ACEOF - fi + fi + fi +fi - if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - { echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6; } + if test x$have_libgpod = xyes; then + with_libgpod_TRUE= + with_libgpod_FALSE='#' +else + with_libgpod_TRUE='#' + with_libgpod_FALSE= +fi - else - { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6; } - MEINPROC=$kde_cv_path - fi +############################################################################### +# END LIBGPOD CHECK +############################################################################### - kde32ornewer=1 - kde33ornewer=1 - if test -n "$kde_qtver" && test "$kde_qtver" -lt 3; then - kde32ornewer= - kde33ornewer= - else - if test "$kde_qtver" = "3"; then - if test "$kde_qtsubver" -le 1; then - kde32ornewer= - fi - if test "$kde_qtsubver" -le 2; then - kde33ornewer= - fi - if test "$KDECONFIG" != "compiled"; then - if test `$KDECONFIG --version | grep KDE | sed 's/KDE: \(...\).*/\1/'` = 3.2; then - kde33ornewer= - fi - fi - fi - fi - if test -n "$kde32ornewer"; then +############################################################################### +# BEGIN statvfs(2) CHECK +############################################################################### - { echo "$as_me:$LINENO: checking for kconfig_compiler" >&5 -echo $ECHO_N "checking for kconfig_compiler... $ECHO_C" >&6; } - if test -n "$KCONFIG_COMPILER"; then - kde_cv_path="$KCONFIG_COMPILER"; - else - kde_cache=`echo kconfig_compiler | sed 'y%./+-%__p_%'` - if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then +for ac_func in statvfs +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+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 $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func - kde_cv_path="NONE" - kde_save_IFS=$IFS - IFS=':' - dirs="" - for dir in $PATH; do - dirs="$dirs $dir" - done - if test -z ""; then dirs="$kde_default_bindirs $dirs" - else dirs="$dirs $kde_default_bindirs" - fi - IFS=$kde_save_IFS - - for dir in $dirs; do - if test -x "$dir/kconfig_compiler"; then - if test -n "" - then - evalstr="$dir/kconfig_compiler 2>&1 " - if eval $evalstr; then - kde_cv_path="$dir/kconfig_compiler" - break - fi - else - kde_cv_path="$dir/kconfig_compiler" - break - fi - fi - done - - eval "kde_cv_path_$kde_cache=$kde_cv_path" +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ +#ifdef __STDC__ +# include +#else +# include +#endif -fi +#undef $ac_func +/* 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 $ac_func (); +/* 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_$ac_func || defined __stub___$ac_func +choke me +#endif - eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\"" +int +main () +{ +return $ac_func (); + ; + 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 + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - fi + eval "$as_ac_var=no" +fi - if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - { echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6; } +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF - { { echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found! -Please check whether you installed KDE correctly. -" >&5 -echo "$as_me: error: The important program kconfig_compiler was not found! -Please check whether you installed KDE correctly. -" >&2;} - { (exit 1); exit 1; }; } +fi +done - else - { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6; } - KCONFIG_COMPILER=$kde_cv_path - fi +############################################################################### +# END statvfs(2) CHECK +############################################################################### - { echo "$as_me:$LINENO: checking for dcopidlng" >&5 -echo $ECHO_N "checking for dcopidlng... $ECHO_C" >&6; } - if test -n "$DCOPIDLNG"; then - kde_cv_path="$DCOPIDLNG"; - else - kde_cache=`echo dcopidlng | sed 'y%./+-%__p_%'` - if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else +############################################################################### +# BEGIN MP4V2 CHECK +############################################################################### +# m4a/aac tag reading and writing needs libmp4v2 from faad2 or better mpeg4ip - kde_cv_path="NONE" - kde_save_IFS=$IFS - IFS=':' - dirs="" - for dir in $PATH; do - dirs="$dirs $dir" - done - if test -z ""; then dirs="$kde_default_bindirs $dirs" - else dirs="$dirs $kde_default_bindirs" - fi - IFS=$kde_save_IFS - for dir in $dirs; do - if test -x "$dir/dcopidlng"; then - if test -n "" - then - evalstr="$dir/dcopidlng 2>&1 " - if eval $evalstr; then - kde_cv_path="$dir/dcopidlng" - break - fi - else - kde_cv_path="$dir/dcopidlng" - break - fi - fi - done +# Check whether --with-mp4v2 was given. +if test "${with_mp4v2+set}" = set; then + withval=$with_mp4v2; have_mp4v2=$withval +else + have_mp4v2=no - eval "kde_cv_path_$kde_cache=$kde_cv_path" +fi -fi +# Check whether --with-mp4v2-dir was given. +if test "${with_mp4v2_dir+set}" = set; then + withval=$with_mp4v2_dir; mp4v2_dir="$withval" +else + mp4v2_dir=/usr - eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\"" +fi - fi - if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - { echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6; } +if test "$have_mp4v2" != "no"; then - { { echo "$as_me:$LINENO: error: The important program dcopidlng was not found! -Please check whether you installed KDE correctly. -" >&5 -echo "$as_me: error: The important program dcopidlng was not found! -Please check whether you installed KDE correctly. -" >&2;} - { (exit 1); exit 1; }; } + 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 - else - { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6; } - DCOPIDLNG=$kde_cv_path +ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - fi - fi - if test -n "$kde33ornewer"; then + ac_cxxflags_save=$CXXFLAGS + CXXFLAGS="$CXXFLAGS -I$mp4v2_dir/include" + ac_ldflags_save=$LDFLAGS + LDFLAGS="$LDFLAGS -L$mp4v2_dir/lib" - { echo "$as_me:$LINENO: checking for makekdewidgets" >&5 -echo $ECHO_N "checking for makekdewidgets... $ECHO_C" >&6; } - if test -n "$MAKEKDEWIDGETS"; then - kde_cv_path="$MAKEKDEWIDGETS"; - else - kde_cache=`echo makekdewidgets | sed 'y%./+-%__p_%'` + # not even everyone using faad2 has + if ! test -f config.h; then + echo "#include \"confdefs.h\"" > config.h + fi + ac_cppflags_save=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I." - if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then +for ac_header in systems.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - kde_cv_path="NONE" - kde_save_IFS=$IFS - IFS=':' - dirs="" - for dir in $PATH; do - dirs="$dirs $dir" - done - if test -z ""; then dirs="$kde_default_bindirs $dirs" - else dirs="$dirs $kde_default_bindirs" - fi - IFS=$kde_save_IFS - - for dir in $dirs; do - if test -x "$dir/makekdewidgets"; then - if test -n "" - then - evalstr="$dir/makekdewidgets 2>&1 " - if eval $evalstr; then - kde_cv_path="$dir/makekdewidgets" - break - fi - else - kde_cv_path="$dir/makekdewidgets" - break - fi - fi - done - - eval "kde_cv_path_$kde_cache=$kde_cv_path" - - + ac_header_compiler=no fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } - eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\"" +# Is the header present? +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_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 + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - fi + ac_header_preproc=no +fi - if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - { echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6; } +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } - { { echo "$as_me:$LINENO: error: The important program makekdewidgets was not found! -Please check whether you installed KDE correctly. -" >&5 -echo "$as_me: error: The important program makekdewidgets was not found! -Please check whether you installed KDE correctly. -" >&2;} - { (exit 1); exit 1; }; } +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - else - { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6; } - MAKEKDEWIDGETS=$kde_cv_path + ;; +esac +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } - fi +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF +fi - fi +done - { echo "$as_me:$LINENO: checking for xmllint" >&5 -echo $ECHO_N "checking for xmllint... $ECHO_C" >&6; } - if test -n "$XMLLINT"; then - kde_cv_path="$XMLLINT"; - else - kde_cache=`echo xmllint | sed 'y%./+-%__p_%'` - if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then +for ac_header in mp4.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+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. */ +#ifdef HAVE_SYSTEMS_H + # include + #endif - kde_cv_path="NONE" - kde_save_IFS=$IFS - IFS=':' - dirs="" - for dir in $PATH; do - dirs="$dirs $dir" - done - if test -z ""; then dirs="${prefix}/bin ${exec_prefix}/bin $dirs" - else dirs="$dirs ${prefix}/bin ${exec_prefix}/bin" - fi - IFS=$kde_save_IFS - - for dir in $dirs; do - if test -x "$dir/xmllint"; then - if test -n "" - then - evalstr="$dir/xmllint 2>&1 " - if eval $evalstr; then - kde_cv_path="$dir/xmllint" - break - fi - else - kde_cv_path="$dir/xmllint" - break - fi - fi - done - eval "kde_cv_path_$kde_cache=$kde_cv_path" +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + eval "$as_ac_Header=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + have_mp4_h=yes fi +done - eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\"" - fi + { echo "$as_me:$LINENO: checking for MP4Read in -lmp4v2" >&5 +echo $ECHO_N "checking for MP4Read in -lmp4v2... $ECHO_C" >&6; } +if test "${ac_cv_lib_mp4v2_MP4Read+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lmp4v2 $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ - if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - { echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6; } - XMLLINT="" - else - { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6; } - XMLLINT=$kde_cv_path +/* 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 MP4Read (); +int +main () +{ +return MP4Read (); + ; + 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_mp4v2_MP4Read=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - fi + ac_cv_lib_mp4v2_MP4Read=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_mp4v2_MP4Read" >&5 +echo "${ECHO_T}$ac_cv_lib_mp4v2_MP4Read" >&6; } +if test $ac_cv_lib_mp4v2_MP4Read = yes; then + have_mp4v2=yes +else + have_mp4v2=no +fi - if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then - kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share" - test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs" + if test "$have_mp4v2" = "yes" -a "$have_mp4_h" = "yes"; then -KDE_XSL_STYLESHEET=NO -for i in $kde_sharedirs; -do - for j in apps/ksgmltools2/customization/kde-chunk.xsl; - do - echo "configure: 33032: $i/$j" >&5 - if test -r "$i/$j"; then - echo "taking that" >&5 - KDE_XSL_STYLESHEET=$i - break 2 +cat >>confdefs.h <<\_ACEOF +#define HAVE_MP4V2 1 +_ACEOF + + MP4V2_INCLUDES="-I$mp4v2_dir/include" + MP4V2_LIBS="-L$mp4v2_dir/lib -lmp4v2" + else + have_mp4v2=no fi - done -done - if test "$KDE_XSL_STYLESHEET" = "NO"; then - KDE_XSL_STYLESHEET="" - else - KDE_XSL_STYLESHEET="$KDE_XSL_STYLESHEET/apps/ksgmltools2/customization/kde-chunk.xsl" - fi - fi + CPPFLAGS=$ac_cppflags_save + CXXFLAGS=$ac_cxxflags_save + LDFLAGS=$ac_ldflags_save + 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 - DCOP_DEPENDENCIES='$(DCOPIDL)' - if test -n "$kde32ornewer"; then - KCFG_DEPENDENCIES='$(KCONFIG_COMPILER)' - DCOP_DEPENDENCIES='$(DCOPIDL) $(DCOPIDLNG)' +fi - fi + if test x$have_mp4v2 != xno ; then + with_mp4v2_TRUE= + with_mp4v2_FALSE='#' +else + with_mp4v2_TRUE='#' + with_mp4v2_FALSE= +fi + + +############################################################################### +# END MP4V2 CHECK +############################################################################### +############################################################################### +# BEGIN DAAP KDE 3.4 CHECK +############################################################################### +daapsave_CXXFLAGS="$CXXFLAGS" +CXXFLAGS="$CXXFLAGS $all_includes" + 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' +{ echo "$as_me:$LINENO: checking if KDE is at least 3.4 for DAAP support" >&5 +echo $ECHO_N "checking if KDE is at least 3.4 for DAAP support... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +#include +#if ! ( KDE_IS_VERSION( 3, 4, 0 ) ) +#error KDE 3.4 +#endif +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + have_kde34="yes" + DNSSD_LIBS=$LIB_KDNSSD +# echo "yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + have_kde34="no" + DNSSD_LIBS="" +# echo "no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +CXXFLAGS="$daapsave_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 + if test x$have_kde34 != xno ; then + atleast_kde34_TRUE= + atleast_kde34_FALSE='#' +else + atleast_kde34_TRUE='#' + atleast_kde34_FALSE= +fi +{ echo "$as_me:$LINENO: result: $have_kde34" >&5 +echo "${ECHO_T}$have_kde34" >&6; } +############################################################################### +# END DAAP KDE 3.4 CHECK +############################################################################### +############################################################################### +# BEGIN OPTIONAL DAAP SUPPORT +############################################################################### +# Check whether --with-daap was given. +if test "${with_daap+set}" = set; then + withval=$with_daap; have_daap=$withval +else + have_daap=yes +fi + if test x$have_daap = xyes; then + with_daap_TRUE= + with_daap_FALSE='#' +else + with_daap_TRUE='#' + with_daap_FALSE= +fi +############################################################################### +# END OPTIONAL DAAP SUPPORT +############################################################################### -kdeinitdir='$(kde_moduledir)' +############################################################################### +# BEGIN DAAP TYPE CHECKS +############################################################################### -if test "$kde_qtver" = 1; then - kde_minidir="$kde_icondir/mini" +{ echo "$as_me:$LINENO: checking for uint8_t" >&5 +echo $ECHO_N "checking for uint8_t... $ECHO_C" >&6; } +if test "${ac_cv_type_uint8_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else -# for KDE 1 - this breaks KDE2 apps using minidir, but -# that's the plan ;-/ - kde_minidir="/dev/null" -fi - - + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +typedef uint8_t ac__type_new_; +int +main () +{ +if ((ac__type_new_ *) 0) + return 0; +if (sizeof (ac__type_new_)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_cv_type_uint8_t=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_type_uint8_t=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_type_uint8_t" >&5 +echo "${ECHO_T}$ac_cv_type_uint8_t" >&6; } +if test $ac_cv_type_uint8_t = yes; then +cat >>confdefs.h <<_ACEOF +#define HAVE_UINT8_T 1 +_ACEOF -if test $kde_qtver = 3; then - case $host in - *cygwin*) lib_kded="-lkdeinit_kded" ;; - *) lib_kded="" ;; - esac - LIB_KDED=$lib_kded - LIB_KDECORE="-lkdecore" +fi +{ echo "$as_me:$LINENO: checking for u_int8_t" >&5 +echo $ECHO_N "checking for u_int8_t... $ECHO_C" >&6; } +if test "${ac_cv_type_u_int8_t+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. */ +$ac_includes_default +typedef u_int8_t ac__type_new_; +int +main () +{ +if ((ac__type_new_ *) 0) + return 0; +if (sizeof (ac__type_new_)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_cv_type_u_int8_t=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - LIB_KDEUI="-lkdeui" + ac_cv_type_u_int8_t=no +fi - LIB_KIO="-lkio" +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_type_u_int8_t" >&5 +echo "${ECHO_T}$ac_cv_type_u_int8_t" >&6; } +if test $ac_cv_type_u_int8_t = yes; then - LIB_KJS="-lkjs" +cat >>confdefs.h <<_ACEOF +#define HAVE_U_INT8_T 1 +_ACEOF - LIB_SMB="-lsmb" - LIB_KAB="-lkab" +fi +{ echo "$as_me:$LINENO: checking for uint16_t" >&5 +echo $ECHO_N "checking for uint16_t... $ECHO_C" >&6; } +if test "${ac_cv_type_uint16_t+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. */ +$ac_includes_default +typedef uint16_t ac__type_new_; +int +main () +{ +if ((ac__type_new_ *) 0) + return 0; +if (sizeof (ac__type_new_)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_cv_type_uint16_t=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - LIB_KABC="-lkabc" + ac_cv_type_uint16_t=no +fi - LIB_KHTML="-lkhtml" +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_type_uint16_t" >&5 +echo "${ECHO_T}$ac_cv_type_uint16_t" >&6; } +if test $ac_cv_type_uint16_t = yes; then - LIB_KSPELL="-lkspell" +cat >>confdefs.h <<_ACEOF +#define HAVE_UINT16_T 1 +_ACEOF - LIB_KPARTS="-lkparts" - LIB_KDEPRINT="-lkdeprint" +fi +{ echo "$as_me:$LINENO: checking for u_int16_t" >&5 +echo $ECHO_N "checking for u_int16_t... $ECHO_C" >&6; } +if test "${ac_cv_type_u_int16_t+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. */ +$ac_includes_default +typedef u_int16_t ac__type_new_; +int +main () +{ +if ((ac__type_new_ *) 0) + return 0; +if (sizeof (ac__type_new_)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_cv_type_u_int16_t=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - LIB_KUTILS="-lkutils" + ac_cv_type_u_int16_t=no +fi - LIB_KDEPIM="-lkdepim" +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_type_u_int16_t" >&5 +echo "${ECHO_T}$ac_cv_type_u_int16_t" >&6; } +if test $ac_cv_type_u_int16_t = yes; then - LIB_KIMPROXY="-lkimproxy" +cat >>confdefs.h <<_ACEOF +#define HAVE_U_INT16_T 1 +_ACEOF - LIB_KNEWSTUFF="-lknewstuff" - LIB_KDNSSD="-lkdnssd" +fi +{ echo "$as_me:$LINENO: checking for uint32_t" >&5 +echo $ECHO_N "checking for uint32_t... $ECHO_C" >&6; } +if test "${ac_cv_type_uint32_t+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. */ +$ac_includes_default +typedef uint32_t ac__type_new_; +int +main () +{ +if ((ac__type_new_ *) 0) + return 0; +if (sizeof (ac__type_new_)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_cv_type_uint32_t=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - LIB_KUNITTEST="-lkunittest" + ac_cv_type_uint32_t=no +fi -# these are for backward compatibility - LIB_KSYCOCA="-lkio" +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_type_uint32_t" >&5 +echo "${ECHO_T}$ac_cv_type_uint32_t" >&6; } +if test $ac_cv_type_uint32_t = yes; then - LIB_KFILE="-lkio" +cat >>confdefs.h <<_ACEOF +#define HAVE_UINT32_T 1 +_ACEOF -elif test $kde_qtver = 2; then - LIB_KDECORE="-lkdecore" - LIB_KDEUI="-lkdeui" +fi +{ echo "$as_me:$LINENO: checking for u_int32_t" >&5 +echo $ECHO_N "checking for u_int32_t... $ECHO_C" >&6; } +if test "${ac_cv_type_u_int32_t+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. */ +$ac_includes_default +typedef u_int32_t ac__type_new_; +int +main () +{ +if ((ac__type_new_ *) 0) + return 0; +if (sizeof (ac__type_new_)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_cv_type_u_int32_t=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - LIB_KIO="-lkio" + ac_cv_type_u_int32_t=no +fi - LIB_KSYCOCA="-lksycoca" +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_type_u_int32_t" >&5 +echo "${ECHO_T}$ac_cv_type_u_int32_t" >&6; } +if test $ac_cv_type_u_int32_t = yes; then - LIB_SMB="-lsmb" +cat >>confdefs.h <<_ACEOF +#define HAVE_U_INT32_T 1 +_ACEOF - LIB_KFILE="-lkfile" - LIB_KAB="-lkab" +fi +{ echo "$as_me:$LINENO: checking for uint64_t" >&5 +echo $ECHO_N "checking for uint64_t... $ECHO_C" >&6; } +if test "${ac_cv_type_uint64_t+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. */ +$ac_includes_default +typedef uint64_t ac__type_new_; +int +main () +{ +if ((ac__type_new_ *) 0) + return 0; +if (sizeof (ac__type_new_)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_cv_type_uint64_t=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - LIB_KHTML="-lkhtml" + ac_cv_type_uint64_t=no +fi - LIB_KSPELL="-lkspell" +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_type_uint64_t" >&5 +echo "${ECHO_T}$ac_cv_type_uint64_t" >&6; } +if test $ac_cv_type_uint64_t = yes; then - LIB_KPARTS="-lkparts" +cat >>confdefs.h <<_ACEOF +#define HAVE_UINT64_T 1 +_ACEOF - LIB_KDEPRINT="-lkdeprint" +fi +{ echo "$as_me:$LINENO: checking for u_int64_t" >&5 +echo $ECHO_N "checking for u_int64_t... $ECHO_C" >&6; } +if test "${ac_cv_type_u_int64_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - LIB_KDECORE="-lkdecore -lXext $(LIB_QT)" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +typedef u_int64_t ac__type_new_; +int +main () +{ +if ((ac__type_new_ *) 0) + return 0; +if (sizeof (ac__type_new_)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_cv_type_u_int64_t=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - LIB_KDEUI="-lkdeui $(LIB_KDECORE)" + ac_cv_type_u_int64_t=no +fi - LIB_KFM="-lkfm $(LIB_KDECORE)" +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_type_u_int64_t" >&5 +echo "${ECHO_T}$ac_cv_type_u_int64_t" >&6; } +if test $ac_cv_type_u_int64_t = yes; then - LIB_KFILE="-lkfile $(LIB_KFM) $(LIB_KDEUI)" +cat >>confdefs.h <<_ACEOF +#define HAVE_U_INT64_T 1 +_ACEOF - LIB_KAB="-lkab $(LIB_KIMGIO) $(LIB_KDECORE)" fi +############################################################################### +# END DAAP TYPE CHECKS +############################################################################### -#MIN_CONFIG(3.3) -CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS" -if test "$build_arts" = "yes"; then -cat >>confdefs.h <<\_ACEOF -#define USE_ARTS 1 -_ACEOF +############################################################################### +# BEGIN DAAP MONGREL RUBY VARIABLE +############################################################################### - LIB_ARTS="-lartskde" +# Extract the first word of "ruby", so it can be a program name with args. +set dummy ruby; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_RUBY+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $RUBY in + [\\/]* | ?:[\\/]*) + ac_cv_path_RUBY="$RUBY" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_RUBY="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + test -z "$ac_cv_path_RUBY" && ac_cv_path_RUBY="no" + ;; +esac fi - - -{ echo "$as_me:$LINENO: checking for Qt docs" >&5 -echo $ECHO_N "checking for Qt docs... $ECHO_C" >&6; } -kde_qtdir= -if test "${with_qt_dir+set}" = set; then - kde_qtdir="$with_qt_dir" +RUBY=$ac_cv_path_RUBY +if test -n "$RUBY"; then + { echo "$as_me:$LINENO: result: $RUBY" >&5 +echo "${ECHO_T}$RUBY" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -QTDOCDIR=NO -for i in $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ; -do - for j in qsql.html; - do - echo "configure: 33215: $i/$j" >&5 - if test -r "$i/$j"; then - echo "taking that" >&5 - QTDOCDIR=$i - break 2 - fi - done -done - -{ echo "$as_me:$LINENO: result: $QTDOCDIR" >&5 -echo "${ECHO_T}$QTDOCDIR" >&6; } +ruby_includes=`$RUBY -rrbconfig -e 'puts Config.expand( Config::MAKEFILE_CONFIG["archdir"] )'` +ruby_ldflags=`$RUBY -rrbconfig -e 'puts Config.expand( Config::MAKEFILE_CONFIG["LIBRUBYARG_SHARED"] )'` - { echo "$as_me:$LINENO: checking for dot" >&5 -echo $ECHO_N "checking for dot... $ECHO_C" >&6; } - if test -n "$DOT"; then - kde_cv_path="$DOT"; - else - kde_cache=`echo dot | sed 'y%./+-%__p_%'` +OLDCFLAGS="$CFLAGS" +CFLAGS="-I$ruby_includes -Wall" +OLDCPPFLAGS="$CPPFLAGS" +CPPFLAGS="-I$ruby_includes" #no I don't know why CPPFLAGS is used - if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then +for ac_header in ruby.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - kde_cv_path="NONE" - kde_save_IFS=$IFS - IFS=':' - dirs="" - for dir in $PATH; do - dirs="$dirs $dir" - done - if test -z ""; then dirs=" $dirs" - else dirs="$dirs " - fi - IFS=$kde_save_IFS - - for dir in $dirs; do - if test -x "$dir/dot"; then - if test -n "" - then - evalstr="$dir/dot 2>&1 " - if eval $evalstr; then - kde_cv_path="$dir/dot" - break - fi - else - kde_cv_path="$dir/dot" - break - fi - fi - done - - eval "kde_cv_path_$kde_cache=$kde_cv_path" - - + ac_header_compiler=no fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } - eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\"" - - fi - - if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - { echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6; } - - else - { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6; } - DOT=$kde_cv_path - - fi - -if test -n "$DOT"; then - KDE_HAVE_DOT="YES" +# Is the header present? +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_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_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes else - KDE_HAVE_DOT="NO" + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no fi +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } - { echo "$as_me:$LINENO: checking for doxygen" >&5 -echo $ECHO_N "checking for doxygen... $ECHO_C" >&6; } - if test -n "$DOXYGEN"; then - kde_cv_path="$DOXYGEN"; - else - kde_cache=`echo doxygen | sed 'y%./+-%__p_%'` +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then + ;; +esac +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else + eval "$as_ac_Header=\$ac_header_preproc" +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } - kde_cv_path="NONE" - kde_save_IFS=$IFS - IFS=':' - dirs="" - for dir in $PATH; do - dirs="$dirs $dir" - done - if test -z ""; then dirs=" $dirs" - else dirs="$dirs " - fi - IFS=$kde_save_IFS - - for dir in $dirs; do - if test -x "$dir/doxygen"; then - if test -n "" - then - evalstr="$dir/doxygen 2>&1 " - if eval $evalstr; then - kde_cv_path="$dir/doxygen" - break - fi - else - kde_cv_path="$dir/doxygen" - break - fi - fi - done - - eval "kde_cv_path_$kde_cache=$kde_cv_path" - - +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + have_ruby_h=yes +else + have_ruby_h=no fi +done + #used in ruby check below +CFLAGS="$OLDCFLAGS" +CPPFLAGS="$OLDCPPFLAGS" - eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\"" +############################################################################### +# END DAAP MONGREL RUBY VARIABLE +############################################################################### - fi - if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - { echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6; } - else - { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6; } - DOXYGEN=$kde_cv_path +############################################################################### +# BEGIN RUBY CHECK +############################################################################### +## TODO: Check version number >= 1.8 - fi +if test "x$RUBY" = "xno" -o "x$have_ruby_h" = "xno"; then + amarok_error_noruby=yes + DO_NOT_COMPILE="$DO_NOT_COMPILE amarok" + no_amarok=yes +fi +############################################################################### +# END RUBY CHECK +############################################################################### -DOXYGEN_PROJECT_NAME="The API Reference" -DOXYGEN_PROJECT_NUMBER="Version $VERSION" +############################################################################### +# BEGIN DO_NOT_COMPILE CHECK +############################################################################### +if test x$build_xine = xno -a x$build_helix = xno; then + DO_NOT_COMPILE="$DO_NOT_COMPILE amarok" + no_engine=yes -KDE_HAS_DOXYGEN=no -if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $QTDOCDIR/qsql.html; then - KDE_HAS_DOXYGEN=yes fi - - +############################################################################### +# END DO_NOT_COMPILE CHECK +############################################################################### @@ -36947,7 +45041,10 @@ fi if test $succeeded = yes; then - build_libvisual="yes" + + LIBVISUAL_LIBS=`echo $LIBVISUAL_LIBS | sed -e 's/-lpthread//' -e 's/-ldl//'` + build_libvisual="yes" + else build_libvisual="no" fi @@ -37619,7 +45716,6 @@ ############################################################################### - kde_safe_cppflags=$CPPFLAGS CPPFLAGS="$CPPFLAGS $all_includes" @@ -38119,6 +46215,7 @@ if test $succeeded = yes; then + LIBMTP_LIBS=`echo ${LIBMTP_LIBS} | sed 's/-lusb//'` have_libmtp=yes else @@ -41533,6 +49630,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 @@ -41701,6 +49805,132 @@ Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${TAGLIB_15_FOUND_TRUE}" && test -z "${TAGLIB_15_FOUND_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"TAGLIB_15_FOUND\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"TAGLIB_15_FOUND\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${with_xine_TRUE}" && test -z "${with_xine_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"with_xine\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"with_xine\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${with_nmm_TRUE}" && test -z "${with_nmm_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"with_nmm\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"with_nmm\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${with_helix_TRUE}" && test -z "${with_helix_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"with_helix\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"with_helix\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${with_yauap_TRUE}" && test -z "${with_yauap_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"with_yauap\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"with_yauap\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${with_included_sqlite_TRUE}" && test -z "${with_included_sqlite_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"with_included_sqlite\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"with_included_sqlite\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${enable_mysql_TRUE}" && test -z "${enable_mysql_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"enable_mysql\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"enable_mysql\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${enable_postgresql_TRUE}" && test -z "${enable_postgresql_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"enable_postgresql\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"enable_postgresql\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${with_libvisual_TRUE}" && test -z "${with_libvisual_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"with_libvisual\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"with_libvisual\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${with_konqsidebar_TRUE}" && test -z "${with_konqsidebar_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"with_konqsidebar\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"with_konqsidebar\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${with_libnjb_TRUE}" && test -z "${with_libnjb_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"with_libnjb\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"with_libnjb\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${with_libmtp_TRUE}" && test -z "${with_libmtp_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"with_libmtp\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"with_libmtp\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${with_libkarma_TRUE}" && test -z "${with_libkarma_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"with_libkarma\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"with_libkarma\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${with_ifp_TRUE}" && test -z "${with_ifp_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"with_ifp\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"with_ifp\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${with_libgpod_TRUE}" && test -z "${with_libgpod_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"with_libgpod\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"with_libgpod\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${with_mp4v2_TRUE}" && test -z "${with_mp4v2_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"with_mp4v2\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"with_mp4v2\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${atleast_kde34_TRUE}" && test -z "${atleast_kde34_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"atleast_kde34\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"atleast_kde34\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${with_daap_TRUE}" && test -z "${with_daap_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"with_daap\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"with_daap\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${amarok_SUBDIR_included_TRUE}" && test -z "${amarok_SUBDIR_included_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"amarok_SUBDIR_included\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -42479,6 +50709,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 @@ -42502,9 +50735,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 @@ -42546,6 +50776,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 @@ -42566,12 +50799,15 @@ KDE_NO_UNDEFINED!$KDE_NO_UNDEFINED$ac_delim KDE_USE_NMCHECK_TRUE!$KDE_USE_NMCHECK_TRUE$ac_delim KDE_USE_NMCHECK_FALSE!$KDE_USE_NMCHECK_FALSE$ac_delim +SED!$SED$ac_delim GREP!$GREP$ac_delim EGREP!$EGREP$ac_delim LN_S!$LN_S$ac_delim ECHO!$ECHO$ac_delim AR!$AR$ac_delim RANLIB!$RANLIB$ac_delim +DSYMUTIL!$DSYMUTIL$ac_delim +NMEDIT!$NMEDIT$ac_delim F77!$F77$ac_delim FFLAGS!$FFLAGS$ac_delim ac_ct_F77!$ac_ct_F77$ac_delim @@ -42624,6 +50860,7 @@ MOC!$MOC$ac_delim UIC!$UIC$ac_delim UIC_TR!$UIC_TR$ac_delim +LIB_QT_EXT!$LIB_QT_EXT$ac_delim LIB_QT!$LIB_QT$ac_delim LIB_QPE!$LIB_QPE$ac_delim kde_qtver!$kde_qtver$ac_delim @@ -42636,13 +50873,6 @@ KDE_INCLUDES!$KDE_INCLUDES$ac_delim all_includes!$all_includes$ac_delim all_libraries!$all_libraries$ac_delim -AUTODIRS!$AUTODIRS$ac_delim -include_ARTS_TRUE!$include_ARTS_TRUE$ac_delim -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 _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -42684,6 +50914,13 @@ ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +AUTODIRS!$AUTODIRS$ac_delim +include_ARTS_TRUE!$include_ARTS_TRUE$ac_delim +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 DCOPIDL2CPP!$DCOPIDL2CPP$ac_delim DCOP_DEPENDENCIES!$DCOP_DEPENDENCIES$ac_delim @@ -42774,13 +51011,6 @@ enable_mysql_TRUE!$enable_mysql_TRUE$ac_delim enable_mysql_FALSE!$enable_mysql_FALSE$ac_delim mysql_includes!$mysql_includes$ac_delim -mysql_libs!$mysql_libs$ac_delim -POSTGRESQL_CONFIG!$POSTGRESQL_CONFIG$ac_delim -enable_postgresql_TRUE!$enable_postgresql_TRUE$ac_delim -enable_postgresql_FALSE!$enable_postgresql_FALSE$ac_delim -postgresql_includes!$postgresql_includes$ac_delim -postgresql_libs!$postgresql_libs$ac_delim -SDL_CONFIG!$SDL_CONFIG$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -42822,6 +51052,13 @@ ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +mysql_libs!$mysql_libs$ac_delim +POSTGRESQL_CONFIG!$POSTGRESQL_CONFIG$ac_delim +enable_postgresql_TRUE!$enable_postgresql_TRUE$ac_delim +enable_postgresql_FALSE!$enable_postgresql_FALSE$ac_delim +postgresql_includes!$postgresql_includes$ac_delim +postgresql_libs!$postgresql_libs$ac_delim +SDL_CONFIG!$SDL_CONFIG$ac_delim sdl_cflags!$sdl_cflags$ac_delim sdl_libs!$sdl_libs$ac_delim LIBVISUAL_CFLAGS!$LIBVISUAL_CFLAGS$ac_delim @@ -42872,7 +51109,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 48; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 55; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -43273,21 +51510,22 @@ fi rm -f "$tmp/out12" # Compute $ac_file's index in $config_headers. +_am_arg=$ac_file _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $ac_file | $ac_file:* ) + $_am_arg | $_am_arg:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || -$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X$ac_file : 'X\(//\)[^/]' \| \ - X$ac_file : 'X\(//\)$' \| \ - X$ac_file : 'X\(/\)' \| . 2>/dev/null || -echo X$ac_file | +echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || +$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$_am_arg" : 'X\(//\)[^/]' \| \ + X"$_am_arg" : 'X\(//\)$' \| \ + X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || +echo X"$_am_arg" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -43324,7 +51562,7 @@ # each Makefile.in and add a new line on top of each file to say so. # Grep'ing the whole file is not good either: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then dirpart=`$as_dirname -- "$mf" || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ --- amarok-1.4.9.1.orig/configure.in +++ amarok-1.4.9.1/configure.in @@ -40,7 +40,9 @@ AC_ARG_PROGRAM dnl Automake doc recommends to do this only here. (Janos) -AM_INIT_AUTOMAKE(multimedia, "3.5.9") dnl searches for some needed programs +AM_INIT_AUTOMAKE(amarok-1.4.9.1, "3.5.9") dnl searches for some needed programs + +AM_MAINTAINER_MODE KDE_SET_PREFIX @@ -75,7 +77,7 @@ KDE_INIT_DOXYGEN([The API Reference], [Version $VERSION]) dnl ======================================================= -dnl FILE: ./amarok/configure.in.in +dnl FILE: ./.pc/97_automake_cleanup.diff/amarok/configure.in.in dnl ======================================================= @@ -1212,6 +1214,1148 @@ # END DO_NOT_COMPILE CHECK ############################################################################### +dnl ======================================================= +dnl FILE: ./amarok/configure.in.in +dnl ======================================================= + + +############################################################################### +# BEGIN PKG-CONFIG CHECK +############################################################################### + +AC_ARG_VAR(PKGCONFIGFOUND, [Path to pkg-config]) +AC_CHECK_PROG(PKGCONFIGFOUND, pkg-config,[yes]) + +############################################################################### +# END PKG-CONFIG CHECK +############################################################################### + + + +############################################################################### +# BEGIN TAGLIB CHECK +############################################################################### + +PKG_CHECK_MODULES([TAGLIB], [taglib >= 1.5], [taglib_15_found=yes], [PKG_CHECK_MODULES([TAGLIB], [taglib >= 1.4])]) + +AM_CONDITIONAL([TAGLIB_15_FOUND], [test "x$taglib_15_found" = "xyes"]) +AC_SUBST(TAGLIB_CFLAGS) +AC_SUBST(TAGLIB_LIBS) + +if test "x$taglib_15_found" = "xyes"; then + AC_DEFINE([TAGLIB_15], 1, [Taglib 1.5 or later found, disabling duplicate metadata plugins]) +fi + +############################################################################### +# END TAGLIB CHECK +############################################################################### + + + +############################################################################### +# BEGIN GSTREAMER-0.10 CHECK +############################################################################### + +#AC_ARG_WITH(gstreamer10, +# AC_HELP_STRING([--with-gstreamer10],[build Amarok with GStreamer 0.10-engine]), +# [build_gstreamer10=$withval], +# [build_gstreamer10=no] +#) +# +#if test "$build_gstreamer10" != "no"; then +# if test "$PKGCONFIGFOUND" = "yes" ; then +# # check for GStreamer +# dnl Now we're ready to ask for gstreamer libs and cflags +# dnl And we can also ask for the right version of gstreamer +# have_gst10=no +# +# GST10_MAJORMINOR=0.10 +# GST10_REQ=0.10.0 +# +# PKG_CHECK_MODULES(GST10, gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR, +# have_gst10=yes,have_gst10=no) +# +# dnl Give error if we don't have gstreamer +# if test "x$have_gst10" = "xno"; then +# LIB_GST10="" +# CFLAGS_GST10="" +# else +# LIB_GST10=$GST10_LIBS +# CFLAGS_GST10=$GST10_CFLAGS +# AC_SUBST(LIB_GST10) +# AC_SUBST(CFLAGS_GST10) +# AC_SUBST(GST10_MAJORMINOR) +# AC_DEFINE(HAVE_GSTREAMER10, 1, [have GStreamer10]) +# fi +# fi +#fi +# +#AM_CONDITIONAL(with_gst10, [test x$have_gst10 = xyes]) + +############################################################################### +# END GSTREAMER-0.10 CHECK +############################################################################### + + + +############################################################################### +# BEGIN XINE CHECK +############################################################################### + +AC_ARG_WITH(xine, + AC_HELP_STRING([--without-xine],[build Amarok without xine-engine]), + [build_xine=$withval], + [build_xine=yes] +) + +if test "$build_xine" != "no"; then + PKG_CHECK_MODULES([XINE], [libxine >= 1.0.2], , [build_xine=no]) +fi + +AM_CONDITIONAL(with_xine, test x$build_xine = xyes) +AC_SUBST(XINE_CFLAGS) +AC_SUBST(XINE_LIBS) + +############################################################################### +# END XINE CHECK +############################################################################### + + + +############################################################################### +# BEGIN AKODE CHECK +############################################################################### + +#AC_ARG_WITH(akode, +# AC_HELP_STRING([--without-akode],[build Amarok without akode-engine]), +# [build_akode=$withval], +# [build_akode=yes] +#) +# +#if test "$build_akode" != "no"; then +# +# AC_CHECK_PROG(AKODE_CONFIG, akode-config, yes) +# +# if test x$AKODE_CONFIG = xyes ; then +# AC_DEFINE(HAVE_AKODE, 1, [have aKode]) +# CFLAGS_AKODE=[`akode-config --cflags`] +# LIBS_AKODE=[`akode-config --libs`] +# +# akode_version=`akode-config --version` +# akode_version=VERSION_TO_NUMBER(echo $akode_version) +# akode_version_min="2.0.0" +# akode_version_min=VERSION_TO_NUMBER(echo $akode_version_min) +# +# AC_MSG_CHECKING([for akode-lib version >= 2.0]) +# +# if test $akode_version -eq $akode_version_min \ +# -o $akode_version -gt $akode_version_min; then +# +# echo "yes" +# +# else +# echo "no" +# +# build_akode=no +# fi +# else +# build_akode=no +# fi +#fi +# +#AM_CONDITIONAL(with_akode, test x$build_akode = xyes) +#AC_SUBST(CFLAGS_AKODE) +#AC_SUBST(LIBS_AKODE) + +############################################################################### +# END AKODE CHECK +############################################################################### + + + +############################################################################### +# BEGIN NMM CHECK +############################################################################### + +AC_ARG_WITH(nmm, + AC_HELP_STRING([--with-nmm],[build Amarok with NMM-engine]), + [build_nmm=$withval], + [build_nmm=no] +) + +AC_ARG_WITH(nmm-dir, + AC_HELP_STRING([--with-nmm-dir],[path to the NMM [default=/usr/local]]), + [nmm_dir="$withval"], + [nmm_dir=/usr/local] +) + +if test "$build_nmm" != "no"; then + + CFLAGS_NMM="-I$nmm_dir/include" + LDFLAGS_NMM="-L$nmm_dir/lib" + AC_DEFINE(HAVE_NMM, 1, [have NMM]) +fi + +AM_CONDITIONAL(with_nmm, test x$build_nmm = xyes) +AC_SUBST(CFLAGS_NMM) +AC_SUBST(LDFLAGS_NMM) + +############################################################################### +# END NMM CHECK +############################################################################### + + + +############################################################################### +# BEGIN MAS CHECK +############################################################################### + +#AC_ARG_WITH(mas, +# AC_HELP_STRING([--with-mas],[build Amarok with MAS-engine]), +# [build_mas=$withval], +# [build_mas=no] +#) +# +# +#if test "$build_mas" != "no"; then +# +# AC_PATH_PROG(MAS_CONFIG, mas-config, no) +# +# if test $MAS_CONFIG = "no" +# then +# amarok_warning_mas_notfound=yes +# echo "amarok_warning_mas_notfound: $amarok_warning_mas_notfound" +# build_mas=no +# else +# AC_DEFINE(HAVE_MAS, 1, [have MAS]) +# +# CFLAGS_MAS=[`$MAS_CONFIG --cflags`] +# LIBS_MAS=[`$MAS_CONFIG --libs`] +# +# build_mas=yes +# fi +#fi +# +#AM_CONDITIONAL(with_mas, test x$build_mas = xyes) +#AC_SUBST(CFLAGS_MAS) +#AC_SUBST(LIBS_MAS) + +############################################################################### +# END MAS CHECK +############################################################################### + + + +############################################################################### +# BEGIN HELIX CHECK +############################################################################### + +AC_ARG_WITH(helix, + AC_HELP_STRING([--with-helix],[build Amarok with Helix-engine]), + [build_helix=$withval], + [build_helix=no] +) + +if test "$build_helix" != "no"; then + AC_MSG_CHECKING([for RealPlayer or HelixPlayer]) + + if test "$build_helix" = "yes"; then + HXPLAY=`type -p hxplay` + RPLAY=`type -p realplay` + if test "$RPLAY" != "" -a -x "$RPLAY"; then + HELIX_LINK=`readlink -f $RPLAY` + HELIX_LINK=`dirname $HELIX_LINK` + HELIX_LIBS=`unset CDPATH; cd $HELIX_LINK && pwd` + if test -e "$HELIX_LIBS/common/clntcore.so"; then + AC_MSG_RESULT([found RealPlayer in $HELIX_LIBS]) + build_helix=$HELIX_LIBS + fi + elif test "$HXPLAY" != "" -a -x "$HXPLAY"; then + HELIX_LINK=`readlink -f $HXPLAY` + HELIX_LINK=`dirname $HELIX_LINK` + HELIX_LIBS=`unset CDPATH; cd $HELIX_LINK && pwd` + if test -e "$HELIX_LIBS/common/clntcore.so"; then + AC_MSG_RESULT([found HelixPlayer in $HELIX_LIBS]) + build_helix=$HELIX_LIBS + fi + fi + else + if test -n "$build_helix" -a -d "$build_helix"; then + HELIX_LIBS=`unset CDPATH; cd $build_helix && pwd` + else + HELIX_LIBS="$build_helix" + fi + build_helix=$HELIX_LIBS + AC_MSG_RESULT([using $HELIX_LIBS]) + fi + + AC_DEFINE(HAVE_HELIX, 1, [have HELIX]) + if test "$build_helix" = "yes"; then + HELIX_LIBS="/usr/local/RealPlayer" + AC_MSG_RESULT(["not found, using default dir"]) + fi + AC_DEFINE_UNQUOTED(HELIX_LIBS, "${HELIX_LIBS}", [location of helix libs]) + if test "$PKGCONFIGFOUND" = "yes" ; then + PKG_CHECK_MODULES([ALSALIB], alsa, have_alsa=yes,have_alsa=no) + if test "$have_alsa" = "yes" ; then + AC_DEFINE(USE_HELIX_ALSA, 1, [support ALSA in the helix-engine]) + fi + fi +fi + +AM_CONDITIONAL(with_helix, test x$build_helix != xno) + +############################################################################### +# END HELIX CHECK +############################################################################### + +############################################################################### +# BEGIN yauap CHECK +############################################################################### + +AC_ARG_WITH(yauap, + AC_HELP_STRING([--with-yauap],[build Amarok with yauap-engine]), + [build_yauap=$withval], + [build_yauap=no] +) + +if test "$build_yauap" != "no"; then + if test "$PKGCONFIGFOUND" = "yes" ; then + # check for dbus-glib + have_yauap=no + + PKG_CHECK_MODULES(DBUS, dbus-1, + have_yauap=yes,have_yauap=no) + + + dnl Give error if we don't have gstreamer + if test "x$have_yauap" = "xno"; then + LIB_YAUAP="" + CFLAGS_YAUAP="" + else + LIB_YAUAP="$DBUS_LIBS -ldbus-qt-1" + CFLAGS_YAUAP="$DBUS_CFLAGS" + AC_SUBST(LIB_YAUAP) + AC_SUBST(CFLAGS_YAUAP) + AC_DEFINE(HAVE_YAUAP, 1, [have yauap]) + fi + fi +fi + +AM_CONDITIONAL(with_yauap, [test x$have_yauap = xyes]) + +############################################################################### +# END yauap CHECK +############################################################################### + + + +############################################################################### +# BEGIN stdint.h CHECK +############################################################################### + +AC_CHECK_HEADER(stdint.h) + +############################################################################### +# END stdint.h CHECK +############################################################################### + + +############################################################################### +# BEGIN fabsf CHECK +############################################################################### + +AC_CHECK_DECLS([fabsf],,,[#include ]) +if test "$ac_cv_have_decl_fabsf" = "yes"; then + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#include ]], + [[return (int)fabsf(1.f);]])], + [AC_DEFINE(HAVE_FABSF, 1, [have fabsf])]) +fi + +############################################################################### +# END fabsf CHECK +############################################################################### + + + + + +############################################################################### +# BEGIN INOTIFY CHECK +############################################################################### + +AC_CHECK_HEADERS(linux/inotify.h) + +if test x"$ac_cv_header_linux_inotify_h" = x"yes"; then + AC_DEFINE(HAVE_INOTIFY, 1, [have inotify]) +fi + +############################################################################### +# END INOTIFY CHECK +############################################################################### + + + +############################################################################### +# BEGIN QT OPENGL CHECK +############################################################################### + +AC_ARG_WITH(opengl, + AC_HELP_STRING([--without-opengl],[build Amarok without OpenGL support]), + [build_opengl=$withval], + [build_opengl=yes] +) + +if test "$build_opengl" != "no"; then + AC_MSG_CHECKING(for Qt with OpenGL support) + AC_CACHE_VAL(ac_cv_kde_qt_has_opengl, + [ + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + + save_CXXFLAGS="$CXXFLAGS" + save_LIBS="$LIBS" + save_LDFLAGS="$LDFLAGS" + + CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes" + LDFLAGS="$LDFLAGS -L$qt_libdir $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS" + LIBS="$LIBS $LIBQT $KDE_MT_LIBS" + + AC_TRY_LINK([ + #include + ], + [ + (void)new QGLWidget((QWidget*)0, "qgl"); + ], + ac_cv_kde_qt_has_opengl=yes, + ac_cv_kde_qt_has_opengl=no) + + CXXFLAGS="$save_CXXFLAGS" + LIBS="$save_LIBS" + LDFLAGS="$save_LDFLAGS" + AC_LANG_RESTORE + ]) + AC_MSG_RESULT($ac_cv_kde_qt_has_opengl) + + if test x$ac_cv_kde_qt_has_opengl = xyes; then + AC_DEFINE(HAVE_QGLWIDGET, 1, [have Qt with OpenGL support]) + gl_libs="-lGL" + else + gl_libs="" + fi + + AC_SUBST(gl_libs) +fi + +############################################################################### +# END QT OPENGL CHECK +############################################################################### + + + +############################################################################### +# BEGIN SQLITE CHECK +############################################################################### + +LIB_SQLITE="" + +AC_ARG_WITH(included-sqlite, + AC_HELP_STRING([--without-included-sqlite],[build Amarok using system sqlite library]), + [included_sqlite=$withval], + [included_sqlite=yes] +) + +if test x$included_sqlite = xno; then + if test x$PKGCONFIGFOUND = xyes; then + PKG_CHECK_MODULES(SQLITE, sqlite3 >= 3.0, have_sqlite=yes,have_sqlite=no) + + if test x$have_sqlite = xyes; then + ## AC_DEFINE(HAVE_SQLITE, 1, [have SQLite database library]) + LIB_SQLITE=`pkg-config --libs sqlite3` + else + # We don't support not having sqlite anymore + DO_NOT_COMPILE="$DO_NOT_COMPILE amarok" + no_amarok=yes + fi + fi +fi + +AC_SUBST(LIB_SQLITE) +AM_CONDITIONAL(with_included_sqlite, [test x$included_sqlite = xyes]) + + +# Determine pointer size for sqlite + +KDE_CHECK_TYPES +AC_DEFINE(SQLITE_PTR_SZ, SIZEOF_CHAR_P, [Determine pointer size for SQLite]) + +############################################################################### +# END SQLITE CHECK +############################################################################### + + + +############################################################################### +# BEGIN MYSQL CHECK +############################################################################### + +AC_ARG_ENABLE(mysql, + AC_HELP_STRING([--enable-mysql],[build Amarok with MySQL support]), + [enable_mysql=$enableval], + [enable_mysql=no] +) + +if test "$enable_mysql" = "yes"; then + + AC_CHECK_PROG(MYSQL_CONFIG, mysql_config, yes) + + if test x$MYSQL_CONFIG = xyes; then + AC_DEFINE(USE_MYSQL, 1, [MySql database support enabled]) + + mysql_includes=`mysql_config --cflags` + mysql_libs=`mysql_config --libs` + else + amarok_warning_mysql_notfound=yes + enable_mysql=no + fi + +fi + +AM_CONDITIONAL(enable_mysql, test x$enable_mysql = xyes) +AC_SUBST(mysql_includes) +AC_SUBST(mysql_libs) + +############################################################################### +# END MYSQL CHECK +############################################################################### + + + +############################################################################### +# BEGIN POSTGRESQL CHECK +############################################################################### + +AC_ARG_ENABLE(postgresql, + AC_HELP_STRING([--enable-postgresql],[build Amarok with PostgreSQL support]), + [enable_postgresql=$enableval], + [enable_postgresql=no] +) + +if test "$enable_postgresql" = "yes"; then + + AC_CHECK_PROG(POSTGRESQL_CONFIG, pg_config, yes) + + if test x$POSTGRESQL_CONFIG = xyes; then + AC_DEFINE(USE_POSTGRESQL, 1, [Postgresql database support enabled]) + + postgresql_includes=-I`pg_config --includedir` + postgresql_libs="-L`pg_config --libdir` -lpq" + else + amarok_warning_postgresql_notfound=yes + enable_postgresql=no + fi + +fi + +AM_CONDITIONAL(enable_postgresql, test x$enable_postgresql = xyes) +AC_SUBST(postgresql_includes) +AC_SUBST(postgresql_libs) + +############################################################################### +# END POSTGRESQL CHECK +############################################################################### + + + +############################################################################### +# BEGIN LIBVISUAL CHECK +############################################################################### + +AC_ARG_WITH(libvisual, + AC_HELP_STRING([--without-libvisual],[build Amarok without libvisual support]), + [with_libvisual=$withval], + [with_libvisual=yes] +) + +if test "$with_libvisual" = "yes"; then + ## libvisual plugin depends on sdl + AC_CHECK_PROG(SDL_CONFIG, sdl-config, yes) + + if test x$SDL_CONFIG = xyes; then + sdl_cflags=`sdl-config --cflags` + sdl_libs=`sdl-config --libs` + fi + + AC_SUBST(sdl_cflags) + AC_SUBST(sdl_libs) + + if test x$PKGCONFIGFOUND = xyes -a x$SDL_CONFIG = xyes; then + + PKG_CHECK_MODULES(LIBVISUAL, libvisual-0.4 >= 0.4.0, [ + LIBVISUAL_LIBS=`echo $LIBVISUAL_LIBS | sed -e 's/-lpthread//' -e 's/-ldl//'` + build_libvisual="yes" + ], [build_libvisual="no"]) + + AC_SUBST(LIBVISUAL_LIBS) + AC_SUBST(LIBVISUAL_CFLAGS) + + if test x$build_libvisual = xyes; then + AC_DEFINE(HAVE_LIBVISUAL, 1, [have LIBVISUAL]) + fi + fi +fi + +AM_CONDITIONAL(with_libvisual, test x$build_libvisual = xyes) + +############################################################################### +# END LIBVISUAL CHECK +############################################################################### + + + +############################################################################### +# BEGIN TUNEPIMP CHECK +############################################################################### + +AC_ARG_WITH(musicbrainz, + AC_HELP_STRING([--without-musicbrainz],[build Amarok without MusicBrainz support]), + [with_musicbrainz=$withval], + [with_musicbrainz=yes] +) + +if test "$with_musicbrainz" = "yes"; then + AC_CHECK_HEADER(tunepimp-0.5/tp_c.h, [build_musicbrainz="yes"], + [AC_CHECK_HEADER(tunepimp/tp_c.h, [build_musicbrainz="yes"], + [build_musicbrainz="no"])]) +fi + +if test "$build_musicbrainz" = "yes"; then + AC_CHECK_LIB(tunepimp, tr_GetPUID, + AC_DEFINE(HAVE_TUNEPIMP, 5, [have MusicBrainz 0.5.x]), + AC_CHECK_LIB(tunepimp, tp_SetFileNameEncoding, + AC_DEFINE(HAVE_TUNEPIMP, 4, [have MusicBrainz 0.4.x]), + AC_DEFINE(HAVE_TUNEPIMP, 1, [have MusicBrainz]))) + LIB_TUNEPIMP="-ltunepimp" + have_tunepimp=yes +else + AC_DEFINE(HAVE_TUNEPIMP, 0, [have TunePimp]) + LIB_TUNEPIMP="" + have_tunepimp=no +fi + +AC_SUBST(LIB_TUNEPIMP) + +############################################################################### +# END TUNEPIMP CHECK +############################################################################### + + + +############################################################################### +# BEGIN AMAZON CHECK +############################################################################### + +AC_ARG_ENABLE(amazon, + AC_HELP_STRING([--disable-amazon],[disable Amazon cover download support [default=enable]]), + [enable_amazon=$enableval], + [enable_amazon=yes] +) + +if test "$enable_amazon" != "no"; then + AC_DEFINE(AMAZON_SUPPORT, 1, [Amazon cover download support enabled]) +fi + +############################################################################### +# END AMAZON CHECK +############################################################################### + + + +############################################################################### +# BEGIN SCHED_SETAFFINITY BUGGY GLIBC CHECK +############################################################################### + +AC_MSG_CHECKING([if sched_setaffinity should be enabled]) + +AC_LANG_SAVE +AC_LANG_CPLUSPLUS + +amarok_glibcsched_works=no + +AC_TRY_COMPILE([ + #include +], +[ + cpu_set_t mask; + CPU_ZERO( &mask ); + CPU_SET( 0, &mask ); + sched_setaffinity( 0, sizeof(mask), &mask ); +], + amarok_sched_3params=yes, + amarok_sched_3params=no +) + +if test "x$amarok_sched_3params" = "xyes"; then + AC_DEFINE(SCHEDAFFINITY_SUPPORT, 1, [sched_setaffinity works correctly]) + AC_DEFINE(SCHEDAFFINITY_3PARAMS, 1, [sched_setaffinity takes three params]) + amarok_glibcsched_works=yes +fi + +if test "x$amarok_sched_3params" = "xno"; then + AC_TRY_COMPILE([ + #include + ], + [ + cpu_set_t mask; + CPU_ZERO( &mask ); + CPU_SET( 0, &mask ); + sched_setaffinity( 0, &mask ); + ], + amarok_sched_2params=yes, + amarok_sched_2params=no + ) + if test "x$amarok_sched_2params" = "xyes"; then + AC_DEFINE(SCHEDAFFINITY_SUPPORT, 1, [sched_setaffinity works correctly]) + amarok_glibcsched_works=yes + fi +fi + +AC_LANG_RESTORE + +AC_MSG_RESULT($amarok_glibcsched_works) + +############################################################################### +# END SCHED_SETAFFINITY BUGGY GLIBC CHECK +############################################################################### + + + +############################################################################### +# BEGIN KDEBASE CHECK +############################################################################### + +KDE_CHECK_HEADER(konqsidebarplugin.h, have_konqsidebar=yes, have_konqsidebar=no) +KDE_CHECK_LIB(konqsidebarplugin, _init, have_konqsidebar=$have_konqsidebar, have_konqsidebar=no) + +AM_CONDITIONAL(with_konqsidebar, [test x$have_konqsidebar = xyes]) + +############################################################################### +# END KDEBASE CHECK +############################################################################### + + + +############################################################################### +# BEGIN NJB CHECK +############################################################################### +### mediabrowser.cpp can use libnjb if available + +AC_ARG_WITH(libnjb, + AC_HELP_STRING([--with-libnjb],[build Amarok with Nomad Jukebox support from libnjb]), + [build_libnjb=$withval], + [build_libnjb=yes] +) + +if test "$build_libnjb" != "no"; then + if test "$PKGCONFIGFOUND" = "yes" ; then + + # check for libnjb + have_libnjb=no + + PKG_CHECK_MODULES(LIBNJB, libnjb, have_libnjb=yes,have_libnjb=no) + if test "x$have_libnjb" != "xno"; then + AC_DEFINE(HAVE_LIBNJB, 1, [have libnjb]) + fi + fi +fi + +AM_CONDITIONAL(with_libnjb, [test x$have_libnjb = xyes]) + +############################################################################### +# END NJB CHECK +############################################################################### + + + +############################################################################### +# BEGIN MTP CHECK +############################################################################### +### mediabrowser.cpp can use libmtp if available + +AC_ARG_WITH(libmtp, + AC_HELP_STRING([--with-libmtp],[build Amarok with support for MTP devices]), + [build_libmtp=$withval], + [build_libmtp=yes] +) +if test "$build_libmtp" != "no"; then + if test "$PKGCONFIGFOUND" = "yes" ; then + PKG_CHECK_MODULES(LIBMTP, libmtp >= 0.1.1, + [ + LIBMTP_LIBS=`echo ${LIBMTP_LIBS} | sed 's/-lusb//'` + have_libmtp=yes + ], + [ + have_libmtp=no + ]) + fi + + if test "x$have_libmtp" != "xno"; then + AC_DEFINE(HAVE_LIBMTP, 1, [have libmtp]) + fi +fi + +AM_CONDITIONAL(with_libmtp, [test x$have_libmtp = xyes]) + +############################################################################### +# END MTP CHECK +############################################################################### + +############################################################################### +# BEGIN RIO KARMA CHECK +############################################################################### +### mediabrowser.cpp can use libkarma if available + +AC_ARG_WITH(libkarma, + AC_HELP_STRING([--with-libkarma],[build Amarok with Rio Karma support]), + [build_libkarma=$withval], + [build_libkarma=yes] +) + +if test "$build_libkarma" != "no"; then + AC_CHECK_HEADERS([libkarma/lkarma.h], [have_libkarma=yes], [], []) + AC_CHECK_HEADERS([usb.h], [have_usb=yes], [], []) + + if test "$have_libkarma" = "yes"; then + AC_DEFINE(HAVE_LIBKARMA, 1, [have libkarma]) + else + AC_MSG_RESULT($have_libkarma) + have_libkarma=no + fi +fi + +AM_CONDITIONAL(with_libkarma, [test x$have_libkarma = xyes]) + +############################################################################### +# END RIO KARMA CHECK +############################################################################### + +############################################################################### +# BEGIN IFP CHECK +############################################################################### +### mediabrowser.cpp can use libifp if available + +AC_ARG_WITH(ifp, + AC_HELP_STRING([--with-ifp],[build Amarok with ifp support]), + [build_ifp=$withval], + [build_ifp=yes] +) + +if test "$build_ifp" != "no"; then + + AC_CHECK_HEADERS([ifp.h], [have_ifp=yes], [], []) + AC_CHECK_HEADERS([usb.h], [have_usb=yes], [], []) + + if test "$have_ifp" = "yes"; then + AC_DEFINE(HAVE_IFP, 1, [have ifp]) + IFP_LIBS="-lifp -lusb" + else + AC_MSG_RESULT($have_ifp) + have_ifp=no + fi + +fi + +AC_SUBST(IFP_INCLUDES) +AC_SUBST(IFP_LIBS) + +AM_CONDITIONAL(with_ifp, [test x$have_ifp = xyes]) + +############################################################################### +# END IFP CHECK +############################################################################### + + + +############################################################################### +# BEGIN LIBGPOD CHECK +############################################################################### + +AC_ARG_WITH(libgpod, + AC_HELP_STRING([--with-libgpod],[build Amarok with iPod support from libgpod]), + [build_libgpod=$withval], + [build_libgpod=yes] +) + +if test "$build_libgpod" != "no"; then + if test "$PKGCONFIGFOUND" = "yes" ; then + + # check for libgpod + have_libgpod=no + + PKG_CHECK_MODULES(LIBGPOD, libgpod-1.0, have_libgpod=yes,have_libgpod=no) + + if test "x$have_libgpod" = "xyes"; then + ac_cppflags_save=$CPPFLAGS + ac_cflags_save=$CFLAGS + ac_libs_save=$LIBS + CPPFLAGS="$CPPFLAGS $LIBGPOD_INCLUDES" + CFLAGS="$CFLAGS $LIBGPOD_CFLAGS" + LIBS="$LIBS $LIBGPOD_LIBS" + + AC_CHECK_FUNCS(itdb_track_set_thumbnails, , have_libgpod_042=no) + AC_CHECK_FUNCS(itdb_get_mountpoint, , have_libgpod_042=no) + AC_CHECK_FUNCS(itdb_device_get_ipod_info, , have_libgpod_042=no) + + AC_CHECK_MEMBER(struct _Itdb_Track.movie_flag, + [AC_DEFINE(HAVE_ITDB_MOVIE_FLAG, 1, [have libgpod movie flag])], + have_libgpod_042=no, + [#include ]) + + AC_CHECK_MEMBER(struct _Itdb_Track.skip_when_shuffling, + [AC_DEFINE(HAVE_ITDB_SKIP_SHUFFLE_FLAG, 1, [have libgpod skip when shuffling flag])], + have_libgpod_042=no, + [#include ]) + + AC_CHECK_MEMBER(struct _Itdb_Track.mark_unplayed, + [AC_DEFINE(HAVE_ITDB_MARK_UNPLAYED, 1, [have libgpod mark played flag])], + have_libgpod_042=no, + [#include ]) + + AC_CHECK_MEMBER(struct _Itdb_Track.mediatype, + [AC_DEFINE(HAVE_ITDB_MEDIATYPE, 1, [have libgpod mediatype flag])], + have_libgpod_042=no, + [#include ]) + + AC_CHECK_DECL(ITDB_IPOD_MODEL_TOUCH_BLACK, + [AC_DEFINE(HAVE_LIBGPOD_060, 1, [have at least libgpod 0.6.0])], + have_libgpod_060=no, + [#include ]) + + CPPFLAGS=$ac_cppflags_save + CFLAGS=$ac_cflags_save + LIBS=$ac_libs_save + fi + + if test "x$have_libgpod_042" = "xno"; then + have_libgpod=no + AC_MSG_RESULT(Your libgpod version is too old: at least 0.4.2 is required) + fi + + if test "x$have_libgpod" != "xno"; then + AC_DEFINE(HAVE_LIBGPOD, 1, [have libgpod]) + fi + fi +fi + +AM_CONDITIONAL(with_libgpod, [test x$have_libgpod = xyes]) + +############################################################################### +# END LIBGPOD CHECK +############################################################################### + + + +############################################################################### +# BEGIN statvfs(2) CHECK +############################################################################### + +AC_CHECK_FUNCS(statvfs) + +############################################################################### +# END statvfs(2) CHECK +############################################################################### + + + +############################################################################### +# BEGIN MP4V2 CHECK +############################################################################### +# m4a/aac tag reading and writing needs libmp4v2 from faad2 or better mpeg4ip + +AC_ARG_WITH(mp4v2, + AC_HELP_STRING([--with-mp4v2],[build Amarok with M4A/AAC tag support from mp4v2/faad2]), + [have_mp4v2=$withval], + [have_mp4v2=no] +) + +AC_ARG_WITH(mp4v2-dir, + AC_HELP_STRING([--with-mp4v2-dir],[path to mp4v2 [default=/usr]]), + [mp4v2_dir="$withval"], + [mp4v2_dir=/usr] +) + +if test "$have_mp4v2" != "no"; then + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + ac_cxxflags_save=$CXXFLAGS + CXXFLAGS="$CXXFLAGS -I$mp4v2_dir/include" + ac_ldflags_save=$LDFLAGS + LDFLAGS="$LDFLAGS -L$mp4v2_dir/lib" + + # not even everyone using faad2 has + if ! test -f config.h; then + echo "#include \"confdefs.h\"" > config.h + fi + ac_cppflags_save=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I." + AC_CHECK_HEADERS(systems.h) + AC_CHECK_HEADERS([mp4.h], [have_mp4_h=yes], [], + [#ifdef HAVE_SYSTEMS_H + # include + #endif + ]) + + AC_CHECK_LIB( mp4v2, MP4Read, have_mp4v2=yes, have_mp4v2=no ) + + if test "$have_mp4v2" = "yes" -a "$have_mp4_h" = "yes"; then + AC_DEFINE(HAVE_MP4V2, 1, [have mp4v2]) + MP4V2_INCLUDES="-I$mp4v2_dir/include" + MP4V2_LIBS="-L$mp4v2_dir/lib -lmp4v2" + else + have_mp4v2=no + fi + + CPPFLAGS=$ac_cppflags_save + CXXFLAGS=$ac_cxxflags_save + LDFLAGS=$ac_ldflags_save + AC_LANG_RESTORE +fi + +AC_SUBST(MP4V2_INCLUDES) +AC_SUBST(MP4V2_LIBS) + +AM_CONDITIONAL(with_mp4v2, [test x$have_mp4v2 != xno ]) + +############################################################################### +# END MP4V2 CHECK +############################################################################### + + + +############################################################################### +# BEGIN DAAP KDE 3.4 CHECK +############################################################################### + +daapsave_CXXFLAGS="$CXXFLAGS" +CXXFLAGS="$CXXFLAGS $all_includes" +AC_LANG_SAVE +AC_LANG_CPLUSPLUS + +AC_MSG_CHECKING([if KDE is at least 3.4 for DAAP support]) +AC_COMPILE_IFELSE([ +#include +#if ! ( KDE_IS_VERSION( 3, 4, 0 ) ) +#error KDE 3.4 +#endif +], + have_kde34="yes" + DNSSD_LIBS=$LIB_KDNSSD +# echo "yes" +, + have_kde34="no" + DNSSD_LIBS="" +# echo "no" +) +CXXFLAGS="$daapsave_CXXFLAGS" +AC_LANG_RESTORE +AC_SUBST(DNSSD_LIBS) +AM_CONDITIONAL(atleast_kde34, [test x$have_kde34 != xno ]) +AC_MSG_RESULT($have_kde34) + +############################################################################### +# END DAAP KDE 3.4 CHECK +############################################################################### + + + +############################################################################### +# BEGIN OPTIONAL DAAP SUPPORT +############################################################################### + +AC_ARG_WITH(daap, + AC_HELP_STRING([--without-daap],[build Amarok without support for DAAP]), + [have_daap=$withval], + [have_daap=yes] +) + +AM_CONDITIONAL(with_daap, [test x$have_daap = xyes]) + +############################################################################### +# END OPTIONAL DAAP SUPPORT +############################################################################### + + + +############################################################################### +# BEGIN DAAP TYPE CHECKS +############################################################################### + +AC_CHECK_TYPES([uint8_t, u_int8_t, uint16_t, u_int16_t, uint32_t, u_int32_t, uint64_t, u_int64_t]) + +############################################################################### +# END DAAP TYPE CHECKS +############################################################################### + + + +############################################################################### +# BEGIN DAAP MONGREL RUBY VARIABLE +############################################################################### + +AC_PATH_PROG(RUBY, ruby, no) + +ruby_includes=[`$RUBY -rrbconfig -e 'puts Config.expand( Config::MAKEFILE_CONFIG["archdir"] )'`] +ruby_ldflags=[`$RUBY -rrbconfig -e 'puts Config.expand( Config::MAKEFILE_CONFIG["LIBRUBYARG_SHARED"] )'`] + +AC_SUBST(ruby_includes) +AC_SUBST(ruby_ldflags) +OLDCFLAGS="$CFLAGS" +CFLAGS="-I$ruby_includes -Wall" +OLDCPPFLAGS="$CPPFLAGS" +CPPFLAGS="-I$ruby_includes" #no I don't know why CPPFLAGS is used +AC_CHECK_HEADERS([ruby.h], [have_ruby_h=yes], [have_ruby_h=no]) #used in ruby check below +CFLAGS="$OLDCFLAGS" +CPPFLAGS="$OLDCPPFLAGS" + +############################################################################### +# END DAAP MONGREL RUBY VARIABLE +############################################################################### + + + +############################################################################### +# BEGIN RUBY CHECK +############################################################################### +## TODO: Check version number >= 1.8 + +if test "x$RUBY" = "xno" -o "x$have_ruby_h" = "xno"; then + amarok_error_noruby=yes + DO_NOT_COMPILE="$DO_NOT_COMPILE amarok" + no_amarok=yes +fi + +############################################################################### +# END RUBY CHECK +############################################################################### + + +############################################################################### +# BEGIN DO_NOT_COMPILE CHECK +############################################################################### + +if test x$build_xine = xno -a x$build_helix = xno; then + + DO_NOT_COMPILE="$DO_NOT_COMPILE amarok" + no_engine=yes + +fi + +############################################################################### +# END DO_NOT_COMPILE CHECK +############################################################################### + KDE_CREATE_SUBDIRSLIST AM_CONDITIONAL(amarok_SUBDIR_included, test "x$amarok_SUBDIR_included" = xyes) AM_CONDITIONAL(doc_SUBDIR_included, test "x$doc_SUBDIR_included" = xyes) --- amarok-1.4.9.1.orig/aclocal.m4 +++ amarok-1.4.9.1/aclocal.m4 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.10 -*- Autoconf -*- +# generated automatically by aclocal 1.10.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008 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. @@ -11,12 +11,15 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -m4_if(m4_PACKAGE_VERSION, [2.61],, -[m4_fatal([this file was generated for autoconf 2.61. -You have another version of autoconf. If you want to use that, -you should regenerate the build system entirely.], [63])]) +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +m4_if(AC_AUTOCONF_VERSION, [2.61],, +[m4_warning([this file was generated for autoconf 2.61. +You have another version of autoconf. It may work, but is not guaranteed to. +If you have problems, you may need to regenerate the build system entirely. +To do so, use the procedure documented by the package, typically `autoreconf'.])]) -# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -31,7 +34,7 @@ [am__api_version='1.10' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.10], [], +m4_if([$1], [1.10.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -47,8 +50,10 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.10])dnl -_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) +[AM_AUTOMAKE_VERSION([1.10.1])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- @@ -320,7 +325,7 @@ # each Makefile.in and add a new line on top of each file to say so. # Grep'ing the whole file is not good either: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then dirpart=`AS_DIRNAME("$mf")` else continue @@ -380,13 +385,13 @@ # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# 2005, 2006, 2008 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 12 +# serial 13 # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -491,16 +496,17 @@ # our stamp files there. AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers. +_am_arg=$1 _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $1 | $1:* ) + $_am_arg | $_am_arg:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # @@ -537,6 +543,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. @@ -772,7 +807,7 @@ # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- -# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. # This macro is traced by Automake. AC_DEFUN([_AM_SUBST_NOTMAKE]) --- amarok-1.4.9.1.orig/amarok/Makefile.in +++ amarok-1.4.9.1/amarok/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -104,6 +104,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -198,6 +199,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -207,6 +209,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -217,6 +220,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -238,6 +242,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -383,7 +388,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*) \ @@ -421,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 mostlyclean-libtool: @@ -507,8 +512,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -533,8 +538,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -544,13 +549,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- amarok-1.4.9.1.orig/amarok/src/Makefile.in +++ amarok-1.4.9.1/amarok/src/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -74,6 +74,7 @@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(LIB_SQLITE_LOCAL) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) @@ -102,9 +103,8 @@ trackpickerdialog.lo tracktooltip.lo transferdialog.lo \ xmlloader.lo xspfplaylist.lo editfilterdialog.lo #>- libamarok_la_OBJECTS = $(am_libamarok_la_OBJECTS) -#>+ 27 -libamarok_la_final_OBJECTS = libamarok_la.all_cpp.lo -libamarok_la_nofinal_OBJECTS = actionclasses.lo app.lo atomicstring.lo \ +#>+ 24 +libamarok_la_OBJECTS = actionclasses.lo app.lo atomicstring.lo \ atomicurl.lo browserbar.lo clicklineedit.lo \ collectionbrowser.lo collectiondb.lo columnlist.lo \ configdialog.lo contextbrowser.lo coverfetcher.lo \ @@ -128,8 +128,6 @@ tagdialog.lo tagguesser.lo threadmanager.lo tooltip.lo \ trackpickerdialog.lo tracktooltip.lo transferdialog.lo \ xmlloader.lo xspfplaylist.lo editfilterdialog.lo Options1.lo Options2.lo Options4.lo Options5.lo Options7.lo Options8.lo dbsetup.lo deletedialogbase.lo firstrunwizard.lo newdynamic.lo organizecollectiondialog.lo podcastsettingsbase.lo scriptmanagerbase.lo tagdialogbase.lo tagguesserconfigdialog.lo trackpickerdialogbase.lo -@KDE_USE_FINAL_FALSE@libamarok_la_OBJECTS = $(libamarok_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@libamarok_la_OBJECTS = $(libamarok_la_final_OBJECTS) #>- libamarok_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ #>- $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ #>- $(CXXFLAGS) $(libamarok_la_LDFLAGS) $(LDFLAGS) -o $@ @@ -150,12 +148,6 @@ $(top_builddir)/amarok/src/plugin/libplugin.la \ $(top_builddir)/amarok/src/statusbar/libstatusbar.la \ $(top_builddir)/amarok/src/metadata/libmetadata.la \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(LIB_SQLITE_LOCAL) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) #>- amarokapp_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ #>- $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ @@ -166,7 +158,7 @@ $(CXXFLAGS) $(KDE_CXXFLAGS) $(amarokapp_LDFLAGS) $(LDFLAGS) -o $@ binSCRIPT_INSTALL = $(INSTALL_SCRIPT) SCRIPTS = $(bin_SCRIPTS) -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -271,6 +263,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -365,6 +358,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -374,6 +368,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -384,6 +379,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -405,6 +401,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -532,6 +529,7 @@ @with_included_sqlite_TRUE@LIB_SQLITE_LOCAL = $(top_builddir)/amarok/src/sqlite/libsqlite.la @with_included_sqlite_TRUE@sqlite_includes = -I$(top_srcdir)/amarok/src/sqlite @with_konqsidebar_TRUE@KONQSIDEBAR_SUBDIR = konquisidebar +KDE_OPTIONS = nofinal lib_LTLIBRARIES = libamarok.la SUBDIRS = \ amarokcore \ @@ -777,7 +775,7 @@ $(top_builddir)/amarok/src/statusbar/libstatusbar.la \ $(top_builddir)/amarok/src/metadata/libmetadata.la \ $(top_builddir)/amarok/src/magnatunebrowser/libmagnatunebrowser.la \ - $(LIB_KUTILS) $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KHTML) $(LIB_KNEWSTUFF) \ + $(LIB_QT) $(LIB_KPARTS) -lDCOP -lkdefx $(KDE_MT_LIBS) $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KHTML) $(LIB_KNEWSTUFF) \ $(TAGLIB_LIBS) $(gl_libs) $(LIB_SQLITE) $(LIB_SQLITE_LOCAL) \ $(LIB_TUNEPIMP) \ $(mysql_libs) \ @@ -808,11 +806,7 @@ $(top_builddir)/amarok/src/plugin/libplugin.la \ $(top_builddir)/amarok/src/statusbar/libstatusbar.la \ $(top_builddir)/amarok/src/metadata/libmetadata.la \ - $(LIB_KUTILS) $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KHTML) $(LIB_KNEWSTUFF) \ - $(TAGLIB_LIBS) $(gl_libs) $(LIB_SQLITE) $(LIB_SQLITE_LOCAL) $(EXSCALIBAR_LIBS) \ - $(LIB_TUNEPIMP) \ - $(mysql_libs) \ - $(postgresql_libs) + $(LIB_KDECORE) amarokapp_LDFLAGS = \ $(all_libraries) \ @@ -865,7 +859,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*) \ @@ -874,9 +868,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -886,9 +880,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/Makefile + $(AUTOMAKE) --foreign amarok/src/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -903,9 +897,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) @@ -913,8 +907,8 @@ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ - $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ else :; fi; \ done @@ -922,8 +916,8 @@ @$(NORMAL_UNINSTALL) @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ done clean-libLTLIBRARIES: @@ -945,8 +939,8 @@ || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -1295,8 +1289,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -1321,8 +1315,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -1332,13 +1326,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -1435,7 +1428,7 @@ #>- clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ #>- clean-libtool mostlyclean-am #>+ 2 -clean-am: clean-metasources clean-ui clean-bcheck clean-final clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ +clean-am: clean-metasources clean-ui clean-bcheck clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ clean-libtool mostlyclean-am distclean: distclean-recursive @@ -1538,6 +1531,7 @@ uninstall-protocolDATA uninstall-rcDATA \ uninstall-servicemenuDATA uninstall-xdg_appsDATA + $(EXSCALIBAR_LIBS) messages: rc.cpp $(EXTRACTRC) `find . -name "*.rc" -o -name "*.ui" -o -name "*.kcfg"` > rc.cpp @@ -1591,13 +1585,6 @@ mocs: hintlineedit.moc #>+ 3 -moodbar.moc: $(srcdir)/moodbar.h - $(MOC) $(srcdir)/moodbar.h -o moodbar.moc - -#>+ 2 -mocs: moodbar.moc - -#>+ 3 mediabrowser.moc: $(srcdir)/mediabrowser.h $(MOC) $(srcdir)/mediabrowser.h -o mediabrowser.moc @@ -1605,11 +1592,11 @@ mocs: mediabrowser.moc #>+ 3 -devicemanager.moc: $(srcdir)/devicemanager.h - $(MOC) $(srcdir)/devicemanager.h -o devicemanager.moc +moodbar.moc: $(srcdir)/moodbar.h + $(MOC) $(srcdir)/moodbar.h -o moodbar.moc #>+ 2 -mocs: devicemanager.moc +mocs: moodbar.moc #>+ 3 app.moc: $(srcdir)/app.h @@ -1619,6 +1606,13 @@ mocs: app.moc #>+ 3 +devicemanager.moc: $(srcdir)/devicemanager.h + $(MOC) $(srcdir)/devicemanager.h -o devicemanager.moc + +#>+ 2 +mocs: devicemanager.moc + +#>+ 3 refreshimages.moc: $(srcdir)/refreshimages.h $(MOC) $(srcdir)/refreshimages.h -o refreshimages.moc @@ -1633,18 +1627,18 @@ mocs: prettypopupmenu.moc #>+ 3 -editfilterdialog.moc: $(srcdir)/editfilterdialog.h - $(MOC) $(srcdir)/editfilterdialog.h -o editfilterdialog.moc +transferdialog.moc: $(srcdir)/transferdialog.h + $(MOC) $(srcdir)/transferdialog.h -o transferdialog.moc #>+ 2 -mocs: editfilterdialog.moc +mocs: transferdialog.moc #>+ 3 -transferdialog.moc: $(srcdir)/transferdialog.h - $(MOC) $(srcdir)/transferdialog.h -o transferdialog.moc +editfilterdialog.moc: $(srcdir)/editfilterdialog.h + $(MOC) $(srcdir)/editfilterdialog.h -o editfilterdialog.moc #>+ 2 -mocs: transferdialog.moc +mocs: editfilterdialog.moc #>+ 3 metabundlesaver.moc: $(srcdir)/metabundlesaver.h @@ -1682,13 +1676,6 @@ mocs: scancontroller.moc #>+ 3 -equalizerpresetmanager.moc: $(srcdir)/equalizerpresetmanager.h - $(MOC) $(srcdir)/equalizerpresetmanager.h -o equalizerpresetmanager.moc - -#>+ 2 -mocs: equalizerpresetmanager.moc - -#>+ 3 collectiondb.moc: $(srcdir)/collectiondb.h $(MOC) $(srcdir)/collectiondb.h -o collectiondb.moc @@ -1703,6 +1690,13 @@ mocs: deviceconfiguredialog.moc #>+ 3 +equalizerpresetmanager.moc: $(srcdir)/equalizerpresetmanager.h + $(MOC) $(srcdir)/equalizerpresetmanager.h -o equalizerpresetmanager.moc + +#>+ 2 +mocs: equalizerpresetmanager.moc + +#>+ 3 xmlloader_p.moc: $(srcdir)/xmlloader_p.h $(MOC) $(srcdir)/xmlloader_p.h -o xmlloader_p.moc @@ -1780,6 +1774,13 @@ mocs: tagdialog.moc #>+ 3 +contextbrowser.moc: $(srcdir)/contextbrowser.h + $(MOC) $(srcdir)/contextbrowser.h -o contextbrowser.moc + +#>+ 2 +mocs: contextbrowser.moc + +#>+ 3 collectionbrowser.moc: $(srcdir)/collectionbrowser.h $(MOC) $(srcdir)/collectionbrowser.h -o collectionbrowser.moc @@ -1794,13 +1795,6 @@ mocs: xmlloader.moc #>+ 3 -contextbrowser.moc: $(srcdir)/contextbrowser.h - $(MOC) $(srcdir)/contextbrowser.h -o contextbrowser.moc - -#>+ 2 -mocs: contextbrowser.moc - -#>+ 3 playlistbrowseritem.moc: $(srcdir)/playlistbrowseritem.h $(MOC) $(srcdir)/playlistbrowseritem.h -o playlistbrowseritem.moc @@ -1822,6 +1816,13 @@ mocs: smartplaylisteditor.moc #>+ 3 +mydiroperator.moc: $(srcdir)/mydiroperator.h + $(MOC) $(srcdir)/mydiroperator.h -o mydiroperator.moc + +#>+ 2 +mocs: mydiroperator.moc + +#>+ 3 podcastsettings.moc: $(srcdir)/podcastsettings.h $(MOC) $(srcdir)/podcastsettings.h -o podcastsettings.moc @@ -1829,11 +1830,11 @@ mocs: podcastsettings.moc #>+ 3 -mydiroperator.moc: $(srcdir)/mydiroperator.h - $(MOC) $(srcdir)/mydiroperator.h -o mydiroperator.moc +mountpointmanager.moc: $(srcdir)/mountpointmanager.h + $(MOC) $(srcdir)/mountpointmanager.h -o mountpointmanager.moc #>+ 2 -mocs: mydiroperator.moc +mocs: mountpointmanager.moc #>+ 3 filebrowser.moc: $(srcdir)/filebrowser.h @@ -1843,13 +1844,6 @@ mocs: filebrowser.moc #>+ 3 -columnlist.moc: $(srcdir)/columnlist.h - $(MOC) $(srcdir)/columnlist.h -o columnlist.moc - -#>+ 2 -mocs: columnlist.moc - -#>+ 3 actionclasses.moc: $(srcdir)/actionclasses.h $(MOC) $(srcdir)/actionclasses.h -o actionclasses.moc @@ -1857,11 +1851,11 @@ mocs: actionclasses.moc #>+ 3 -mountpointmanager.moc: $(srcdir)/mountpointmanager.h - $(MOC) $(srcdir)/mountpointmanager.h -o mountpointmanager.moc +columnlist.moc: $(srcdir)/columnlist.h + $(MOC) $(srcdir)/columnlist.h -o columnlist.moc #>+ 2 -mocs: mountpointmanager.moc +mocs: columnlist.moc #>+ 3 scrobbler.moc: $(srcdir)/scrobbler.h @@ -2012,10 +2006,10 @@ #>+ 3 clean-metasources: - -rm -f playlistbrowser.moc browserbar.moc statistics.moc hintlineedit.moc moodbar.moc mediabrowser.moc devicemanager.moc app.moc refreshimages.moc prettypopupmenu.moc editfilterdialog.moc transferdialog.moc metabundlesaver.moc starmanager.moc socketserver.moc playlistselection.moc scancontroller.moc equalizerpresetmanager.moc collectiondb.moc deviceconfiguredialog.moc xmlloader_p.moc multitabbar.moc multitabbar_p.moc cuefile.moc mediadevicemanager.moc deletedialog.moc ktrm.moc directorylist.moc mediumpluginmanager.moc enginecontroller.moc tagdialog.moc collectionbrowser.moc xmlloader.moc contextbrowser.moc playlistbrowseritem.moc htmlview.moc smartplaylisteditor.moc podcastsettings.moc mydiroperator.moc filebrowser.moc columnlist.moc actionclasses.moc mountpointmanager.moc scrobbler.moc osd.moc scriptmanager.moc threadmanager.moc configdialog.moc equalizersetup.moc playlistwindow.moc tooltip.moc tracktooltip.moc clicklineedit.moc playlistloader.moc queuemanager.moc covermanager.moc playlist.moc trackpickerdialog.moc lastfm.moc playerwindow.moc pixmapviewer.moc coverfetcher.moc enginebase.moc sliderwidget.moc + -rm -f playlistbrowser.moc browserbar.moc statistics.moc hintlineedit.moc mediabrowser.moc moodbar.moc app.moc devicemanager.moc refreshimages.moc prettypopupmenu.moc transferdialog.moc editfilterdialog.moc metabundlesaver.moc starmanager.moc socketserver.moc playlistselection.moc scancontroller.moc collectiondb.moc deviceconfiguredialog.moc equalizerpresetmanager.moc xmlloader_p.moc multitabbar.moc multitabbar_p.moc cuefile.moc mediadevicemanager.moc deletedialog.moc ktrm.moc directorylist.moc mediumpluginmanager.moc enginecontroller.moc tagdialog.moc contextbrowser.moc collectionbrowser.moc xmlloader.moc playlistbrowseritem.moc htmlview.moc smartplaylisteditor.moc mydiroperator.moc podcastsettings.moc mountpointmanager.moc filebrowser.moc actionclasses.moc columnlist.moc scrobbler.moc osd.moc scriptmanager.moc threadmanager.moc configdialog.moc equalizersetup.moc playlistwindow.moc tooltip.moc tracktooltip.moc clicklineedit.moc playlistloader.moc queuemanager.moc covermanager.moc playlist.moc trackpickerdialog.moc lastfm.moc playerwindow.moc pixmapviewer.moc coverfetcher.moc enginebase.moc sliderwidget.moc #>+ 2 -KDE_DIST=firstrunwizard.ui amarokui_xmms.rc playlistbrowser.h refreshimages.h equalizersetup.h Options5.ui.h trackpickerdialogbase.ui Options2.ui amarok.desktop pixmapviewer.h amarok_codecinstall.desktop podcastsettings.h transferdialog.h amarok_addaspodcast.desktop mydiroperator.h ktrm.h Options4.ui mediadevicemanager.h statistics.h scriptmanager.h playlistwindow.h amarok.h playlistloader.h playlistbrowseritem.h medium.h engineobserver.h Options7.ui hintlineedit.h tagguesserconfigdialog.ui editfilterdialog.h socketserver.h playerwindow.h deletedialogbase.ui hi22-app-amarok.png xmlloader.h Options8.ui queuemanager.h tracktooltip.h tagguesser.h collectionbrowser.h mountpointmanager.h hi128-app-amarok.png browserbar.h moodbar.h newdynamic.ui playlistitem.h collectiondb.h contextbrowser.h enginebase.h amarok_append.desktop playlistselection.h deviceconfiguredialog.h amarok_proxy.rb directorylist.h osd.h debug.h amarok_play_audiocd.desktop hi64-app-amarok.png scrobbler.h Makefile.in amarokpcast.protocol qstringx.h tagdialog.h organizecollectiondialog.ui.h amarokrc organizecollectiondialog.ui xmlloader_p.h lastfm.h starmanager.h pluginmanager.h systray.h enginecontroller.h amarok.profile.xml firstrunwizard.ui.h cuefile.h bcpp.cfg tagdialogbase.ui.h amarok_export.h amaroklastfm.protocol mydirlister.h smartplaylisteditor.h hi32-app-amarok.png tagdialogbase.ui sliderwidget.h tooltip.h atomicurl.h actionclasses.h expression.h Options2.ui.h hi48-app-amarok.png fht.h dynamicmode.h columnlist.h filebrowser.h podcastbundle.h clicklineedit.h equalizergraph.h xspfplaylist.h multitabbar_p.h colorgenerator.h scriptmanagerbase.ui threadmanager.h k3bexporter.h engine_fwd.h playlist.h devicemanager.h multitabbar.h metabundle.h amarok_plugin.desktop amarokui.rc prettypopupmenu.h htmlview.h configdialog.h browserToolBar.h hi16-app-amarok.png dbsetup.ui podcastsettingsbase.ui app.h tagguesserconfigdialog.ui.h deletedialog.h Options1.ui covermanager.h scancontroller.h amarokitpc.protocol kbookmarkhandler.h mediumpluginmanager.h metabundlesaver.h Options8.ui.h mediabrowser.h trackpickerdialog.h tdebug.h equalizerpresetmanager.h Options5.ui Makefile.am coverfetcher.h +KDE_DIST=firstrunwizard.ui amarokui_xmms.rc playlistbrowser.h equalizersetup.h refreshimages.h Options2.ui trackpickerdialogbase.ui Options5.ui.h pixmapviewer.h amarok.desktop podcastsettings.h amarok_codecinstall.desktop transferdialog.h mydiroperator.h amarok_addaspodcast.desktop ktrm.h Options4.ui mediadevicemanager.h statistics.h amarok.h scriptmanager.h playlistwindow.h playlistloader.h playlistbrowseritem.h medium.h Options7.ui engineobserver.h hintlineedit.h tagguesserconfigdialog.ui editfilterdialog.h socketserver.h playerwindow.h deletedialogbase.ui hi22-app-amarok.png xmlloader.h queuemanager.h Options8.ui tracktooltip.h tagguesser.h collectionbrowser.h mountpointmanager.h hi128-app-amarok.png browserbar.h newdynamic.ui moodbar.h collectiondb.h playlistitem.h contextbrowser.h enginebase.h amarok_append.desktop playlistselection.h deviceconfiguredialog.h amarok_proxy.rb directorylist.h osd.h debug.h amarok_play_audiocd.desktop hi64-app-amarok.png scrobbler.h qstringx.h Makefile.in amarokpcast.protocol tagdialog.h organizecollectiondialog.ui.h amarokrc organizecollectiondialog.ui xmlloader_p.h lastfm.h starmanager.h pluginmanager.h systray.h enginecontroller.h amarok.profile.xml firstrunwizard.ui.h cuefile.h bcpp.cfg tagdialogbase.ui.h amaroklastfm.protocol amarok_export.h mydirlister.h smartplaylisteditor.h hi32-app-amarok.png tagdialogbase.ui sliderwidget.h tooltip.h actionclasses.h atomicurl.h expression.h Options2.ui.h hi48-app-amarok.png fht.h dynamicmode.h columnlist.h filebrowser.h podcastbundle.h clicklineedit.h xspfplaylist.h equalizergraph.h multitabbar_p.h k3bexporter.h threadmanager.h colorgenerator.h scriptmanagerbase.ui engine_fwd.h playlist.h devicemanager.h multitabbar.h metabundle.h amarok_plugin.desktop amarokui.rc prettypopupmenu.h htmlview.h configdialog.h browserToolBar.h hi16-app-amarok.png dbsetup.ui podcastsettingsbase.ui app.h tagguesserconfigdialog.ui.h deletedialog.h Options1.ui covermanager.h scancontroller.h amarokitpc.protocol kbookmarkhandler.h mediumpluginmanager.h metabundlesaver.h Options8.ui.h mediabrowser.h trackpickerdialog.h equalizerpresetmanager.h tdebug.h Makefile.am Options5.ui coverfetcher.h #>+ 19 clean-ui: @@ -2042,26 +2036,26 @@ #>+ 22 install-kde-icons: - $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps - $(INSTALL_DATA) $(srcdir)/hi16-app-amarok.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/amarok.png $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps $(INSTALL_DATA) $(srcdir)/hi128-app-amarok.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/amarok.png $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps $(INSTALL_DATA) $(srcdir)/hi64-app-amarok.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/amarok.png + $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps + $(INSTALL_DATA) $(srcdir)/hi48-app-amarok.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/amarok.png $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps $(INSTALL_DATA) $(srcdir)/hi22-app-amarok.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/amarok.png $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps $(INSTALL_DATA) $(srcdir)/hi32-app-amarok.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/amarok.png - $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps - $(INSTALL_DATA) $(srcdir)/hi48-app-amarok.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/amarok.png + $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps + $(INSTALL_DATA) $(srcdir)/hi16-app-amarok.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/amarok.png uninstall-kde-icons: - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/amarok.png -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/amarok.png -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/amarok.png + -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/amarok.png -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/amarok.png -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/amarok.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/amarok.png + -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/amarok.png #>+ 15 force-reedit: @@ -2073,9 +2067,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/Makefile + $(AUTOMAKE) --foreign amarok/src/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/Makefile.in @@ -2101,37 +2095,21 @@ done -#>+ 11 -libamarok_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/actionclasses.cpp $(srcdir)/app.cpp $(srcdir)/atomicstring.cpp $(srcdir)/atomicurl.cpp $(srcdir)/browserbar.cpp $(srcdir)/clicklineedit.cpp $(srcdir)/collectionbrowser.cpp $(srcdir)/collectiondb.cpp $(srcdir)/columnlist.cpp $(srcdir)/configdialog.cpp $(srcdir)/contextbrowser.cpp $(srcdir)/coverfetcher.cpp $(srcdir)/covermanager.cpp $(srcdir)/cuefile.cpp $(srcdir)/deletedialog.cpp $(srcdir)/deviceconfiguredialog.cpp $(srcdir)/devicemanager.cpp $(srcdir)/directorylist.cpp $(srcdir)/dynamicmode.cpp $(srcdir)/enginebase.cpp $(srcdir)/enginecontroller.cpp $(srcdir)/engineobserver.cpp $(srcdir)/equalizergraph.cpp $(srcdir)/equalizerpresetmanager.cpp $(srcdir)/equalizersetup.cpp $(srcdir)/expression.cpp $(srcdir)/fht.cpp $(srcdir)/filebrowser.cpp $(srcdir)/hintlineedit.cpp $(srcdir)/htmlview.cpp $(srcdir)/iconloader.cpp $(srcdir)/k3bexporter.cpp $(srcdir)/kbookmarkhandler.cpp $(srcdir)/ktrm.cpp $(srcdir)/lastfm.cpp $(srcdir)/mediabrowser.cpp $(srcdir)/mediadevicemanager.cpp $(srcdir)/medium.cpp $(srcdir)/mediumpluginmanager.cpp $(srcdir)/metabundle.cpp $(srcdir)/metabundlesaver.cpp $(srcdir)/moodbar.cpp $(srcdir)/mountpointmanager.cpp $(srcdir)/multitabbar.cpp $(srcdir)/mydiroperator.cpp $(srcdir)/osd.cpp $(srcdir)/pixmapviewer.cpp $(srcdir)/playerwindow.cpp $(srcdir)/playlist.cpp $(srcdir)/playlistbrowser.cpp $(srcdir)/playlistbrowseritem.cpp $(srcdir)/playlistitem.cpp $(srcdir)/playlistloader.cpp $(srcdir)/playlistselection.cpp $(srcdir)/playlistwindow.cpp $(srcdir)/pluginmanager.cpp $(srcdir)/podcastsettings.cpp $(srcdir)/prettypopupmenu.cpp $(srcdir)/queuemanager.cpp $(srcdir)/refreshimages.cpp $(srcdir)/scancontroller.cpp $(srcdir)/scriptmanager.cpp $(srcdir)/scrobbler.cpp $(srcdir)/sliderwidget.cpp $(srcdir)/smartplaylisteditor.cpp $(srcdir)/socketserver.cpp $(srcdir)/starmanager.cpp $(srcdir)/statistics.cpp $(srcdir)/systray.cpp $(srcdir)/tagdialog.cpp $(srcdir)/tagguesser.cpp $(srcdir)/threadmanager.cpp $(srcdir)/tooltip.cpp $(srcdir)/trackpickerdialog.cpp $(srcdir)/tracktooltip.cpp $(srcdir)/transferdialog.cpp $(srcdir)/xmlloader.cpp $(srcdir)/xspfplaylist.cpp $(srcdir)/editfilterdialog.cpp Options1.cpp Options2.cpp Options4.cpp Options5.cpp Options7.cpp Options8.cpp dbsetup.cpp deletedialogbase.cpp firstrunwizard.cpp newdynamic.cpp organizecollectiondialog.cpp podcastsettingsbase.cpp scriptmanagerbase.cpp tagdialogbase.cpp tagguesserconfigdialog.cpp trackpickerdialogbase.cpp browserbar.moc playlistbrowser.moc statistics.moc firstrunwizard.moc hintlineedit.moc mediabrowser.moc moodbar.moc trackpickerdialogbase.moc tagguesserconfigdialog.moc Options2.moc refreshimages.moc app.moc devicemanager.moc Options4.moc prettypopupmenu.moc deletedialogbase.moc Options5.moc Options7.moc editfilterdialog.moc transferdialog.moc metabundlesaver.moc starmanager.moc socketserver.moc playlistselection.moc scancontroller.moc deviceconfiguredialog.moc collectiondb.moc equalizerpresetmanager.moc xmlloader_p.moc tagdialogbase.moc multitabbar.moc multitabbar_p.moc scriptmanagerbase.moc cuefile.moc Options8.moc mediadevicemanager.moc deletedialog.moc ktrm.moc directorylist.moc mediumpluginmanager.moc newdynamic.moc enginecontroller.moc tagdialog.moc dbsetup.moc collectionbrowser.moc xmlloader.moc contextbrowser.moc podcastsettingsbase.moc playlistbrowseritem.moc organizecollectiondialog.moc htmlview.moc smartplaylisteditor.moc podcastsettings.moc mydiroperator.moc filebrowser.moc columnlist.moc actionclasses.moc mountpointmanager.moc Options1.moc scrobbler.moc osd.moc scriptmanager.moc threadmanager.moc configdialog.moc equalizersetup.moc playlistwindow.moc tooltip.moc tracktooltip.moc clicklineedit.moc playlistloader.moc queuemanager.moc playlist.moc covermanager.moc trackpickerdialog.moc playerwindow.moc lastfm.moc enginebase.moc coverfetcher.moc pixmapviewer.moc sliderwidget.moc - @echo 'creating libamarok_la.all_cpp.cpp ...'; \ - rm -f libamarok_la.all_cpp.files libamarok_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> libamarok_la.all_cpp.final; \ - for file in actionclasses.cpp app.cpp atomicstring.cpp atomicurl.cpp browserbar.cpp clicklineedit.cpp collectionbrowser.cpp collectiondb.cpp columnlist.cpp configdialog.cpp contextbrowser.cpp coverfetcher.cpp covermanager.cpp cuefile.cpp deletedialog.cpp deviceconfiguredialog.cpp devicemanager.cpp directorylist.cpp dynamicmode.cpp enginebase.cpp enginecontroller.cpp engineobserver.cpp equalizergraph.cpp equalizerpresetmanager.cpp equalizersetup.cpp expression.cpp fht.cpp filebrowser.cpp hintlineedit.cpp htmlview.cpp iconloader.cpp k3bexporter.cpp kbookmarkhandler.cpp ktrm.cpp lastfm.cpp mediabrowser.cpp mediadevicemanager.cpp medium.cpp mediumpluginmanager.cpp metabundle.cpp metabundlesaver.cpp moodbar.cpp mountpointmanager.cpp multitabbar.cpp mydiroperator.cpp osd.cpp pixmapviewer.cpp playerwindow.cpp playlist.cpp playlistbrowser.cpp playlistbrowseritem.cpp playlistitem.cpp playlistloader.cpp playlistselection.cpp playlistwindow.cpp pluginmanager.cpp podcastsettings.cpp prettypopupmenu.cpp queuemanager.cpp refreshimages.cpp scancontroller.cpp scriptmanager.cpp scrobbler.cpp sliderwidget.cpp smartplaylisteditor.cpp socketserver.cpp starmanager.cpp statistics.cpp systray.cpp tagdialog.cpp tagguesser.cpp threadmanager.cpp tooltip.cpp trackpickerdialog.cpp tracktooltip.cpp transferdialog.cpp xmlloader.cpp xspfplaylist.cpp editfilterdialog.cpp Options1.cpp Options2.cpp Options4.cpp Options5.cpp Options7.cpp Options8.cpp dbsetup.cpp deletedialogbase.cpp firstrunwizard.cpp newdynamic.cpp organizecollectiondialog.cpp podcastsettingsbase.cpp scriptmanagerbase.cpp tagdialogbase.cpp tagguesserconfigdialog.cpp trackpickerdialogbase.cpp ; do \ - echo "#include \"$$file\"" >> libamarok_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libamarok_la.all_cpp.final; \ - done; \ - cat libamarok_la.all_cpp.final libamarok_la.all_cpp.files > libamarok_la.all_cpp.cpp; \ - rm -f libamarok_la.all_cpp.final libamarok_la.all_cpp.files - -#>+ 3 -clean-final: - -rm -f libamarok_la.all_cpp.cpp - #>+ 3 final: - $(MAKE) libamarok_la_OBJECTS="$(libamarok_la_final_OBJECTS)" all-am + $(MAKE) all-am #>+ 3 final-install: - $(MAKE) libamarok_la_OBJECTS="$(libamarok_la_final_OBJECTS)" install-am + $(MAKE) install-am #>+ 3 no-final: - $(MAKE) libamarok_la_OBJECTS="$(libamarok_la_nofinal_OBJECTS)" all-am + $(MAKE) all-am #>+ 3 no-final-install: - $(MAKE) libamarok_la_OBJECTS="$(libamarok_la_nofinal_OBJECTS)" install-am + $(MAKE) install-am #>+ 3 kde-rpo-clean: @@ -2244,8 +2222,8 @@ $(srcdir)/tooltip.cpp: Options1.h Options2.h Options4.h Options5.h Options7.h Options8.h dbsetup.h deletedialogbase.h firstrunwizard.h newdynamic.h organizecollectiondialog.h podcastsettingsbase.h scriptmanagerbase.h tagdialogbase.h tagguesserconfigdialog.h trackpickerdialogbase.h $(srcdir)/queuemanager.cpp: Options1.h Options2.h Options4.h Options5.h Options7.h Options8.h dbsetup.h deletedialogbase.h firstrunwizard.h newdynamic.h organizecollectiondialog.h podcastsettingsbase.h scriptmanagerbase.h tagdialogbase.h tagguesserconfigdialog.h trackpickerdialogbase.h cuefile.o: cuefile.moc -collectionbrowser.lo: collectionbrowser.moc contextbrowser.o: contextbrowser.moc +collectionbrowser.lo: collectionbrowser.moc mydiroperator.lo: mydiroperator.moc podcastsettings.o: podcastsettings.moc threadmanager.o: threadmanager.moc --- amarok-1.4.9.1.orig/amarok/src/magnatunebrowser/Makefile.in +++ amarok-1.4.9.1/amarok/src/magnatunebrowser/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -70,7 +70,7 @@ magnatuneredownloadhandler.moc.lo magnatunealbumdownloader.moc.lo @KDE_USE_FINAL_FALSE@libmagnatunebrowser_la_OBJECTS = $(libmagnatunebrowser_la_nofinal_OBJECTS) @KDE_USE_FINAL_TRUE@libmagnatunebrowser_la_OBJECTS = $(libmagnatunebrowser_la_final_OBJECTS) -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -137,6 +137,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -231,6 +232,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -240,6 +242,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -250,6 +253,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -271,6 +275,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -424,7 +429,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*) \ @@ -433,9 +438,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/magnatunebrowser/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/magnatunebrowser/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/magnatunebrowser/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/magnatunebrowser/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -445,9 +450,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/magnatunebrowser/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/magnatunebrowser/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/magnatunebrowser/Makefile + $(AUTOMAKE) --foreign amarok/src/magnatunebrowser/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/magnatunebrowser/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -462,9 +467,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: @@ -531,8 +536,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -544,8 +549,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -555,13 +560,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -747,18 +751,18 @@ mocs: magnatuneredownloaddialog.moc #>+ 3 -magnatuneartistinfobox.moc: $(srcdir)/magnatuneartistinfobox.h - $(MOC) $(srcdir)/magnatuneartistinfobox.h -o magnatuneartistinfobox.moc +magnatunepurchasehandler.moc: $(srcdir)/magnatunepurchasehandler.h + $(MOC) $(srcdir)/magnatunepurchasehandler.h -o magnatunepurchasehandler.moc #>+ 2 -mocs: magnatuneartistinfobox.moc +mocs: magnatunepurchasehandler.moc #>+ 3 -magnatunepurchasehandler.moc: $(srcdir)/magnatunepurchasehandler.h - $(MOC) $(srcdir)/magnatunepurchasehandler.h -o magnatunepurchasehandler.moc +magnatuneartistinfobox.moc: $(srcdir)/magnatuneartistinfobox.h + $(MOC) $(srcdir)/magnatuneartistinfobox.h -o magnatuneartistinfobox.moc #>+ 2 -mocs: magnatunepurchasehandler.moc +mocs: magnatuneartistinfobox.moc #>+ 3 magnatunealbumdownloader.moc.cpp: $(srcdir)/magnatunealbumdownloader.h @@ -776,7 +780,7 @@ #>+ 3 clean-metasources: - -rm -f magnatunedownloaddialog.moc magnatunebrowser.moc magnatuneredownloadhandler.moc.cpp magnatunexmlparser.moc magnatuneredownloaddialog.moc magnatuneartistinfobox.moc magnatunepurchasehandler.moc magnatunealbumdownloader.moc.cpp magnatunepurchasedialog.moc + -rm -f magnatunedownloaddialog.moc magnatunebrowser.moc magnatuneredownloadhandler.moc.cpp magnatunexmlparser.moc magnatuneredownloaddialog.moc magnatunepurchasehandler.moc magnatuneartistinfobox.moc magnatunealbumdownloader.moc.cpp magnatunepurchasedialog.moc #>+ 2 KDE_DIST=magnatunepurchasedialogbase.ui magnatuneredownloaddialog.h Makefile.in magnatunedownloaddialogbase.ui magnatuneredownloadhandler.h magnatuneredownloaddialogbase.ui Makefile.am @@ -801,9 +805,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/magnatunebrowser/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/magnatunebrowser/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/magnatunebrowser/Makefile + $(AUTOMAKE) --foreign amarok/src/magnatunebrowser/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/magnatunebrowser/Makefile.in @@ -830,7 +834,7 @@ #>+ 11 -libmagnatunebrowser_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/magnatuneartistinfobox.cpp $(srcdir)/magnatunebrowser.cpp $(srcdir)/magnatunedownloaddialog.cpp $(srcdir)/magnatunepurchasedialog.cpp $(srcdir)/magnatunepurchasehandler.cpp $(srcdir)/magnatunetypes.cpp $(srcdir)/magnatunexmlparser.cpp $(srcdir)/magnatunedatabasehandler.cpp $(srcdir)/magnatunelistviewitems.cpp $(srcdir)/magnatunelistview.cpp $(srcdir)/magnatuneredownloaddialog.cpp $(srcdir)/magnatuneredownloadhandler.cpp $(srcdir)/magnatunedownloadinfo.cpp $(srcdir)/magnatunealbumdownloader.cpp magnatunedownloaddialogbase.cpp magnatunepurchasedialogbase.cpp magnatuneredownloaddialogbase.cpp magnatuneredownloadhandler.moc.cpp magnatunealbumdownloader.moc.cpp magnatunedownloaddialog.moc magnatunebrowser.moc magnatuneredownloaddialogbase.moc magnatunexmlparser.moc magnatunedownloaddialogbase.moc magnatuneredownloaddialog.moc magnatunepurchasehandler.moc magnatuneartistinfobox.moc magnatunepurchasedialogbase.moc magnatunepurchasedialog.moc +libmagnatunebrowser_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/magnatuneartistinfobox.cpp $(srcdir)/magnatunebrowser.cpp $(srcdir)/magnatunedownloaddialog.cpp $(srcdir)/magnatunepurchasedialog.cpp $(srcdir)/magnatunepurchasehandler.cpp $(srcdir)/magnatunetypes.cpp $(srcdir)/magnatunexmlparser.cpp $(srcdir)/magnatunedatabasehandler.cpp $(srcdir)/magnatunelistviewitems.cpp $(srcdir)/magnatunelistview.cpp $(srcdir)/magnatuneredownloaddialog.cpp $(srcdir)/magnatuneredownloadhandler.cpp $(srcdir)/magnatunedownloadinfo.cpp $(srcdir)/magnatunealbumdownloader.cpp magnatunedownloaddialogbase.cpp magnatunepurchasedialogbase.cpp magnatuneredownloaddialogbase.cpp magnatuneredownloadhandler.moc.cpp magnatunealbumdownloader.moc.cpp magnatunedownloaddialog.moc magnatunebrowser.moc magnatuneredownloaddialogbase.moc magnatunexmlparser.moc magnatunedownloaddialogbase.moc magnatuneredownloaddialog.moc magnatuneartistinfobox.moc magnatunepurchasehandler.moc magnatunepurchasedialogbase.moc magnatunepurchasedialog.moc @echo 'creating libmagnatunebrowser_la.all_cpp.cpp ...'; \ rm -f libmagnatunebrowser_la.all_cpp.files libmagnatunebrowser_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> libmagnatunebrowser_la.all_cpp.final; \ --- amarok-1.4.9.1.orig/amarok/src/scripts/Makefile.in +++ amarok-1.4.9.1/amarok/src/scripts/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -104,6 +104,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -198,6 +199,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -207,6 +209,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -217,6 +220,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -238,6 +242,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -377,7 +382,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*) \ @@ -386,9 +391,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/scripts/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/scripts/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -398,9 +403,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/scripts/Makefile + $(AUTOMAKE) --foreign amarok/src/scripts/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/scripts/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -415,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 mostlyclean-libtool: @@ -501,8 +506,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -527,8 +532,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -538,13 +543,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -724,9 +728,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/scripts/Makefile + $(AUTOMAKE) --foreign amarok/src/scripts/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/scripts/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/scripts/graphequalizer/Makefile.in +++ amarok-1.4.9.1/amarok/src/scripts/graphequalizer/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -70,7 +70,7 @@ graphequalizer_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(KDE_CXXFLAGS) $(graphequalizer_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -153,6 +153,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -247,6 +248,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -256,6 +258,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -266,6 +269,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -287,6 +291,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -443,7 +448,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*) \ @@ -452,9 +457,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/graphequalizer/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/graphequalizer/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/scripts/graphequalizer/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/scripts/graphequalizer/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -464,9 +469,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/graphequalizer/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/graphequalizer/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/scripts/graphequalizer/Makefile + $(AUTOMAKE) --foreign amarok/src/scripts/graphequalizer/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/scripts/graphequalizer/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -481,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-graphequalizerPROGRAMS: $(graphequalizer_PROGRAMS) @$(NORMAL_INSTALL) @@ -494,8 +499,8 @@ || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(graphequalizerPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(graphequalizerdir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(graphequalizerPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(graphequalizerdir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(graphequalizerPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(graphequalizerdir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(graphequalizerPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(graphequalizerdir)/$$f" || exit 1; \ else :; fi; \ done @@ -575,8 +580,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -588,8 +593,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -599,13 +604,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -809,9 +813,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/graphequalizer/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/graphequalizer/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/scripts/graphequalizer/Makefile + $(AUTOMAKE) --foreign amarok/src/scripts/graphequalizer/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/scripts/graphequalizer/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/scripts/lyrics_astraweb/Makefile.in +++ amarok-1.4.9.1/amarok/src/scripts/lyrics_astraweb/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -95,6 +95,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -189,6 +190,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -198,6 +200,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -208,6 +211,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -229,6 +233,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -366,7 +371,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*) \ @@ -375,9 +380,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/lyrics_astraweb/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/lyrics_astraweb/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/scripts/lyrics_astraweb/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/scripts/lyrics_astraweb/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -387,9 +392,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/lyrics_astraweb/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/lyrics_astraweb/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/scripts/lyrics_astraweb/Makefile + $(AUTOMAKE) --foreign amarok/src/scripts/lyrics_astraweb/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/scripts/lyrics_astraweb/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -404,9 +409,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: @@ -587,9 +592,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/lyrics_astraweb/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/lyrics_astraweb/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/scripts/lyrics_astraweb/Makefile + $(AUTOMAKE) --foreign amarok/src/scripts/lyrics_astraweb/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/scripts/lyrics_astraweb/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/scripts/score_impulsive/Makefile.in +++ amarok-1.4.9.1/amarok/src/scripts/score_impulsive/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -99,6 +99,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -193,6 +194,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -202,6 +204,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -212,6 +215,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -233,6 +237,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -372,7 +377,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*) \ @@ -381,9 +386,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/score_impulsive/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/score_impulsive/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/scripts/score_impulsive/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/scripts/score_impulsive/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -393,9 +398,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/score_impulsive/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/score_impulsive/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/scripts/score_impulsive/Makefile + $(AUTOMAKE) --foreign amarok/src/scripts/score_impulsive/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/scripts/score_impulsive/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -410,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 install-scoreimpulsiveSCRIPTS: $(scoreimpulsive_SCRIPTS) @$(NORMAL_INSTALL) @@ -616,9 +621,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/score_impulsive/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/score_impulsive/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/scripts/score_impulsive/Makefile + $(AUTOMAKE) --foreign amarok/src/scripts/score_impulsive/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/scripts/score_impulsive/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/scripts/common/Makefile.in +++ amarok-1.4.9.1/amarok/src/scripts/common/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -94,6 +94,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -188,6 +189,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -197,6 +199,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -207,6 +210,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -228,6 +232,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -358,7 +363,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 +372,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/common/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/common/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/scripts/common/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/scripts/common/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -379,9 +384,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/common/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/common/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/scripts/common/Makefile + $(AUTOMAKE) --foreign amarok/src/scripts/common/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/scripts/common/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -396,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 mostlyclean-libtool: @@ -579,9 +584,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/common/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/common/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/scripts/common/Makefile + $(AUTOMAKE) --foreign amarok/src/scripts/common/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/scripts/common/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/scripts/ruby_debug/Makefile.in +++ amarok-1.4.9.1/amarok/src/scripts/ruby_debug/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -94,6 +94,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -188,6 +189,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -197,6 +199,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -207,6 +210,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -228,6 +232,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -362,7 +367,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*) \ @@ -371,9 +376,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/ruby_debug/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/ruby_debug/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/scripts/ruby_debug/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/scripts/ruby_debug/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -383,9 +388,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/ruby_debug/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/ruby_debug/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/scripts/ruby_debug/Makefile + $(AUTOMAKE) --foreign amarok/src/scripts/ruby_debug/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/scripts/ruby_debug/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -400,9 +405,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: @@ -583,9 +588,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/ruby_debug/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/ruby_debug/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/scripts/ruby_debug/Makefile + $(AUTOMAKE) --foreign amarok/src/scripts/ruby_debug/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/scripts/ruby_debug/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/scripts/templates/Makefile.in +++ amarok-1.4.9.1/amarok/src/scripts/templates/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -94,6 +94,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -188,6 +189,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -197,6 +199,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -207,6 +210,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -228,6 +232,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -364,7 +369,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*) \ @@ -373,9 +378,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/templates/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/templates/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/scripts/templates/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/scripts/templates/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -385,9 +390,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/templates/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/templates/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/scripts/templates/Makefile + $(AUTOMAKE) --foreign amarok/src/scripts/templates/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/scripts/templates/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -402,9 +407,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: @@ -585,9 +590,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/templates/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/templates/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/scripts/templates/Makefile + $(AUTOMAKE) --foreign amarok/src/scripts/templates/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/scripts/templates/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/scripts/lyrics_lyrc/Makefile.in +++ amarok-1.4.9.1/amarok/src/scripts/lyrics_lyrc/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -99,6 +99,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -193,6 +194,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -202,6 +204,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -212,6 +215,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -233,6 +237,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -372,7 +377,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*) \ @@ -381,9 +386,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/lyrics_lyrc/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/lyrics_lyrc/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/scripts/lyrics_lyrc/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/scripts/lyrics_lyrc/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -393,9 +398,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/lyrics_lyrc/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/lyrics_lyrc/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/scripts/lyrics_lyrc/Makefile + $(AUTOMAKE) --foreign amarok/src/scripts/lyrics_lyrc/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/scripts/lyrics_lyrc/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -410,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 install-lyricslyrcSCRIPTS: $(lyricslyrc_SCRIPTS) @$(NORMAL_INSTALL) @@ -613,9 +618,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/lyrics_lyrc/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/lyrics_lyrc/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/scripts/lyrics_lyrc/Makefile + $(AUTOMAKE) --foreign amarok/src/scripts/lyrics_lyrc/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/scripts/lyrics_lyrc/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/scripts/score_default/Makefile.in +++ amarok-1.4.9.1/amarok/src/scripts/score_default/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -99,6 +99,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -193,6 +194,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -202,6 +204,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -212,6 +215,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -233,6 +237,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -372,7 +377,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*) \ @@ -381,9 +386,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/score_default/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/score_default/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/scripts/score_default/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/scripts/score_default/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -393,9 +398,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/score_default/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/score_default/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/scripts/score_default/Makefile + $(AUTOMAKE) --foreign amarok/src/scripts/score_default/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/scripts/score_default/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -410,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 install-scoredefaultSCRIPTS: $(scoredefault_SCRIPTS) @$(NORMAL_INSTALL) @@ -614,9 +619,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/score_default/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/score_default/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/scripts/score_default/Makefile + $(AUTOMAKE) --foreign amarok/src/scripts/score_default/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/scripts/score_default/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/scripts/playlist2html/Makefile.in +++ amarok-1.4.9.1/amarok/src/scripts/playlist2html/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -98,6 +98,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -192,6 +193,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -201,6 +203,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -211,6 +214,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -232,6 +236,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -368,7 +373,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*) \ @@ -377,9 +382,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/playlist2html/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/playlist2html/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/scripts/playlist2html/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/scripts/playlist2html/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -389,9 +394,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/playlist2html/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/playlist2html/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/scripts/playlist2html/Makefile + $(AUTOMAKE) --foreign amarok/src/scripts/playlist2html/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/scripts/playlist2html/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -406,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-playlistexporterSCRIPTS: $(playlistexporter_SCRIPTS) @$(NORMAL_INSTALL) @@ -612,9 +617,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/playlist2html/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/playlist2html/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/scripts/playlist2html/Makefile + $(AUTOMAKE) --foreign amarok/src/scripts/playlist2html/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/scripts/playlist2html/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/scripts/webcontrol/Makefile.in +++ amarok-1.4.9.1/amarok/src/scripts/webcontrol/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -98,6 +98,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -192,6 +193,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -201,6 +203,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -211,6 +214,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -232,6 +236,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -387,7 +392,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*) \ @@ -396,9 +401,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/webcontrol/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/webcontrol/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/scripts/webcontrol/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/scripts/webcontrol/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -408,9 +413,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/webcontrol/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/webcontrol/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/scripts/webcontrol/Makefile + $(AUTOMAKE) --foreign amarok/src/scripts/webcontrol/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/scripts/webcontrol/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -425,9 +430,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-webcontrolSCRIPTS: $(webcontrol_SCRIPTS) @$(NORMAL_INSTALL) @@ -628,9 +633,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/webcontrol/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/webcontrol/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/scripts/webcontrol/Makefile + $(AUTOMAKE) --foreign amarok/src/scripts/webcontrol/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/scripts/webcontrol/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/plugin/Makefile.in +++ amarok-1.4.9.1/amarok/src/plugin/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -56,7 +56,7 @@ pluginconfig.moc.lo @KDE_USE_FINAL_FALSE@libplugin_la_OBJECTS = $(libplugin_la_nofinal_OBJECTS) @KDE_USE_FINAL_TRUE@libplugin_la_OBJECTS = $(libplugin_la_final_OBJECTS) -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -123,6 +123,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -217,6 +218,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -226,6 +228,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -236,6 +239,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -257,6 +261,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -403,7 +408,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*) \ @@ -412,9 +417,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/plugin/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/plugin/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/plugin/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/plugin/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -424,9 +429,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/plugin/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/plugin/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/plugin/Makefile + $(AUTOMAKE) --foreign amarok/src/plugin/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/plugin/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -441,9 +446,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: @@ -497,8 +502,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -510,8 +515,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -521,13 +526,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -704,9 +708,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/plugin/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/plugin/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/plugin/Makefile + $(AUTOMAKE) --foreign amarok/src/plugin/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/plugin/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/metadata/Makefile.in +++ amarok-1.4.9.1/amarok/src/metadata/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -61,7 +61,7 @@ libmetadata_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(KDE_CXXFLAGS) $(libmetadata_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -147,6 +147,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -241,6 +242,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -250,6 +252,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -260,6 +263,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -281,6 +285,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -436,7 +441,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*) \ @@ -445,9 +450,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/metadata/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/metadata/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -457,9 +462,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/metadata/Makefile + $(AUTOMAKE) --foreign amarok/src/metadata/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/metadata/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -474,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 clean-noinstLTLIBRARIES: @@ -600,8 +605,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -626,8 +631,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -637,13 +642,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -830,9 +834,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/metadata/Makefile + $(AUTOMAKE) --foreign amarok/src/metadata/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/metadata/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/metadata/wav/Makefile.in +++ amarok-1.4.9.1/amarok/src/metadata/wav/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -64,7 +64,7 @@ libtagwav_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(KDE_CXXFLAGS) $(libtagwav_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -149,6 +149,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -243,6 +244,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -252,6 +254,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -262,6 +265,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -283,6 +287,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -425,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*) \ @@ -434,9 +439,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/wav/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/wav/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/metadata/wav/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/metadata/wav/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -446,9 +451,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/wav/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/wav/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/metadata/wav/Makefile + $(AUTOMAKE) --foreign amarok/src/metadata/wav/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/metadata/wav/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -463,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 clean-noinstLTLIBRARIES: @@ -591,8 +596,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -617,8 +622,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -628,13 +633,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -821,9 +825,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/wav/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/wav/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/metadata/wav/Makefile + $(AUTOMAKE) --foreign amarok/src/metadata/wav/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/metadata/wav/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/metadata/speex/Makefile.in +++ amarok-1.4.9.1/amarok/src/metadata/speex/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -64,7 +64,7 @@ libtagspeex_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(KDE_CXXFLAGS) $(libtagspeex_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -149,6 +149,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -243,6 +244,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -252,6 +254,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -262,6 +265,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -283,6 +287,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -426,7 +431,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*) \ @@ -435,9 +440,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/speex/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/speex/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/metadata/speex/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/metadata/speex/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -447,9 +452,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/speex/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/speex/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/metadata/speex/Makefile + $(AUTOMAKE) --foreign amarok/src/metadata/speex/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/metadata/speex/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -464,9 +469,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: @@ -592,8 +597,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -618,8 +623,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -629,13 +634,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -822,9 +826,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/speex/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/speex/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/metadata/speex/Makefile + $(AUTOMAKE) --foreign amarok/src/metadata/speex/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/metadata/speex/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/metadata/audible/Makefile.in +++ amarok-1.4.9.1/amarok/src/metadata/audible/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -64,7 +64,7 @@ libtagaudible_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(KDE_CXXFLAGS) $(libtagaudible_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -149,6 +149,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -243,6 +244,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -252,6 +254,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -262,6 +265,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -283,6 +287,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -427,7 +432,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 +441,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/audible/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/audible/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/metadata/audible/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/metadata/audible/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -448,9 +453,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/audible/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/audible/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/metadata/audible/Makefile + $(AUTOMAKE) --foreign amarok/src/metadata/audible/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/metadata/audible/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -465,9 +470,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: @@ -594,8 +599,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -620,8 +625,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -631,13 +636,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -824,9 +828,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/audible/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/audible/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/metadata/audible/Makefile + $(AUTOMAKE) --foreign amarok/src/metadata/audible/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/metadata/audible/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/metadata/wavpack/Makefile.in +++ amarok-1.4.9.1/amarok/src/metadata/wavpack/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -64,7 +64,7 @@ libtagwavpack_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(KDE_CXXFLAGS) $(libtagwavpack_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -149,6 +149,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -243,6 +244,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -252,6 +254,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -262,6 +265,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -283,6 +287,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -426,7 +431,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*) \ @@ -435,9 +440,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/wavpack/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/wavpack/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/metadata/wavpack/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/metadata/wavpack/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -447,9 +452,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/wavpack/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/wavpack/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/metadata/wavpack/Makefile + $(AUTOMAKE) --foreign amarok/src/metadata/wavpack/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/metadata/wavpack/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -464,9 +469,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: @@ -592,8 +597,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -618,8 +623,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -629,13 +634,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -822,9 +826,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/wavpack/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/wavpack/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/metadata/wavpack/Makefile + $(AUTOMAKE) --foreign amarok/src/metadata/wavpack/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/metadata/wavpack/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/metadata/asf/Makefile.in +++ amarok-1.4.9.1/amarok/src/metadata/asf/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -64,7 +64,7 @@ libtagasf_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(KDE_CXXFLAGS) $(libtagasf_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -149,6 +149,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -243,6 +244,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -252,6 +254,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -262,6 +265,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -283,6 +287,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -431,7 +436,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 +445,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/asf/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/asf/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/metadata/asf/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/metadata/asf/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -452,9 +457,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/asf/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/asf/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/metadata/asf/Makefile + $(AUTOMAKE) --foreign amarok/src/metadata/asf/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/metadata/asf/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -469,9 +474,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: @@ -599,8 +604,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -625,8 +630,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -636,13 +641,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -829,9 +833,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/asf/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/asf/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/metadata/asf/Makefile + $(AUTOMAKE) --foreign amarok/src/metadata/asf/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/metadata/asf/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/metadata/m4a/Makefile.in +++ amarok-1.4.9.1/amarok/src/metadata/m4a/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -84,7 +84,7 @@ libtagm4a_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(KDE_CXXFLAGS) $(libtagm4a_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -169,6 +169,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -263,6 +264,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -272,6 +274,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -282,6 +285,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -303,6 +307,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -515,7 +520,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*) \ @@ -524,9 +529,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/m4a/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/m4a/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/metadata/m4a/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/metadata/m4a/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -536,9 +541,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/m4a/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/m4a/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/metadata/m4a/Makefile + $(AUTOMAKE) --foreign amarok/src/metadata/m4a/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/metadata/m4a/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -553,9 +558,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: @@ -715,8 +720,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -741,8 +746,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -752,13 +757,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -945,9 +949,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/m4a/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/m4a/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/metadata/m4a/Makefile + $(AUTOMAKE) --foreign amarok/src/metadata/m4a/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/metadata/m4a/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/metadata/mp4/Makefile.in +++ amarok-1.4.9.1/amarok/src/metadata/mp4/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -64,7 +64,7 @@ libtagmp4_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(KDE_CXXFLAGS) $(libtagmp4_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -149,6 +149,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -243,6 +244,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -252,6 +254,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -262,6 +265,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -283,6 +287,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -429,7 +434,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 +443,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/mp4/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/mp4/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/metadata/mp4/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/metadata/mp4/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -450,9 +455,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/mp4/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/mp4/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/metadata/mp4/Makefile + $(AUTOMAKE) --foreign amarok/src/metadata/mp4/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/metadata/mp4/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -467,9 +472,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: @@ -596,8 +601,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -622,8 +627,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -633,13 +638,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -826,9 +830,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/mp4/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/mp4/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/metadata/mp4/Makefile + $(AUTOMAKE) --foreign amarok/src/metadata/mp4/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/metadata/mp4/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/metadata/trueaudio/Makefile.in +++ amarok-1.4.9.1/amarok/src/metadata/trueaudio/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -64,7 +64,7 @@ libtagtrueaudio_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(KDE_CXXFLAGS) $(libtagtrueaudio_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -149,6 +149,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -243,6 +244,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -252,6 +254,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -262,6 +265,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -283,6 +287,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -426,7 +431,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*) \ @@ -435,9 +440,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/trueaudio/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/trueaudio/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/metadata/trueaudio/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/metadata/trueaudio/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -447,9 +452,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/trueaudio/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/trueaudio/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/metadata/trueaudio/Makefile + $(AUTOMAKE) --foreign amarok/src/metadata/trueaudio/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/metadata/trueaudio/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -464,9 +469,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: @@ -592,8 +597,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -618,8 +623,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -629,13 +634,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -822,9 +826,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/trueaudio/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/trueaudio/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/metadata/trueaudio/Makefile + $(AUTOMAKE) --foreign amarok/src/metadata/trueaudio/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/metadata/trueaudio/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/metadata/rmff/Makefile.in +++ amarok-1.4.9.1/amarok/src/metadata/rmff/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -64,7 +64,7 @@ libtagrealmedia_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(KDE_CXXFLAGS) $(libtagrealmedia_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -149,6 +149,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -243,6 +244,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -252,6 +254,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -262,6 +265,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -283,6 +287,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -425,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*) \ @@ -434,9 +439,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/rmff/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/rmff/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/metadata/rmff/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/metadata/rmff/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -446,9 +451,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/rmff/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/rmff/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/metadata/rmff/Makefile + $(AUTOMAKE) --foreign amarok/src/metadata/rmff/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/metadata/rmff/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -463,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 clean-noinstLTLIBRARIES: @@ -591,8 +596,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -617,8 +622,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -628,13 +633,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -821,9 +825,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/rmff/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/rmff/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/metadata/rmff/Makefile + $(AUTOMAKE) --foreign amarok/src/metadata/rmff/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/metadata/rmff/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/metadata/aac/Makefile.in +++ amarok-1.4.9.1/amarok/src/metadata/aac/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -59,7 +59,7 @@ libtagaac_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(KDE_CXXFLAGS) $(libtagaac_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -144,6 +144,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -238,6 +239,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -247,6 +249,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -257,6 +260,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -278,6 +282,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -418,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*) \ @@ -427,9 +432,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/aac/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/aac/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/metadata/aac/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/metadata/aac/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -439,9 +444,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/aac/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/aac/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/metadata/aac/Makefile + $(AUTOMAKE) --foreign amarok/src/metadata/aac/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/metadata/aac/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -456,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 clean-noinstLTLIBRARIES: @@ -582,8 +587,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -608,8 +613,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -619,13 +624,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -812,9 +816,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/aac/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/aac/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/metadata/aac/Makefile + $(AUTOMAKE) --foreign amarok/src/metadata/aac/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/metadata/aac/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/sqlite/Makefile.in +++ amarok-1.4.9.1/amarok/src/sqlite/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -53,7 +53,7 @@ libsqlite_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libsqlite_la_CFLAGS) \ $(CFLAGS) $(libsqlite_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -108,6 +108,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -202,6 +203,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -211,6 +213,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -221,6 +224,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -242,6 +246,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -388,7 +393,7 @@ .SUFFIXES: .SUFFIXES: .c .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*) \ @@ -397,9 +402,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/sqlite/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/sqlite/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/sqlite/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/sqlite/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -409,9 +414,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/sqlite/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/sqlite/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/sqlite/Makefile + $(AUTOMAKE) --foreign amarok/src/sqlite/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/sqlite/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -426,9 +431,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: @@ -489,8 +494,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -502,8 +507,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -513,13 +518,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -685,9 +689,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/sqlite/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/sqlite/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/sqlite/Makefile + $(AUTOMAKE) --foreign amarok/src/sqlite/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/sqlite/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/amarokcore/Makefile.in +++ amarok-1.4.9.1/amarok/src/amarokcore/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -56,7 +56,7 @@ libamarokcore_la_nofinal_OBJECTS = amarokdcophandler.lo crashhandler.lo amarokdcopiface_skel.lo amarokconfig.lo @KDE_USE_FINAL_FALSE@libamarokcore_la_OBJECTS = $(libamarokcore_la_nofinal_OBJECTS) @KDE_USE_FINAL_TRUE@libamarokcore_la_OBJECTS = $(libamarokcore_la_final_OBJECTS) -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -132,6 +132,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -226,6 +227,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -235,6 +237,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -245,6 +248,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -266,6 +270,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -430,7 +435,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 +444,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/amarokcore/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/amarokcore/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/amarokcore/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/amarokcore/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -451,9 +456,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/amarokcore/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/amarokcore/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/amarokcore/Makefile + $(AUTOMAKE) --foreign amarok/src/amarokcore/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/amarokcore/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -468,9 +473,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: @@ -542,8 +547,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -555,8 +560,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -566,13 +571,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -769,9 +773,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/amarokcore/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/amarokcore/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/amarokcore/Makefile + $(AUTOMAKE) --foreign amarok/src/amarokcore/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/amarokcore/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/collectionscanner/Makefile.in +++ amarok-1.4.9.1/amarok/src/collectionscanner/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -76,7 +76,7 @@ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(KDE_CXXFLAGS) $(amarokcollectionscanner_LDFLAGS) $(LDFLAGS) -o \ $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -143,6 +143,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -237,6 +238,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -246,6 +248,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -256,6 +259,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -277,6 +281,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -438,7 +443,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*) \ @@ -447,9 +452,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/collectionscanner/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/collectionscanner/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/collectionscanner/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/collectionscanner/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -459,9 +464,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/collectionscanner/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/collectionscanner/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/collectionscanner/Makefile + $(AUTOMAKE) --foreign amarok/src/collectionscanner/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/collectionscanner/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -476,9 +481,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) @@ -489,8 +494,8 @@ || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -554,8 +559,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -567,8 +572,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -578,13 +583,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -781,9 +785,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/collectionscanner/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/collectionscanner/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/collectionscanner/Makefile + $(AUTOMAKE) --foreign amarok/src/collectionscanner/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/collectionscanner/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/mediadevice/Makefile.in +++ amarok-1.4.9.1/amarok/src/mediadevice/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -104,6 +104,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -198,6 +199,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -207,6 +209,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -217,6 +220,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -238,6 +242,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -374,7 +379,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*) \ @@ -383,9 +388,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/mediadevice/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/mediadevice/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -395,9 +400,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -412,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 mostlyclean-libtool: @@ -498,8 +503,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -524,8 +529,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -535,13 +540,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -721,9 +725,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/mediadevice/ipod/Makefile.in +++ amarok-1.4.9.1/amarok/src/mediadevice/ipod/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -57,8 +57,11 @@ "$(DESTDIR)$(kde_servicesdir)" kde_moduleLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(kde_module_LTLIBRARIES) +am__DEPENDENCIES_1 = libamarok_ipod_mediadevice_la_DEPENDENCIES = \ - $(top_builddir)/amarok/src/libamarok.la + $(top_builddir)/amarok/src/libamarok.la $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) am_libamarok_ipod_mediadevice_la_OBJECTS = ipodmediadevice.lo #>- libamarok_ipod_mediadevice_la_OBJECTS = \ #>- $(am_libamarok_ipod_mediadevice_la_OBJECTS) @@ -73,7 +76,7 @@ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(libamarok_ipod_mediadevice_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -142,6 +145,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -236,6 +240,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -245,6 +250,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -255,6 +261,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -276,6 +283,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -415,7 +423,7 @@ #>- METASOURCES = AUTO libamarok_ipod_mediadevice_la_LIBADD = \ - $(top_builddir)/amarok/src/libamarok.la + $(top_builddir)/amarok/src/libamarok.la $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KIO) libamarok_ipod_mediadevice_la_LDFLAGS = \ $(KDE_PLUGIN) \ @@ -434,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*) \ @@ -443,9 +451,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/ipod/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/ipod/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/mediadevice/ipod/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/mediadevice/ipod/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -455,9 +463,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/ipod/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/ipod/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/ipod/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/ipod/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/ipod/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -472,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-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) @@ -482,8 +490,8 @@ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ - $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ else :; fi; \ done @@ -491,8 +499,8 @@ @$(NORMAL_UNINSTALL) @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ done clean-kde_moduleLTLIBRARIES: @@ -563,8 +571,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -576,8 +584,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -587,13 +595,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -783,9 +790,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/ipod/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/ipod/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/ipod/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/ipod/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/ipod/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/mediadevice/mtp/Makefile.in +++ amarok-1.4.9.1/amarok/src/mediadevice/mtp/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -59,7 +59,9 @@ LTLIBRARIES = $(kde_module_LTLIBRARIES) am__DEPENDENCIES_1 = libamarok_mtp_mediadevice_la_DEPENDENCIES = \ - $(top_builddir)/amarok/src/libamarok.la $(am__DEPENDENCIES_1) + $(top_builddir)/amarok/src/libamarok.la $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) am_libamarok_mtp_mediadevice_la_OBJECTS = mtpmediadevice.lo #>- libamarok_mtp_mediadevice_la_OBJECTS = \ #>- $(am_libamarok_mtp_mediadevice_la_OBJECTS) @@ -78,7 +80,7 @@ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(libamarok_mtp_mediadevice_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -147,6 +149,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -241,6 +244,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -250,6 +254,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -260,6 +265,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -281,6 +287,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -420,7 +427,7 @@ #>- METASOURCES = AUTO libamarok_mtp_mediadevice_la_LIBADD = \ $(top_builddir)/amarok/src/libamarok.la \ - $(LIBMTP_LIBS) + $(LIBMTP_LIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) libamarok_mtp_mediadevice_la_LDFLAGS = \ $(KDE_PLUGIN) \ @@ -438,7 +445,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*) \ @@ -447,9 +454,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/mtp/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/mtp/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/mediadevice/mtp/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/mediadevice/mtp/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -459,9 +466,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/mtp/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/mtp/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/mtp/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/mtp/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/mtp/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -476,9 +483,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) @@ -486,8 +493,8 @@ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ - $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ else :; fi; \ done @@ -495,8 +502,8 @@ @$(NORMAL_UNINSTALL) @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ done clean-kde_moduleLTLIBRARIES: @@ -567,8 +574,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -580,8 +587,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -591,13 +598,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -787,9 +793,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/mtp/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/mtp/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/mtp/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/mtp/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/mtp/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/mediadevice/riokarma/Makefile.in +++ amarok-1.4.9.1/amarok/src/mediadevice/riokarma/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -57,8 +57,10 @@ "$(DESTDIR)$(kde_servicesdir)" kde_moduleLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(kde_module_LTLIBRARIES) +am__DEPENDENCIES_1 = libamarok_riokarma_mediadevice_la_DEPENDENCIES = \ - $(top_builddir)/amarok/src/libamarok.la + $(top_builddir)/amarok/src/libamarok.la $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_libamarok_riokarma_mediadevice_la_OBJECTS = riokarmamediadevice.lo #>- libamarok_riokarma_mediadevice_la_OBJECTS = \ #>- $(am_libamarok_riokarma_mediadevice_la_OBJECTS) @@ -77,7 +79,7 @@ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(libamarok_riokarma_mediadevice_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -146,6 +148,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -240,6 +243,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -249,6 +253,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -259,6 +264,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -280,6 +286,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -419,7 +426,7 @@ #>- METASOURCES = AUTO libamarok_riokarma_mediadevice_la_LIBADD = \ $(top_builddir)/amarok/src/libamarok.la \ - -ltag_c -lz -lusb -lkarma + -lkarma $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) libamarok_riokarma_mediadevice_la_LDFLAGS = \ $(KDE_PLUGIN) \ @@ -437,7 +444,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*) \ @@ -446,9 +453,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/riokarma/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/riokarma/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/mediadevice/riokarma/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/mediadevice/riokarma/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -458,9 +465,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/riokarma/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/riokarma/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/riokarma/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/riokarma/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/riokarma/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -475,9 +482,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) @@ -485,8 +492,8 @@ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ - $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ else :; fi; \ done @@ -494,8 +501,8 @@ @$(NORMAL_UNINSTALL) @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ done clean-kde_moduleLTLIBRARIES: @@ -566,8 +573,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -579,8 +586,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -590,13 +597,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -786,9 +792,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/riokarma/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/riokarma/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/riokarma/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/riokarma/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/riokarma/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/mediadevice/generic/Makefile.in +++ amarok-1.4.9.1/amarok/src/mediadevice/generic/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -57,8 +57,11 @@ "$(DESTDIR)$(kde_servicesdir)" kde_moduleLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(kde_module_LTLIBRARIES) +am__DEPENDENCIES_1 = libamarok_generic_mediadevice_la_DEPENDENCIES = \ - $(top_builddir)/amarok/src/libamarok.la + $(top_builddir)/amarok/src/libamarok.la $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) am_libamarok_generic_mediadevice_la_OBJECTS = genericmediadevice.lo #>- libamarok_generic_mediadevice_la_OBJECTS = \ #>- $(am_libamarok_generic_mediadevice_la_OBJECTS) @@ -76,7 +79,7 @@ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(libamarok_generic_mediadevice_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -145,6 +148,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -239,6 +243,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -248,6 +253,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -258,6 +264,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -279,6 +286,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -417,7 +425,7 @@ #>- METASOURCES = AUTO libamarok_generic_mediadevice_la_LIBADD = \ $(top_builddir)/amarok/src/libamarok.la \ - -lkdeui -lkdecore -lkio + $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KIO) $(LIB_QT) libamarok_generic_mediadevice_la_LDFLAGS = \ $(KDE_PLUGIN) \ @@ -441,7 +449,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*) \ @@ -450,9 +458,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/generic/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/generic/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/mediadevice/generic/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/mediadevice/generic/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -462,9 +470,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/generic/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/generic/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/generic/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/generic/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/generic/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -479,9 +487,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) @@ -489,8 +497,8 @@ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ - $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ else :; fi; \ done @@ -498,8 +506,8 @@ @$(NORMAL_UNINSTALL) @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ done clean-kde_moduleLTLIBRARIES: @@ -570,8 +578,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -583,8 +591,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -594,13 +602,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -795,9 +802,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/generic/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/generic/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/generic/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/generic/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/generic/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/mediadevice/ifp/Makefile.in +++ amarok-1.4.9.1/amarok/src/mediadevice/ifp/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -55,8 +55,11 @@ "$(DESTDIR)$(kde_servicesdir)" kde_moduleLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(kde_module_LTLIBRARIES) +am__DEPENDENCIES_1 = libamarok_ifp_mediadevice_la_DEPENDENCIES = \ - $(top_builddir)/amarok/src/libamarok.la + $(top_builddir)/amarok/src/libamarok.la $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) am_libamarok_ifp_mediadevice_la_OBJECTS = ifpmediadevice.lo #>- libamarok_ifp_mediadevice_la_OBJECTS = \ #>- $(am_libamarok_ifp_mediadevice_la_OBJECTS) @@ -71,7 +74,7 @@ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(libamarok_ifp_mediadevice_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -139,6 +142,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -233,6 +237,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -242,6 +247,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -252,6 +258,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -273,6 +280,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -412,7 +420,7 @@ libamarok_ifp_mediadevice_la_LIBADD = \ $(top_builddir)/amarok/src/libamarok.la \ -lusb -lifp \ - -lkdeui -lkdecore -lkio + $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KIO) $(LIB_QT) libamarok_ifp_mediadevice_la_LDFLAGS = \ $(KDE_PLUGIN) \ @@ -428,7 +436,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 +445,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/ifp/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/ifp/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/mediadevice/ifp/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/mediadevice/ifp/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -449,9 +457,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/ifp/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/ifp/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/ifp/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/ifp/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/ifp/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -466,9 +474,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) @@ -476,8 +484,8 @@ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ - $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ else :; fi; \ done @@ -485,8 +493,8 @@ @$(NORMAL_UNINSTALL) @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ done clean-kde_moduleLTLIBRARIES: @@ -557,8 +565,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -570,8 +578,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -581,13 +589,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -777,9 +784,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/ifp/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/ifp/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/ifp/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/ifp/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/ifp/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/mediadevice/daap/Makefile.in +++ amarok-1.4.9.1/amarok/src/mediadevice/daap/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -63,7 +63,8 @@ $(top_builddir)/amarok/src/libamarok.la \ $(top_builddir)/amarok/src/mediadevice/daap/daapreader/libdaapreader.la \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) am_libamarok_daap_mediadevice_la_OBJECTS = daapclient.lo daapserver.lo \ proxy.lo #>- libamarok_daap_mediadevice_la_OBJECTS = \ @@ -85,7 +86,7 @@ $(libamarok_daap_mediadevice_la_LDFLAGS) $(LDFLAGS) -o $@ binSCRIPT_INSTALL = $(INSTALL_SCRIPT) SCRIPTS = $(bin_SCRIPTS) -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -173,6 +174,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -267,6 +269,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -276,6 +279,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -286,6 +290,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -307,6 +312,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -447,7 +453,7 @@ libamarok_daap_mediadevice_la_LIBADD = \ $(top_builddir)/amarok/src/libamarok.la \ $(top_builddir)/amarok/src/mediadevice/daap/daapreader/libdaapreader.la \ - $(DNSSD_LIBS) ${LIB_KDEUI} ${LIB_KDECORE} ${LIB_KIO} + $(DNSSD_LIBS) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KIO) $(LIB_QT) libamarok_daap_mediadevice_la_LDFLAGS = \ $(KDE_PLUGIN) \ @@ -484,7 +490,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*) \ @@ -493,9 +499,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -505,9 +511,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/daap/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -522,9 +528,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) @@ -532,8 +538,8 @@ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ - $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ else :; fi; \ done @@ -541,8 +547,8 @@ @$(NORMAL_UNINSTALL) @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ done clean-kde_moduleLTLIBRARIES: @@ -721,8 +727,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -747,8 +753,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -758,13 +764,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -995,9 +1000,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/daap/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/mediadevice/daap/daapreader/Makefile.in +++ amarok-1.4.9.1/amarok/src/mediadevice/daap/daapreader/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -62,7 +62,7 @@ libdaapreader_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(KDE_CXXFLAGS) $(libdaapreader_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -147,6 +147,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -241,6 +242,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -250,6 +252,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -260,6 +263,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -281,6 +285,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -426,7 +431,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*) \ @@ -435,9 +440,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/daapreader/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/daapreader/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/daapreader/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/daapreader/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -447,9 +452,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/daapreader/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/daapreader/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/daapreader/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/daapreader/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/daap/daapreader/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -464,9 +469,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: @@ -590,8 +595,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -616,8 +621,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -627,13 +632,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -831,9 +835,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/daapreader/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/daapreader/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/daapreader/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/daapreader/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/daap/daapreader/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/mediadevice/daap/daapreader/authentication/Makefile.in +++ amarok-1.4.9.1/amarok/src/mediadevice/daap/daapreader/authentication/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -64,7 +64,7 @@ libauthentication_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(KDE_CXXFLAGS) $(libauthentication_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -140,6 +140,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -234,6 +235,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -243,6 +245,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -253,6 +256,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -274,6 +278,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -421,7 +426,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*) \ @@ -430,9 +435,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/daapreader/authentication/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/daapreader/authentication/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/daapreader/authentication/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/daapreader/authentication/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -442,9 +447,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/daapreader/authentication/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/daapreader/authentication/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/daapreader/authentication/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/daapreader/authentication/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/daap/daapreader/authentication/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -459,9 +464,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: @@ -538,8 +543,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -551,8 +556,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -562,13 +567,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -745,9 +749,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/daapreader/authentication/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/daapreader/authentication/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/daapreader/authentication/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/daapreader/authentication/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/daap/daapreader/authentication/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/mediadevice/daap/mongrel/Makefile.in +++ amarok-1.4.9.1/amarok/src/mediadevice/daap/mongrel/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -104,6 +104,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -198,6 +199,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -207,6 +209,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -217,6 +220,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -238,6 +242,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -367,7 +372,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 +381,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -388,9 +393,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/daap/mongrel/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -405,9 +410,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: @@ -491,8 +496,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -517,8 +522,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -528,13 +533,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -714,9 +718,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/daap/mongrel/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/mediadevice/daap/mongrel/http11/Makefile.in +++ amarok-1.4.9.1/amarok/src/mediadevice/daap/mongrel/http11/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -72,7 +72,7 @@ libhttp11_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libhttp11_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -130,6 +130,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -224,6 +225,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -233,6 +235,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -243,6 +246,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -264,6 +268,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -419,7 +424,7 @@ .SUFFIXES: .SUFFIXES: .c .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*) \ @@ -428,9 +433,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/http11/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/http11/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/http11/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/http11/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -440,9 +445,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/http11/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/http11/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/http11/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/http11/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/daap/mongrel/http11/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -457,9 +462,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-amarokrubylibLTLIBRARIES: $(amarokrubylib_LTLIBRARIES) @$(NORMAL_INSTALL) @@ -467,8 +472,8 @@ @list='$(amarokrubylib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(amarokrubylibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(amarokrubylibdir)/$$f'"; \ - $(LIBTOOL) --mode=install $(amarokrubylibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(amarokrubylibdir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(amarokrubylibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(amarokrubylibdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(amarokrubylibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(amarokrubylibdir)/$$f"; \ else :; fi; \ done @@ -476,8 +481,8 @@ @$(NORMAL_UNINSTALL) @list='$(amarokrubylib_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(amarokrubylibdir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(amarokrubylibdir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(amarokrubylibdir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(amarokrubylibdir)/$$p"; \ done clean-amarokrubylibLTLIBRARIES: @@ -555,8 +560,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -568,8 +573,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -579,13 +584,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -759,9 +763,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/http11/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/http11/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/http11/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/http11/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/daap/mongrel/http11/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/mediadevice/daap/mongrel/lib/Makefile.in +++ amarok-1.4.9.1/amarok/src/mediadevice/daap/mongrel/lib/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -114,6 +114,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -208,6 +209,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -217,6 +219,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -227,6 +230,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -248,6 +252,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -386,7 +391,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*) \ @@ -395,9 +400,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/lib/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/lib/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/lib/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/lib/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -407,9 +412,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/lib/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/lib/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/lib/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/lib/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/daap/mongrel/lib/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -424,9 +429,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: @@ -527,8 +532,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -553,8 +558,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -564,13 +569,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -754,9 +758,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/lib/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/lib/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/lib/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/lib/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/daap/mongrel/lib/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/mediadevice/daap/mongrel/lib/rbconfig/Makefile.in +++ amarok-1.4.9.1/amarok/src/mediadevice/daap/mongrel/lib/rbconfig/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -94,6 +94,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -188,6 +189,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -197,6 +199,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -207,6 +210,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -228,6 +232,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -362,7 +367,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*) \ @@ -371,9 +376,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/lib/rbconfig/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/lib/rbconfig/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/lib/rbconfig/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/lib/rbconfig/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -383,9 +388,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/lib/rbconfig/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/lib/rbconfig/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/lib/rbconfig/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/lib/rbconfig/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/daap/mongrel/lib/rbconfig/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -400,9 +405,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: @@ -583,9 +588,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/lib/rbconfig/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/lib/rbconfig/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/lib/rbconfig/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/lib/rbconfig/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/daap/mongrel/lib/rbconfig/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/mediadevice/daap/mongrel/lib/rubygems/Makefile.in +++ amarok-1.4.9.1/amarok/src/mediadevice/daap/mongrel/lib/rubygems/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -94,6 +94,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -188,6 +189,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -197,6 +199,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -207,6 +210,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -228,6 +232,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -388,7 +393,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*) \ @@ -397,9 +402,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/lib/rubygems/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/lib/rubygems/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/lib/rubygems/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/lib/rubygems/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -409,9 +414,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/lib/rubygems/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/lib/rubygems/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/lib/rubygems/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/lib/rubygems/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/daap/mongrel/lib/rubygems/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -426,9 +431,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: @@ -609,9 +614,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/lib/rubygems/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/lib/rubygems/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/lib/rubygems/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/lib/rubygems/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/daap/mongrel/lib/rubygems/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/mediadevice/daap/mongrel/lib/mongrel/Makefile.in +++ amarok-1.4.9.1/amarok/src/mediadevice/daap/mongrel/lib/mongrel/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -94,6 +94,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -188,6 +189,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -197,6 +199,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -207,6 +210,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -228,6 +232,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -370,7 +375,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*) \ @@ -379,9 +384,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/lib/mongrel/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/lib/mongrel/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/lib/mongrel/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/lib/mongrel/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -391,9 +396,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/lib/mongrel/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/lib/mongrel/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/lib/mongrel/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/lib/mongrel/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/daap/mongrel/lib/mongrel/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -408,9 +413,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: @@ -591,9 +596,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/lib/mongrel/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/lib/mongrel/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/lib/mongrel/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/lib/mongrel/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/daap/mongrel/lib/mongrel/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/mediadevice/njb/Makefile.in +++ amarok-1.4.9.1/amarok/src/mediadevice/njb/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -57,8 +57,11 @@ "$(DESTDIR)$(kde_servicesdir)" kde_moduleLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(kde_module_LTLIBRARIES) +am__DEPENDENCIES_1 = libamarok_njb_mediadevice_la_DEPENDENCIES = \ - $(top_builddir)/amarok/src/libamarok.la + $(top_builddir)/amarok/src/libamarok.la $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) am_libamarok_njb_mediadevice_la_OBJECTS = njbmediadevice.lo \ playlist.lo track.lo #>- libamarok_njb_mediadevice_la_OBJECTS = \ @@ -79,7 +82,7 @@ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(libamarok_njb_mediadevice_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -148,6 +151,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -242,6 +246,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -251,6 +256,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -261,6 +267,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -282,6 +289,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -420,7 +428,7 @@ #>- METASOURCES = AUTO kde_module_LTLIBRARIES = libamarok_njb-mediadevice.la libamarok_njb_mediadevice_la_LIBADD = $(top_builddir)/amarok/src/libamarok.la \ - -lkdeui -lkdecore -lnjb + $(LIB_KDEUI) $(LIB_KDECORE) -lnjb $(LIB_QT) $(LIB_KIO) libamarok_njb_mediadevice_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) noinst_HEADERS = njbmediadevice.h playlist.h track.h @@ -433,7 +441,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*) \ @@ -442,9 +450,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/njb/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/njb/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/mediadevice/njb/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/mediadevice/njb/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -454,9 +462,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/njb/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/njb/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/njb/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/njb/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/njb/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -471,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-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) @@ -481,8 +489,8 @@ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ - $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ else :; fi; \ done @@ -490,8 +498,8 @@ @$(NORMAL_UNINSTALL) @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ done clean-kde_moduleLTLIBRARIES: @@ -564,8 +572,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -577,8 +585,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -588,13 +596,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -784,9 +791,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/njb/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/njb/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/njb/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/njb/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/njb/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/vis/Makefile.in +++ amarok-1.4.9.1/amarok/src/vis/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -104,6 +104,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -198,6 +199,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -207,6 +209,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -217,6 +220,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -238,6 +242,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -370,7 +375,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 +384,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/vis/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/vis/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/vis/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/vis/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -391,9 +396,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/vis/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/vis/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/vis/Makefile + $(AUTOMAKE) --foreign amarok/src/vis/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/vis/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -408,9 +413,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: @@ -494,8 +499,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -520,8 +525,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -531,13 +536,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -717,9 +721,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/vis/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/vis/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/vis/Makefile + $(AUTOMAKE) --foreign amarok/src/vis/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/vis/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/vis/libvisual/Makefile.in +++ amarok-1.4.9.1/amarok/src/vis/libvisual/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -60,7 +60,7 @@ amarok_libvisual_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(KDE_CXXFLAGS) $(amarok_libvisual_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -126,6 +126,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -220,6 +221,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -229,6 +231,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -239,6 +242,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -260,6 +264,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -400,7 +405,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*) \ @@ -409,9 +414,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/vis/libvisual/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/vis/libvisual/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/vis/libvisual/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/vis/libvisual/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -421,9 +426,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/vis/libvisual/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/vis/libvisual/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/vis/libvisual/Makefile + $(AUTOMAKE) --foreign amarok/src/vis/libvisual/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/vis/libvisual/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -438,9 +443,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) @@ -451,8 +456,8 @@ || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -514,8 +519,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -527,8 +532,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -538,13 +543,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -712,9 +716,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/vis/libvisual/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/vis/libvisual/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/vis/libvisual/Makefile + $(AUTOMAKE) --foreign amarok/src/vis/libvisual/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/vis/libvisual/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/statusbar/Makefile.in +++ amarok-1.4.9.1/amarok/src/statusbar/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -58,7 +58,7 @@ squeezedtextlabel.lo queueLabel.lo @KDE_USE_FINAL_FALSE@libstatusbar_la_OBJECTS = $(libstatusbar_la_nofinal_OBJECTS) @KDE_USE_FINAL_TRUE@libstatusbar_la_OBJECTS = $(libstatusbar_la_final_OBJECTS) -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -124,6 +124,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -218,6 +219,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -227,6 +229,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -237,6 +240,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -258,6 +262,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -407,7 +412,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 +421,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/statusbar/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/statusbar/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/statusbar/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/statusbar/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -428,9 +433,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/statusbar/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/statusbar/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/statusbar/Makefile + $(AUTOMAKE) --foreign amarok/src/statusbar/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/statusbar/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -445,9 +450,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: @@ -507,8 +512,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -520,8 +525,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -531,13 +536,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -688,13 +692,6 @@ .NOEXPORT: #>+ 3 -queueLabel.moc: $(srcdir)/queueLabel.h - $(MOC) $(srcdir)/queueLabel.h -o queueLabel.moc - -#>+ 2 -mocs: queueLabel.moc - -#>+ 3 selectLabel.moc: $(srcdir)/selectLabel.h $(MOC) $(srcdir)/selectLabel.h -o selectLabel.moc @@ -709,6 +706,13 @@ mocs: statusbar.moc #>+ 3 +queueLabel.moc: $(srcdir)/queueLabel.h + $(MOC) $(srcdir)/queueLabel.h -o queueLabel.moc + +#>+ 2 +mocs: queueLabel.moc + +#>+ 3 popupMessage.moc: $(srcdir)/popupMessage.h $(MOC) $(srcdir)/popupMessage.h -o popupMessage.moc @@ -738,7 +742,7 @@ #>+ 3 clean-metasources: - -rm -f queueLabel.moc selectLabel.moc statusbar.moc popupMessage.moc squeezedtextlabel.moc statusBarBase.moc toggleLabel.moc + -rm -f selectLabel.moc statusbar.moc queueLabel.moc popupMessage.moc squeezedtextlabel.moc statusBarBase.moc toggleLabel.moc #>+ 2 KDE_DIST=statusbar.h statusBarBase.h Makefile.in timeLabel.h toggleLabel.h progressBar.h selectLabel.h overlayWidget.h queueLabel.h squeezedtextlabel.h popupMessage.h Makefile.am @@ -756,9 +760,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/statusbar/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/statusbar/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/statusbar/Makefile + $(AUTOMAKE) --foreign amarok/src/statusbar/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/statusbar/Makefile.in @@ -785,7 +789,7 @@ #>+ 11 -libstatusbar_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/statusBarBase.cpp $(srcdir)/statusbar.cpp $(srcdir)/overlayWidget.cpp $(srcdir)/popupMessage.cpp $(srcdir)/progressBar.cpp $(srcdir)/squeezedtextlabel.cpp $(srcdir)/queueLabel.cpp statusbar.moc selectLabel.moc queueLabel.moc popupMessage.moc squeezedtextlabel.moc statusBarBase.moc toggleLabel.moc +libstatusbar_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/statusBarBase.cpp $(srcdir)/statusbar.cpp $(srcdir)/overlayWidget.cpp $(srcdir)/popupMessage.cpp $(srcdir)/progressBar.cpp $(srcdir)/squeezedtextlabel.cpp $(srcdir)/queueLabel.cpp queueLabel.moc statusbar.moc selectLabel.moc popupMessage.moc squeezedtextlabel.moc statusBarBase.moc toggleLabel.moc @echo 'creating libstatusbar_la.all_cpp.cpp ...'; \ rm -f libstatusbar_la.all_cpp.files libstatusbar_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> libstatusbar_la.all_cpp.final; \ --- amarok-1.4.9.1.orig/amarok/src/images/Makefile.in +++ amarok-1.4.9.1/amarok/src/images/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -114,6 +114,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -208,6 +209,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -217,6 +219,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -227,6 +230,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -248,6 +252,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -427,7 +432,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*) \ @@ -436,9 +441,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/images/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/images/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/images/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/images/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -448,9 +453,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/images/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/images/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/images/Makefile + $(AUTOMAKE) --foreign amarok/src/images/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/images/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -465,9 +470,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: @@ -568,8 +573,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -594,8 +599,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -605,13 +610,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -780,7 +784,7 @@ .NOEXPORT: #>+ 2 -KDE_DIST=xine_logo.png volumeslider-inset.png currenttrack_stop.png pl_active2.png amarok_rocks.xcf currenttrack_bar_mid.png eq_active2.png volumeslider-handle.png currenttrack_stop_small.png b_next.png pl_inactive2.png smallstar.png amarok_icon_small.svg Makefile.in shadow_albumcover.png menu_sidepixmap.xcf time_plus.png amarok_logo.svg back_stars_grey.png wizard_compact.png currenttrack_repeat.png menu_sidepixmap.png time_minus.png sound.png sbinner_stars.png amarok_cut.png b_prev.png player_background.jpg nocover.png b_stop.png b_play.png b_pause.png eq_inactive2.png volumeslider-gradient.png currenttrack_play.png splash_screen.jpg loading1.png lastfm.png currenttrack_bar_left.png amarok_rocks.jpg volumeslider-handle_glow.png currenttrack_bar_right.png star.png more_albums.png musicbrainz.png vol_speaker.png wizard_xmms.png currenttrack_pause.png amarok_icon.svg Makefile.am currenttrack_repeat_small.png loading2.png +KDE_DIST=xine_logo.png volumeslider-inset.png currenttrack_stop.png pl_active2.png amarok_rocks.xcf currenttrack_bar_mid.png eq_active2.png volumeslider-handle.png currenttrack_stop_small.png b_next.png smallstar.png pl_inactive2.png amarok_icon_small.svg Makefile.in shadow_albumcover.png menu_sidepixmap.xcf time_plus.png amarok_logo.svg back_stars_grey.png wizard_compact.png currenttrack_repeat.png menu_sidepixmap.png time_minus.png sound.png sbinner_stars.png amarok_cut.png b_prev.png player_background.jpg nocover.png b_stop.png b_play.png b_pause.png eq_inactive2.png volumeslider-gradient.png currenttrack_play.png splash_screen.jpg loading1.png lastfm.png currenttrack_bar_left.png amarok_rocks.jpg volumeslider-handle_glow.png currenttrack_bar_right.png star.png more_albums.png musicbrainz.png vol_speaker.png wizard_xmms.png currenttrack_pause.png amarok_icon.svg Makefile.am loading2.png currenttrack_repeat_small.png #>+ 2 docs-am: @@ -795,9 +799,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/images/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/images/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/images/Makefile + $(AUTOMAKE) --foreign amarok/src/images/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/images/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/images/icons/Makefile.in +++ amarok-1.4.9.1/amarok/src/images/icons/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -84,6 +84,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -178,6 +179,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -187,6 +189,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -197,6 +200,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -218,6 +222,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -348,7 +353,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*) \ @@ -357,9 +362,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/images/icons/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/images/icons/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/images/icons/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/images/icons/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -369,9 +374,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/images/icons/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/images/icons/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/images/icons/Makefile + $(AUTOMAKE) --foreign amarok/src/images/icons/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/images/icons/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -386,9 +391,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: @@ -537,745 +542,745 @@ .NOEXPORT: #>+ 2 -KDE_DIST=hi22-action-amarok_audioscrobbler.png hi64-action-amarok_add_lyrics.png hi16-action-amarok_rescan.png hi48-action-amarok_circle.png hi48-action-amarok_zoom.png cr22-action-babelfish.png hi22-action-amarok_dynamic.png hi16-action-amarok_info.png hi48-action-amarok_editcopy.png hi22-action-amarok_search.png hi22-action-amarok_visualizations.png hi22-action-amarok_music.png hi48-action-amarok_burn.png hi48-action-amarok_random.png hi22-action-amarok_stop.png cr16-action-wiki.png cr64-action-dynamic.png hi16-action-amarok_playlist.png hi64-action-amarok_repeat_no.png hi16-action-amarok_rewind.png hi48-action-amarok_podcast2.png hi48-action-amarok_visualizations.png hi64-action-amarok_album.png hi16-action-amarok_burn.png hi32-action-amarok_random_no.png hi16-action-amarok_playlist_refresh.png cr16-action-podcast.png hi48-action-amarok_change_language.png hi16-action-amarok_dynamic.png hi16-action-amarok_podcast.png hi64-action-amarok_favourite_genres.png hi16-action-amarok_zoom.png hi48-action-amarok_random_no.png hi64-action-collection.png hi22-action-amarok_add_playlist.png hi16-action-amarok_search.png hi22-action-amarok_equalizer.png hi22-action-amarok_repeat_playlist.png hi64-action-amarok_dynamic.png hi16-action-amarok_artist.png hi32-action-amarok_play.png hi64-action-amarok_scripts.png hi16-action-amarok_album.png hi32-action-amarok_info.png hi32-action-audioscrobbler.png hi32-action-amarok_remove.png hi48-action-amarok_settings_indicator.png hi22-action-amarok_back.png hi64-action-amarok_random.png hi48-action-amarok_files2.png hi22-action-amarok_album.png hi16-action-amarok_scripts.png hi48-action-amarok_magnatune.png hi16-action-amarok_pause.png hi64-action-amarok_next.png hi64-action-amarok_random_no.png hi64-action-amarok_music.png hi32-action-amarok_settings_general.png hi48-action-amarok_refresh.png hi32-action-amarok_settings_engine.png hi16-action-amarok_music.png hi48-action-amarok_podcast.png hi64-action-amarok_repeat_album.png hi64-action-amarok_change_language.png hi48-action-amarok_next.png hi16-action-amarok_editcopy.png hi22-action-amarok_files2.png hi22-action-amarok_rewind.png Makefile.in hi32-action-amarok_podcast.png hi48-action-amarok_love.png hi48-action-amarok_scripts.png hi32-action-amarok_dynamic.png hi22-action-amarok_favourite_genres.png hi64-action-amarok_files.png hi22-action-amarok_files.png hi64-action-amarok_magnatune.png hi22-action-amarok_podcast2.png hi48-action-amarok_settings_engine.png hi64-action-amarok_device.png hi48-action-amarok_pause.png hi32-action-amarok_files2.png hi48-action-amarok_album.png hi16-action-amarok_remove_from_playlist.png hi48-action-amarok_download.png hi16-action-amarok_files.png hi22-action-amarok_next.png hi64-action-amarok_pause.png hi48-action-amarok_settings_general.png hi48-action-amarok_repeat_track.png hi48-action-amarok_device.png hi16-action-amarok_mostplayed.png hi22-action-amarok_covermanager.png hi32-action-amarok_love.png hi64-action-amarok_remove.png hi16-action-amarok_settings_view.png hi16-action-amarok_fastforward.png hi22-action-amarok_random.png hi16-action-amarok_edit.png hi64-action-amarok_repeat_playlist.png hi64-action-amarok_remove_from_playlist.png hi48-action-amarok_lyrics.png hi64-action-amarok_save.png hi48-action-amarok_covermanager.png hi22-action-amarok_repeat_album.png hi64-action-amarok_equalizer.png cr16-action-random.png hi32-action-collection.png hi64-action-amarok_refresh.png hi64-action-amarok_playlist_clear.png hi64-action-amarok_queue.png hi48-action-amarok_artist.png hi48-action-amarok_random_album.png hi22-action-amarok_settings_general.png hi16-action-amarok_audioscrobbler.png hi22-action-amarok_random_track.png hi22-action-amarok_zoom.png hi32-action-amarok_download.png hi32-action-amarok_equalizer.png hi64-action-amarok_settings_engine.png cr22-action-dynamic.png hi22-action-amarok_device.png hi22-action-amarok_burn.png hi32-action-amarok_change_language.png hi22-action-amarok_rescan.png hi64-action-amarok_podcast2.png hi16-action-amarok_save.png hi48-action-amarok_repeat_playlist.png hi32-action-amarok_pause.png hi22-action-amarok_fastforward.png hi16-action-amarok_settings_general.png cr16-action-equalizer.png cr64-action-podcast.png hi22-action-collection.png hi32-action-amarok_collection.png hi64-action-amarok_settings_indicator.png hi32-action-amarok_mostplayed.png hi32-action-amarok_covermanager.png hi32-action-amarok_circle.png hi48-action-amarok_external.png hi22-action-amarok_settings_engine.png hi32-action-amarok_scripts.png hi22-action-amarok_external.png hi64-action-amarok_editcopy.png hi64-action-amarok_covermanager.png hi32-action-amarok_queue.png hi22-action-amarok_save.png hi48-action-amarok_info.png hi64-action-amarok_playlist_refresh.png hi22-action-amarok_refresh.png hi32-action-amarok_rewind.png hi32-action-amarok_clock.png cr16-action-mini_dock.png cr16-action-repeat_playlist.png cr16-action-covermanager.png hi64-action-amarok_stop.png hi32-action-amarok_search.png hi48-action-amarok_track.png hi22-action-amarok_mostplayed.png hi16-action-amarok_redo.png cr22-action-repeat_playlist.png hi48-action-amarok_repeat_album.png hi48-action-amarok_add_playlist.png hi22-action-amarok_settings_view.png hi48-action-amarok_settings_view.png hi48-action-amarok_settings_playback.png hi16-action-amarok_repeat_playlist.png hi48-action-amarok_repeat_no.png hi64-action-amarok_edit.png hi32-action-amarok_playlist.png hi48-action-amarok_favourite_genres.png hi32-action-amarok_album.png hi16-action-amarok_settings_indicator.png cr64-action-repeat_playlist.png hi32-action-amarok_device.png hi16-action-amarok_configure.png hi16-action-amarok_lyrics.png hi32-action-amarok_undo.png hi32-action-amarok_random_album.png hi32-action-amarok_back.png hi16-action-amarok_change_language.png hi22-action-amarok_scripts.png hi16-action-amarok_favourite_genres.png hi64-action-amarok_configure.png hi64-action-amarok_love.png hi48-action-amarok_playlist.png cr64-action-podcast_new.png hi22-action-amarok_settings_indicator.png hi48-action-amarok_equalizer.png hi64-action-amarok_artist.png hi64-action-amarok_collection.png hi32-action-amarok_repeat_no.png hi48-action-amarok_playlist_refresh.png hi22-action-amarok_artist.png hi16-action-amarok_visualizations.png hi22-action-amarok_podcast.png hi22-action-amarok_remove.png hi32-action-amarok_add_playlist.png hi32-action-amarok_repeat_playlist.png hi16-action-amarok_device.png hi64-action-amarok_burn.png hi16-action-amarok_repeat_track.png hi64-action-amarok_info.png hi64-action-amarok_playlist.png hi64-action-amarok_circle.png hi64-action-amarok_settings_view.png hi32-action-amarok_music.png hi64-action-amarok_podcast.png hi32-action-amarok_save.png hi48-action-amarok_clock.png hi64-action-amarok_add_playlist.png hi48-action-amarok_audioscrobbler.png hi22-action-amarok_editcopy.png hi22-action-amarok_circle.png hi16-action-amarok_add_lyrics.png hi48-action-amarok_remove_from_playlist.png hi32-action-amarok_random.png cr64-action-random.png hi22-action-amarok_info.png hi22-action-amarok_playlist_clear.png hi32-action-amarok_playlist_clear.png hi16-action-amarok_external.png hi32-action-amarok_lyrics.png hi48-action-amarok_undo.png hi32-action-amarok_burn.png hi16-action-amarok_remove.png hi48-action-collection.png hi48-action-amarok_play.png hi16-action-amarok_repeat_no.png hi22-action-amarok_remove_from_playlist.png hi48-action-amarok_files.png hi16-action-collection.png hi64-action-amarok_rescan.png hi22-action-amarok_track.png hi22-action-amarok_queue.png hi22-action-amarok_change_language.png hi22-action-amarok_repeat_track.png hi22-action-amarok_playlist.png hi16-action-amarok_podcast2.png hi22-action-amarok_play.png hi16-action-amarok_random_no.png hi16-action-amarok_settings_playback.png hi16-action-amarok_random.png cr22-action-visualizations.png cr16-action-player_playlist_2.png hi32-action-amarok_zoom.png hi16-action-amarok_circle.png hi32-action-amarok_rescan.png hi16-action-amarok_clock.png hi16-action-amarok_track.png hi48-action-amarok_dynamic.png hi32-action-amarok_remove_from_playlist.png hi16-action-amarok_refresh.png hi64-action-amarok_fastforward.png hi48-action-amarok_fastforward.png hi32-action-amarok_editcopy.png hi22-action-amarok_repeat_no.png hi32-action-amarok_settings_indicator.png hi32-action-amarok_track.png hi32-action-amarok_magnatune.png hi32-action-amarok_external.png hi32-action-amarok_refresh.png hi48-action-amarok_save.png cr22-action-amarok_podcast.png hi64-action-amarok_settings_playback.png hi64-action-amarok_visualizations.png hi22-action-amarok_configure.png hi64-action-amarok_random_album.png hi32-action-amarok_podcast2.png hi22-action-amarok_lyrics.png hi48-action-amarok_redo.png cr22-action-amarok_podcast_new.png hi16-action-amarok_next.png hi32-action-amarok_repeat_album.png hi48-action-amarok_remove.png hi22-action-amarok_edit.png hi16-action-amarok_files2.png hi32-action-amarok_repeat_track.png hi16-action-amarok_equalizer.png cr16-action-repeat_track.png hi32-action-amarok_add_lyrics.png hi22-action-amarok_random_album.png hi22-action-amarok_magnatune.png hi22-action-amarok_settings_playback.png hi22-action-amarok_redo.png hi16-action-amarok_back.png hi48-action-amarok_search.png hi48-action-amarok_configure.png hi64-action-amarok_clock.png hi16-action-amarok_covermanager.png hi22-action-amarok_clock.png hi22-action-amarok_undo.png hi16-action-amarok_undo.png hi48-action-amarok_music.png hi48-action-amarok_rewind.png hi64-action-amarok_back.png hi64-action-amarok_rewind.png hi16-action-amarok_settings_engine.png hi16-action-amarok_random_track.png hi64-action-amarok_random_track.png hi64-action-amarok_search.png hi22-action-amarok_random_no.png hi32-action-amarok_visualizations.png hi48-action-amarok_stop.png hi16-action-amarok_queue.png hi48-action-amarok_edit.png hi64-action-amarok_lyrics.png hi48-action-amarok_random_track.png hi64-action-amarok_audioscrobbler.png hi16-action-amarok_stop.png hi22-action-amarok_add_lyrics.png hi32-action-amarok_files.png hi64-action-amarok_files2.png hi64-action-amarok_repeat_track.png cr16-action-dynamic.png hi64-action-amarok_redo.png hi48-action-amarok_playlist_clear.png hi64-action-amarok_settings_general.png hi22-action-amarok_pause.png hi16-action-amarok_random_album.png hi22-action-amarok_love.png hi32-action-amarok_next.png cr22-action-player_playlist_2.png hi16-action-amarok_download.png hi32-action-amarok_edit.png hi32-action-amarok_random_track.png hi16-action-amarok_repeat_album.png cr22-action-random.png hi48-action-amarok_back.png hi48-action-amarok_collection.png hi22-action-amarok_collection.png hi64-action-amarok_mostplayed.png hi48-action-amarok_add_lyrics.png hi32-action-amarok_configure.png hi48-action-amarok_queue.png hi64-action-amarok_external.png hi48-action-amarok_mostplayed.png hi64-action-amarok_zoom.png hi32-action-amarok_settings_playback.png hi32-action-amarok_favourite_genres.png hi32-action-amarok_artist.png hi16-action-amarok_playlist_clear.png hi64-action-amarok_undo.png hi32-action-amarok_audioscrobbler.png hi64-action-amarok_track.png hi32-action-amarok_stop.png hi48-action-amarok_rescan.png cr16-action-visualizations.png cr16-action-podcast_new.png hi22-action-amarok_playlist_refresh.png hi32-action-amarok_playlist_refresh.png hi22-action-amarok_download.png hi16-action-amarok_play.png hi16-action-amarok_add_playlist.png hi16-action-amarok_magnatune.png hi16-action-amarok_collection.png hi32-action-amarok_redo.png hi64-action-amarok_play.png hi64-action-amarok_download.png hi32-action-amarok_fastforward.png hi16-action-amarok_love.png Makefile.am hi32-action-amarok_settings_view.png +KDE_DIST=hi22-action-amarok_audioscrobbler.png hi64-action-amarok_add_lyrics.png hi16-action-amarok_rescan.png hi48-action-amarok_circle.png hi48-action-amarok_zoom.png cr22-action-babelfish.png hi16-action-amarok_info.png hi22-action-amarok_dynamic.png hi48-action-amarok_editcopy.png hi22-action-amarok_search.png hi22-action-amarok_visualizations.png hi22-action-amarok_music.png hi48-action-amarok_random.png hi48-action-amarok_burn.png hi22-action-amarok_stop.png cr16-action-wiki.png cr64-action-dynamic.png hi16-action-amarok_playlist.png hi64-action-amarok_repeat_no.png hi16-action-amarok_rewind.png hi48-action-amarok_podcast2.png hi48-action-amarok_visualizations.png hi64-action-amarok_album.png hi16-action-amarok_burn.png hi32-action-amarok_random_no.png hi16-action-amarok_playlist_refresh.png cr16-action-podcast.png hi48-action-amarok_change_language.png hi16-action-amarok_dynamic.png hi16-action-amarok_podcast.png hi64-action-amarok_favourite_genres.png hi16-action-amarok_zoom.png hi48-action-amarok_random_no.png hi64-action-collection.png hi22-action-amarok_add_playlist.png hi16-action-amarok_search.png hi22-action-amarok_equalizer.png hi22-action-amarok_repeat_playlist.png hi64-action-amarok_dynamic.png hi64-action-amarok_scripts.png hi16-action-amarok_artist.png hi32-action-amarok_play.png hi16-action-amarok_album.png hi32-action-amarok_info.png hi32-action-audioscrobbler.png hi32-action-amarok_remove.png hi48-action-amarok_settings_indicator.png hi64-action-amarok_random.png hi22-action-amarok_back.png hi48-action-amarok_files2.png hi16-action-amarok_scripts.png hi22-action-amarok_album.png hi48-action-amarok_magnatune.png hi16-action-amarok_pause.png hi64-action-amarok_next.png hi64-action-amarok_random_no.png hi64-action-amarok_music.png hi32-action-amarok_settings_general.png hi48-action-amarok_refresh.png hi32-action-amarok_settings_engine.png hi16-action-amarok_music.png hi48-action-amarok_podcast.png hi64-action-amarok_repeat_album.png hi64-action-amarok_change_language.png hi48-action-amarok_next.png hi16-action-amarok_editcopy.png hi22-action-amarok_files2.png hi22-action-amarok_rewind.png hi32-action-amarok_podcast.png hi48-action-amarok_love.png Makefile.in hi48-action-amarok_scripts.png hi32-action-amarok_dynamic.png hi22-action-amarok_favourite_genres.png hi64-action-amarok_files.png hi22-action-amarok_files.png hi64-action-amarok_magnatune.png hi22-action-amarok_podcast2.png hi48-action-amarok_settings_engine.png hi64-action-amarok_device.png hi32-action-amarok_files2.png hi48-action-amarok_pause.png hi48-action-amarok_album.png hi48-action-amarok_download.png hi16-action-amarok_remove_from_playlist.png hi16-action-amarok_files.png hi64-action-amarok_pause.png hi22-action-amarok_next.png hi48-action-amarok_settings_general.png hi48-action-amarok_repeat_track.png hi16-action-amarok_mostplayed.png hi48-action-amarok_device.png hi22-action-amarok_covermanager.png hi64-action-amarok_remove.png hi32-action-amarok_love.png hi16-action-amarok_settings_view.png hi16-action-amarok_fastforward.png hi22-action-amarok_random.png hi16-action-amarok_edit.png hi64-action-amarok_repeat_playlist.png hi64-action-amarok_remove_from_playlist.png hi48-action-amarok_lyrics.png hi64-action-amarok_save.png hi48-action-amarok_covermanager.png hi22-action-amarok_repeat_album.png hi64-action-amarok_equalizer.png cr16-action-random.png hi32-action-collection.png hi64-action-amarok_refresh.png hi64-action-amarok_playlist_clear.png hi64-action-amarok_queue.png hi48-action-amarok_artist.png hi48-action-amarok_random_album.png hi22-action-amarok_settings_general.png hi22-action-amarok_random_track.png hi16-action-amarok_audioscrobbler.png hi22-action-amarok_zoom.png hi32-action-amarok_download.png hi32-action-amarok_equalizer.png hi64-action-amarok_settings_engine.png hi22-action-amarok_device.png cr22-action-dynamic.png hi22-action-amarok_burn.png hi22-action-amarok_rescan.png hi32-action-amarok_change_language.png hi64-action-amarok_podcast2.png hi16-action-amarok_save.png hi48-action-amarok_repeat_playlist.png hi32-action-amarok_pause.png hi16-action-amarok_settings_general.png hi22-action-amarok_fastforward.png cr16-action-equalizer.png cr64-action-podcast.png hi22-action-collection.png hi32-action-amarok_collection.png hi64-action-amarok_settings_indicator.png hi32-action-amarok_mostplayed.png hi32-action-amarok_circle.png hi32-action-amarok_covermanager.png hi48-action-amarok_external.png hi22-action-amarok_settings_engine.png hi32-action-amarok_scripts.png hi64-action-amarok_editcopy.png hi22-action-amarok_external.png hi32-action-amarok_queue.png hi64-action-amarok_covermanager.png hi22-action-amarok_save.png hi48-action-amarok_info.png hi64-action-amarok_playlist_refresh.png hi32-action-amarok_rewind.png hi32-action-amarok_clock.png hi22-action-amarok_refresh.png cr16-action-mini_dock.png cr16-action-repeat_playlist.png cr16-action-covermanager.png hi64-action-amarok_stop.png hi32-action-amarok_search.png hi48-action-amarok_track.png hi22-action-amarok_mostplayed.png hi16-action-amarok_redo.png cr22-action-repeat_playlist.png hi48-action-amarok_repeat_album.png hi48-action-amarok_add_playlist.png hi22-action-amarok_settings_view.png hi48-action-amarok_settings_view.png hi48-action-amarok_settings_playback.png hi16-action-amarok_repeat_playlist.png hi48-action-amarok_repeat_no.png hi64-action-amarok_edit.png hi32-action-amarok_playlist.png hi48-action-amarok_favourite_genres.png hi32-action-amarok_album.png hi16-action-amarok_settings_indicator.png cr64-action-repeat_playlist.png hi32-action-amarok_device.png hi16-action-amarok_lyrics.png hi16-action-amarok_configure.png hi32-action-amarok_back.png hi32-action-amarok_random_album.png hi16-action-amarok_change_language.png hi32-action-amarok_undo.png hi22-action-amarok_scripts.png hi16-action-amarok_favourite_genres.png hi64-action-amarok_configure.png hi48-action-amarok_playlist.png hi64-action-amarok_love.png cr64-action-podcast_new.png hi22-action-amarok_settings_indicator.png hi48-action-amarok_equalizer.png hi64-action-amarok_artist.png hi64-action-amarok_collection.png hi32-action-amarok_repeat_no.png hi48-action-amarok_playlist_refresh.png hi22-action-amarok_artist.png hi16-action-amarok_visualizations.png hi22-action-amarok_podcast.png hi22-action-amarok_remove.png hi32-action-amarok_add_playlist.png hi32-action-amarok_repeat_playlist.png hi16-action-amarok_device.png hi64-action-amarok_info.png hi64-action-amarok_burn.png hi16-action-amarok_repeat_track.png hi64-action-amarok_playlist.png hi64-action-amarok_circle.png hi64-action-amarok_settings_view.png hi32-action-amarok_music.png hi32-action-amarok_save.png hi64-action-amarok_podcast.png hi48-action-amarok_clock.png hi64-action-amarok_add_playlist.png hi48-action-amarok_audioscrobbler.png hi22-action-amarok_circle.png hi22-action-amarok_editcopy.png hi16-action-amarok_add_lyrics.png hi48-action-amarok_remove_from_playlist.png hi32-action-amarok_random.png cr64-action-random.png hi22-action-amarok_info.png hi22-action-amarok_playlist_clear.png hi32-action-amarok_playlist_clear.png hi16-action-amarok_external.png hi32-action-amarok_lyrics.png hi48-action-amarok_undo.png hi32-action-amarok_burn.png hi16-action-amarok_remove.png hi48-action-collection.png hi48-action-amarok_play.png hi16-action-amarok_repeat_no.png hi22-action-amarok_remove_from_playlist.png hi48-action-amarok_files.png hi16-action-collection.png hi64-action-amarok_rescan.png hi22-action-amarok_track.png hi22-action-amarok_queue.png hi22-action-amarok_repeat_track.png hi22-action-amarok_change_language.png hi22-action-amarok_playlist.png hi16-action-amarok_podcast2.png hi22-action-amarok_play.png hi16-action-amarok_random_no.png hi16-action-amarok_settings_playback.png hi16-action-amarok_random.png cr22-action-visualizations.png hi32-action-amarok_zoom.png cr16-action-player_playlist_2.png hi16-action-amarok_circle.png hi32-action-amarok_rescan.png hi16-action-amarok_clock.png hi16-action-amarok_track.png hi48-action-amarok_dynamic.png hi32-action-amarok_remove_from_playlist.png hi16-action-amarok_refresh.png hi64-action-amarok_fastforward.png hi48-action-amarok_fastforward.png hi32-action-amarok_editcopy.png hi22-action-amarok_repeat_no.png hi32-action-amarok_settings_indicator.png hi32-action-amarok_track.png hi32-action-amarok_magnatune.png hi32-action-amarok_external.png hi32-action-amarok_refresh.png hi48-action-amarok_save.png cr22-action-amarok_podcast.png hi64-action-amarok_settings_playback.png hi64-action-amarok_visualizations.png hi22-action-amarok_configure.png hi64-action-amarok_random_album.png hi32-action-amarok_podcast2.png hi22-action-amarok_lyrics.png hi48-action-amarok_redo.png cr22-action-amarok_podcast_new.png hi16-action-amarok_next.png hi32-action-amarok_repeat_album.png hi48-action-amarok_remove.png hi22-action-amarok_edit.png hi16-action-amarok_files2.png hi16-action-amarok_equalizer.png hi32-action-amarok_repeat_track.png cr16-action-repeat_track.png hi32-action-amarok_add_lyrics.png hi22-action-amarok_random_album.png hi22-action-amarok_magnatune.png hi22-action-amarok_settings_playback.png hi22-action-amarok_redo.png hi16-action-amarok_back.png hi48-action-amarok_search.png hi48-action-amarok_configure.png hi64-action-amarok_clock.png hi22-action-amarok_clock.png hi16-action-amarok_covermanager.png hi22-action-amarok_undo.png hi16-action-amarok_undo.png hi48-action-amarok_music.png hi48-action-amarok_rewind.png hi64-action-amarok_rewind.png hi64-action-amarok_back.png hi16-action-amarok_settings_engine.png hi16-action-amarok_random_track.png hi64-action-amarok_random_track.png hi22-action-amarok_random_no.png hi64-action-amarok_search.png hi32-action-amarok_visualizations.png hi48-action-amarok_stop.png hi16-action-amarok_queue.png hi48-action-amarok_edit.png hi64-action-amarok_lyrics.png hi48-action-amarok_random_track.png hi64-action-amarok_audioscrobbler.png hi16-action-amarok_stop.png hi22-action-amarok_add_lyrics.png hi64-action-amarok_files2.png hi32-action-amarok_files.png hi64-action-amarok_repeat_track.png cr16-action-dynamic.png hi64-action-amarok_redo.png hi48-action-amarok_playlist_clear.png hi64-action-amarok_settings_general.png hi22-action-amarok_pause.png hi16-action-amarok_random_album.png hi22-action-amarok_love.png cr22-action-player_playlist_2.png hi32-action-amarok_next.png hi32-action-amarok_edit.png hi16-action-amarok_download.png hi32-action-amarok_random_track.png hi16-action-amarok_repeat_album.png hi48-action-amarok_back.png hi48-action-amarok_collection.png cr22-action-random.png hi22-action-amarok_collection.png hi64-action-amarok_mostplayed.png hi48-action-amarok_add_lyrics.png hi32-action-amarok_configure.png hi48-action-amarok_queue.png hi64-action-amarok_external.png hi48-action-amarok_mostplayed.png hi64-action-amarok_zoom.png hi32-action-amarok_settings_playback.png hi32-action-amarok_favourite_genres.png hi32-action-amarok_artist.png hi16-action-amarok_playlist_clear.png hi64-action-amarok_undo.png hi32-action-amarok_audioscrobbler.png hi64-action-amarok_track.png hi32-action-amarok_stop.png hi48-action-amarok_rescan.png cr16-action-visualizations.png cr16-action-podcast_new.png hi22-action-amarok_playlist_refresh.png hi32-action-amarok_playlist_refresh.png hi22-action-amarok_download.png hi16-action-amarok_play.png hi16-action-amarok_add_playlist.png hi16-action-amarok_magnatune.png hi16-action-amarok_collection.png hi32-action-amarok_redo.png hi64-action-amarok_play.png hi64-action-amarok_download.png hi32-action-amarok_fastforward.png hi16-action-amarok_love.png Makefile.am hi32-action-amarok_settings_view.png #>+ 2 docs-am: #>+ 734 install-kde-icons: - $(mkinstalldirs) $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_edit.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_edit.png - $(mkinstalldirs) $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_configure.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_configure.png $(mkinstalldirs) $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_fastforward.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_fastforward.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_random_album.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_random_album.png $(mkinstalldirs) $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_change_language.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_change_language.png - $(mkinstalldirs) $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_settings_indicator.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_settings_indicator.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_redo.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_redo.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_podcast.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_podcast.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_remove.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_remove.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_remove.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_remove.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_podcast.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_podcast.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_remove.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_remove.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_love.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_love.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_remove.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_remove.png $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_track.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_track.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_repeat_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_repeat_playlist.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_dynamic.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_dynamic.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_refresh.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_refresh.png + $(mkinstalldirs) $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_refresh.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_refresh.png + $(mkinstalldirs) $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_remove_from_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_remove_from_playlist.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_fastforward.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_fastforward.png + $(mkinstalldirs) $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_add_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_add_playlist.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_dynamic.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_dynamic.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_remove_from_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_remove_from_playlist.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_rewind.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_rewind.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_playlist.png $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_settings_playback.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_settings_playback.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_next.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_next.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_music.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_music.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_configure.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_configure.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_queue.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_queue.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_mostplayed.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_mostplayed.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_dynamic.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_dynamic.png $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_stop.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_stop.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_info.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_info.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_audioscrobbler.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_audioscrobbler.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_redo.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_redo.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_clock.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_clock.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_change_language.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_change_language.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_repeat_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_repeat_playlist.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_settings_view.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_settings_view.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_files2.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_files2.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_zoom.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_zoom.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_settings_playback.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_settings_playback.png $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_repeat_album.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_repeat_album.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_settings_general.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_settings_general.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_repeat_album.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_repeat_album.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_save.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_save.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_collection.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_collection.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_repeat_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_repeat_playlist.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_remove_from_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_remove_from_playlist.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_circle.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_circle.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_random_track.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_random_track.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_rescan.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_rescan.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_covermanager.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_covermanager.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_settings_view.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_settings_view.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_random_no.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_random_no.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_playlist_refresh.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_playlist_refresh.png $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_circle.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_circle.png - $(mkinstalldirs) $(DESTDIR)$(amarokicondir)/crystalsvg/64x64/actions - $(INSTALL_DATA) $(srcdir)/cr64-action-dynamic.png $(DESTDIR)$(amarokicondir)/crystalsvg/64x64/actions/dynamic.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_album.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_album.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_repeat_track.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_repeat_track.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_music.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_music.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_remove.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_remove.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_equalizer.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_equalizer.png + $(mkinstalldirs) $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions + $(INSTALL_DATA) $(srcdir)/cr16-action-player_playlist_2.png $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/player_playlist_2.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_redo.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_redo.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_rewind.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_rewind.png $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_random_track.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_random_track.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_play.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_play.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_circle.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_circle.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_album.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_album.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_random_album.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_random_album.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_playlist.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_random_album.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_random_album.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_love.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_love.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_remove.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_remove.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_save.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_save.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_back.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_back.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_next.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_next.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_artist.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_artist.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_podcast.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_podcast.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_playlist_clear.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_playlist_clear.png + $(INSTALL_DATA) $(srcdir)/hi32-action-audioscrobbler.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/audioscrobbler.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_settings_view.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_settings_view.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_audioscrobbler.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_audioscrobbler.png $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_circle.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_circle.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_favourite_genres.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_favourite_genres.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_undo.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_undo.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_add_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_add_playlist.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_random.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_random.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_random_no.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_random_no.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_random.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_random.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_add_lyrics.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_add_lyrics.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_repeat_no.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_repeat_no.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_random.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_random.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_random.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_random.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_edit.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_edit.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_audioscrobbler.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_audioscrobbler.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_random_track.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_random_track.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_dynamic.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_dynamic.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_collection.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_collection.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_random_track.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_random_track.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_queue.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_queue.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_save.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_save.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_clock.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_clock.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_refresh.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_refresh.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_mostplayed.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_mostplayed.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_burn.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_burn.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_equalizer.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_equalizer.png $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_clock.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_clock.png - $(mkinstalldirs) $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions - $(INSTALL_DATA) $(srcdir)/cr16-action-visualizations.png $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/visualizations.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_equalizer.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_equalizer.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_settings_indicator.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_settings_indicator.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_back.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_back.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_track.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_track.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_podcast.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_podcast.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_lyrics.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_lyrics.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_playlist.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_lyrics.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_lyrics.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_burn.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_burn.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_rescan.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_rescan.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_lyrics.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_lyrics.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_lyrics.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_lyrics.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_random_no.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_random_no.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_pause.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_pause.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_repeat_no.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_repeat_no.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_next.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_next.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_editcopy.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_editcopy.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_dynamic.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_dynamic.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_scripts.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_scripts.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_music.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_music.png - $(mkinstalldirs) $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions - $(INSTALL_DATA) $(srcdir)/cr22-action-random.png $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/random.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_queue.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_queue.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_files2.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_files2.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_covermanager.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_covermanager.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_download.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_download.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_repeat_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_repeat_playlist.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_track.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_track.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_settings_general.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_settings_general.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_scripts.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_scripts.png + $(mkinstalldirs) $(DESTDIR)$(amarokicondir)/crystalsvg/64x64/actions + $(INSTALL_DATA) $(srcdir)/cr64-action-repeat_playlist.png $(DESTDIR)$(amarokicondir)/crystalsvg/64x64/actions/repeat_playlist.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_undo.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_undo.png $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_stop.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_stop.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_device.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_device.png - $(INSTALL_DATA) $(srcdir)/cr64-action-random.png $(DESTDIR)$(amarokicondir)/crystalsvg/64x64/actions/random.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_clock.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_clock.png $(INSTALL_DATA) $(srcdir)/cr16-action-dynamic.png $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/dynamic.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_random_album.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_random_album.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_repeat_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_repeat_playlist.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_settings_general.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_settings_general.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_search.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_search.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_album.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_album.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_playlist_clear.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_playlist_clear.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_search.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_search.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_add_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_add_playlist.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_remove_from_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_remove_from_playlist.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_add_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_add_playlist.png - $(INSTALL_DATA) $(srcdir)/cr22-action-repeat_playlist.png $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/repeat_playlist.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_search.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_search.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_burn.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_burn.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_add_lyrics.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_add_lyrics.png $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_search.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_search.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_download.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_download.png - $(INSTALL_DATA) $(srcdir)/cr16-action-repeat_playlist.png $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/repeat_playlist.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_favourite_genres.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_favourite_genres.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_playlist_refresh.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_playlist_refresh.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_configure.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_configure.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_external.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_external.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_files2.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_files2.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_external.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_external.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_files2.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_files2.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_zoom.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_zoom.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_redo.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_redo.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_files2.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_files2.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_visualizations.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_visualizations.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_editcopy.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_editcopy.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_settings_engine.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_settings_engine.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_configure.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_configure.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_save.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_save.png + $(mkinstalldirs) $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions + $(INSTALL_DATA) $(srcdir)/cr22-action-dynamic.png $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/dynamic.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_repeat_album.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_repeat_album.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_clock.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_clock.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_back.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_back.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_burn.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_burn.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_undo.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_undo.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_settings_indicator.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_settings_indicator.png + $(INSTALL_DATA) $(srcdir)/cr22-action-repeat_playlist.png $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/repeat_playlist.png $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_files2.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_files2.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_clock.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_clock.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_visualizations.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_visualizations.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_settings_playback.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_settings_playback.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_love.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_love.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_add_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_add_playlist.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_change_language.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_change_language.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_scripts.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_scripts.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_playlist.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_random.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_random.png $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_equalizer.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_equalizer.png - $(INSTALL_DATA) $(srcdir)/cr16-action-podcast_new.png $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/podcast_new.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_pause.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_pause.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_podcast2.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_podcast2.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_music.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_music.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_mostplayed.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_mostplayed.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_scripts.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_scripts.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_queue.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_queue.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_info.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_info.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_remove_from_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_remove_from_playlist.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_repeat_no.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_repeat_no.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_settings_indicator.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_settings_indicator.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_mostplayed.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_mostplayed.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_next.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_next.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_podcast2.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_podcast2.png + $(INSTALL_DATA) $(srcdir)/cr64-action-dynamic.png $(DESTDIR)$(amarokicondir)/crystalsvg/64x64/actions/dynamic.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_rewind.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_rewind.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_random_track.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_random_track.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_edit.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_edit.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_lyrics.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_lyrics.png + $(INSTALL_DATA) $(srcdir)/cr22-action-amarok_podcast_new.png $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/amarok_podcast_new.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_music.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_music.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_album.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_album.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_fastforward.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_fastforward.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_queue.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_queue.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_configure.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_configure.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_collection.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_collection.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_add_lyrics.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_add_lyrics.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_scripts.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_scripts.png $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_collection.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_collection.png - $(INSTALL_DATA) $(srcdir)/cr22-action-visualizations.png $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/visualizations.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_save.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_save.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_equalizer.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_equalizer.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_random_album.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_random_album.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_stop.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_stop.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_podcast.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_podcast.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_play.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_play.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_redo.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_redo.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_covermanager.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_covermanager.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_podcast2.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_podcast2.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_circle.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_circle.png $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_playlist_clear.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_playlist_clear.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_play.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_play.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_playlist_clear.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_playlist_clear.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_undo.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_undo.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_random_no.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_random_no.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_repeat_track.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_repeat_track.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_add_lyrics.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_add_lyrics.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_dynamic.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_dynamic.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_settings_engine.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_settings_engine.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_playlist_refresh.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_playlist_refresh.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_fastforward.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_fastforward.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_configure.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_configure.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_rewind.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_rewind.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_dynamic.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_dynamic.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_rewind.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_rewind.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_edit.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_edit.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_settings_engine.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_settings_engine.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_settings_indicator.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_settings_indicator.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_remove.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_remove.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_rewind.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_rewind.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_refresh.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_refresh.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_rewind.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_rewind.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_back.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_back.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_redo.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_redo.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_files.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_files.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_album.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_album.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_audioscrobbler.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_audioscrobbler.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_audioscrobbler.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_audioscrobbler.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_burn.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_burn.png - $(INSTALL_DATA) $(srcdir)/cr22-action-player_playlist_2.png $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/player_playlist_2.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_playlist.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_settings_playback.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_settings_playback.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_pause.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_pause.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_configure.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_configure.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_next.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_next.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_repeat_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_repeat_playlist.png + $(INSTALL_DATA) $(srcdir)/cr16-action-repeat_track.png $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/repeat_track.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_search.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_search.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_mostplayed.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_mostplayed.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_music.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_music.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_settings_general.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_settings_general.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_love.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_love.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_zoom.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_zoom.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_album.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_album.png $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_fastforward.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_fastforward.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_magnatune.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_magnatune.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_editcopy.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_editcopy.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_stop.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_stop.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_random_album.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_random_album.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_random_album.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_random_album.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_redo.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_redo.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_remove.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_remove.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_album.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_album.png $(INSTALL_DATA) $(srcdir)/hi22-action-collection.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/collection.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_circle.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_circle.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_play.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_play.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_artist.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_artist.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_next.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_next.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_rescan.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_rescan.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_device.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_device.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_files.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_files.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_settings_engine.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_settings_engine.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_visualizations.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_visualizations.png + $(INSTALL_DATA) $(srcdir)/cr16-action-equalizer.png $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/equalizer.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_repeat_track.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_repeat_track.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_remove.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_remove.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_random_album.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_random_album.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_refresh.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_refresh.png + $(INSTALL_DATA) $(srcdir)/cr22-action-visualizations.png $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/visualizations.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_rescan.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_rescan.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_dynamic.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_dynamic.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_music.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_music.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_change_language.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_change_language.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_device.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_device.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_pause.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_pause.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_track.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_track.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_configure.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_configure.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_rescan.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_rescan.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_love.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_love.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_covermanager.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_covermanager.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_repeat_album.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_repeat_album.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_repeat_album.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_repeat_album.png $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_info.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_info.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_undo.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_undo.png - $(INSTALL_DATA) $(srcdir)/hi32-action-audioscrobbler.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/audioscrobbler.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_save.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_save.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_repeat_track.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_repeat_track.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_remove_from_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_remove_from_playlist.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_download.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_download.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_magnatune.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_magnatune.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_random.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_random.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_playlist_refresh.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_playlist_refresh.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_music.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_music.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_random_no.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_random_no.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_zoom.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_zoom.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_edit.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_edit.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_scripts.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_scripts.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_queue.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_queue.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_dynamic.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_dynamic.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_playlist_refresh.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_playlist_refresh.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_play.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_play.png + $(INSTALL_DATA) $(srcdir)/cr22-action-babelfish.png $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/babelfish.png $(INSTALL_DATA) $(srcdir)/cr16-action-random.png $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/random.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_settings_view.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_settings_view.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_settings_engine.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_settings_engine.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_scripts.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_scripts.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_album.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_album.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_refresh.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_refresh.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_playlist.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_remove.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_remove.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_files.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_files.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_audioscrobbler.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_audioscrobbler.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_collection.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_collection.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_configure.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_configure.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_external.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_external.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_device.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_device.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_search.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_search.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_magnatune.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_magnatune.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_random_no.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_random_no.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_visualizations.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_visualizations.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_random_album.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_random_album.png + $(INSTALL_DATA) $(srcdir)/cr64-action-random.png $(DESTDIR)$(amarokicondir)/crystalsvg/64x64/actions/random.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_lyrics.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_lyrics.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_info.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_info.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_zoom.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_zoom.png $(INSTALL_DATA) $(srcdir)/hi16-action-collection.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/collection.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_settings_indicator.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_settings_indicator.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_queue.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_queue.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_undo.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_undo.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_playlist.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_save.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_save.png + $(INSTALL_DATA) $(srcdir)/cr64-action-podcast.png $(DESTDIR)$(amarokicondir)/crystalsvg/64x64/actions/podcast.png + $(INSTALL_DATA) $(srcdir)/cr22-action-amarok_podcast.png $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/amarok_podcast.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_playlist_clear.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_playlist_clear.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_random_track.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_random_track.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_add_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_add_playlist.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_remove_from_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_remove_from_playlist.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_dynamic.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_dynamic.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_download.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_download.png $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_lyrics.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_lyrics.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_love.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_love.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_back.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_back.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_files.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_files.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_burn.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_burn.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_next.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_next.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_random_no.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_random_no.png - $(INSTALL_DATA) $(srcdir)/cr16-action-wiki.png $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/wiki.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_covermanager.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_covermanager.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_editcopy.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_editcopy.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_mostplayed.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_mostplayed.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_stop.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_stop.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_settings_engine.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_settings_engine.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_podcast2.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_podcast2.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_settings_view.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_settings_view.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_settings_general.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_settings_general.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_remove_from_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_remove_from_playlist.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_collection.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_collection.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_track.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_track.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_search.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_search.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_play.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_play.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_search.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_search.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_favourite_genres.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_favourite_genres.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_favourite_genres.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_favourite_genres.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_visualizations.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_visualizations.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_podcast2.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_podcast2.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_magnatune.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_magnatune.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_artist.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_artist.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_repeat_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_repeat_playlist.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_love.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_love.png + $(INSTALL_DATA) $(srcdir)/cr22-action-random.png $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/random.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_repeat_track.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_repeat_track.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_scripts.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_scripts.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_play.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_play.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_save.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_save.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_queue.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_queue.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_equalizer.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_equalizer.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_visualizations.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_visualizations.png + $(INSTALL_DATA) $(srcdir)/hi64-action-collection.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/collection.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_podcast2.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_podcast2.png $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_settings_playback.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_settings_playback.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_artist.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_artist.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_editcopy.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_editcopy.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_random.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_random.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_burn.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_burn.png $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_favourite_genres.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_favourite_genres.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_download.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_download.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_artist.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_artist.png $(INSTALL_DATA) $(srcdir)/hi48-action-collection.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/collection.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_repeat_track.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_repeat_track.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_artist.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_artist.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_artist.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_artist.png - $(INSTALL_DATA) $(srcdir)/cr16-action-equalizer.png $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/equalizer.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_pause.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_pause.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_music.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_music.png - $(INSTALL_DATA) $(srcdir)/cr16-action-repeat_track.png $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/repeat_track.png - $(INSTALL_DATA) $(srcdir)/cr64-action-repeat_playlist.png $(DESTDIR)$(amarokicondir)/crystalsvg/64x64/actions/repeat_playlist.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_visualizations.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_visualizations.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_files2.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_files2.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_add_lyrics.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_add_lyrics.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_queue.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_queue.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_playlist_refresh.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_playlist_refresh.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_magnatune.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_magnatune.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_settings_general.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_settings_general.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_random_no.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_random_no.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_love.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_love.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_external.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_external.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_audioscrobbler.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_audioscrobbler.png $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_external.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_external.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_settings_view.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_settings_view.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_zoom.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_zoom.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_scripts.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_scripts.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_redo.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_redo.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_settings_indicator.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_settings_indicator.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_files.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_files.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_covermanager.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_covermanager.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_love.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_love.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_magnatune.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_magnatune.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_podcast2.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_podcast2.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_mostplayed.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_mostplayed.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_settings_engine.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_settings_engine.png $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_change_language.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_change_language.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_clock.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_clock.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_podcast.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_podcast.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_refresh.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_refresh.png - $(INSTALL_DATA) $(srcdir)/cr22-action-dynamic.png $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/dynamic.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_change_language.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_change_language.png - $(INSTALL_DATA) $(srcdir)/cr22-action-amarok_podcast.png $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/amarok_podcast.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_info.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_info.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_settings_view.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_settings_view.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_repeat_track.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_repeat_track.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_refresh.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_refresh.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_save.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_save.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_repeat_track.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_repeat_track.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_undo.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_undo.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_repeat_album.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_repeat_album.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_random_track.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_random_track.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_track.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_track.png - $(INSTALL_DATA) $(srcdir)/cr64-action-podcast.png $(DESTDIR)$(amarokicondir)/crystalsvg/64x64/actions/podcast.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_play.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_play.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_pause.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_pause.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_repeat_no.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_repeat_no.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_visualizations.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_visualizations.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_editcopy.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_editcopy.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_playlist.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_settings_indicator.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_settings_indicator.png $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_visualizations.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_visualizations.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_rewind.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_rewind.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_edit.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_edit.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_redo.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_redo.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_audioscrobbler.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_audioscrobbler.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_playlist.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_playlist.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_back.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_back.png - $(INSTALL_DATA) $(srcdir)/cr16-action-player_playlist_2.png $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/player_playlist_2.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_rescan.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_rescan.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_burn.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_burn.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_edit.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_edit.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_settings_engine.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_settings_engine.png + $(INSTALL_DATA) $(srcdir)/cr64-action-podcast_new.png $(DESTDIR)$(amarokicondir)/crystalsvg/64x64/actions/podcast_new.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_editcopy.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_editcopy.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_download.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_download.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_repeat_track.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_repeat_track.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_rewind.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_rewind.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_scripts.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_scripts.png + $(INSTALL_DATA) $(srcdir)/hi32-action-collection.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/collection.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_stop.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_stop.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_random_no.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_random_no.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_back.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_back.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_settings_engine.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_settings_engine.png $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_repeat_no.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_repeat_no.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_rescan.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_rescan.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_covermanager.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_covermanager.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_editcopy.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_editcopy.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_next.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_next.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_rescan.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_rescan.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_fastforward.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_fastforward.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_editcopy.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_editcopy.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_rescan.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_rescan.png - $(INSTALL_DATA) $(srcdir)/cr16-action-covermanager.png $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/covermanager.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_magnatune.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_magnatune.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_mostplayed.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_mostplayed.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_stop.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_stop.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_info.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_info.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_collection.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_collection.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_settings_general.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_settings_general.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_save.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_save.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_change_language.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_change_language.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_device.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_device.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_podcast.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_podcast.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_settings_view.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_settings_view.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_device.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_device.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_clock.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_clock.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_repeat_album.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_repeat_album.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_remove_from_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_remove_from_playlist.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_files.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_files.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_device.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_device.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_refresh.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_refresh.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_device.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_device.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_random_track.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_random_track.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_download.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_download.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_favourite_genres.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_favourite_genres.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_zoom.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_zoom.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_add_lyrics.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_add_lyrics.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_lyrics.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_lyrics.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_covermanager.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_covermanager.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_next.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_next.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_playlist_refresh.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_playlist_refresh.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_play.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_play.png $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_download.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_download.png - $(INSTALL_DATA) $(srcdir)/cr16-action-podcast.png $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/podcast.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_track.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_track.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_playlist_clear.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_playlist_clear.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_add_lyrics.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_add_lyrics.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_playlist_clear.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_playlist_clear.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_add_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_add_playlist.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_magnatune.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_magnatune.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_fastforward.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_fastforward.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_change_language.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_change_language.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_external.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_external.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_zoom.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_zoom.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_settings_indicator.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_settings_indicator.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_audioscrobbler.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_audioscrobbler.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_back.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_back.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_repeat_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_repeat_playlist.png - $(INSTALL_DATA) $(srcdir)/hi32-action-collection.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/collection.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_audioscrobbler.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_audioscrobbler.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_burn.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_burn.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_equalizer.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_equalizer.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_repeat_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_repeat_playlist.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_covermanager.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_covermanager.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_covermanager.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_covermanager.png - $(INSTALL_DATA) $(srcdir)/cr22-action-amarok_podcast_new.png $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/amarok_podcast_new.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_love.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_love.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_podcast2.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_podcast2.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_podcast2.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_podcast2.png - $(INSTALL_DATA) $(srcdir)/cr64-action-podcast_new.png $(DESTDIR)$(amarokicondir)/crystalsvg/64x64/actions/podcast_new.png - $(INSTALL_DATA) $(srcdir)/cr22-action-babelfish.png $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/babelfish.png $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_collection.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_collection.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_album.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_album.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_clock.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_clock.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_equalizer.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_equalizer.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_files.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_files.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_settings_general.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_settings_general.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_undo.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_undo.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_artist.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_artist.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_repeat_album.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_repeat_album.png - $(INSTALL_DATA) $(srcdir)/hi64-action-collection.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/collection.png - $(INSTALL_DATA) $(srcdir)/cr16-action-mini_dock.png $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/mini_dock.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_settings_playback.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_settings_playback.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_random_track.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_random_track.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_play.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_play.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_lyrics.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_lyrics.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_repeat_album.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_repeat_album.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_add_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_add_playlist.png $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_repeat_no.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_repeat_no.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_add_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_add_playlist.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_add_lyrics.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_add_lyrics.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_info.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_info.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_podcast.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_podcast.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_edit.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_edit.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_fastforward.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_fastforward.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_rewind.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_rewind.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_settings_playback.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_settings_playback.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_playlist_clear.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_playlist_clear.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_undo.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_undo.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_settings_general.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_settings_general.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_edit.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_edit.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_back.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_back.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_magnatune.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_magnatune.png $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_favourite_genres.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_favourite_genres.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_playlist_refresh.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_playlist_refresh.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_external.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_external.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_magnatune.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_magnatune.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_random.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_random.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_add_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_add_playlist.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_editcopy.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_editcopy.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_search.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_search.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_podcast.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_podcast.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_change_language.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_change_language.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_random_album.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_random_album.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_artist.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_artist.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_files.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_files.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_queue.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_queue.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_random.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_random.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_stop.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_stop.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_pause.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_pause.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_settings_view.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_settings_view.png + $(INSTALL_DATA) $(srcdir)/cr16-action-repeat_playlist.png $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/repeat_playlist.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_settings_playback.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_settings_playback.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_settings_engine.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_settings_engine.png + $(INSTALL_DATA) $(srcdir)/cr16-action-visualizations.png $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/visualizations.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_back.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_back.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_pause.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_pause.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_settings_general.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_settings_general.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_podcast2.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_podcast2.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_next.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_next.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_album.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_album.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_random.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_random.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_pause.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_pause.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_fastforward.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_fastforward.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_track.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_track.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_configure.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_configure.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_favourite_genres.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_favourite_genres.png + $(INSTALL_DATA) $(srcdir)/cr16-action-wiki.png $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/wiki.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_music.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_music.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_equalizer.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_equalizer.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_remove_from_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_remove_from_playlist.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_rescan.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_rescan.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_info.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_info.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_repeat_track.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_repeat_track.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_add_lyrics.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_add_lyrics.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_repeat_no.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_repeat_no.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_random_no.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_random_no.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_podcast.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_podcast.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_add_lyrics.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_add_lyrics.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_repeat_no.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_repeat_no.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_external.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_external.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_refresh.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_refresh.png + $(INSTALL_DATA) $(srcdir)/cr16-action-covermanager.png $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/covermanager.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_artist.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_artist.png + $(INSTALL_DATA) $(srcdir)/cr16-action-mini_dock.png $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/mini_dock.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_circle.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_circle.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_burn.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_burn.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_playlist_refresh.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_playlist_refresh.png + $(INSTALL_DATA) $(srcdir)/cr22-action-player_playlist_2.png $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/player_playlist_2.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_files.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_files.png $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_zoom.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_zoom.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_track.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_track.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_device.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_device.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_files.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_files.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_edit.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_edit.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_mostplayed.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_mostplayed.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_external.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_external.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_files2.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_files2.png + $(INSTALL_DATA) $(srcdir)/cr16-action-podcast_new.png $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/podcast_new.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_mostplayed.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_mostplayed.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_files2.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_files2.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_playlist_clear.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_playlist_clear.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_device.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_device.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_info.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_info.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_undo.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_undo.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_pause.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_pause.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_settings_view.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_settings_view.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_playlist_refresh.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_playlist_refresh.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_circle.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_circle.png + $(INSTALL_DATA) $(srcdir)/cr16-action-podcast.png $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/podcast.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_repeat_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_repeat_playlist.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_redo.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_redo.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_download.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_download.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_settings_indicator.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_settings_indicator.png uninstall-kde-icons: - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_edit.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_configure.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_fastforward.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_change_language.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_settings_indicator.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_redo.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_podcast.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_remove.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_remove.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_podcast.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_remove.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_love.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_remove.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_random_album.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_track.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_repeat_playlist.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_dynamic.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_refresh.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_refresh.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_remove_from_playlist.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_fastforward.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_add_playlist.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_dynamic.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_remove_from_playlist.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_rewind.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_playlist.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_settings_playback.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_next.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_music.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_configure.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_queue.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_mostplayed.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_dynamic.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_stop.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_info.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_audioscrobbler.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_redo.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_clock.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_change_language.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_repeat_playlist.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_settings_view.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_files2.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_zoom.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_settings_playback.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_repeat_album.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_settings_general.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_repeat_album.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_save.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_collection.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_repeat_playlist.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_remove_from_playlist.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_circle.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_random_track.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_rescan.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_covermanager.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_settings_view.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_random_no.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_playlist_refresh.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_circle.png - -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/64x64/actions/dynamic.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_album.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_repeat_track.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_music.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_remove.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_equalizer.png + -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/player_playlist_2.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_redo.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_rewind.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_random_track.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_play.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_circle.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_album.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_random_album.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_playlist.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_random_album.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_love.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_remove.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_save.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_back.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_next.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_artist.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_podcast.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_playlist_clear.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/audioscrobbler.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_settings_view.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_audioscrobbler.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_circle.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_favourite_genres.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_undo.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_add_playlist.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_random.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_random_no.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_random.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_add_lyrics.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_repeat_no.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_random.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_random.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_edit.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_clock.png - -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/visualizations.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_equalizer.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_settings_indicator.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_back.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_track.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_podcast.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_lyrics.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_playlist.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_lyrics.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_audioscrobbler.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_random_track.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_dynamic.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_collection.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_random_track.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_queue.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_save.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_clock.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_refresh.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_mostplayed.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_burn.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_equalizer.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_clock.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_files2.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_covermanager.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_download.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_repeat_playlist.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_track.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_settings_general.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_scripts.png + -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/64x64/actions/repeat_playlist.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_undo.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_stop.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_clock.png + -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/dynamic.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_burn.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_add_lyrics.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_search.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_editcopy.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_settings_engine.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_configure.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_save.png + -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/dynamic.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_repeat_album.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_clock.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_back.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_burn.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_rescan.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_lyrics.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_lyrics.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_random_no.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_pause.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_repeat_no.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_next.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_editcopy.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_dynamic.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_undo.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_settings_indicator.png + -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/repeat_playlist.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_files2.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_add_playlist.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_change_language.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_scripts.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_playlist.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_random.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_equalizer.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_remove_from_playlist.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_repeat_no.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_settings_indicator.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_mostplayed.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_next.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_podcast2.png + -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/64x64/actions/dynamic.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_rewind.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_random_track.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_edit.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_lyrics.png + -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/amarok_podcast_new.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_music.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_album.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_fastforward.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_queue.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_configure.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_collection.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_add_lyrics.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_scripts.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_collection.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_stop.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_podcast.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_play.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_redo.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_covermanager.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_podcast2.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_circle.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_playlist_clear.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_repeat_playlist.png + -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/repeat_track.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_search.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_mostplayed.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_music.png - -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/random.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_queue.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_stop.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_device.png - -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/64x64/actions/random.png - -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/dynamic.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_random_album.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_repeat_playlist.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_settings_general.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_search.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_love.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_zoom.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_album.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_fastforward.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_redo.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_remove.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_album.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_playlist_clear.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_search.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_add_playlist.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/collection.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_play.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_artist.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_next.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_rescan.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_device.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_files.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_settings_engine.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_visualizations.png + -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/equalizer.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_repeat_track.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_remove.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_random_album.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_refresh.png + -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/visualizations.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_rescan.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_dynamic.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_music.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_change_language.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_device.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_pause.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_track.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_configure.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_rescan.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_love.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_covermanager.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_repeat_album.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_repeat_album.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_info.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_playlist_refresh.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_play.png + -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/babelfish.png + -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/random.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_remove.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_files.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_audioscrobbler.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_collection.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_configure.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_external.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_device.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_search.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_magnatune.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_random_no.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_visualizations.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_random_album.png + -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/64x64/actions/random.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_lyrics.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_info.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_zoom.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/collection.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_settings_indicator.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_queue.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_undo.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_playlist.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_save.png + -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/64x64/actions/podcast.png + -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/amarok_podcast.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_playlist_clear.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_random_track.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_add_playlist.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_remove_from_playlist.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_add_playlist.png - -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/repeat_playlist.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_search.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_search.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_download.png - -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/repeat_playlist.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_dynamic.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_download.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_lyrics.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_search.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_favourite_genres.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_playlist_refresh.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_configure.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_external.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_files2.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_external.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_files2.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_zoom.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_redo.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_files2.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_visualizations.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_files2.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_clock.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_favourite_genres.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_visualizations.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_settings_playback.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_love.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_equalizer.png - -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/podcast_new.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_pause.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_podcast2.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_music.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_mostplayed.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_magnatune.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_artist.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_repeat_playlist.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_love.png + -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/random.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_repeat_track.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_scripts.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_queue.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_info.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_collection.png - -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/visualizations.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_save.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_equalizer.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_random_album.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_playlist_clear.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_play.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_playlist_clear.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_undo.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_random_no.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_repeat_track.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_add_lyrics.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_dynamic.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_save.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_queue.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_equalizer.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_visualizations.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/collection.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_podcast2.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_settings_playback.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_editcopy.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_random.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_burn.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_favourite_genres.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/collection.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_magnatune.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_settings_general.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_random_no.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_love.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_external.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_audioscrobbler.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_external.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_change_language.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_editcopy.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_playlist.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_settings_indicator.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_visualizations.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_edit.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_settings_engine.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_playlist_refresh.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_fastforward.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_configure.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_rewind.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_dynamic.png + -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/64x64/actions/podcast_new.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_editcopy.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_download.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_repeat_track.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_rewind.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_edit.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_settings_engine.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_settings_indicator.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_remove.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_rewind.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_refresh.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_rewind.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_back.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_redo.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_files.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_album.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_audioscrobbler.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_audioscrobbler.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_burn.png - -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/player_playlist_2.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_playlist.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_settings_playback.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_pause.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_configure.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_next.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_fastforward.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_magnatune.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_editcopy.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_stop.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_random_album.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_random_album.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/collection.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_circle.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_info.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_undo.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/audioscrobbler.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_save.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_repeat_track.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_remove_from_playlist.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_download.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_magnatune.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_random.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_playlist_refresh.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_music.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_random_no.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_zoom.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_edit.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_scripts.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_queue.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_dynamic.png - -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/random.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_settings_view.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_settings_engine.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_scripts.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_album.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_refresh.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_playlist.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/collection.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_lyrics.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_love.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_back.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_files.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_burn.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_next.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_random_no.png - -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/wiki.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_covermanager.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_editcopy.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_mostplayed.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/collection.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_stop.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_random_no.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_back.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_settings_engine.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_podcast2.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_settings_view.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_settings_general.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_remove_from_playlist.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_collection.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_track.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_search.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_play.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_settings_playback.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_repeat_no.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_zoom.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_add_lyrics.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_lyrics.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_covermanager.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_next.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_playlist_refresh.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_play.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_download.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_collection.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_lyrics.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_repeat_album.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_add_playlist.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_repeat_no.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_info.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_podcast.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_edit.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_fastforward.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_rewind.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_settings_playback.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_playlist_clear.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_undo.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_settings_general.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_edit.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_back.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_magnatune.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_favourite_genres.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_magnatune.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_random.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_add_playlist.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_editcopy.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_search.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_podcast.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_change_language.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_random_album.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_artist.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_favourite_genres.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_download.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_artist.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/collection.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_repeat_track.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_artist.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_artist.png - -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/equalizer.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_pause.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_music.png - -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/repeat_track.png - -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/64x64/actions/repeat_playlist.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_visualizations.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_files2.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_add_lyrics.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_queue.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_playlist_refresh.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_external.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_files.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_queue.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_random.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_stop.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_pause.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_settings_view.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_zoom.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_scripts.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_redo.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_settings_indicator.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_files.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_covermanager.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_love.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_magnatune.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_podcast2.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_mostplayed.png + -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/repeat_playlist.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_settings_playback.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_settings_engine.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_change_language.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_clock.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_podcast.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_refresh.png - -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/dynamic.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_change_language.png - -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/amarok_podcast.png + -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/visualizations.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_back.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_pause.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_settings_general.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_podcast2.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_next.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_album.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_random.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_pause.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_fastforward.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_track.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_configure.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_favourite_genres.png + -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/wiki.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_music.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_equalizer.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_remove_from_playlist.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_rescan.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_info.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_settings_view.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_repeat_track.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_refresh.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_save.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_repeat_track.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_undo.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_repeat_album.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_random_track.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_track.png - -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/64x64/actions/podcast.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_play.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_pause.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_repeat_track.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_add_lyrics.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_repeat_no.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_visualizations.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_visualizations.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_rewind.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_edit.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_redo.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_audioscrobbler.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_playlist.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_playlist.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_back.png - -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/player_playlist_2.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_rescan.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_burn.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_repeat_no.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_rescan.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_covermanager.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_editcopy.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_next.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_rescan.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_fastforward.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_editcopy.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_rescan.png - -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/covermanager.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_magnatune.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_mostplayed.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_stop.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_info.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_collection.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_settings_general.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_save.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_change_language.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_device.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_podcast.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_settings_view.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_device.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_clock.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_repeat_album.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_remove_from_playlist.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_files.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_device.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_random_no.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_podcast.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_add_lyrics.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_repeat_no.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_external.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_refresh.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_device.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_random_track.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_download.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_favourite_genres.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_download.png - -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/podcast.png + -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/covermanager.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_artist.png + -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/mini_dock.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_circle.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_burn.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_playlist_refresh.png + -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/player_playlist_2.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_files.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_zoom.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_track.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_playlist_clear.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_add_lyrics.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_playlist_clear.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_add_playlist.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_magnatune.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_fastforward.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_change_language.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_device.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_files.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_edit.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_mostplayed.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_external.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_zoom.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_settings_indicator.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_audioscrobbler.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_back.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_repeat_playlist.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/collection.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_audioscrobbler.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_burn.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_equalizer.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_repeat_playlist.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_covermanager.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_covermanager.png - -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/amarok_podcast_new.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_love.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_podcast2.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_podcast2.png - -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/64x64/actions/podcast_new.png - -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/babelfish.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_collection.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_album.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_clock.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_equalizer.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_files.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_settings_general.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_undo.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_artist.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_repeat_album.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/collection.png - -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/mini_dock.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_settings_playback.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_random_track.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_play.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_repeat_no.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_add_playlist.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_add_lyrics.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_favourite_genres.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_files2.png + -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/podcast_new.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_mostplayed.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_files2.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_playlist_clear.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_device.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_info.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_undo.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_pause.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_settings_view.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_playlist_refresh.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_external.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_zoom.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_circle.png + -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/podcast.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_repeat_playlist.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_redo.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_download.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_settings_indicator.png #>+ 15 force-reedit: @@ -1287,9 +1292,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/images/icons/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/images/icons/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/images/icons/Makefile + $(AUTOMAKE) --foreign amarok/src/images/icons/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/images/icons/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/analyzers/Makefile.in +++ amarok-1.4.9.1/amarok/src/analyzers/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -57,7 +57,7 @@ glanalyzer3.lo sonogram.lo turbine.lo boomanalyzer.lo @KDE_USE_FINAL_FALSE@libanalyzers_la_OBJECTS = $(libanalyzers_la_nofinal_OBJECTS) @KDE_USE_FINAL_TRUE@libanalyzers_la_OBJECTS = $(libanalyzers_la_final_OBJECTS) -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -123,6 +123,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -217,6 +218,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -226,6 +228,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -236,6 +239,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -257,6 +261,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -413,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*) \ @@ -422,9 +427,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/analyzers/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/analyzers/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/analyzers/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/analyzers/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +439,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/analyzers/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/analyzers/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/analyzers/Makefile + $(AUTOMAKE) --foreign amarok/src/analyzers/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/analyzers/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,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 clean-noinstLTLIBRARIES: @@ -516,8 +521,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -529,8 +534,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -540,13 +545,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -730,9 +734,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/analyzers/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/analyzers/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/analyzers/Makefile + $(AUTOMAKE) --foreign amarok/src/analyzers/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/analyzers/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/konquisidebar/Makefile.in +++ amarok-1.4.9.1/amarok/src/konquisidebar/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -61,7 +61,8 @@ LTLIBRARIES = $(kde_module_LTLIBRARIES) am__DEPENDENCIES_1 = konqsidebar_universalamarok_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) am_konqsidebar_universalamarok_la_OBJECTS = universalamarok.lo #>- konqsidebar_universalamarok_la_OBJECTS = \ #>- $(am_konqsidebar_universalamarok_la_OBJECTS) @@ -79,7 +80,7 @@ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(konqsidebar_universalamarok_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -151,6 +152,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -245,6 +247,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -254,6 +257,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -264,6 +268,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -285,6 +290,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -415,7 +421,7 @@ #>+ 1 konqsidebar_universalamarok_la_SOURCES=universalamarok.cpp amarokdcopiface_stub.cpp konqsidebar_universalamarok_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkonqsidebarplugin -konqsidebar_universalamarok_la_LIBADD = $(LIB_KHTML) $(LIB_KPARTS) $(LIB_KFILE) +konqsidebar_universalamarok_la_LIBADD = $(LIB_KHTML) $(LIB_QT) $(LIB_KDECORE) -lDCOP $(LIB_KDEUI) amarokdcopiface_DIR = $(top_srcdir)/amarok/src/amarokcore universalamarok_add_DATA = amarok.desktop universalamarok_adddir = $(kde_datadir)/konqsidebartng/add @@ -430,7 +436,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 +445,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/konquisidebar/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/konquisidebar/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/konquisidebar/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/konquisidebar/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -451,9 +457,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/konquisidebar/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/konquisidebar/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/konquisidebar/Makefile + $(AUTOMAKE) --foreign amarok/src/konquisidebar/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/konquisidebar/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -468,9 +474,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) @@ -478,8 +484,8 @@ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ - $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ else :; fi; \ done @@ -487,8 +493,8 @@ @$(NORMAL_UNINSTALL) @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ done clean-kde_moduleLTLIBRARIES: @@ -593,8 +599,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -606,8 +612,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -617,13 +623,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -834,9 +839,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/konquisidebar/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/konquisidebar/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/konquisidebar/Makefile + $(AUTOMAKE) --foreign amarok/src/konquisidebar/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/konquisidebar/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/loader/Makefile.in +++ amarok-1.4.9.1/amarok/src/loader/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -61,7 +61,7 @@ amarok_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(amarok_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -127,6 +127,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -221,6 +222,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -230,6 +232,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -240,6 +243,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -261,6 +265,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -402,7 +407,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*) \ @@ -411,9 +416,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/loader/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/loader/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/loader/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/loader/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -423,9 +428,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/loader/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/loader/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/loader/Makefile + $(AUTOMAKE) --foreign amarok/src/loader/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/loader/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -440,9 +445,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) @@ -453,8 +458,8 @@ || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -516,8 +521,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -529,8 +534,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -540,13 +545,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -714,9 +718,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/loader/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/loader/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/loader/Makefile + $(AUTOMAKE) --foreign amarok/src/loader/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/loader/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/themes/Makefile.in +++ amarok-1.4.9.1/amarok/src/themes/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -104,6 +104,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -198,6 +199,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -207,6 +209,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -217,6 +220,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -238,6 +242,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -367,7 +372,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 +381,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/themes/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/themes/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/themes/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/themes/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -388,9 +393,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/themes/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/themes/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/themes/Makefile + $(AUTOMAKE) --foreign amarok/src/themes/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/themes/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -405,9 +410,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: @@ -491,8 +496,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -517,8 +522,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -528,13 +533,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -714,9 +718,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/themes/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/themes/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/themes/Makefile + $(AUTOMAKE) --foreign amarok/src/themes/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/themes/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/themes/reinhardt/Makefile.in +++ amarok-1.4.9.1/amarok/src/themes/reinhardt/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -114,6 +114,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -208,6 +209,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -217,6 +219,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -227,6 +230,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -248,6 +252,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -379,7 +384,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*) \ @@ -388,9 +393,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/themes/reinhardt/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/themes/reinhardt/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/themes/reinhardt/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/themes/reinhardt/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -400,9 +405,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/themes/reinhardt/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/themes/reinhardt/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/themes/reinhardt/Makefile + $(AUTOMAKE) --foreign amarok/src/themes/reinhardt/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/themes/reinhardt/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -417,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 mostlyclean-libtool: @@ -520,8 +525,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -546,8 +551,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -557,13 +562,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -747,9 +751,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/themes/reinhardt/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/themes/reinhardt/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/themes/reinhardt/Makefile + $(AUTOMAKE) --foreign amarok/src/themes/reinhardt/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/themes/reinhardt/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/themes/reinhardt/images/Makefile.in +++ amarok-1.4.9.1/amarok/src/themes/reinhardt/images/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -94,6 +94,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -188,6 +189,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -197,6 +199,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -207,6 +210,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -228,6 +232,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -358,7 +363,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 +372,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/themes/reinhardt/images/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/themes/reinhardt/images/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/themes/reinhardt/images/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/themes/reinhardt/images/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -379,9 +384,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/themes/reinhardt/images/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/themes/reinhardt/images/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/themes/reinhardt/images/Makefile + $(AUTOMAKE) --foreign amarok/src/themes/reinhardt/images/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/themes/reinhardt/images/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -396,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 mostlyclean-libtool: @@ -580,9 +585,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/themes/reinhardt/images/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/themes/reinhardt/images/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/themes/reinhardt/images/Makefile + $(AUTOMAKE) --foreign amarok/src/themes/reinhardt/images/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/themes/reinhardt/images/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/themes/example/Makefile.in +++ amarok-1.4.9.1/amarok/src/themes/example/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -94,6 +94,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -188,6 +189,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -197,6 +199,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -207,6 +210,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -228,6 +232,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -358,7 +363,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 +372,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/themes/example/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/themes/example/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/themes/example/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/themes/example/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -379,9 +384,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/themes/example/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/themes/example/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/themes/example/Makefile + $(AUTOMAKE) --foreign amarok/src/themes/example/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/themes/example/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -396,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 mostlyclean-libtool: @@ -579,9 +584,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/themes/example/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/themes/example/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/themes/example/Makefile + $(AUTOMAKE) --foreign amarok/src/themes/example/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/themes/example/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/device/Makefile.in +++ amarok-1.4.9.1/amarok/src/device/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -104,6 +104,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -198,6 +199,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -207,6 +209,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -217,6 +220,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -238,6 +242,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -368,7 +373,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*) \ @@ -377,9 +382,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/device/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/device/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/device/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/device/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -389,9 +394,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/device/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/device/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/device/Makefile + $(AUTOMAKE) --foreign amarok/src/device/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/device/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -406,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 mostlyclean-libtool: @@ -492,8 +497,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -518,8 +523,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -529,13 +534,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -715,9 +719,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/device/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/device/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/device/Makefile + $(AUTOMAKE) --foreign amarok/src/device/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/device/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/device/massstorage/Makefile.in +++ amarok-1.4.9.1/amarok/src/device/massstorage/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -57,8 +57,10 @@ "$(DESTDIR)$(kde_servicesdir)" kde_moduleLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(kde_module_LTLIBRARIES) +am__DEPENDENCIES_1 = libamarok_massstorage_device_la_DEPENDENCIES = \ - $(top_builddir)/amarok/src/libamarok.la + $(top_builddir)/amarok/src/libamarok.la $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) am_libamarok_massstorage_device_la_OBJECTS = \ massstoragedevicehandler.lo #>- libamarok_massstorage_device_la_OBJECTS = \ @@ -74,7 +76,7 @@ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(libamarok_massstorage_device_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -143,6 +145,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -237,6 +240,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -246,6 +250,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -256,6 +261,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -277,6 +283,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -414,7 +421,7 @@ #>- METASOURCES = AUTO libamarok_massstorage_device_la_LIBADD = \ $(top_builddir)/amarok/src/libamarok.la \ - -lkdecore + $(LIB_KDECORE) $(LIB_QT) libamarok_massstorage_device_la_LDFLAGS = \ $(KDE_PLUGIN) \ @@ -432,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*) \ @@ -441,9 +448,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/device/massstorage/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/device/massstorage/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/device/massstorage/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/device/massstorage/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -453,9 +460,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/device/massstorage/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/device/massstorage/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/device/massstorage/Makefile + $(AUTOMAKE) --foreign amarok/src/device/massstorage/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/device/massstorage/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -470,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-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) @@ -480,8 +487,8 @@ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ - $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ else :; fi; \ done @@ -489,8 +496,8 @@ @$(NORMAL_UNINSTALL) @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ done clean-kde_moduleLTLIBRARIES: @@ -561,8 +568,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -574,8 +581,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -585,13 +592,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -770,9 +776,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/device/massstorage/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/device/massstorage/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/device/massstorage/Makefile + $(AUTOMAKE) --foreign amarok/src/device/massstorage/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/device/massstorage/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/device/nfs/Makefile.in +++ amarok-1.4.9.1/amarok/src/device/nfs/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -57,8 +57,10 @@ "$(DESTDIR)$(kde_servicesdir)" kde_moduleLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(kde_module_LTLIBRARIES) +am__DEPENDENCIES_1 = libamarok_nfs_device_la_DEPENDENCIES = \ - $(top_builddir)/amarok/src/libamarok.la + $(top_builddir)/amarok/src/libamarok.la $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) am_libamarok_nfs_device_la_OBJECTS = nfsdevicehandler.lo #>- libamarok_nfs_device_la_OBJECTS = \ #>- $(am_libamarok_nfs_device_la_OBJECTS) @@ -73,7 +75,7 @@ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(KDE_CXXFLAGS) $(libamarok_nfs_device_la_LDFLAGS) $(LDFLAGS) -o \ $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -142,6 +144,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -236,6 +239,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -245,6 +249,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -255,6 +260,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -276,6 +282,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -413,7 +420,7 @@ #>- METASOURCES = AUTO libamarok_nfs_device_la_LIBADD = \ $(top_builddir)/amarok/src/libamarok.la \ - -lkdecore + $(LIB_KDECORE) $(LIB_QT) libamarok_nfs_device_la_LDFLAGS = \ $(KDE_PLUGIN) \ @@ -427,7 +434,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 +443,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/device/nfs/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/device/nfs/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/device/nfs/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/device/nfs/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -448,9 +455,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/device/nfs/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/device/nfs/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/device/nfs/Makefile + $(AUTOMAKE) --foreign amarok/src/device/nfs/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/device/nfs/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -465,9 +472,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) @@ -475,8 +482,8 @@ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ - $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ else :; fi; \ done @@ -484,8 +491,8 @@ @$(NORMAL_UNINSTALL) @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ done clean-kde_moduleLTLIBRARIES: @@ -556,8 +563,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -569,8 +576,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -580,13 +587,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -765,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/device/nfs/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/device/nfs/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/device/nfs/Makefile + $(AUTOMAKE) --foreign amarok/src/device/nfs/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/device/nfs/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/device/smb/Makefile.in +++ amarok-1.4.9.1/amarok/src/device/smb/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -57,8 +57,10 @@ "$(DESTDIR)$(kde_servicesdir)" kde_moduleLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(kde_module_LTLIBRARIES) +am__DEPENDENCIES_1 = libamarok_smb_device_la_DEPENDENCIES = \ - $(top_builddir)/amarok/src/libamarok.la + $(top_builddir)/amarok/src/libamarok.la $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) am_libamarok_smb_device_la_OBJECTS = smbdevicehandler.lo #>- libamarok_smb_device_la_OBJECTS = \ #>- $(am_libamarok_smb_device_la_OBJECTS) @@ -73,7 +75,7 @@ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(KDE_CXXFLAGS) $(libamarok_smb_device_la_LDFLAGS) $(LDFLAGS) -o \ $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -142,6 +144,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -236,6 +239,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -245,6 +249,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -255,6 +260,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -276,6 +282,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -413,7 +420,7 @@ #>- METASOURCES = AUTO libamarok_smb_device_la_LIBADD = \ $(top_builddir)/amarok/src/libamarok.la \ - -lkdecore + $(LIB_KDECORE) $(LIB_QT) libamarok_smb_device_la_LDFLAGS = \ $(KDE_PLUGIN) \ @@ -427,7 +434,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 +443,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/device/smb/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/device/smb/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/device/smb/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/device/smb/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -448,9 +455,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/device/smb/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/device/smb/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/device/smb/Makefile + $(AUTOMAKE) --foreign amarok/src/device/smb/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/device/smb/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -465,9 +472,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) @@ -475,8 +482,8 @@ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ - $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ else :; fi; \ done @@ -484,8 +491,8 @@ @$(NORMAL_UNINSTALL) @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ done clean-kde_moduleLTLIBRARIES: @@ -556,8 +563,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -569,8 +576,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -580,13 +587,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -765,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/device/smb/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/device/smb/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/device/smb/Makefile + $(AUTOMAKE) --foreign amarok/src/device/smb/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/device/smb/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/engine/Makefile.in +++ amarok-1.4.9.1/amarok/src/engine/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -108,6 +108,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -202,6 +203,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -211,6 +213,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -221,6 +224,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -242,6 +246,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -381,7 +386,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*) \ @@ -390,9 +395,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/engine/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/engine/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -402,9 +407,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/engine/Makefile + $(AUTOMAKE) --foreign amarok/src/engine/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/engine/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -419,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 mostlyclean-libtool: @@ -505,8 +510,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -531,8 +536,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -542,13 +547,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -728,9 +732,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/engine/Makefile + $(AUTOMAKE) --foreign amarok/src/engine/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/engine/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/engine/kdemm/Makefile.in +++ amarok-1.4.9.1/amarok/src/engine/kdemm/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -75,7 +75,7 @@ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(libamarok_kdemmengine_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -143,6 +143,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -237,6 +238,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -246,6 +248,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -256,6 +259,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -277,6 +281,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -430,7 +435,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 +444,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/kdemm/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/kdemm/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/engine/kdemm/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/engine/kdemm/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -451,9 +456,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/kdemm/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/kdemm/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/engine/kdemm/Makefile + $(AUTOMAKE) --foreign amarok/src/engine/kdemm/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/engine/kdemm/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -468,9 +473,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) @@ -478,8 +483,8 @@ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ - $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ else :; fi; \ done @@ -487,8 +492,8 @@ @$(NORMAL_UNINSTALL) @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ done clean-kde_moduleLTLIBRARIES: @@ -559,8 +564,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -572,8 +577,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -583,13 +588,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -779,9 +783,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/kdemm/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/kdemm/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/engine/kdemm/Makefile + $(AUTOMAKE) --foreign amarok/src/engine/kdemm/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/engine/kdemm/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/engine/void/Makefile.in +++ amarok-1.4.9.1/amarok/src/engine/void/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -59,7 +59,7 @@ libamarok_void_engine_plugin_la_DEPENDENCIES = \ $(top_builddir)/amarok/src/libamarok.la \ $(top_builddir)/amarok/src/plugin/libplugin.la \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_libamarok_void_engine_plugin_la_OBJECTS = void-engine.lo #>- libamarok_void_engine_plugin_la_OBJECTS = \ #>- $(am_libamarok_void_engine_plugin_la_OBJECTS) @@ -74,7 +74,7 @@ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(libamarok_void_engine_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -142,6 +142,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -236,6 +237,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -245,6 +247,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -255,6 +258,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -276,6 +280,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -410,7 +415,7 @@ libamarok_void_engine_plugin_la_LIBADD = \ $(top_builddir)/amarok/src/libamarok.la \ $(top_builddir)/amarok/src/plugin/libplugin.la \ - $(LIB_KDECORE) + $(LIB_KDECORE) $(LIB_QT) libamarok_void_engine_plugin_la_SOURCES = \ void-engine.cpp @@ -431,7 +436,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 +445,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/void/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/void/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/engine/void/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/engine/void/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -452,9 +457,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/void/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/void/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/engine/void/Makefile + $(AUTOMAKE) --foreign amarok/src/engine/void/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/engine/void/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -469,9 +474,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) @@ -479,8 +484,8 @@ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ - $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ else :; fi; \ done @@ -488,8 +493,8 @@ @$(NORMAL_UNINSTALL) @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ done clean-kde_moduleLTLIBRARIES: @@ -560,8 +565,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -573,8 +578,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -584,13 +589,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -769,9 +773,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/void/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/void/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/engine/void/Makefile + $(AUTOMAKE) --foreign amarok/src/engine/void/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/engine/void/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/engine/akode/Makefile.in +++ amarok-1.4.9.1/amarok/src/engine/akode/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -75,7 +75,7 @@ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(libamarok_aKode_engine_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -143,6 +143,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -237,6 +238,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -246,6 +248,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -256,6 +259,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -277,6 +281,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -418,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*) \ @@ -427,9 +432,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/akode/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/akode/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/engine/akode/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/engine/akode/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -439,9 +444,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/akode/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/akode/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/engine/akode/Makefile + $(AUTOMAKE) --foreign amarok/src/engine/akode/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/engine/akode/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -456,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) @@ -466,8 +471,8 @@ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ - $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ else :; fi; \ done @@ -475,8 +480,8 @@ @$(NORMAL_UNINSTALL) @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ done clean-kde_moduleLTLIBRARIES: @@ -548,8 +553,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -561,8 +566,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -572,13 +577,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -757,9 +761,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/akode/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/akode/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/engine/akode/Makefile + $(AUTOMAKE) --foreign amarok/src/engine/akode/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/engine/akode/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/engine/mas/Makefile.in +++ amarok-1.4.9.1/amarok/src/engine/mas/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -75,7 +75,7 @@ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(libamarok_masengine_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -143,6 +143,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -237,6 +238,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -246,6 +248,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -256,6 +259,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -277,6 +281,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -430,7 +435,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 +444,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/mas/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/mas/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/engine/mas/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/engine/mas/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -451,9 +456,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/mas/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/mas/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/engine/mas/Makefile + $(AUTOMAKE) --foreign amarok/src/engine/mas/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/engine/mas/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -468,9 +473,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) @@ -478,8 +483,8 @@ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ - $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ else :; fi; \ done @@ -487,8 +492,8 @@ @$(NORMAL_UNINSTALL) @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ done clean-kde_moduleLTLIBRARIES: @@ -559,8 +564,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -572,8 +577,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -583,13 +588,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -779,9 +783,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/mas/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/mas/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/engine/mas/Makefile + $(AUTOMAKE) --foreign amarok/src/engine/mas/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/engine/mas/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/engine/helix/Makefile.in +++ amarok-1.4.9.1/amarok/src/engine/helix/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -78,7 +78,7 @@ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(libamarok_helixengine_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -164,6 +164,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -258,6 +259,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -267,6 +269,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -277,6 +280,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -298,6 +302,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -470,7 +475,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 +484,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/helix/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/helix/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/engine/helix/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/engine/helix/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -491,9 +496,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/helix/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/helix/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/engine/helix/Makefile + $(AUTOMAKE) --foreign amarok/src/engine/helix/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/engine/helix/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -508,9 +513,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) @@ -518,8 +523,8 @@ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ - $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ else :; fi; \ done @@ -527,8 +532,8 @@ @$(NORMAL_UNINSTALL) @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ done clean-kde_moduleLTLIBRARIES: @@ -672,8 +677,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -698,8 +703,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -709,13 +714,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -932,9 +936,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/helix/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/helix/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/engine/helix/Makefile + $(AUTOMAKE) --foreign amarok/src/engine/helix/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/engine/helix/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/engine/helix/helix-sp/Makefile.in +++ amarok-1.4.9.1/amarok/src/engine/helix/helix-sp/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -54,7 +54,7 @@ libhelix_sp_la_OBJECTS = hspcontext.lo hspadvisesink.lo hsperror.lo \ hspauthmgr.lo hsphook.lo iids.lo utils.lo gain.lo \ hspalsadevice.lo helix-sp.lo -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -120,6 +120,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -214,6 +215,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -223,6 +225,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -233,6 +236,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -254,6 +258,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -420,7 +425,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*) \ @@ -429,9 +434,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/helix/helix-sp/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/helix/helix-sp/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/engine/helix/helix-sp/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/engine/helix/helix-sp/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -441,9 +446,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/helix/helix-sp/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/helix/helix-sp/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/engine/helix/helix-sp/Makefile + $(AUTOMAKE) --foreign amarok/src/engine/helix/helix-sp/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/engine/helix/helix-sp/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -458,9 +463,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: @@ -523,8 +528,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -536,8 +541,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -547,13 +552,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -719,9 +723,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/helix/helix-sp/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/helix/helix-sp/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/engine/helix/helix-sp/Makefile + $(AUTOMAKE) --foreign amarok/src/engine/helix/helix-sp/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/engine/helix/helix-sp/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/engine/helix/config/Makefile.in +++ amarok-1.4.9.1/amarok/src/engine/helix/config/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -54,7 +54,7 @@ libhelixconfig_la_nofinal_OBJECTS = dummy.lo helixconfig.lo @KDE_USE_FINAL_FALSE@libhelixconfig_la_OBJECTS = $(libhelixconfig_la_nofinal_OBJECTS) @KDE_USE_FINAL_TRUE@libhelixconfig_la_OBJECTS = $(libhelixconfig_la_final_OBJECTS) -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -129,6 +129,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -223,6 +224,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -232,6 +234,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -242,6 +245,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -263,6 +267,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -409,7 +414,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 +423,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/helix/config/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/helix/config/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/engine/helix/config/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/engine/helix/config/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -430,9 +435,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/helix/config/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/helix/config/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/engine/helix/config/Makefile + $(AUTOMAKE) --foreign amarok/src/engine/helix/config/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/engine/helix/config/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -447,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 clean-noinstLTLIBRARIES: @@ -520,8 +525,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -533,8 +538,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -544,13 +549,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -725,9 +729,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/helix/config/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/helix/config/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/engine/helix/config/Makefile + $(AUTOMAKE) --foreign amarok/src/engine/helix/config/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/engine/helix/config/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/engine/xine/Makefile.in +++ amarok-1.4.9.1/amarok/src/engine/xine/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -59,7 +59,7 @@ libamarok_xine_engine_la_DEPENDENCIES = \ $(top_builddir)/amarok/src/libamarok.la \ $(top_builddir)/amarok/src/plugin/libplugin.la \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_libamarok_xine_engine_la_OBJECTS = xine-scope.lo xine-engine.lo \ xine-config.lo #>- libamarok_xine_engine_la_OBJECTS = \ @@ -79,7 +79,7 @@ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(libamarok_xine_engine_la_LDFLAGS) \ $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -157,6 +157,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -251,6 +252,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -260,6 +262,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -270,6 +273,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -291,6 +295,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -427,7 +432,7 @@ $(top_builddir)/amarok/src/libamarok.la \ $(top_builddir)/amarok/src/plugin/libplugin.la \ -lkdeui -lkdecore \ - $(XINE_LIBS) + $(XINE_LIBS) $(LIB_QT) #>- libamarok_xine_engine_la_SOURCES = \ #>- xine-scope.c \ @@ -457,7 +462,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*) \ @@ -466,9 +471,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/xine/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/xine/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/engine/xine/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/engine/xine/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -478,9 +483,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/xine/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/xine/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/engine/xine/Makefile + $(AUTOMAKE) --foreign amarok/src/engine/xine/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/engine/xine/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -495,9 +500,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) @@ -505,8 +510,8 @@ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ - $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ else :; fi; \ done @@ -514,8 +519,8 @@ @$(NORMAL_UNINSTALL) @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ done clean-kde_moduleLTLIBRARIES: @@ -626,8 +631,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -639,8 +644,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -650,13 +655,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -863,9 +867,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/xine/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/xine/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/engine/xine/Makefile + $(AUTOMAKE) --foreign amarok/src/engine/xine/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/engine/xine/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/engine/nmm/Makefile.in +++ amarok-1.4.9.1/amarok/src/engine/nmm/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -82,7 +82,7 @@ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(libamarok_nmmengine_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -170,6 +170,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -264,6 +265,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -273,6 +275,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -283,6 +286,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -304,6 +308,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -488,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*) \ @@ -497,9 +502,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/nmm/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/nmm/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/engine/nmm/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/engine/nmm/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -509,9 +514,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/nmm/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/nmm/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/engine/nmm/Makefile + $(AUTOMAKE) --foreign amarok/src/engine/nmm/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/engine/nmm/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -526,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-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) @@ -536,8 +541,8 @@ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ - $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ else :; fi; \ done @@ -545,8 +550,8 @@ @$(NORMAL_UNINSTALL) @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ done clean-kde_moduleLTLIBRARIES: @@ -726,8 +731,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -752,8 +757,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -763,13 +768,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -1012,9 +1016,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/nmm/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/nmm/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/engine/nmm/Makefile + $(AUTOMAKE) --foreign amarok/src/engine/nmm/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/engine/nmm/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/engine/nmm/icons/Makefile.in +++ amarok-1.4.9.1/amarok/src/engine/nmm/icons/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -84,6 +84,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -178,6 +179,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -187,6 +189,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -197,6 +200,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -218,6 +222,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -348,7 +353,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*) \ @@ -357,9 +362,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/nmm/icons/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/nmm/icons/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/engine/nmm/icons/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/engine/nmm/icons/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -369,9 +374,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/nmm/icons/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/nmm/icons/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/engine/nmm/icons/Makefile + $(AUTOMAKE) --foreign amarok/src/engine/nmm/icons/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/engine/nmm/icons/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -386,9 +391,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: @@ -545,13 +550,13 @@ #>+ 11 install-kde-icons: $(mkinstalldirs) $(DESTDIR)$(nmmicondir)/hicolor/16x16/actions - $(INSTALL_DATA) $(srcdir)/hi16-action-nmm_option_on_readonly.png $(DESTDIR)$(nmmicondir)/hicolor/16x16/actions/nmm_option_on_readonly.png $(INSTALL_DATA) $(srcdir)/hi16-action-nmm_option_off.png $(DESTDIR)$(nmmicondir)/hicolor/16x16/actions/nmm_option_off.png + $(INSTALL_DATA) $(srcdir)/hi16-action-nmm_option_on_readonly.png $(DESTDIR)$(nmmicondir)/hicolor/16x16/actions/nmm_option_on_readonly.png $(INSTALL_DATA) $(srcdir)/hi16-action-nmm_option_on.png $(DESTDIR)$(nmmicondir)/hicolor/16x16/actions/nmm_option_on.png uninstall-kde-icons: - -rm -f $(DESTDIR)$(nmmicondir)/hicolor/16x16/actions/nmm_option_on_readonly.png -rm -f $(DESTDIR)$(nmmicondir)/hicolor/16x16/actions/nmm_option_off.png + -rm -f $(DESTDIR)$(nmmicondir)/hicolor/16x16/actions/nmm_option_on_readonly.png -rm -f $(DESTDIR)$(nmmicondir)/hicolor/16x16/actions/nmm_option_on.png #>+ 15 @@ -564,9 +569,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/nmm/icons/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/nmm/icons/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/engine/nmm/icons/Makefile + $(AUTOMAKE) --foreign amarok/src/engine/nmm/icons/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/engine/nmm/icons/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/engine/yauap/Makefile.in +++ amarok-1.4.9.1/amarok/src/engine/yauap/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -59,7 +59,8 @@ libamarok_yauap_engine_plugin_la_DEPENDENCIES = \ $(top_builddir)/amarok/src/libamarok.la \ $(top_builddir)/amarok/src/plugin/libplugin.la \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) am_libamarok_yauap_engine_plugin_la_OBJECTS = yauap-engine.lo #>- libamarok_yauap_engine_plugin_la_OBJECTS = \ #>- $(am_libamarok_yauap_engine_plugin_la_OBJECTS) @@ -74,7 +75,7 @@ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(libamarok_yauap_engine_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -142,6 +143,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -236,6 +238,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -245,6 +248,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -255,6 +259,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -276,6 +281,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -412,7 +418,7 @@ $(top_builddir)/amarok/src/libamarok.la \ $(top_builddir)/amarok/src/plugin/libplugin.la \ $(LIB_YAUAP)\ - $(LIB_KDECORE) + $(LIB_KDECORE) $(LIB_QT) libamarok_yauap_engine_plugin_la_SOURCES = \ yauap-engine.cpp @@ -431,7 +437,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 +446,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/yauap/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/yauap/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/engine/yauap/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/engine/yauap/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -452,9 +458,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/yauap/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/yauap/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/engine/yauap/Makefile + $(AUTOMAKE) --foreign amarok/src/engine/yauap/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/engine/yauap/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -469,9 +475,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) @@ -479,8 +485,8 @@ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ - $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ else :; fi; \ done @@ -488,8 +494,8 @@ @$(NORMAL_UNINSTALL) @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ done clean-kde_moduleLTLIBRARIES: @@ -560,8 +566,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -573,8 +579,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -584,13 +590,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -780,9 +785,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/yauap/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/yauap/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/engine/yauap/Makefile + $(AUTOMAKE) --foreign amarok/src/engine/yauap/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/engine/yauap/Makefile.in --- amarok-1.4.9.1.orig/amarok/src/data/Makefile.in +++ amarok-1.4.9.1/amarok/src/data/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -94,6 +94,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -188,6 +189,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -197,6 +199,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -207,6 +210,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -228,6 +232,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -371,7 +376,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*) \ @@ -380,9 +385,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/data/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/data/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/data/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/data/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -392,9 +397,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/data/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/data/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/data/Makefile + $(AUTOMAKE) --foreign amarok/src/data/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/data/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -409,9 +414,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: @@ -592,9 +597,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/data/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/data/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/data/Makefile + $(AUTOMAKE) --foreign amarok/src/data/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/data/Makefile.in --- amarok-1.4.9.1.orig/doc/Makefile.in +++ amarok-1.4.9.1/doc/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -104,6 +104,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -198,6 +199,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -207,6 +209,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -217,6 +220,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -238,6 +242,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -365,13 +370,13 @@ KDE_DOCS = AUTO #>- SUBDIRS = $(AUTODIRS) #>+ 1 -SUBDIRS =. amarok da de es et fr it nl pl pt pt_BR ru sv +SUBDIRS =. amarok fr ru it da es de pl et nl sv pt pt_BR #>- all: all-recursive #>+ 1 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*) \ @@ -380,9 +385,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu doc/Makefile +#>- $(AUTOMAKE) --foreign doc/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -392,9 +397,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/Makefile + $(AUTOMAKE) --foreign doc/Makefile cd $(top_srcdir) && perl admin/am_edit doc/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -409,9 +414,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: @@ -495,8 +500,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -521,8 +526,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -532,13 +537,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -718,9 +722,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/Makefile + $(AUTOMAKE) --foreign doc/Makefile cd $(top_srcdir) && perl admin/am_edit doc/Makefile.in --- amarok-1.4.9.1.orig/doc/amarok/Makefile.in +++ amarok-1.4.9.1/doc/amarok/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -84,6 +84,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -178,6 +179,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -187,6 +189,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -197,6 +200,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -218,6 +222,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -348,7 +353,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*) \ @@ -357,9 +362,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/amarok/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/amarok/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu doc/amarok/Makefile +#>- $(AUTOMAKE) --foreign doc/amarok/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -369,9 +374,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/amarok/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/amarok/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/amarok/Makefile + $(AUTOMAKE) --foreign doc/amarok/Makefile cd $(top_srcdir) && perl admin/am_edit doc/amarok/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -386,9 +391,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: @@ -542,7 +547,7 @@ KDE_DIST=add_dynamic.png config_appearance.png media_device.png file_browser.png analyzer.png using.docbook Makefile.in tab_music.png buttons.png dynamic_bar.png dynamic_settings.png config_scrobbler.png pl_tip1.png player_window.png config_engine.png queue_manager.png advanced.docbook config_collection.png script_manager.png musicbrainz.png collection.png quick.docbook config_playback.png index.docbook equalizer.png faq.docbook vis_window.png config.docbook requirements.docbook tab_wiki.png playlist_browser.png play_list.png coverman.png config_general.png config_osd.png status_bar.png menubar.png tab_lyrics.png playlist_window.png logo.png rmb_menu.png amarok_playlist.png Makefile.am #>+ 24 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) play_list.png logo.png equalizer.png advanced.docbook config.docbook config_scrobbler.png index.docbook dynamic_settings.png status_bar.png dynamic_bar.png config_osd.png coverman.png config_playback.png queue_manager.png config_collection.png using.docbook file_browser.png player_window.png config_appearance.png analyzer.png playlist_window.png vis_window.png add_dynamic.png media_device.png buttons.png script_manager.png config_general.png faq.docbook playlist_browser.png rmb_menu.png tab_music.png pl_tip1.png quick.docbook requirements.docbook musicbrainz.png menubar.png tab_wiki.png config_engine.png amarok_playlist.png collection.png tab_lyrics.png +index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) using.docbook buttons.png tab_lyrics.png config_engine.png tab_wiki.png config_scrobbler.png queue_manager.png dynamic_bar.png collection.png config.docbook amarok_playlist.png menubar.png advanced.docbook playlist_browser.png config_appearance.png logo.png player_window.png playlist_window.png coverman.png quick.docbook musicbrainz.png tab_music.png index.docbook config_osd.png faq.docbook file_browser.png config_playback.png status_bar.png dynamic_settings.png vis_window.png config_collection.png pl_tip1.png play_list.png media_device.png requirements.docbook script_manager.png equalizer.png config_general.png add_dynamic.png analyzer.png rmb_menu.png @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi docs-am: index.cache.bz2 @@ -569,20 +574,20 @@ #>+ 13 install-nls: $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok - @for base in play_list.png logo.png equalizer.png advanced.docbook config.docbook config_scrobbler.png index.docbook dynamic_settings.png status_bar.png dynamic_bar.png config_osd.png coverman.png config_playback.png queue_manager.png config_collection.png using.docbook file_browser.png player_window.png config_appearance.png analyzer.png playlist_window.png vis_window.png add_dynamic.png media_device.png buttons.png script_manager.png config_general.png faq.docbook playlist_browser.png rmb_menu.png tab_music.png pl_tip1.png quick.docbook requirements.docbook musicbrainz.png menubar.png tab_wiki.png config_engine.png amarok_playlist.png collection.png tab_lyrics.png ; do \ + @for base in using.docbook buttons.png tab_lyrics.png config_engine.png tab_wiki.png config_scrobbler.png queue_manager.png dynamic_bar.png collection.png config.docbook amarok_playlist.png menubar.png advanced.docbook playlist_browser.png config_appearance.png logo.png player_window.png playlist_window.png coverman.png quick.docbook musicbrainz.png tab_music.png index.docbook config_osd.png faq.docbook file_browser.png config_playback.png status_bar.png dynamic_settings.png vis_window.png config_collection.png pl_tip1.png play_list.png media_device.png requirements.docbook script_manager.png equalizer.png config_general.png add_dynamic.png analyzer.png rmb_menu.png ; do \ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ done uninstall-nls: - for base in play_list.png logo.png equalizer.png advanced.docbook config.docbook config_scrobbler.png index.docbook dynamic_settings.png status_bar.png dynamic_bar.png config_osd.png coverman.png config_playback.png queue_manager.png config_collection.png using.docbook file_browser.png player_window.png config_appearance.png analyzer.png playlist_window.png vis_window.png add_dynamic.png media_device.png buttons.png script_manager.png config_general.png faq.docbook playlist_browser.png rmb_menu.png tab_music.png pl_tip1.png quick.docbook requirements.docbook musicbrainz.png menubar.png tab_wiki.png config_engine.png amarok_playlist.png collection.png tab_lyrics.png ; do \ + for base in using.docbook buttons.png tab_lyrics.png config_engine.png tab_wiki.png config_scrobbler.png queue_manager.png dynamic_bar.png collection.png config.docbook amarok_playlist.png menubar.png advanced.docbook playlist_browser.png config_appearance.png logo.png player_window.png playlist_window.png coverman.png quick.docbook musicbrainz.png tab_music.png index.docbook config_osd.png faq.docbook file_browser.png config_playback.png status_bar.png dynamic_settings.png vis_window.png config_collection.png pl_tip1.png play_list.png media_device.png requirements.docbook script_manager.png equalizer.png config_general.png add_dynamic.png analyzer.png rmb_menu.png ; do \ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ done #>+ 5 distdir-nls: - for file in play_list.png logo.png equalizer.png advanced.docbook config.docbook config_scrobbler.png index.docbook dynamic_settings.png status_bar.png dynamic_bar.png config_osd.png coverman.png config_playback.png queue_manager.png config_collection.png using.docbook file_browser.png player_window.png config_appearance.png analyzer.png playlist_window.png vis_window.png add_dynamic.png media_device.png buttons.png script_manager.png config_general.png faq.docbook playlist_browser.png rmb_menu.png tab_music.png pl_tip1.png quick.docbook requirements.docbook musicbrainz.png menubar.png tab_wiki.png config_engine.png amarok_playlist.png collection.png tab_lyrics.png ; do \ + for file in using.docbook buttons.png tab_lyrics.png config_engine.png tab_wiki.png config_scrobbler.png queue_manager.png dynamic_bar.png collection.png config.docbook amarok_playlist.png menubar.png advanced.docbook playlist_browser.png config_appearance.png logo.png player_window.png playlist_window.png coverman.png quick.docbook musicbrainz.png tab_music.png index.docbook config_osd.png faq.docbook file_browser.png config_playback.png status_bar.png dynamic_settings.png vis_window.png config_collection.png pl_tip1.png play_list.png media_device.png requirements.docbook script_manager.png equalizer.png config_general.png add_dynamic.png analyzer.png rmb_menu.png ; do \ cp $(srcdir)/$$file $(distdir); \ done @@ -596,9 +601,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/amarok/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/amarok/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/amarok/Makefile + $(AUTOMAKE) --foreign doc/amarok/Makefile cd $(top_srcdir) && perl admin/am_edit doc/amarok/Makefile.in --- amarok-1.4.9.1.orig/doc/fr/Makefile.in +++ amarok-1.4.9.1/doc/fr/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -84,6 +84,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -178,6 +179,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -187,6 +189,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -197,6 +200,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -218,6 +222,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -348,7 +353,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*) \ @@ -357,9 +362,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/fr/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/fr/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu doc/fr/Makefile +#>- $(AUTOMAKE) --foreign doc/fr/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -369,9 +374,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/fr/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/fr/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/fr/Makefile + $(AUTOMAKE) --foreign doc/fr/Makefile cd $(top_srcdir) && perl admin/am_edit doc/fr/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -386,9 +391,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: @@ -542,7 +547,7 @@ KDE_DIST=using.docbook Makefile.in advanced.docbook feature_guide.docbook quick.docbook index.docbook faq.docbook config.docbook requirements.docbook Makefile.am #>+ 24 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) requirements.docbook advanced.docbook config.docbook using.docbook faq.docbook index.docbook feature_guide.docbook quick.docbook +index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) using.docbook config.docbook advanced.docbook quick.docbook index.docbook faq.docbook requirements.docbook feature_guide.docbook @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi docs-am: index.cache.bz2 @@ -569,20 +574,20 @@ #>+ 13 install-nls: $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok - @for base in requirements.docbook advanced.docbook config.docbook using.docbook faq.docbook index.docbook feature_guide.docbook quick.docbook ; do \ + @for base in using.docbook config.docbook advanced.docbook quick.docbook index.docbook faq.docbook requirements.docbook feature_guide.docbook ; do \ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ done uninstall-nls: - for base in requirements.docbook advanced.docbook config.docbook using.docbook faq.docbook index.docbook feature_guide.docbook quick.docbook ; do \ + for base in using.docbook config.docbook advanced.docbook quick.docbook index.docbook faq.docbook requirements.docbook feature_guide.docbook ; do \ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ done #>+ 5 distdir-nls: - for file in requirements.docbook advanced.docbook config.docbook using.docbook faq.docbook index.docbook feature_guide.docbook quick.docbook ; do \ + for file in using.docbook config.docbook advanced.docbook quick.docbook index.docbook faq.docbook requirements.docbook feature_guide.docbook ; do \ cp $(srcdir)/$$file $(distdir); \ done @@ -596,9 +601,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/fr/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/fr/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/fr/Makefile + $(AUTOMAKE) --foreign doc/fr/Makefile cd $(top_srcdir) && perl admin/am_edit doc/fr/Makefile.in --- amarok-1.4.9.1.orig/doc/ru/Makefile.in +++ amarok-1.4.9.1/doc/ru/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -84,6 +84,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -178,6 +179,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -187,6 +189,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -197,6 +200,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -218,6 +222,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -348,7 +353,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*) \ @@ -357,9 +362,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/ru/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/ru/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu doc/ru/Makefile +#>- $(AUTOMAKE) --foreign doc/ru/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -369,9 +374,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/ru/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/ru/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/ru/Makefile + $(AUTOMAKE) --foreign doc/ru/Makefile cd $(top_srcdir) && perl admin/am_edit doc/ru/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -386,9 +391,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: @@ -542,7 +547,7 @@ KDE_DIST=config_appearance.png file_browser.png pl_browser.png using.docbook Makefile.in config_scrobbler.png pl_tip1.png config_engine.png queue_manager.png advanced.docbook config_collection.png feature_guide.docbook collection.png quick.docbook config_playback.png index.docbook equalizer.png faq.docbook config.docbook requirements.docbook play_list.png coverman.png config_general.png config_osd.png status_bar.png dynamic_mode1.png menubar.png playlist_window.png context.png rmb_menu.png Makefile.am #>+ 24 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) play_list.png equalizer.png config.docbook advanced.docbook config_scrobbler.png config_general.png faq.docbook index.docbook feature_guide.docbook rmb_menu.png status_bar.png pl_tip1.png quick.docbook dynamic_mode1.png coverman.png config_osd.png config_playback.png pl_browser.png queue_manager.png requirements.docbook config_collection.png using.docbook file_browser.png context.png config_appearance.png playlist_window.png menubar.png config_engine.png collection.png +index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) using.docbook config_engine.png config_scrobbler.png queue_manager.png context.png pl_browser.png dynamic_mode1.png collection.png config.docbook menubar.png advanced.docbook config_appearance.png playlist_window.png coverman.png quick.docbook index.docbook config_osd.png faq.docbook file_browser.png config_playback.png status_bar.png config_collection.png pl_tip1.png play_list.png requirements.docbook equalizer.png config_general.png feature_guide.docbook rmb_menu.png @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi docs-am: index.cache.bz2 @@ -569,20 +574,20 @@ #>+ 13 install-nls: $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok - @for base in play_list.png equalizer.png config.docbook advanced.docbook config_scrobbler.png config_general.png faq.docbook index.docbook feature_guide.docbook rmb_menu.png status_bar.png pl_tip1.png quick.docbook dynamic_mode1.png coverman.png config_osd.png config_playback.png pl_browser.png queue_manager.png requirements.docbook config_collection.png using.docbook file_browser.png context.png config_appearance.png playlist_window.png menubar.png config_engine.png collection.png ; do \ + @for base in using.docbook config_engine.png config_scrobbler.png queue_manager.png context.png pl_browser.png dynamic_mode1.png collection.png config.docbook menubar.png advanced.docbook config_appearance.png playlist_window.png coverman.png quick.docbook index.docbook config_osd.png faq.docbook file_browser.png config_playback.png status_bar.png config_collection.png pl_tip1.png play_list.png requirements.docbook equalizer.png config_general.png feature_guide.docbook rmb_menu.png ; do \ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ done uninstall-nls: - for base in play_list.png equalizer.png config.docbook advanced.docbook config_scrobbler.png config_general.png faq.docbook index.docbook feature_guide.docbook rmb_menu.png status_bar.png pl_tip1.png quick.docbook dynamic_mode1.png coverman.png config_osd.png config_playback.png pl_browser.png queue_manager.png requirements.docbook config_collection.png using.docbook file_browser.png context.png config_appearance.png playlist_window.png menubar.png config_engine.png collection.png ; do \ + for base in using.docbook config_engine.png config_scrobbler.png queue_manager.png context.png pl_browser.png dynamic_mode1.png collection.png config.docbook menubar.png advanced.docbook config_appearance.png playlist_window.png coverman.png quick.docbook index.docbook config_osd.png faq.docbook file_browser.png config_playback.png status_bar.png config_collection.png pl_tip1.png play_list.png requirements.docbook equalizer.png config_general.png feature_guide.docbook rmb_menu.png ; do \ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ done #>+ 5 distdir-nls: - for file in play_list.png equalizer.png config.docbook advanced.docbook config_scrobbler.png config_general.png faq.docbook index.docbook feature_guide.docbook rmb_menu.png status_bar.png pl_tip1.png quick.docbook dynamic_mode1.png coverman.png config_osd.png config_playback.png pl_browser.png queue_manager.png requirements.docbook config_collection.png using.docbook file_browser.png context.png config_appearance.png playlist_window.png menubar.png config_engine.png collection.png ; do \ + for file in using.docbook config_engine.png config_scrobbler.png queue_manager.png context.png pl_browser.png dynamic_mode1.png collection.png config.docbook menubar.png advanced.docbook config_appearance.png playlist_window.png coverman.png quick.docbook index.docbook config_osd.png faq.docbook file_browser.png config_playback.png status_bar.png config_collection.png pl_tip1.png play_list.png requirements.docbook equalizer.png config_general.png feature_guide.docbook rmb_menu.png ; do \ cp $(srcdir)/$$file $(distdir); \ done @@ -596,9 +601,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/ru/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/ru/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/ru/Makefile + $(AUTOMAKE) --foreign doc/ru/Makefile cd $(top_srcdir) && perl admin/am_edit doc/ru/Makefile.in --- amarok-1.4.9.1.orig/doc/it/Makefile.in +++ amarok-1.4.9.1/doc/it/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -84,6 +84,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -178,6 +179,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -187,6 +189,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -197,6 +200,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -218,6 +222,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -348,7 +353,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*) \ @@ -357,9 +362,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/it/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/it/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu doc/it/Makefile +#>- $(AUTOMAKE) --foreign doc/it/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -369,9 +374,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/it/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/it/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/it/Makefile + $(AUTOMAKE) --foreign doc/it/Makefile cd $(top_srcdir) && perl admin/am_edit doc/it/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -386,9 +391,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: @@ -542,7 +547,7 @@ KDE_DIST=plugin.docbook add_dynamic.png hidden.docbook config_appearance.png media_device.png completo.png file_browser.png pl_browser.png analyzer.png using.docbook Makefile.in tab_music.png buttons.png dynamic_bar.png dynamic_settings.png config_scrobbler.png pl_tip1.png player_window.png config_engine.png queue_manager.png advanced.docbook config_collection.png script_manager.png feature_guide.docbook collection.png quick.docbook config_playback.png index.docbook equalizer.png faq.docbook vis_window.png config.docbook requirements.docbook tab_wiki.png playlist_browser.png develop.docbook play_list.png coverman.png config_general.png config_osd.png status_bar.png menubar.png tab_lyrics.png playlist_window.png context.png rmb_menu.png amarok_playlist.png Makefile.am #>+ 24 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) play_list.png equalizer.png advanced.docbook config.docbook config_scrobbler.png index.docbook feature_guide.docbook dynamic_settings.png status_bar.png dynamic_bar.png coverman.png config_osd.png config_playback.png pl_browser.png queue_manager.png config_collection.png using.docbook file_browser.png completo.png player_window.png config_appearance.png context.png analyzer.png hidden.docbook playlist_window.png vis_window.png develop.docbook plugin.docbook add_dynamic.png media_device.png buttons.png script_manager.png config_general.png faq.docbook playlist_browser.png rmb_menu.png tab_music.png pl_tip1.png quick.docbook requirements.docbook menubar.png tab_wiki.png config_engine.png amarok_playlist.png collection.png tab_lyrics.png +index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) using.docbook buttons.png tab_lyrics.png config_engine.png tab_wiki.png config_scrobbler.png queue_manager.png dynamic_bar.png context.png completo.png pl_browser.png collection.png develop.docbook config.docbook amarok_playlist.png menubar.png advanced.docbook playlist_browser.png config_appearance.png player_window.png playlist_window.png coverman.png quick.docbook hidden.docbook tab_music.png index.docbook config_osd.png faq.docbook file_browser.png config_playback.png status_bar.png dynamic_settings.png vis_window.png config_collection.png plugin.docbook pl_tip1.png play_list.png media_device.png requirements.docbook script_manager.png equalizer.png config_general.png feature_guide.docbook add_dynamic.png analyzer.png rmb_menu.png @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi docs-am: index.cache.bz2 @@ -569,20 +574,20 @@ #>+ 13 install-nls: $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok - @for base in play_list.png equalizer.png advanced.docbook config.docbook config_scrobbler.png index.docbook feature_guide.docbook dynamic_settings.png status_bar.png dynamic_bar.png coverman.png config_osd.png config_playback.png pl_browser.png queue_manager.png config_collection.png using.docbook file_browser.png completo.png player_window.png config_appearance.png context.png analyzer.png hidden.docbook playlist_window.png vis_window.png develop.docbook plugin.docbook add_dynamic.png media_device.png buttons.png script_manager.png config_general.png faq.docbook playlist_browser.png rmb_menu.png tab_music.png pl_tip1.png quick.docbook requirements.docbook menubar.png tab_wiki.png config_engine.png amarok_playlist.png collection.png tab_lyrics.png ; do \ + @for base in using.docbook buttons.png tab_lyrics.png config_engine.png tab_wiki.png config_scrobbler.png queue_manager.png dynamic_bar.png context.png completo.png pl_browser.png collection.png develop.docbook config.docbook amarok_playlist.png menubar.png advanced.docbook playlist_browser.png config_appearance.png player_window.png playlist_window.png coverman.png quick.docbook hidden.docbook tab_music.png index.docbook config_osd.png faq.docbook file_browser.png config_playback.png status_bar.png dynamic_settings.png vis_window.png config_collection.png plugin.docbook pl_tip1.png play_list.png media_device.png requirements.docbook script_manager.png equalizer.png config_general.png feature_guide.docbook add_dynamic.png analyzer.png rmb_menu.png ; do \ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ done uninstall-nls: - for base in play_list.png equalizer.png advanced.docbook config.docbook config_scrobbler.png index.docbook feature_guide.docbook dynamic_settings.png status_bar.png dynamic_bar.png coverman.png config_osd.png config_playback.png pl_browser.png queue_manager.png config_collection.png using.docbook file_browser.png completo.png player_window.png config_appearance.png context.png analyzer.png hidden.docbook playlist_window.png vis_window.png develop.docbook plugin.docbook add_dynamic.png media_device.png buttons.png script_manager.png config_general.png faq.docbook playlist_browser.png rmb_menu.png tab_music.png pl_tip1.png quick.docbook requirements.docbook menubar.png tab_wiki.png config_engine.png amarok_playlist.png collection.png tab_lyrics.png ; do \ + for base in using.docbook buttons.png tab_lyrics.png config_engine.png tab_wiki.png config_scrobbler.png queue_manager.png dynamic_bar.png context.png completo.png pl_browser.png collection.png develop.docbook config.docbook amarok_playlist.png menubar.png advanced.docbook playlist_browser.png config_appearance.png player_window.png playlist_window.png coverman.png quick.docbook hidden.docbook tab_music.png index.docbook config_osd.png faq.docbook file_browser.png config_playback.png status_bar.png dynamic_settings.png vis_window.png config_collection.png plugin.docbook pl_tip1.png play_list.png media_device.png requirements.docbook script_manager.png equalizer.png config_general.png feature_guide.docbook add_dynamic.png analyzer.png rmb_menu.png ; do \ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ done #>+ 5 distdir-nls: - for file in play_list.png equalizer.png advanced.docbook config.docbook config_scrobbler.png index.docbook feature_guide.docbook dynamic_settings.png status_bar.png dynamic_bar.png coverman.png config_osd.png config_playback.png pl_browser.png queue_manager.png config_collection.png using.docbook file_browser.png completo.png player_window.png config_appearance.png context.png analyzer.png hidden.docbook playlist_window.png vis_window.png develop.docbook plugin.docbook add_dynamic.png media_device.png buttons.png script_manager.png config_general.png faq.docbook playlist_browser.png rmb_menu.png tab_music.png pl_tip1.png quick.docbook requirements.docbook menubar.png tab_wiki.png config_engine.png amarok_playlist.png collection.png tab_lyrics.png ; do \ + for file in using.docbook buttons.png tab_lyrics.png config_engine.png tab_wiki.png config_scrobbler.png queue_manager.png dynamic_bar.png context.png completo.png pl_browser.png collection.png develop.docbook config.docbook amarok_playlist.png menubar.png advanced.docbook playlist_browser.png config_appearance.png player_window.png playlist_window.png coverman.png quick.docbook hidden.docbook tab_music.png index.docbook config_osd.png faq.docbook file_browser.png config_playback.png status_bar.png dynamic_settings.png vis_window.png config_collection.png plugin.docbook pl_tip1.png play_list.png media_device.png requirements.docbook script_manager.png equalizer.png config_general.png feature_guide.docbook add_dynamic.png analyzer.png rmb_menu.png ; do \ cp $(srcdir)/$$file $(distdir); \ done @@ -596,9 +601,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/it/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/it/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/it/Makefile + $(AUTOMAKE) --foreign doc/it/Makefile cd $(top_srcdir) && perl admin/am_edit doc/it/Makefile.in --- amarok-1.4.9.1.orig/doc/da/Makefile.in +++ amarok-1.4.9.1/doc/da/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -84,6 +84,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -178,6 +179,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -187,6 +189,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -197,6 +200,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -218,6 +222,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -348,7 +353,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*) \ @@ -357,9 +362,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/da/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/da/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu doc/da/Makefile +#>- $(AUTOMAKE) --foreign doc/da/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -369,9 +374,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/da/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/da/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/da/Makefile + $(AUTOMAKE) --foreign doc/da/Makefile cd $(top_srcdir) && perl admin/am_edit doc/da/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -386,9 +391,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: @@ -542,7 +547,7 @@ KDE_DIST=using.docbook Makefile.in advanced.docbook quick.docbook index.docbook faq.docbook config.docbook requirements.docbook Makefile.am #>+ 24 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) requirements.docbook advanced.docbook config.docbook using.docbook faq.docbook index.docbook quick.docbook +index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) using.docbook config.docbook advanced.docbook quick.docbook index.docbook faq.docbook requirements.docbook @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi docs-am: index.cache.bz2 @@ -569,20 +574,20 @@ #>+ 13 install-nls: $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok - @for base in requirements.docbook advanced.docbook config.docbook using.docbook faq.docbook index.docbook quick.docbook ; do \ + @for base in using.docbook config.docbook advanced.docbook quick.docbook index.docbook faq.docbook requirements.docbook ; do \ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ done uninstall-nls: - for base in requirements.docbook advanced.docbook config.docbook using.docbook faq.docbook index.docbook quick.docbook ; do \ + for base in using.docbook config.docbook advanced.docbook quick.docbook index.docbook faq.docbook requirements.docbook ; do \ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ done #>+ 5 distdir-nls: - for file in requirements.docbook advanced.docbook config.docbook using.docbook faq.docbook index.docbook quick.docbook ; do \ + for file in using.docbook config.docbook advanced.docbook quick.docbook index.docbook faq.docbook requirements.docbook ; do \ cp $(srcdir)/$$file $(distdir); \ done @@ -596,9 +601,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/da/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/da/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/da/Makefile + $(AUTOMAKE) --foreign doc/da/Makefile cd $(top_srcdir) && perl admin/am_edit doc/da/Makefile.in --- amarok-1.4.9.1.orig/doc/es/Makefile.in +++ amarok-1.4.9.1/doc/es/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -84,6 +84,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -178,6 +179,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -187,6 +189,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -197,6 +200,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -218,6 +222,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -348,7 +353,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*) \ @@ -357,9 +362,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/es/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/es/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu doc/es/Makefile +#>- $(AUTOMAKE) --foreign doc/es/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -369,9 +374,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/es/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/es/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/es/Makefile + $(AUTOMAKE) --foreign doc/es/Makefile cd $(top_srcdir) && perl admin/am_edit doc/es/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -386,9 +391,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: @@ -542,7 +547,7 @@ KDE_DIST=dynamic_mode2.png add_dynamic.png config_appearance.png media_device.png browser_choice.png file_browser.png pl_browser.png analyzer.png using.docbook Makefile.in tab_music.png buttons.png dynamic_bar.png dynamic_settings.png config_scrobbler.png pl_tip1.png player_window.png config_engine.png queue_manager.png advanced.docbook config_collection.png script_manager.png musicbrainz.png collection.png quick.docbook config_playback.png index.docbook equalizer.png faq.docbook vis_window.png config.docbook requirements.docbook tab_wiki.png playlist_browser.png play_list.png coverman.png config_general.png config_osd.png status_bar.png dynamic_mode1.png menubar.png tab_lyrics.png playlist_window.png logo.png context.png rmb_menu.png amarok_playlist.png Makefile.am #>+ 24 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) play_list.png logo.png equalizer.png advanced.docbook config.docbook config_scrobbler.png index.docbook dynamic_settings.png status_bar.png dynamic_bar.png dynamic_mode1.png dynamic_mode2.png coverman.png config_osd.png config_playback.png pl_browser.png queue_manager.png config_collection.png using.docbook file_browser.png player_window.png config_appearance.png context.png analyzer.png playlist_window.png vis_window.png add_dynamic.png browser_choice.png media_device.png buttons.png script_manager.png config_general.png faq.docbook playlist_browser.png rmb_menu.png tab_music.png pl_tip1.png quick.docbook requirements.docbook musicbrainz.png menubar.png tab_wiki.png config_engine.png amarok_playlist.png collection.png tab_lyrics.png +index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) using.docbook buttons.png tab_lyrics.png config_engine.png tab_wiki.png config_scrobbler.png queue_manager.png dynamic_bar.png context.png pl_browser.png dynamic_mode1.png collection.png config.docbook amarok_playlist.png menubar.png advanced.docbook playlist_browser.png config_appearance.png logo.png player_window.png playlist_window.png coverman.png quick.docbook musicbrainz.png browser_choice.png tab_music.png index.docbook config_osd.png faq.docbook file_browser.png config_playback.png status_bar.png dynamic_settings.png vis_window.png config_collection.png pl_tip1.png play_list.png dynamic_mode2.png media_device.png requirements.docbook script_manager.png equalizer.png config_general.png add_dynamic.png analyzer.png rmb_menu.png @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi docs-am: index.cache.bz2 @@ -569,20 +574,20 @@ #>+ 13 install-nls: $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok - @for base in play_list.png logo.png equalizer.png advanced.docbook config.docbook config_scrobbler.png index.docbook dynamic_settings.png status_bar.png dynamic_bar.png dynamic_mode1.png dynamic_mode2.png coverman.png config_osd.png config_playback.png pl_browser.png queue_manager.png config_collection.png using.docbook file_browser.png player_window.png config_appearance.png context.png analyzer.png playlist_window.png vis_window.png add_dynamic.png browser_choice.png media_device.png buttons.png script_manager.png config_general.png faq.docbook playlist_browser.png rmb_menu.png tab_music.png pl_tip1.png quick.docbook requirements.docbook musicbrainz.png menubar.png tab_wiki.png config_engine.png amarok_playlist.png collection.png tab_lyrics.png ; do \ + @for base in using.docbook buttons.png tab_lyrics.png config_engine.png tab_wiki.png config_scrobbler.png queue_manager.png dynamic_bar.png context.png pl_browser.png dynamic_mode1.png collection.png config.docbook amarok_playlist.png menubar.png advanced.docbook playlist_browser.png config_appearance.png logo.png player_window.png playlist_window.png coverman.png quick.docbook musicbrainz.png browser_choice.png tab_music.png index.docbook config_osd.png faq.docbook file_browser.png config_playback.png status_bar.png dynamic_settings.png vis_window.png config_collection.png pl_tip1.png play_list.png dynamic_mode2.png media_device.png requirements.docbook script_manager.png equalizer.png config_general.png add_dynamic.png analyzer.png rmb_menu.png ; do \ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ done uninstall-nls: - for base in play_list.png logo.png equalizer.png advanced.docbook config.docbook config_scrobbler.png index.docbook dynamic_settings.png status_bar.png dynamic_bar.png dynamic_mode1.png dynamic_mode2.png coverman.png config_osd.png config_playback.png pl_browser.png queue_manager.png config_collection.png using.docbook file_browser.png player_window.png config_appearance.png context.png analyzer.png playlist_window.png vis_window.png add_dynamic.png browser_choice.png media_device.png buttons.png script_manager.png config_general.png faq.docbook playlist_browser.png rmb_menu.png tab_music.png pl_tip1.png quick.docbook requirements.docbook musicbrainz.png menubar.png tab_wiki.png config_engine.png amarok_playlist.png collection.png tab_lyrics.png ; do \ + for base in using.docbook buttons.png tab_lyrics.png config_engine.png tab_wiki.png config_scrobbler.png queue_manager.png dynamic_bar.png context.png pl_browser.png dynamic_mode1.png collection.png config.docbook amarok_playlist.png menubar.png advanced.docbook playlist_browser.png config_appearance.png logo.png player_window.png playlist_window.png coverman.png quick.docbook musicbrainz.png browser_choice.png tab_music.png index.docbook config_osd.png faq.docbook file_browser.png config_playback.png status_bar.png dynamic_settings.png vis_window.png config_collection.png pl_tip1.png play_list.png dynamic_mode2.png media_device.png requirements.docbook script_manager.png equalizer.png config_general.png add_dynamic.png analyzer.png rmb_menu.png ; do \ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ done #>+ 5 distdir-nls: - for file in play_list.png logo.png equalizer.png advanced.docbook config.docbook config_scrobbler.png index.docbook dynamic_settings.png status_bar.png dynamic_bar.png dynamic_mode1.png dynamic_mode2.png coverman.png config_osd.png config_playback.png pl_browser.png queue_manager.png config_collection.png using.docbook file_browser.png player_window.png config_appearance.png context.png analyzer.png playlist_window.png vis_window.png add_dynamic.png browser_choice.png media_device.png buttons.png script_manager.png config_general.png faq.docbook playlist_browser.png rmb_menu.png tab_music.png pl_tip1.png quick.docbook requirements.docbook musicbrainz.png menubar.png tab_wiki.png config_engine.png amarok_playlist.png collection.png tab_lyrics.png ; do \ + for file in using.docbook buttons.png tab_lyrics.png config_engine.png tab_wiki.png config_scrobbler.png queue_manager.png dynamic_bar.png context.png pl_browser.png dynamic_mode1.png collection.png config.docbook amarok_playlist.png menubar.png advanced.docbook playlist_browser.png config_appearance.png logo.png player_window.png playlist_window.png coverman.png quick.docbook musicbrainz.png browser_choice.png tab_music.png index.docbook config_osd.png faq.docbook file_browser.png config_playback.png status_bar.png dynamic_settings.png vis_window.png config_collection.png pl_tip1.png play_list.png dynamic_mode2.png media_device.png requirements.docbook script_manager.png equalizer.png config_general.png add_dynamic.png analyzer.png rmb_menu.png ; do \ cp $(srcdir)/$$file $(distdir); \ done @@ -596,9 +601,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/es/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/es/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/es/Makefile + $(AUTOMAKE) --foreign doc/es/Makefile cd $(top_srcdir) && perl admin/am_edit doc/es/Makefile.in --- amarok-1.4.9.1.orig/doc/de/Makefile.in +++ amarok-1.4.9.1/doc/de/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -84,6 +84,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -178,6 +179,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -187,6 +189,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -197,6 +200,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -218,6 +222,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -348,7 +353,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*) \ @@ -357,9 +362,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/de/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/de/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu doc/de/Makefile +#>- $(AUTOMAKE) --foreign doc/de/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -369,9 +374,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/de/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/de/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/de/Makefile + $(AUTOMAKE) --foreign doc/de/Makefile cd $(top_srcdir) && perl admin/am_edit doc/de/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -386,9 +391,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: @@ -542,7 +547,7 @@ KDE_DIST=add_dynamic.png config_appearance.png media_device.png file_browser.png pl_browser.png analyzer.png using.docbook Makefile.in buttons.png dynamic_bar.png dynamic_settings.png config_scrobbler.png pl_tip1.png player_window.png config_engine.png queue_manager.png advanced.docbook config_collection.png script_manager.png musicbrainz.png collection.png quick.docbook config_playback.png index.docbook equalizer.png faq.docbook vis_window.png config.docbook requirements.docbook playlist_browser.png play_list.png coverman.png config_general.png config_osd.png status_bar.png menubar.png playlist_window.png logo.png context.png rmb_menu.png amarok_playlist.png Makefile.am #>+ 24 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) play_list.png logo.png equalizer.png advanced.docbook config.docbook config_scrobbler.png index.docbook dynamic_settings.png status_bar.png dynamic_bar.png config_osd.png coverman.png config_playback.png pl_browser.png queue_manager.png config_collection.png using.docbook file_browser.png player_window.png config_appearance.png context.png analyzer.png playlist_window.png vis_window.png add_dynamic.png media_device.png buttons.png script_manager.png config_general.png faq.docbook playlist_browser.png rmb_menu.png pl_tip1.png quick.docbook requirements.docbook musicbrainz.png menubar.png config_engine.png amarok_playlist.png collection.png +index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) using.docbook buttons.png config_engine.png config_scrobbler.png queue_manager.png dynamic_bar.png context.png pl_browser.png collection.png config.docbook amarok_playlist.png menubar.png advanced.docbook playlist_browser.png config_appearance.png logo.png player_window.png playlist_window.png coverman.png quick.docbook musicbrainz.png index.docbook config_osd.png faq.docbook file_browser.png config_playback.png status_bar.png dynamic_settings.png vis_window.png config_collection.png pl_tip1.png play_list.png media_device.png requirements.docbook script_manager.png equalizer.png config_general.png add_dynamic.png analyzer.png rmb_menu.png @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi docs-am: index.cache.bz2 @@ -569,20 +574,20 @@ #>+ 13 install-nls: $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok - @for base in play_list.png logo.png equalizer.png advanced.docbook config.docbook config_scrobbler.png index.docbook dynamic_settings.png status_bar.png dynamic_bar.png config_osd.png coverman.png config_playback.png pl_browser.png queue_manager.png config_collection.png using.docbook file_browser.png player_window.png config_appearance.png context.png analyzer.png playlist_window.png vis_window.png add_dynamic.png media_device.png buttons.png script_manager.png config_general.png faq.docbook playlist_browser.png rmb_menu.png pl_tip1.png quick.docbook requirements.docbook musicbrainz.png menubar.png config_engine.png amarok_playlist.png collection.png ; do \ + @for base in using.docbook buttons.png config_engine.png config_scrobbler.png queue_manager.png dynamic_bar.png context.png pl_browser.png collection.png config.docbook amarok_playlist.png menubar.png advanced.docbook playlist_browser.png config_appearance.png logo.png player_window.png playlist_window.png coverman.png quick.docbook musicbrainz.png index.docbook config_osd.png faq.docbook file_browser.png config_playback.png status_bar.png dynamic_settings.png vis_window.png config_collection.png pl_tip1.png play_list.png media_device.png requirements.docbook script_manager.png equalizer.png config_general.png add_dynamic.png analyzer.png rmb_menu.png ; do \ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ done uninstall-nls: - for base in play_list.png logo.png equalizer.png advanced.docbook config.docbook config_scrobbler.png index.docbook dynamic_settings.png status_bar.png dynamic_bar.png config_osd.png coverman.png config_playback.png pl_browser.png queue_manager.png config_collection.png using.docbook file_browser.png player_window.png config_appearance.png context.png analyzer.png playlist_window.png vis_window.png add_dynamic.png media_device.png buttons.png script_manager.png config_general.png faq.docbook playlist_browser.png rmb_menu.png pl_tip1.png quick.docbook requirements.docbook musicbrainz.png menubar.png config_engine.png amarok_playlist.png collection.png ; do \ + for base in using.docbook buttons.png config_engine.png config_scrobbler.png queue_manager.png dynamic_bar.png context.png pl_browser.png collection.png config.docbook amarok_playlist.png menubar.png advanced.docbook playlist_browser.png config_appearance.png logo.png player_window.png playlist_window.png coverman.png quick.docbook musicbrainz.png index.docbook config_osd.png faq.docbook file_browser.png config_playback.png status_bar.png dynamic_settings.png vis_window.png config_collection.png pl_tip1.png play_list.png media_device.png requirements.docbook script_manager.png equalizer.png config_general.png add_dynamic.png analyzer.png rmb_menu.png ; do \ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ done #>+ 5 distdir-nls: - for file in play_list.png logo.png equalizer.png advanced.docbook config.docbook config_scrobbler.png index.docbook dynamic_settings.png status_bar.png dynamic_bar.png config_osd.png coverman.png config_playback.png pl_browser.png queue_manager.png config_collection.png using.docbook file_browser.png player_window.png config_appearance.png context.png analyzer.png playlist_window.png vis_window.png add_dynamic.png media_device.png buttons.png script_manager.png config_general.png faq.docbook playlist_browser.png rmb_menu.png pl_tip1.png quick.docbook requirements.docbook musicbrainz.png menubar.png config_engine.png amarok_playlist.png collection.png ; do \ + for file in using.docbook buttons.png config_engine.png config_scrobbler.png queue_manager.png dynamic_bar.png context.png pl_browser.png collection.png config.docbook amarok_playlist.png menubar.png advanced.docbook playlist_browser.png config_appearance.png logo.png player_window.png playlist_window.png coverman.png quick.docbook musicbrainz.png index.docbook config_osd.png faq.docbook file_browser.png config_playback.png status_bar.png dynamic_settings.png vis_window.png config_collection.png pl_tip1.png play_list.png media_device.png requirements.docbook script_manager.png equalizer.png config_general.png add_dynamic.png analyzer.png rmb_menu.png ; do \ cp $(srcdir)/$$file $(distdir); \ done @@ -596,9 +601,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/de/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/de/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/de/Makefile + $(AUTOMAKE) --foreign doc/de/Makefile cd $(top_srcdir) && perl admin/am_edit doc/de/Makefile.in --- amarok-1.4.9.1.orig/doc/pl/Makefile.in +++ amarok-1.4.9.1/doc/pl/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -84,6 +84,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -178,6 +179,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -187,6 +189,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -197,6 +200,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -218,6 +222,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -348,7 +353,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*) \ @@ -357,9 +362,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/pl/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/pl/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu doc/pl/Makefile +#>- $(AUTOMAKE) --foreign doc/pl/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -369,9 +374,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/pl/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/pl/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/pl/Makefile + $(AUTOMAKE) --foreign doc/pl/Makefile cd $(top_srcdir) && perl admin/am_edit doc/pl/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -386,9 +391,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: @@ -542,7 +547,7 @@ KDE_DIST=using.docbook Makefile.in advanced.docbook quick.docbook index.docbook faq.docbook config.docbook requirements.docbook Makefile.am #>+ 24 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) requirements.docbook advanced.docbook config.docbook using.docbook faq.docbook index.docbook quick.docbook +index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) using.docbook config.docbook advanced.docbook quick.docbook index.docbook faq.docbook requirements.docbook @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi docs-am: index.cache.bz2 @@ -569,20 +574,20 @@ #>+ 13 install-nls: $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok - @for base in requirements.docbook advanced.docbook config.docbook using.docbook faq.docbook index.docbook quick.docbook ; do \ + @for base in using.docbook config.docbook advanced.docbook quick.docbook index.docbook faq.docbook requirements.docbook ; do \ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ done uninstall-nls: - for base in requirements.docbook advanced.docbook config.docbook using.docbook faq.docbook index.docbook quick.docbook ; do \ + for base in using.docbook config.docbook advanced.docbook quick.docbook index.docbook faq.docbook requirements.docbook ; do \ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ done #>+ 5 distdir-nls: - for file in requirements.docbook advanced.docbook config.docbook using.docbook faq.docbook index.docbook quick.docbook ; do \ + for file in using.docbook config.docbook advanced.docbook quick.docbook index.docbook faq.docbook requirements.docbook ; do \ cp $(srcdir)/$$file $(distdir); \ done @@ -596,9 +601,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/pl/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/pl/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/pl/Makefile + $(AUTOMAKE) --foreign doc/pl/Makefile cd $(top_srcdir) && perl admin/am_edit doc/pl/Makefile.in --- amarok-1.4.9.1.orig/doc/et/Makefile.in +++ amarok-1.4.9.1/doc/et/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -84,6 +84,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -178,6 +179,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -187,6 +189,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -197,6 +200,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -218,6 +222,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -348,7 +353,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*) \ @@ -357,9 +362,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/et/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/et/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu doc/et/Makefile +#>- $(AUTOMAKE) --foreign doc/et/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -369,9 +374,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/et/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/et/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/et/Makefile + $(AUTOMAKE) --foreign doc/et/Makefile cd $(top_srcdir) && perl admin/am_edit doc/et/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -386,9 +391,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: @@ -542,7 +547,7 @@ KDE_DIST=plugin.docbook hidden.docbook using.docbook Makefile.in advanced.docbook feature_guide.docbook quick.docbook index.docbook howto.docbook faq.docbook config.docbook requirements.docbook develop.docbook Makefile.am #>+ 24 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) howto.docbook requirements.docbook advanced.docbook config.docbook using.docbook faq.docbook index.docbook feature_guide.docbook hidden.docbook quick.docbook develop.docbook plugin.docbook +index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) using.docbook develop.docbook config.docbook advanced.docbook howto.docbook quick.docbook hidden.docbook index.docbook faq.docbook plugin.docbook requirements.docbook feature_guide.docbook @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi docs-am: index.cache.bz2 @@ -569,20 +574,20 @@ #>+ 13 install-nls: $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok - @for base in howto.docbook requirements.docbook advanced.docbook config.docbook using.docbook faq.docbook index.docbook feature_guide.docbook hidden.docbook quick.docbook develop.docbook plugin.docbook ; do \ + @for base in using.docbook develop.docbook config.docbook advanced.docbook howto.docbook quick.docbook hidden.docbook index.docbook faq.docbook plugin.docbook requirements.docbook feature_guide.docbook ; do \ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ done uninstall-nls: - for base in howto.docbook requirements.docbook advanced.docbook config.docbook using.docbook faq.docbook index.docbook feature_guide.docbook hidden.docbook quick.docbook develop.docbook plugin.docbook ; do \ + for base in using.docbook develop.docbook config.docbook advanced.docbook howto.docbook quick.docbook hidden.docbook index.docbook faq.docbook plugin.docbook requirements.docbook feature_guide.docbook ; do \ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ done #>+ 5 distdir-nls: - for file in howto.docbook requirements.docbook advanced.docbook config.docbook using.docbook faq.docbook index.docbook feature_guide.docbook hidden.docbook quick.docbook develop.docbook plugin.docbook ; do \ + for file in using.docbook develop.docbook config.docbook advanced.docbook howto.docbook quick.docbook hidden.docbook index.docbook faq.docbook plugin.docbook requirements.docbook feature_guide.docbook ; do \ cp $(srcdir)/$$file $(distdir); \ done @@ -596,9 +601,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/et/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/et/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/et/Makefile + $(AUTOMAKE) --foreign doc/et/Makefile cd $(top_srcdir) && perl admin/am_edit doc/et/Makefile.in --- amarok-1.4.9.1.orig/doc/nl/Makefile.in +++ amarok-1.4.9.1/doc/nl/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -84,6 +84,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -178,6 +179,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -187,6 +189,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -197,6 +200,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -218,6 +222,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -348,7 +353,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*) \ @@ -357,9 +362,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/nl/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/nl/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu doc/nl/Makefile +#>- $(AUTOMAKE) --foreign doc/nl/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -369,9 +374,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/nl/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/nl/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/nl/Makefile + $(AUTOMAKE) --foreign doc/nl/Makefile cd $(top_srcdir) && perl admin/am_edit doc/nl/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -386,9 +391,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: @@ -542,7 +547,7 @@ KDE_DIST=plugin.docbook add_dynamic.png hidden.docbook config_appearance.png media_device.png file_browser.png pl_browser.png analyzer.png using.docbook Makefile.in tab_music.png buttons.png dynamic_bar.png dynamic_settings.png config_scrobbler.png pl_tip1.png player_window.png config_engine.png queue_manager.png advanced.docbook config_collection.png script_manager.png musicbrainz.png tab_lyrics1.png feature_guide.docbook collection.png quick.docbook config_playback.png index.docbook equalizer.png faq.docbook vis_window.png config.docbook requirements.docbook tab_wiki.png playlist_browser.png develop.docbook play_list.png coverman.png config_general.png config_osd.png status_bar.png menubar.png tab_lyrics.png playlist_window.png logo.png context.png rmb_menu.png amarok_playlist.png Makefile.am #>+ 24 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) play_list.png logo.png equalizer.png advanced.docbook config.docbook config_scrobbler.png index.docbook feature_guide.docbook dynamic_settings.png status_bar.png dynamic_bar.png config_osd.png coverman.png config_playback.png pl_browser.png queue_manager.png config_collection.png using.docbook file_browser.png player_window.png config_appearance.png context.png analyzer.png hidden.docbook playlist_window.png vis_window.png develop.docbook plugin.docbook add_dynamic.png media_device.png buttons.png script_manager.png config_general.png faq.docbook playlist_browser.png rmb_menu.png tab_music.png pl_tip1.png quick.docbook tab_lyrics1.png requirements.docbook musicbrainz.png menubar.png tab_wiki.png config_engine.png amarok_playlist.png collection.png tab_lyrics.png +index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) tab_lyrics1.png using.docbook buttons.png tab_lyrics.png config_engine.png tab_wiki.png config_scrobbler.png queue_manager.png dynamic_bar.png context.png pl_browser.png collection.png develop.docbook config.docbook amarok_playlist.png menubar.png advanced.docbook playlist_browser.png config_appearance.png logo.png player_window.png playlist_window.png coverman.png quick.docbook musicbrainz.png hidden.docbook tab_music.png index.docbook config_osd.png faq.docbook file_browser.png config_playback.png status_bar.png dynamic_settings.png vis_window.png config_collection.png plugin.docbook pl_tip1.png play_list.png media_device.png requirements.docbook script_manager.png equalizer.png config_general.png feature_guide.docbook add_dynamic.png analyzer.png rmb_menu.png @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi docs-am: index.cache.bz2 @@ -569,20 +574,20 @@ #>+ 13 install-nls: $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok - @for base in play_list.png logo.png equalizer.png advanced.docbook config.docbook config_scrobbler.png index.docbook feature_guide.docbook dynamic_settings.png status_bar.png dynamic_bar.png config_osd.png coverman.png config_playback.png pl_browser.png queue_manager.png config_collection.png using.docbook file_browser.png player_window.png config_appearance.png context.png analyzer.png hidden.docbook playlist_window.png vis_window.png develop.docbook plugin.docbook add_dynamic.png media_device.png buttons.png script_manager.png config_general.png faq.docbook playlist_browser.png rmb_menu.png tab_music.png pl_tip1.png quick.docbook tab_lyrics1.png requirements.docbook musicbrainz.png menubar.png tab_wiki.png config_engine.png amarok_playlist.png collection.png tab_lyrics.png ; do \ + @for base in tab_lyrics1.png using.docbook buttons.png tab_lyrics.png config_engine.png tab_wiki.png config_scrobbler.png queue_manager.png dynamic_bar.png context.png pl_browser.png collection.png develop.docbook config.docbook amarok_playlist.png menubar.png advanced.docbook playlist_browser.png config_appearance.png logo.png player_window.png playlist_window.png coverman.png quick.docbook musicbrainz.png hidden.docbook tab_music.png index.docbook config_osd.png faq.docbook file_browser.png config_playback.png status_bar.png dynamic_settings.png vis_window.png config_collection.png plugin.docbook pl_tip1.png play_list.png media_device.png requirements.docbook script_manager.png equalizer.png config_general.png feature_guide.docbook add_dynamic.png analyzer.png rmb_menu.png ; do \ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ done uninstall-nls: - for base in play_list.png logo.png equalizer.png advanced.docbook config.docbook config_scrobbler.png index.docbook feature_guide.docbook dynamic_settings.png status_bar.png dynamic_bar.png config_osd.png coverman.png config_playback.png pl_browser.png queue_manager.png config_collection.png using.docbook file_browser.png player_window.png config_appearance.png context.png analyzer.png hidden.docbook playlist_window.png vis_window.png develop.docbook plugin.docbook add_dynamic.png media_device.png buttons.png script_manager.png config_general.png faq.docbook playlist_browser.png rmb_menu.png tab_music.png pl_tip1.png quick.docbook tab_lyrics1.png requirements.docbook musicbrainz.png menubar.png tab_wiki.png config_engine.png amarok_playlist.png collection.png tab_lyrics.png ; do \ + for base in tab_lyrics1.png using.docbook buttons.png tab_lyrics.png config_engine.png tab_wiki.png config_scrobbler.png queue_manager.png dynamic_bar.png context.png pl_browser.png collection.png develop.docbook config.docbook amarok_playlist.png menubar.png advanced.docbook playlist_browser.png config_appearance.png logo.png player_window.png playlist_window.png coverman.png quick.docbook musicbrainz.png hidden.docbook tab_music.png index.docbook config_osd.png faq.docbook file_browser.png config_playback.png status_bar.png dynamic_settings.png vis_window.png config_collection.png plugin.docbook pl_tip1.png play_list.png media_device.png requirements.docbook script_manager.png equalizer.png config_general.png feature_guide.docbook add_dynamic.png analyzer.png rmb_menu.png ; do \ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ done #>+ 5 distdir-nls: - for file in play_list.png logo.png equalizer.png advanced.docbook config.docbook config_scrobbler.png index.docbook feature_guide.docbook dynamic_settings.png status_bar.png dynamic_bar.png config_osd.png coverman.png config_playback.png pl_browser.png queue_manager.png config_collection.png using.docbook file_browser.png player_window.png config_appearance.png context.png analyzer.png hidden.docbook playlist_window.png vis_window.png develop.docbook plugin.docbook add_dynamic.png media_device.png buttons.png script_manager.png config_general.png faq.docbook playlist_browser.png rmb_menu.png tab_music.png pl_tip1.png quick.docbook tab_lyrics1.png requirements.docbook musicbrainz.png menubar.png tab_wiki.png config_engine.png amarok_playlist.png collection.png tab_lyrics.png ; do \ + for file in tab_lyrics1.png using.docbook buttons.png tab_lyrics.png config_engine.png tab_wiki.png config_scrobbler.png queue_manager.png dynamic_bar.png context.png pl_browser.png collection.png develop.docbook config.docbook amarok_playlist.png menubar.png advanced.docbook playlist_browser.png config_appearance.png logo.png player_window.png playlist_window.png coverman.png quick.docbook musicbrainz.png hidden.docbook tab_music.png index.docbook config_osd.png faq.docbook file_browser.png config_playback.png status_bar.png dynamic_settings.png vis_window.png config_collection.png plugin.docbook pl_tip1.png play_list.png media_device.png requirements.docbook script_manager.png equalizer.png config_general.png feature_guide.docbook add_dynamic.png analyzer.png rmb_menu.png ; do \ cp $(srcdir)/$$file $(distdir); \ done @@ -596,9 +601,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/nl/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/nl/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/nl/Makefile + $(AUTOMAKE) --foreign doc/nl/Makefile cd $(top_srcdir) && perl admin/am_edit doc/nl/Makefile.in --- amarok-1.4.9.1.orig/doc/sv/Makefile.in +++ amarok-1.4.9.1/doc/sv/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -84,6 +84,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -178,6 +179,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -187,6 +189,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -197,6 +200,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -218,6 +222,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -348,7 +353,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*) \ @@ -357,9 +362,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/sv/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/sv/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu doc/sv/Makefile +#>- $(AUTOMAKE) --foreign doc/sv/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -369,9 +374,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/sv/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/sv/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/sv/Makefile + $(AUTOMAKE) --foreign doc/sv/Makefile cd $(top_srcdir) && perl admin/am_edit doc/sv/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -386,9 +391,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: @@ -542,7 +547,7 @@ KDE_DIST=plugin.docbook add_dynamic.png hidden.docbook config_appearance.png media_device.png browser_choice.png file_browser.png pl_browser.png analyzer.png using.docbook Makefile.in buttons.png dynamic_bar.png dynamic_settings.png config_scrobbler.png pl_tip1.png player_window.png config_engine.png queue_manager.png advanced.docbook config_collection.png script_manager.png config_colors.png feature_guide.docbook collection.png quick.docbook config_playback.png scripts_window.png index.docbook equalizer.png search.png faq.docbook vis_window.png config.docbook requirements.docbook streams.png playlist_browser.png develop.docbook play_list.png coverman.png config_general.png config_osd.png status_bar.png config_fonts.png welcome.png config_mysql.png menubar.png playlist_window.png context.png rmb_menu.png amarok_playlist.png Makefile.am #>+ 24 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) play_list.png equalizer.png advanced.docbook config.docbook config_scrobbler.png index.docbook feature_guide.docbook dynamic_settings.png search.png status_bar.png dynamic_bar.png coverman.png config_osd.png config_playback.png pl_browser.png queue_manager.png config_collection.png using.docbook file_browser.png player_window.png context.png config_appearance.png analyzer.png hidden.docbook playlist_window.png vis_window.png develop.docbook config_mysql.png plugin.docbook add_dynamic.png browser_choice.png media_device.png buttons.png script_manager.png config_general.png faq.docbook playlist_browser.png rmb_menu.png pl_tip1.png quick.docbook config_fonts.png scripts_window.png streams.png requirements.docbook config_colors.png menubar.png config_engine.png amarok_playlist.png collection.png welcome.png +index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) search.png using.docbook buttons.png config_engine.png config_scrobbler.png queue_manager.png dynamic_bar.png context.png pl_browser.png collection.png develop.docbook config.docbook amarok_playlist.png menubar.png advanced.docbook playlist_browser.png streams.png config_appearance.png player_window.png playlist_window.png coverman.png quick.docbook browser_choice.png hidden.docbook index.docbook config_osd.png faq.docbook config_colors.png file_browser.png config_playback.png status_bar.png dynamic_settings.png vis_window.png config_collection.png plugin.docbook pl_tip1.png play_list.png media_device.png requirements.docbook welcome.png script_manager.png equalizer.png config_fonts.png config_general.png feature_guide.docbook add_dynamic.png analyzer.png config_mysql.png rmb_menu.png scripts_window.png @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi docs-am: index.cache.bz2 @@ -569,20 +574,20 @@ #>+ 13 install-nls: $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok - @for base in play_list.png equalizer.png advanced.docbook config.docbook config_scrobbler.png index.docbook feature_guide.docbook dynamic_settings.png search.png status_bar.png dynamic_bar.png coverman.png config_osd.png config_playback.png pl_browser.png queue_manager.png config_collection.png using.docbook file_browser.png player_window.png context.png config_appearance.png analyzer.png hidden.docbook playlist_window.png vis_window.png develop.docbook config_mysql.png plugin.docbook add_dynamic.png browser_choice.png media_device.png buttons.png script_manager.png config_general.png faq.docbook playlist_browser.png rmb_menu.png pl_tip1.png quick.docbook config_fonts.png scripts_window.png streams.png requirements.docbook config_colors.png menubar.png config_engine.png amarok_playlist.png collection.png welcome.png ; do \ + @for base in search.png using.docbook buttons.png config_engine.png config_scrobbler.png queue_manager.png dynamic_bar.png context.png pl_browser.png collection.png develop.docbook config.docbook amarok_playlist.png menubar.png advanced.docbook playlist_browser.png streams.png config_appearance.png player_window.png playlist_window.png coverman.png quick.docbook browser_choice.png hidden.docbook index.docbook config_osd.png faq.docbook config_colors.png file_browser.png config_playback.png status_bar.png dynamic_settings.png vis_window.png config_collection.png plugin.docbook pl_tip1.png play_list.png media_device.png requirements.docbook welcome.png script_manager.png equalizer.png config_fonts.png config_general.png feature_guide.docbook add_dynamic.png analyzer.png config_mysql.png rmb_menu.png scripts_window.png ; do \ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ done uninstall-nls: - for base in play_list.png equalizer.png advanced.docbook config.docbook config_scrobbler.png index.docbook feature_guide.docbook dynamic_settings.png search.png status_bar.png dynamic_bar.png coverman.png config_osd.png config_playback.png pl_browser.png queue_manager.png config_collection.png using.docbook file_browser.png player_window.png context.png config_appearance.png analyzer.png hidden.docbook playlist_window.png vis_window.png develop.docbook config_mysql.png plugin.docbook add_dynamic.png browser_choice.png media_device.png buttons.png script_manager.png config_general.png faq.docbook playlist_browser.png rmb_menu.png pl_tip1.png quick.docbook config_fonts.png scripts_window.png streams.png requirements.docbook config_colors.png menubar.png config_engine.png amarok_playlist.png collection.png welcome.png ; do \ + for base in search.png using.docbook buttons.png config_engine.png config_scrobbler.png queue_manager.png dynamic_bar.png context.png pl_browser.png collection.png develop.docbook config.docbook amarok_playlist.png menubar.png advanced.docbook playlist_browser.png streams.png config_appearance.png player_window.png playlist_window.png coverman.png quick.docbook browser_choice.png hidden.docbook index.docbook config_osd.png faq.docbook config_colors.png file_browser.png config_playback.png status_bar.png dynamic_settings.png vis_window.png config_collection.png plugin.docbook pl_tip1.png play_list.png media_device.png requirements.docbook welcome.png script_manager.png equalizer.png config_fonts.png config_general.png feature_guide.docbook add_dynamic.png analyzer.png config_mysql.png rmb_menu.png scripts_window.png ; do \ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ done #>+ 5 distdir-nls: - for file in play_list.png equalizer.png advanced.docbook config.docbook config_scrobbler.png index.docbook feature_guide.docbook dynamic_settings.png search.png status_bar.png dynamic_bar.png coverman.png config_osd.png config_playback.png pl_browser.png queue_manager.png config_collection.png using.docbook file_browser.png player_window.png context.png config_appearance.png analyzer.png hidden.docbook playlist_window.png vis_window.png develop.docbook config_mysql.png plugin.docbook add_dynamic.png browser_choice.png media_device.png buttons.png script_manager.png config_general.png faq.docbook playlist_browser.png rmb_menu.png pl_tip1.png quick.docbook config_fonts.png scripts_window.png streams.png requirements.docbook config_colors.png menubar.png config_engine.png amarok_playlist.png collection.png welcome.png ; do \ + for file in search.png using.docbook buttons.png config_engine.png config_scrobbler.png queue_manager.png dynamic_bar.png context.png pl_browser.png collection.png develop.docbook config.docbook amarok_playlist.png menubar.png advanced.docbook playlist_browser.png streams.png config_appearance.png player_window.png playlist_window.png coverman.png quick.docbook browser_choice.png hidden.docbook index.docbook config_osd.png faq.docbook config_colors.png file_browser.png config_playback.png status_bar.png dynamic_settings.png vis_window.png config_collection.png plugin.docbook pl_tip1.png play_list.png media_device.png requirements.docbook welcome.png script_manager.png equalizer.png config_fonts.png config_general.png feature_guide.docbook add_dynamic.png analyzer.png config_mysql.png rmb_menu.png scripts_window.png ; do \ cp $(srcdir)/$$file $(distdir); \ done @@ -596,9 +601,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/sv/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/sv/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/sv/Makefile + $(AUTOMAKE) --foreign doc/sv/Makefile cd $(top_srcdir) && perl admin/am_edit doc/sv/Makefile.in --- amarok-1.4.9.1.orig/doc/pt/Makefile.in +++ amarok-1.4.9.1/doc/pt/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -84,6 +84,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -178,6 +179,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -187,6 +189,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -197,6 +200,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -218,6 +222,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -348,7 +353,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*) \ @@ -357,9 +362,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/pt/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/pt/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu doc/pt/Makefile +#>- $(AUTOMAKE) --foreign doc/pt/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -369,9 +374,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/pt/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/pt/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/pt/Makefile + $(AUTOMAKE) --foreign doc/pt/Makefile cd $(top_srcdir) && perl admin/am_edit doc/pt/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -386,9 +391,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: @@ -542,7 +547,7 @@ KDE_DIST=plugin.docbook add_dynamic.png hidden.docbook config_appearance.png media_device.png file_browser.png analyzer.png using.docbook Makefile.in buttons.png dynamic_bar.png dynamic_settings.png config_scrobbler.png pl_tip1.png player_window.png config_engine.png queue_manager.png advanced.docbook config_collection.png script_manager.png musicbrainz.png feature_guide.docbook collection.png quick.docbook config_playback.png index.docbook equalizer.png faq.docbook vis_window.png config.docbook requirements.docbook playlist_browser.png develop.docbook play_list.png coverman.png config_general.png config_osd.png status_bar.png menubar.png playlist_window.png logo.png rmb_menu.png amarok_playlist.png Makefile.am #>+ 24 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) play_list.png logo.png equalizer.png advanced.docbook config.docbook config_scrobbler.png index.docbook feature_guide.docbook dynamic_settings.png status_bar.png dynamic_bar.png config_osd.png coverman.png config_playback.png queue_manager.png config_collection.png using.docbook file_browser.png player_window.png config_appearance.png analyzer.png hidden.docbook playlist_window.png vis_window.png develop.docbook plugin.docbook add_dynamic.png media_device.png buttons.png script_manager.png config_general.png faq.docbook playlist_browser.png rmb_menu.png pl_tip1.png quick.docbook requirements.docbook musicbrainz.png menubar.png config_engine.png amarok_playlist.png collection.png +index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) using.docbook buttons.png config_engine.png config_scrobbler.png queue_manager.png dynamic_bar.png collection.png develop.docbook config.docbook amarok_playlist.png menubar.png advanced.docbook playlist_browser.png config_appearance.png logo.png player_window.png playlist_window.png coverman.png quick.docbook musicbrainz.png hidden.docbook index.docbook config_osd.png faq.docbook file_browser.png config_playback.png status_bar.png dynamic_settings.png vis_window.png config_collection.png plugin.docbook pl_tip1.png play_list.png media_device.png requirements.docbook script_manager.png equalizer.png config_general.png feature_guide.docbook add_dynamic.png analyzer.png rmb_menu.png @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi docs-am: index.cache.bz2 @@ -569,20 +574,20 @@ #>+ 13 install-nls: $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok - @for base in play_list.png logo.png equalizer.png advanced.docbook config.docbook config_scrobbler.png index.docbook feature_guide.docbook dynamic_settings.png status_bar.png dynamic_bar.png config_osd.png coverman.png config_playback.png queue_manager.png config_collection.png using.docbook file_browser.png player_window.png config_appearance.png analyzer.png hidden.docbook playlist_window.png vis_window.png develop.docbook plugin.docbook add_dynamic.png media_device.png buttons.png script_manager.png config_general.png faq.docbook playlist_browser.png rmb_menu.png pl_tip1.png quick.docbook requirements.docbook musicbrainz.png menubar.png config_engine.png amarok_playlist.png collection.png ; do \ + @for base in using.docbook buttons.png config_engine.png config_scrobbler.png queue_manager.png dynamic_bar.png collection.png develop.docbook config.docbook amarok_playlist.png menubar.png advanced.docbook playlist_browser.png config_appearance.png logo.png player_window.png playlist_window.png coverman.png quick.docbook musicbrainz.png hidden.docbook index.docbook config_osd.png faq.docbook file_browser.png config_playback.png status_bar.png dynamic_settings.png vis_window.png config_collection.png plugin.docbook pl_tip1.png play_list.png media_device.png requirements.docbook script_manager.png equalizer.png config_general.png feature_guide.docbook add_dynamic.png analyzer.png rmb_menu.png ; do \ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ done uninstall-nls: - for base in play_list.png logo.png equalizer.png advanced.docbook config.docbook config_scrobbler.png index.docbook feature_guide.docbook dynamic_settings.png status_bar.png dynamic_bar.png config_osd.png coverman.png config_playback.png queue_manager.png config_collection.png using.docbook file_browser.png player_window.png config_appearance.png analyzer.png hidden.docbook playlist_window.png vis_window.png develop.docbook plugin.docbook add_dynamic.png media_device.png buttons.png script_manager.png config_general.png faq.docbook playlist_browser.png rmb_menu.png pl_tip1.png quick.docbook requirements.docbook musicbrainz.png menubar.png config_engine.png amarok_playlist.png collection.png ; do \ + for base in using.docbook buttons.png config_engine.png config_scrobbler.png queue_manager.png dynamic_bar.png collection.png develop.docbook config.docbook amarok_playlist.png menubar.png advanced.docbook playlist_browser.png config_appearance.png logo.png player_window.png playlist_window.png coverman.png quick.docbook musicbrainz.png hidden.docbook index.docbook config_osd.png faq.docbook file_browser.png config_playback.png status_bar.png dynamic_settings.png vis_window.png config_collection.png plugin.docbook pl_tip1.png play_list.png media_device.png requirements.docbook script_manager.png equalizer.png config_general.png feature_guide.docbook add_dynamic.png analyzer.png rmb_menu.png ; do \ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ done #>+ 5 distdir-nls: - for file in play_list.png logo.png equalizer.png advanced.docbook config.docbook config_scrobbler.png index.docbook feature_guide.docbook dynamic_settings.png status_bar.png dynamic_bar.png config_osd.png coverman.png config_playback.png queue_manager.png config_collection.png using.docbook file_browser.png player_window.png config_appearance.png analyzer.png hidden.docbook playlist_window.png vis_window.png develop.docbook plugin.docbook add_dynamic.png media_device.png buttons.png script_manager.png config_general.png faq.docbook playlist_browser.png rmb_menu.png pl_tip1.png quick.docbook requirements.docbook musicbrainz.png menubar.png config_engine.png amarok_playlist.png collection.png ; do \ + for file in using.docbook buttons.png config_engine.png config_scrobbler.png queue_manager.png dynamic_bar.png collection.png develop.docbook config.docbook amarok_playlist.png menubar.png advanced.docbook playlist_browser.png config_appearance.png logo.png player_window.png playlist_window.png coverman.png quick.docbook musicbrainz.png hidden.docbook index.docbook config_osd.png faq.docbook file_browser.png config_playback.png status_bar.png dynamic_settings.png vis_window.png config_collection.png plugin.docbook pl_tip1.png play_list.png media_device.png requirements.docbook script_manager.png equalizer.png config_general.png feature_guide.docbook add_dynamic.png analyzer.png rmb_menu.png ; do \ cp $(srcdir)/$$file $(distdir); \ done @@ -596,9 +601,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/pt/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/pt/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/pt/Makefile + $(AUTOMAKE) --foreign doc/pt/Makefile cd $(top_srcdir) && perl admin/am_edit doc/pt/Makefile.in --- amarok-1.4.9.1.orig/doc/pt_BR/Makefile.in +++ amarok-1.4.9.1/doc/pt_BR/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -84,6 +84,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -178,6 +179,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -187,6 +189,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -197,6 +200,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -218,6 +222,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -348,7 +353,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*) \ @@ -357,9 +362,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/pt_BR/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/pt_BR/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu doc/pt_BR/Makefile +#>- $(AUTOMAKE) --foreign doc/pt_BR/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -369,9 +374,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/pt_BR/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/pt_BR/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/pt_BR/Makefile + $(AUTOMAKE) --foreign doc/pt_BR/Makefile cd $(top_srcdir) && perl admin/am_edit doc/pt_BR/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -386,9 +391,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: @@ -542,7 +547,7 @@ KDE_DIST=using.docbook Makefile.in advanced.docbook feature_guide.docbook quick.docbook index.docbook faq.docbook config.docbook requirements.docbook Makefile.am #>+ 24 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) requirements.docbook advanced.docbook config.docbook using.docbook faq.docbook index.docbook feature_guide.docbook quick.docbook +index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) using.docbook config.docbook advanced.docbook quick.docbook index.docbook faq.docbook requirements.docbook feature_guide.docbook @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi docs-am: index.cache.bz2 @@ -569,20 +574,20 @@ #>+ 13 install-nls: $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok - @for base in requirements.docbook advanced.docbook config.docbook using.docbook faq.docbook index.docbook feature_guide.docbook quick.docbook ; do \ + @for base in using.docbook config.docbook advanced.docbook quick.docbook index.docbook faq.docbook requirements.docbook feature_guide.docbook ; do \ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ done uninstall-nls: - for base in requirements.docbook advanced.docbook config.docbook using.docbook faq.docbook index.docbook feature_guide.docbook quick.docbook ; do \ + for base in using.docbook config.docbook advanced.docbook quick.docbook index.docbook faq.docbook requirements.docbook feature_guide.docbook ; do \ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ done #>+ 5 distdir-nls: - for file in requirements.docbook advanced.docbook config.docbook using.docbook faq.docbook index.docbook feature_guide.docbook quick.docbook ; do \ + for file in using.docbook config.docbook advanced.docbook quick.docbook index.docbook faq.docbook requirements.docbook feature_guide.docbook ; do \ cp $(srcdir)/$$file $(distdir); \ done @@ -596,9 +601,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/pt_BR/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/pt_BR/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/pt_BR/Makefile + $(AUTOMAKE) --foreign doc/pt_BR/Makefile cd $(top_srcdir) && perl admin/am_edit doc/pt_BR/Makefile.in --- amarok-1.4.9.1.orig/po/Makefile.in +++ amarok-1.4.9.1/po/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -104,6 +104,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -198,6 +199,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -207,6 +209,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -217,6 +220,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -238,6 +242,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -363,13 +368,13 @@ xdg_menudir = @xdg_menudir@ #>- SUBDIRS = $(AUTODIRS) #>+ 1 -SUBDIRS =. af ar az be bg bn br ca cs cy da de el en_GB eo es et eu fa fi fr ga gl he hi hu id is it ja km ko ku lo lt mk ms nb nds ne nl nn pa pl pt pt_BR ro ru rw se sk sl sq sr sr@Latn ss sv ta tg th tr uk uz zh_CN zh_TW +SUBDIRS =. pa az th sk fr hi ru tr sq bn br fa it is ja lt en_GB ne mk nn eo uk ar da cy sr@Latn ss hu es id nds de sl pl zh_CN sr gl ku ko km bg nb el et nl ga tg ro sv cs fi ca ta pt ms se af be zh_TW pt_BR lo eu he rw uz #>- all: all-recursive #>+ 1 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 +383,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/Makefile +#>- $(AUTOMAKE) --foreign po/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -390,9 +395,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/Makefile + $(AUTOMAKE) --foreign po/Makefile cd $(top_srcdir) && perl admin/am_edit po/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -407,9 +412,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: @@ -493,8 +498,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -519,8 +524,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -530,13 +535,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -716,9 +720,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/Makefile + $(AUTOMAKE) --foreign po/Makefile cd $(top_srcdir) && perl admin/am_edit po/Makefile.in --- amarok-1.4.9.1.orig/po/pa/Makefile.in +++ amarok-1.4.9.1/po/pa/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/pa/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/pa/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/pa/Makefile +#>- $(AUTOMAKE) --foreign po/pa/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/pa/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/pa/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/pa/Makefile + $(AUTOMAKE) --foreign po/pa/Makefile cd $(top_srcdir) && perl admin/am_edit po/pa/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/pa/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/pa/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/pa/Makefile + $(AUTOMAKE) --foreign po/pa/Makefile cd $(top_srcdir) && perl admin/am_edit po/pa/Makefile.in --- amarok-1.4.9.1.orig/po/az/Makefile.in +++ amarok-1.4.9.1/po/az/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/az/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/az/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/az/Makefile +#>- $(AUTOMAKE) --foreign po/az/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/az/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/az/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/az/Makefile + $(AUTOMAKE) --foreign po/az/Makefile cd $(top_srcdir) && perl admin/am_edit po/az/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/az/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/az/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/az/Makefile + $(AUTOMAKE) --foreign po/az/Makefile cd $(top_srcdir) && perl admin/am_edit po/az/Makefile.in --- amarok-1.4.9.1.orig/po/th/Makefile.in +++ amarok-1.4.9.1/po/th/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/th/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/th/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/th/Makefile +#>- $(AUTOMAKE) --foreign po/th/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/th/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/th/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/th/Makefile + $(AUTOMAKE) --foreign po/th/Makefile cd $(top_srcdir) && perl admin/am_edit po/th/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/th/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/th/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/th/Makefile + $(AUTOMAKE) --foreign po/th/Makefile cd $(top_srcdir) && perl admin/am_edit po/th/Makefile.in --- amarok-1.4.9.1.orig/po/sk/Makefile.in +++ amarok-1.4.9.1/po/sk/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/sk/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/sk/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/sk/Makefile +#>- $(AUTOMAKE) --foreign po/sk/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/sk/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/sk/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/sk/Makefile + $(AUTOMAKE) --foreign po/sk/Makefile cd $(top_srcdir) && perl admin/am_edit po/sk/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/sk/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/sk/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/sk/Makefile + $(AUTOMAKE) --foreign po/sk/Makefile cd $(top_srcdir) && perl admin/am_edit po/sk/Makefile.in --- amarok-1.4.9.1.orig/po/fr/Makefile.in +++ amarok-1.4.9.1/po/fr/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/fr/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/fr/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/fr/Makefile +#>- $(AUTOMAKE) --foreign po/fr/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/fr/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/fr/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/fr/Makefile + $(AUTOMAKE) --foreign po/fr/Makefile cd $(top_srcdir) && perl admin/am_edit po/fr/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/fr/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/fr/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/fr/Makefile + $(AUTOMAKE) --foreign po/fr/Makefile cd $(top_srcdir) && perl admin/am_edit po/fr/Makefile.in --- amarok-1.4.9.1.orig/po/hi/Makefile.in +++ amarok-1.4.9.1/po/hi/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/hi/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/hi/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/hi/Makefile +#>- $(AUTOMAKE) --foreign po/hi/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/hi/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/hi/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/hi/Makefile + $(AUTOMAKE) --foreign po/hi/Makefile cd $(top_srcdir) && perl admin/am_edit po/hi/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/hi/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/hi/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/hi/Makefile + $(AUTOMAKE) --foreign po/hi/Makefile cd $(top_srcdir) && perl admin/am_edit po/hi/Makefile.in --- amarok-1.4.9.1.orig/po/ru/Makefile.in +++ amarok-1.4.9.1/po/ru/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ru/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ru/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/ru/Makefile +#>- $(AUTOMAKE) --foreign po/ru/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ru/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ru/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/ru/Makefile + $(AUTOMAKE) --foreign po/ru/Makefile cd $(top_srcdir) && perl admin/am_edit po/ru/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ru/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ru/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/ru/Makefile + $(AUTOMAKE) --foreign po/ru/Makefile cd $(top_srcdir) && perl admin/am_edit po/ru/Makefile.in --- amarok-1.4.9.1.orig/po/tr/Makefile.in +++ amarok-1.4.9.1/po/tr/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/tr/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/tr/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/tr/Makefile +#>- $(AUTOMAKE) --foreign po/tr/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/tr/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/tr/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/tr/Makefile + $(AUTOMAKE) --foreign po/tr/Makefile cd $(top_srcdir) && perl admin/am_edit po/tr/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/tr/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/tr/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/tr/Makefile + $(AUTOMAKE) --foreign po/tr/Makefile cd $(top_srcdir) && perl admin/am_edit po/tr/Makefile.in --- amarok-1.4.9.1.orig/po/sq/Makefile.in +++ amarok-1.4.9.1/po/sq/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/sq/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/sq/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/sq/Makefile +#>- $(AUTOMAKE) --foreign po/sq/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/sq/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/sq/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/sq/Makefile + $(AUTOMAKE) --foreign po/sq/Makefile cd $(top_srcdir) && perl admin/am_edit po/sq/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/sq/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/sq/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/sq/Makefile + $(AUTOMAKE) --foreign po/sq/Makefile cd $(top_srcdir) && perl admin/am_edit po/sq/Makefile.in --- amarok-1.4.9.1.orig/po/bn/Makefile.in +++ amarok-1.4.9.1/po/bn/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/bn/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/bn/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/bn/Makefile +#>- $(AUTOMAKE) --foreign po/bn/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/bn/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/bn/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/bn/Makefile + $(AUTOMAKE) --foreign po/bn/Makefile cd $(top_srcdir) && perl admin/am_edit po/bn/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/bn/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/bn/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/bn/Makefile + $(AUTOMAKE) --foreign po/bn/Makefile cd $(top_srcdir) && perl admin/am_edit po/bn/Makefile.in --- amarok-1.4.9.1.orig/po/br/Makefile.in +++ amarok-1.4.9.1/po/br/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/br/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/br/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/br/Makefile +#>- $(AUTOMAKE) --foreign po/br/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/br/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/br/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/br/Makefile + $(AUTOMAKE) --foreign po/br/Makefile cd $(top_srcdir) && perl admin/am_edit po/br/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/br/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/br/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/br/Makefile + $(AUTOMAKE) --foreign po/br/Makefile cd $(top_srcdir) && perl admin/am_edit po/br/Makefile.in --- amarok-1.4.9.1.orig/po/fa/Makefile.in +++ amarok-1.4.9.1/po/fa/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/fa/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/fa/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/fa/Makefile +#>- $(AUTOMAKE) --foreign po/fa/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/fa/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/fa/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/fa/Makefile + $(AUTOMAKE) --foreign po/fa/Makefile cd $(top_srcdir) && perl admin/am_edit po/fa/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/fa/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/fa/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/fa/Makefile + $(AUTOMAKE) --foreign po/fa/Makefile cd $(top_srcdir) && perl admin/am_edit po/fa/Makefile.in --- amarok-1.4.9.1.orig/po/it/Makefile.in +++ amarok-1.4.9.1/po/it/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/it/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/it/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/it/Makefile +#>- $(AUTOMAKE) --foreign po/it/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/it/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/it/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/it/Makefile + $(AUTOMAKE) --foreign po/it/Makefile cd $(top_srcdir) && perl admin/am_edit po/it/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/it/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/it/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/it/Makefile + $(AUTOMAKE) --foreign po/it/Makefile cd $(top_srcdir) && perl admin/am_edit po/it/Makefile.in --- amarok-1.4.9.1.orig/po/is/Makefile.in +++ amarok-1.4.9.1/po/is/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/is/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/is/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/is/Makefile +#>- $(AUTOMAKE) --foreign po/is/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/is/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/is/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/is/Makefile + $(AUTOMAKE) --foreign po/is/Makefile cd $(top_srcdir) && perl admin/am_edit po/is/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/is/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/is/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/is/Makefile + $(AUTOMAKE) --foreign po/is/Makefile cd $(top_srcdir) && perl admin/am_edit po/is/Makefile.in --- amarok-1.4.9.1.orig/po/ja/Makefile.in +++ amarok-1.4.9.1/po/ja/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ja/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ja/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/ja/Makefile +#>- $(AUTOMAKE) --foreign po/ja/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ja/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ja/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/ja/Makefile + $(AUTOMAKE) --foreign po/ja/Makefile cd $(top_srcdir) && perl admin/am_edit po/ja/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ja/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ja/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/ja/Makefile + $(AUTOMAKE) --foreign po/ja/Makefile cd $(top_srcdir) && perl admin/am_edit po/ja/Makefile.in --- amarok-1.4.9.1.orig/po/lt/Makefile.in +++ amarok-1.4.9.1/po/lt/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/lt/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/lt/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/lt/Makefile +#>- $(AUTOMAKE) --foreign po/lt/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/lt/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/lt/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/lt/Makefile + $(AUTOMAKE) --foreign po/lt/Makefile cd $(top_srcdir) && perl admin/am_edit po/lt/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/lt/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/lt/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/lt/Makefile + $(AUTOMAKE) --foreign po/lt/Makefile cd $(top_srcdir) && perl admin/am_edit po/lt/Makefile.in --- amarok-1.4.9.1.orig/po/en_GB/Makefile.in +++ amarok-1.4.9.1/po/en_GB/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/en_GB/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/en_GB/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/en_GB/Makefile +#>- $(AUTOMAKE) --foreign po/en_GB/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/en_GB/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/en_GB/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/en_GB/Makefile + $(AUTOMAKE) --foreign po/en_GB/Makefile cd $(top_srcdir) && perl admin/am_edit po/en_GB/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/en_GB/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/en_GB/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/en_GB/Makefile + $(AUTOMAKE) --foreign po/en_GB/Makefile cd $(top_srcdir) && perl admin/am_edit po/en_GB/Makefile.in --- amarok-1.4.9.1.orig/po/ne/Makefile.in +++ amarok-1.4.9.1/po/ne/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ne/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ne/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/ne/Makefile +#>- $(AUTOMAKE) --foreign po/ne/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ne/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ne/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/ne/Makefile + $(AUTOMAKE) --foreign po/ne/Makefile cd $(top_srcdir) && perl admin/am_edit po/ne/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ne/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ne/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/ne/Makefile + $(AUTOMAKE) --foreign po/ne/Makefile cd $(top_srcdir) && perl admin/am_edit po/ne/Makefile.in --- amarok-1.4.9.1.orig/po/mk/Makefile.in +++ amarok-1.4.9.1/po/mk/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/mk/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/mk/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/mk/Makefile +#>- $(AUTOMAKE) --foreign po/mk/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/mk/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/mk/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/mk/Makefile + $(AUTOMAKE) --foreign po/mk/Makefile cd $(top_srcdir) && perl admin/am_edit po/mk/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/mk/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/mk/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/mk/Makefile + $(AUTOMAKE) --foreign po/mk/Makefile cd $(top_srcdir) && perl admin/am_edit po/mk/Makefile.in --- amarok-1.4.9.1.orig/po/nn/Makefile.in +++ amarok-1.4.9.1/po/nn/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/nn/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/nn/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/nn/Makefile +#>- $(AUTOMAKE) --foreign po/nn/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/nn/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/nn/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/nn/Makefile + $(AUTOMAKE) --foreign po/nn/Makefile cd $(top_srcdir) && perl admin/am_edit po/nn/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/nn/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/nn/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/nn/Makefile + $(AUTOMAKE) --foreign po/nn/Makefile cd $(top_srcdir) && perl admin/am_edit po/nn/Makefile.in --- amarok-1.4.9.1.orig/po/eo/Makefile.in +++ amarok-1.4.9.1/po/eo/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/eo/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/eo/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/eo/Makefile +#>- $(AUTOMAKE) --foreign po/eo/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/eo/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/eo/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/eo/Makefile + $(AUTOMAKE) --foreign po/eo/Makefile cd $(top_srcdir) && perl admin/am_edit po/eo/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/eo/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/eo/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/eo/Makefile + $(AUTOMAKE) --foreign po/eo/Makefile cd $(top_srcdir) && perl admin/am_edit po/eo/Makefile.in --- amarok-1.4.9.1.orig/po/uk/Makefile.in +++ amarok-1.4.9.1/po/uk/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/uk/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/uk/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/uk/Makefile +#>- $(AUTOMAKE) --foreign po/uk/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/uk/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/uk/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/uk/Makefile + $(AUTOMAKE) --foreign po/uk/Makefile cd $(top_srcdir) && perl admin/am_edit po/uk/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/uk/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/uk/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/uk/Makefile + $(AUTOMAKE) --foreign po/uk/Makefile cd $(top_srcdir) && perl admin/am_edit po/uk/Makefile.in --- amarok-1.4.9.1.orig/po/ar/Makefile.in +++ amarok-1.4.9.1/po/ar/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ar/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ar/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/ar/Makefile +#>- $(AUTOMAKE) --foreign po/ar/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ar/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ar/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/ar/Makefile + $(AUTOMAKE) --foreign po/ar/Makefile cd $(top_srcdir) && perl admin/am_edit po/ar/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ar/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ar/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/ar/Makefile + $(AUTOMAKE) --foreign po/ar/Makefile cd $(top_srcdir) && perl admin/am_edit po/ar/Makefile.in --- amarok-1.4.9.1.orig/po/da/Makefile.in +++ amarok-1.4.9.1/po/da/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/da/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/da/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/da/Makefile +#>- $(AUTOMAKE) --foreign po/da/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/da/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/da/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/da/Makefile + $(AUTOMAKE) --foreign po/da/Makefile cd $(top_srcdir) && perl admin/am_edit po/da/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/da/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/da/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/da/Makefile + $(AUTOMAKE) --foreign po/da/Makefile cd $(top_srcdir) && perl admin/am_edit po/da/Makefile.in --- amarok-1.4.9.1.orig/po/cy/Makefile.in +++ amarok-1.4.9.1/po/cy/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/cy/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/cy/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/cy/Makefile +#>- $(AUTOMAKE) --foreign po/cy/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/cy/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/cy/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/cy/Makefile + $(AUTOMAKE) --foreign po/cy/Makefile cd $(top_srcdir) && perl admin/am_edit po/cy/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/cy/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/cy/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/cy/Makefile + $(AUTOMAKE) --foreign po/cy/Makefile cd $(top_srcdir) && perl admin/am_edit po/cy/Makefile.in --- amarok-1.4.9.1.orig/po/sr@Latn/Makefile.in +++ amarok-1.4.9.1/po/sr@Latn/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/sr@Latn/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/sr@Latn/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/sr@Latn/Makefile +#>- $(AUTOMAKE) --foreign po/sr@Latn/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/sr@Latn/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/sr@Latn/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/sr@Latn/Makefile + $(AUTOMAKE) --foreign po/sr@Latn/Makefile cd $(top_srcdir) && perl admin/am_edit po/sr@Latn/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/sr@Latn/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/sr@Latn/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/sr@Latn/Makefile + $(AUTOMAKE) --foreign po/sr@Latn/Makefile cd $(top_srcdir) && perl admin/am_edit po/sr@Latn/Makefile.in --- amarok-1.4.9.1.orig/po/ss/Makefile.in +++ amarok-1.4.9.1/po/ss/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ss/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ss/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/ss/Makefile +#>- $(AUTOMAKE) --foreign po/ss/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ss/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ss/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/ss/Makefile + $(AUTOMAKE) --foreign po/ss/Makefile cd $(top_srcdir) && perl admin/am_edit po/ss/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ss/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ss/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/ss/Makefile + $(AUTOMAKE) --foreign po/ss/Makefile cd $(top_srcdir) && perl admin/am_edit po/ss/Makefile.in --- amarok-1.4.9.1.orig/po/hu/Makefile.in +++ amarok-1.4.9.1/po/hu/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/hu/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/hu/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/hu/Makefile +#>- $(AUTOMAKE) --foreign po/hu/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/hu/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/hu/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/hu/Makefile + $(AUTOMAKE) --foreign po/hu/Makefile cd $(top_srcdir) && perl admin/am_edit po/hu/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/hu/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/hu/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/hu/Makefile + $(AUTOMAKE) --foreign po/hu/Makefile cd $(top_srcdir) && perl admin/am_edit po/hu/Makefile.in --- amarok-1.4.9.1.orig/po/es/Makefile.in +++ amarok-1.4.9.1/po/es/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/es/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/es/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/es/Makefile +#>- $(AUTOMAKE) --foreign po/es/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/es/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/es/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/es/Makefile + $(AUTOMAKE) --foreign po/es/Makefile cd $(top_srcdir) && perl admin/am_edit po/es/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/es/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/es/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/es/Makefile + $(AUTOMAKE) --foreign po/es/Makefile cd $(top_srcdir) && perl admin/am_edit po/es/Makefile.in --- amarok-1.4.9.1.orig/po/id/Makefile.in +++ amarok-1.4.9.1/po/id/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/id/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/id/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/id/Makefile +#>- $(AUTOMAKE) --foreign po/id/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/id/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/id/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/id/Makefile + $(AUTOMAKE) --foreign po/id/Makefile cd $(top_srcdir) && perl admin/am_edit po/id/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/id/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/id/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/id/Makefile + $(AUTOMAKE) --foreign po/id/Makefile cd $(top_srcdir) && perl admin/am_edit po/id/Makefile.in --- amarok-1.4.9.1.orig/po/nds/Makefile.in +++ amarok-1.4.9.1/po/nds/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/nds/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/nds/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/nds/Makefile +#>- $(AUTOMAKE) --foreign po/nds/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/nds/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/nds/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/nds/Makefile + $(AUTOMAKE) --foreign po/nds/Makefile cd $(top_srcdir) && perl admin/am_edit po/nds/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/nds/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/nds/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/nds/Makefile + $(AUTOMAKE) --foreign po/nds/Makefile cd $(top_srcdir) && perl admin/am_edit po/nds/Makefile.in --- amarok-1.4.9.1.orig/po/de/Makefile.in +++ amarok-1.4.9.1/po/de/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/de/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/de/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/de/Makefile +#>- $(AUTOMAKE) --foreign po/de/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/de/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/de/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/de/Makefile + $(AUTOMAKE) --foreign po/de/Makefile cd $(top_srcdir) && perl admin/am_edit po/de/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/de/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/de/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/de/Makefile + $(AUTOMAKE) --foreign po/de/Makefile cd $(top_srcdir) && perl admin/am_edit po/de/Makefile.in --- amarok-1.4.9.1.orig/po/sl/Makefile.in +++ amarok-1.4.9.1/po/sl/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/sl/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/sl/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/sl/Makefile +#>- $(AUTOMAKE) --foreign po/sl/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/sl/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/sl/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/sl/Makefile + $(AUTOMAKE) --foreign po/sl/Makefile cd $(top_srcdir) && perl admin/am_edit po/sl/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/sl/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/sl/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/sl/Makefile + $(AUTOMAKE) --foreign po/sl/Makefile cd $(top_srcdir) && perl admin/am_edit po/sl/Makefile.in --- amarok-1.4.9.1.orig/po/pl/Makefile.in +++ amarok-1.4.9.1/po/pl/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/pl/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/pl/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/pl/Makefile +#>- $(AUTOMAKE) --foreign po/pl/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/pl/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/pl/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/pl/Makefile + $(AUTOMAKE) --foreign po/pl/Makefile cd $(top_srcdir) && perl admin/am_edit po/pl/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/pl/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/pl/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/pl/Makefile + $(AUTOMAKE) --foreign po/pl/Makefile cd $(top_srcdir) && perl admin/am_edit po/pl/Makefile.in --- amarok-1.4.9.1.orig/po/zh_CN/Makefile.in +++ amarok-1.4.9.1/po/zh_CN/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/zh_CN/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/zh_CN/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/zh_CN/Makefile +#>- $(AUTOMAKE) --foreign po/zh_CN/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/zh_CN/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/zh_CN/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/zh_CN/Makefile + $(AUTOMAKE) --foreign po/zh_CN/Makefile cd $(top_srcdir) && perl admin/am_edit po/zh_CN/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/zh_CN/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/zh_CN/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/zh_CN/Makefile + $(AUTOMAKE) --foreign po/zh_CN/Makefile cd $(top_srcdir) && perl admin/am_edit po/zh_CN/Makefile.in --- amarok-1.4.9.1.orig/po/sr/Makefile.in +++ amarok-1.4.9.1/po/sr/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/sr/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/sr/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/sr/Makefile +#>- $(AUTOMAKE) --foreign po/sr/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/sr/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/sr/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/sr/Makefile + $(AUTOMAKE) --foreign po/sr/Makefile cd $(top_srcdir) && perl admin/am_edit po/sr/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/sr/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/sr/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/sr/Makefile + $(AUTOMAKE) --foreign po/sr/Makefile cd $(top_srcdir) && perl admin/am_edit po/sr/Makefile.in --- amarok-1.4.9.1.orig/po/gl/Makefile.in +++ amarok-1.4.9.1/po/gl/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/gl/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/gl/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/gl/Makefile +#>- $(AUTOMAKE) --foreign po/gl/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/gl/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/gl/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/gl/Makefile + $(AUTOMAKE) --foreign po/gl/Makefile cd $(top_srcdir) && perl admin/am_edit po/gl/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/gl/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/gl/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/gl/Makefile + $(AUTOMAKE) --foreign po/gl/Makefile cd $(top_srcdir) && perl admin/am_edit po/gl/Makefile.in --- amarok-1.4.9.1.orig/po/ku/Makefile.in +++ amarok-1.4.9.1/po/ku/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ku/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ku/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/ku/Makefile +#>- $(AUTOMAKE) --foreign po/ku/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ku/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ku/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/ku/Makefile + $(AUTOMAKE) --foreign po/ku/Makefile cd $(top_srcdir) && perl admin/am_edit po/ku/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ku/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ku/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/ku/Makefile + $(AUTOMAKE) --foreign po/ku/Makefile cd $(top_srcdir) && perl admin/am_edit po/ku/Makefile.in --- amarok-1.4.9.1.orig/po/ko/Makefile.in +++ amarok-1.4.9.1/po/ko/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ko/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ko/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/ko/Makefile +#>- $(AUTOMAKE) --foreign po/ko/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ko/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ko/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/ko/Makefile + $(AUTOMAKE) --foreign po/ko/Makefile cd $(top_srcdir) && perl admin/am_edit po/ko/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ko/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ko/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/ko/Makefile + $(AUTOMAKE) --foreign po/ko/Makefile cd $(top_srcdir) && perl admin/am_edit po/ko/Makefile.in --- amarok-1.4.9.1.orig/po/km/Makefile.in +++ amarok-1.4.9.1/po/km/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/km/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/km/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/km/Makefile +#>- $(AUTOMAKE) --foreign po/km/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/km/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/km/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/km/Makefile + $(AUTOMAKE) --foreign po/km/Makefile cd $(top_srcdir) && perl admin/am_edit po/km/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/km/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/km/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/km/Makefile + $(AUTOMAKE) --foreign po/km/Makefile cd $(top_srcdir) && perl admin/am_edit po/km/Makefile.in --- amarok-1.4.9.1.orig/po/bg/Makefile.in +++ amarok-1.4.9.1/po/bg/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/bg/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/bg/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/bg/Makefile +#>- $(AUTOMAKE) --foreign po/bg/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/bg/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/bg/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/bg/Makefile + $(AUTOMAKE) --foreign po/bg/Makefile cd $(top_srcdir) && perl admin/am_edit po/bg/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/bg/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/bg/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/bg/Makefile + $(AUTOMAKE) --foreign po/bg/Makefile cd $(top_srcdir) && perl admin/am_edit po/bg/Makefile.in --- amarok-1.4.9.1.orig/po/nb/Makefile.in +++ amarok-1.4.9.1/po/nb/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/nb/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/nb/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/nb/Makefile +#>- $(AUTOMAKE) --foreign po/nb/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/nb/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/nb/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/nb/Makefile + $(AUTOMAKE) --foreign po/nb/Makefile cd $(top_srcdir) && perl admin/am_edit po/nb/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/nb/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/nb/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/nb/Makefile + $(AUTOMAKE) --foreign po/nb/Makefile cd $(top_srcdir) && perl admin/am_edit po/nb/Makefile.in --- amarok-1.4.9.1.orig/po/el/Makefile.in +++ amarok-1.4.9.1/po/el/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/el/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/el/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/el/Makefile +#>- $(AUTOMAKE) --foreign po/el/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/el/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/el/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/el/Makefile + $(AUTOMAKE) --foreign po/el/Makefile cd $(top_srcdir) && perl admin/am_edit po/el/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/el/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/el/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/el/Makefile + $(AUTOMAKE) --foreign po/el/Makefile cd $(top_srcdir) && perl admin/am_edit po/el/Makefile.in --- amarok-1.4.9.1.orig/po/et/Makefile.in +++ amarok-1.4.9.1/po/et/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/et/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/et/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/et/Makefile +#>- $(AUTOMAKE) --foreign po/et/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/et/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/et/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/et/Makefile + $(AUTOMAKE) --foreign po/et/Makefile cd $(top_srcdir) && perl admin/am_edit po/et/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/et/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/et/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/et/Makefile + $(AUTOMAKE) --foreign po/et/Makefile cd $(top_srcdir) && perl admin/am_edit po/et/Makefile.in --- amarok-1.4.9.1.orig/po/nl/Makefile.in +++ amarok-1.4.9.1/po/nl/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/nl/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/nl/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/nl/Makefile +#>- $(AUTOMAKE) --foreign po/nl/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/nl/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/nl/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/nl/Makefile + $(AUTOMAKE) --foreign po/nl/Makefile cd $(top_srcdir) && perl admin/am_edit po/nl/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/nl/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/nl/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/nl/Makefile + $(AUTOMAKE) --foreign po/nl/Makefile cd $(top_srcdir) && perl admin/am_edit po/nl/Makefile.in --- amarok-1.4.9.1.orig/po/ga/Makefile.in +++ amarok-1.4.9.1/po/ga/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ga/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ga/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/ga/Makefile +#>- $(AUTOMAKE) --foreign po/ga/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ga/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ga/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/ga/Makefile + $(AUTOMAKE) --foreign po/ga/Makefile cd $(top_srcdir) && perl admin/am_edit po/ga/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ga/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ga/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/ga/Makefile + $(AUTOMAKE) --foreign po/ga/Makefile cd $(top_srcdir) && perl admin/am_edit po/ga/Makefile.in --- amarok-1.4.9.1.orig/po/tg/Makefile.in +++ amarok-1.4.9.1/po/tg/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/tg/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/tg/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/tg/Makefile +#>- $(AUTOMAKE) --foreign po/tg/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/tg/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/tg/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/tg/Makefile + $(AUTOMAKE) --foreign po/tg/Makefile cd $(top_srcdir) && perl admin/am_edit po/tg/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/tg/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/tg/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/tg/Makefile + $(AUTOMAKE) --foreign po/tg/Makefile cd $(top_srcdir) && perl admin/am_edit po/tg/Makefile.in --- amarok-1.4.9.1.orig/po/ro/Makefile.in +++ amarok-1.4.9.1/po/ro/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ro/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ro/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/ro/Makefile +#>- $(AUTOMAKE) --foreign po/ro/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ro/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ro/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/ro/Makefile + $(AUTOMAKE) --foreign po/ro/Makefile cd $(top_srcdir) && perl admin/am_edit po/ro/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ro/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ro/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/ro/Makefile + $(AUTOMAKE) --foreign po/ro/Makefile cd $(top_srcdir) && perl admin/am_edit po/ro/Makefile.in --- amarok-1.4.9.1.orig/po/sv/Makefile.in +++ amarok-1.4.9.1/po/sv/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/sv/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/sv/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/sv/Makefile +#>- $(AUTOMAKE) --foreign po/sv/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/sv/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/sv/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/sv/Makefile + $(AUTOMAKE) --foreign po/sv/Makefile cd $(top_srcdir) && perl admin/am_edit po/sv/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/sv/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/sv/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/sv/Makefile + $(AUTOMAKE) --foreign po/sv/Makefile cd $(top_srcdir) && perl admin/am_edit po/sv/Makefile.in --- amarok-1.4.9.1.orig/po/cs/Makefile.in +++ amarok-1.4.9.1/po/cs/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/cs/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/cs/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/cs/Makefile +#>- $(AUTOMAKE) --foreign po/cs/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/cs/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/cs/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/cs/Makefile + $(AUTOMAKE) --foreign po/cs/Makefile cd $(top_srcdir) && perl admin/am_edit po/cs/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/cs/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/cs/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/cs/Makefile + $(AUTOMAKE) --foreign po/cs/Makefile cd $(top_srcdir) && perl admin/am_edit po/cs/Makefile.in --- amarok-1.4.9.1.orig/po/fi/Makefile.in +++ amarok-1.4.9.1/po/fi/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/fi/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/fi/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/fi/Makefile +#>- $(AUTOMAKE) --foreign po/fi/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/fi/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/fi/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/fi/Makefile + $(AUTOMAKE) --foreign po/fi/Makefile cd $(top_srcdir) && perl admin/am_edit po/fi/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/fi/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/fi/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/fi/Makefile + $(AUTOMAKE) --foreign po/fi/Makefile cd $(top_srcdir) && perl admin/am_edit po/fi/Makefile.in --- amarok-1.4.9.1.orig/po/ca/Makefile.in +++ amarok-1.4.9.1/po/ca/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ca/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ca/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/ca/Makefile +#>- $(AUTOMAKE) --foreign po/ca/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ca/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ca/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/ca/Makefile + $(AUTOMAKE) --foreign po/ca/Makefile cd $(top_srcdir) && perl admin/am_edit po/ca/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ca/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ca/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/ca/Makefile + $(AUTOMAKE) --foreign po/ca/Makefile cd $(top_srcdir) && perl admin/am_edit po/ca/Makefile.in --- amarok-1.4.9.1.orig/po/ta/Makefile.in +++ amarok-1.4.9.1/po/ta/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ta/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ta/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/ta/Makefile +#>- $(AUTOMAKE) --foreign po/ta/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ta/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ta/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/ta/Makefile + $(AUTOMAKE) --foreign po/ta/Makefile cd $(top_srcdir) && perl admin/am_edit po/ta/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ta/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ta/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/ta/Makefile + $(AUTOMAKE) --foreign po/ta/Makefile cd $(top_srcdir) && perl admin/am_edit po/ta/Makefile.in --- amarok-1.4.9.1.orig/po/pt/Makefile.in +++ amarok-1.4.9.1/po/pt/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/pt/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/pt/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/pt/Makefile +#>- $(AUTOMAKE) --foreign po/pt/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/pt/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/pt/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/pt/Makefile + $(AUTOMAKE) --foreign po/pt/Makefile cd $(top_srcdir) && perl admin/am_edit po/pt/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/pt/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/pt/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/pt/Makefile + $(AUTOMAKE) --foreign po/pt/Makefile cd $(top_srcdir) && perl admin/am_edit po/pt/Makefile.in --- amarok-1.4.9.1.orig/po/ms/Makefile.in +++ amarok-1.4.9.1/po/ms/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ms/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ms/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/ms/Makefile +#>- $(AUTOMAKE) --foreign po/ms/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ms/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ms/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/ms/Makefile + $(AUTOMAKE) --foreign po/ms/Makefile cd $(top_srcdir) && perl admin/am_edit po/ms/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ms/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ms/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/ms/Makefile + $(AUTOMAKE) --foreign po/ms/Makefile cd $(top_srcdir) && perl admin/am_edit po/ms/Makefile.in --- amarok-1.4.9.1.orig/po/se/Makefile.in +++ amarok-1.4.9.1/po/se/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/se/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/se/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/se/Makefile +#>- $(AUTOMAKE) --foreign po/se/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/se/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/se/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/se/Makefile + $(AUTOMAKE) --foreign po/se/Makefile cd $(top_srcdir) && perl admin/am_edit po/se/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/se/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/se/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/se/Makefile + $(AUTOMAKE) --foreign po/se/Makefile cd $(top_srcdir) && perl admin/am_edit po/se/Makefile.in --- amarok-1.4.9.1.orig/po/af/Makefile.in +++ amarok-1.4.9.1/po/af/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/af/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/af/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/af/Makefile +#>- $(AUTOMAKE) --foreign po/af/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/af/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/af/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/af/Makefile + $(AUTOMAKE) --foreign po/af/Makefile cd $(top_srcdir) && perl admin/am_edit po/af/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/af/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/af/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/af/Makefile + $(AUTOMAKE) --foreign po/af/Makefile cd $(top_srcdir) && perl admin/am_edit po/af/Makefile.in --- amarok-1.4.9.1.orig/po/be/Makefile.in +++ amarok-1.4.9.1/po/be/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/be/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/be/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/be/Makefile +#>- $(AUTOMAKE) --foreign po/be/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/be/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/be/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/be/Makefile + $(AUTOMAKE) --foreign po/be/Makefile cd $(top_srcdir) && perl admin/am_edit po/be/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/be/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/be/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/be/Makefile + $(AUTOMAKE) --foreign po/be/Makefile cd $(top_srcdir) && perl admin/am_edit po/be/Makefile.in --- amarok-1.4.9.1.orig/po/zh_TW/Makefile.in +++ amarok-1.4.9.1/po/zh_TW/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/zh_TW/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/zh_TW/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/zh_TW/Makefile +#>- $(AUTOMAKE) --foreign po/zh_TW/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/zh_TW/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/zh_TW/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/zh_TW/Makefile + $(AUTOMAKE) --foreign po/zh_TW/Makefile cd $(top_srcdir) && perl admin/am_edit po/zh_TW/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/zh_TW/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/zh_TW/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/zh_TW/Makefile + $(AUTOMAKE) --foreign po/zh_TW/Makefile cd $(top_srcdir) && perl admin/am_edit po/zh_TW/Makefile.in --- amarok-1.4.9.1.orig/po/pt_BR/Makefile.in +++ amarok-1.4.9.1/po/pt_BR/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/pt_BR/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/pt_BR/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/pt_BR/Makefile +#>- $(AUTOMAKE) --foreign po/pt_BR/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/pt_BR/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/pt_BR/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/pt_BR/Makefile + $(AUTOMAKE) --foreign po/pt_BR/Makefile cd $(top_srcdir) && perl admin/am_edit po/pt_BR/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/pt_BR/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/pt_BR/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/pt_BR/Makefile + $(AUTOMAKE) --foreign po/pt_BR/Makefile cd $(top_srcdir) && perl admin/am_edit po/pt_BR/Makefile.in --- amarok-1.4.9.1.orig/po/lo/Makefile.in +++ amarok-1.4.9.1/po/lo/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/lo/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/lo/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/lo/Makefile +#>- $(AUTOMAKE) --foreign po/lo/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/lo/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/lo/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/lo/Makefile + $(AUTOMAKE) --foreign po/lo/Makefile cd $(top_srcdir) && perl admin/am_edit po/lo/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/lo/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/lo/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/lo/Makefile + $(AUTOMAKE) --foreign po/lo/Makefile cd $(top_srcdir) && perl admin/am_edit po/lo/Makefile.in --- amarok-1.4.9.1.orig/po/eu/Makefile.in +++ amarok-1.4.9.1/po/eu/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/eu/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/eu/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/eu/Makefile +#>- $(AUTOMAKE) --foreign po/eu/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/eu/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/eu/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/eu/Makefile + $(AUTOMAKE) --foreign po/eu/Makefile cd $(top_srcdir) && perl admin/am_edit po/eu/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/eu/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/eu/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/eu/Makefile + $(AUTOMAKE) --foreign po/eu/Makefile cd $(top_srcdir) && perl admin/am_edit po/eu/Makefile.in --- amarok-1.4.9.1.orig/po/he/Makefile.in +++ amarok-1.4.9.1/po/he/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/he/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/he/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/he/Makefile +#>- $(AUTOMAKE) --foreign po/he/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/he/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/he/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/he/Makefile + $(AUTOMAKE) --foreign po/he/Makefile cd $(top_srcdir) && perl admin/am_edit po/he/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/he/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/he/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/he/Makefile + $(AUTOMAKE) --foreign po/he/Makefile cd $(top_srcdir) && perl admin/am_edit po/he/Makefile.in --- amarok-1.4.9.1.orig/po/rw/Makefile.in +++ amarok-1.4.9.1/po/rw/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/rw/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/rw/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/rw/Makefile +#>- $(AUTOMAKE) --foreign po/rw/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/rw/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/rw/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/rw/Makefile + $(AUTOMAKE) --foreign po/rw/Makefile cd $(top_srcdir) && perl admin/am_edit po/rw/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/rw/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/rw/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/rw/Makefile + $(AUTOMAKE) --foreign po/rw/Makefile cd $(top_srcdir) && perl admin/am_edit po/rw/Makefile.in --- amarok-1.4.9.1.orig/po/uz/Makefile.in +++ amarok-1.4.9.1/po/uz/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -106,6 +106,7 @@ DOXYGEN = @DOXYGEN@ DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -200,6 +201,7 @@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ +LIB_QT_EXT = @LIB_QT_EXT@ LIB_SMB = @LIB_SMB@ LIB_SQLITE = @LIB_SQLITE@ LIB_TUNEPIMP = @LIB_TUNEPIMP@ @@ -209,6 +211,7 @@ LIB_YAUAP = @LIB_YAUAP@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -219,6 +222,7 @@ MP4V2_LIBS = @MP4V2_LIBS@ MSGFMT = @MSGFMT@ MYSQL_CONFIG = @MYSQL_CONFIG@ +NMEDIT = @NMEDIT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -240,6 +244,7 @@ RANLIB = @RANLIB@ RUBY = @RUBY@ SDL_CONFIG = @SDL_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ @@ -376,7 +381,7 @@ all: all-nls 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*) \ @@ -385,9 +390,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/uz/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/uz/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/uz/Makefile +#>- $(AUTOMAKE) --foreign po/uz/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,9 +402,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/uz/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/uz/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/uz/Makefile + $(AUTOMAKE) --foreign po/uz/Makefile cd $(top_srcdir) && perl admin/am_edit po/uz/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -414,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 mostlyclean-libtool: @@ -500,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,13 +542,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -767,9 +771,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/uz/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/uz/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/uz/Makefile + $(AUTOMAKE) --foreign po/uz/Makefile cd $(top_srcdir) && perl admin/am_edit po/uz/Makefile.in --- amarok-1.4.9.1.orig/debian/amarok.menu +++ amarok-1.4.9.1/debian/amarok.menu @@ -0,0 +1,8 @@ +?package(amarok):\ + needs="X11"\ + section="Applications/Sound"\ + hints="KDE"\ + title="Amarok"\ + icon32x32="/usr/share/pixmaps/amarok.xpm"\ + icon16x16="/usr/share/pixmaps/amarok-16.xpm"\ + command="/usr/bin/amarok" --- amarok-1.4.9.1.orig/debian/amarok.install +++ amarok-1.4.9.1/debian/amarok.install @@ -0,0 +1,48 @@ +debian/tmp/usr/share/applications/kde/amarok.desktop +debian/tmp/usr/share/services/amarokitpc.protocol +debian/tmp/usr/share/services/amaroklastfm.protocol +debian/tmp/usr/share/services/amarokpcast.protocol +debian/tmp/usr/share/servicetypes/amarok_plugin.desktop +debian/tmp/usr/share/servicetypes/amarok_codecinstall.desktop +debian/tmp/usr/share/apps/konqueror/servicemenus/amarok_append.desktop +debian/tmp/usr/share/apps/konqueror/servicemenus/amarok_addaspodcast.desktop +debian/tmp/usr/share/apps/konqueror/servicemenus/amarok_play_audiocd.desktop +debian/tmp/usr/lib/kde3/libamarok_void-engine_plugin.la +debian/tmp/usr/lib/kde3/libamarok_void-engine_plugin.so +debian/tmp/usr/lib/kde3/libamarok_generic-mediadevice.la +debian/tmp/usr/lib/kde3/libamarok_generic-mediadevice.so +debian/tmp/usr/lib/kde3/libamarok_ifp-mediadevice.la +debian/tmp/usr/lib/kde3/libamarok_ifp-mediadevice.so +debian/tmp/usr/lib/kde3/libamarok_ipod-mediadevice.la +debian/tmp/usr/lib/kde3/libamarok_ipod-mediadevice.so +debian/tmp/usr/lib/kde3/libamarok_njb-mediadevice.la +debian/tmp/usr/lib/kde3/libamarok_njb-mediadevice.so +debian/tmp/usr/lib/kde3/libamarok_smb-device.la +debian/tmp/usr/lib/kde3/libamarok_smb-device.so +debian/tmp/usr/lib/kde3/libamarok_massstorage-device.la +debian/tmp/usr/lib/kde3/libamarok_massstorage-device.so +debian/tmp/usr/lib/kde3/libamarok_nfs-device.la +debian/tmp/usr/lib/kde3/libamarok_nfs-device.so +debian/tmp/usr/lib/kde3/libamarok_daap-mediadevice.la +debian/tmp/usr/lib/kde3/libamarok_daap-mediadevice.so + +#libkarma is not in MAIN yet +#debian/tmp/usr/lib/kde3/libamarok_riokarma-mediadevice.la +#debian/tmp/usr/lib/kde3/libamarok_riokarma-mediadevice.so + +debian/tmp/usr/lib/kde3/libamarok_mtp-mediadevice.la +debian/tmp/usr/lib/kde3/libamarok_mtp-mediadevice.so +debian/tmp/usr/lib/ruby_lib/* /usr/lib/ruby_lib/ +debian/tmp/usr/lib/libamarok.so.0 +debian/tmp/usr/lib/libamarok.so.0.0.0 +debian/tmp/usr/bin/amarok +debian/tmp/usr/bin/amarokapp +debian/tmp/usr/bin/amarok_libvisual +debian/tmp/usr/bin/amarokcollectionscanner + +debian/icons/* /usr/share/pixmaps + +amarok/src/engine/xine/amarok_xine-mp3_install.desktop /usr/share/services +debian/amarok_play_audiocd.desktop /usr/share/apps/konqueror/servicemenus +debian/kubuntu-media-amarok /usr/bin +debian/install-mp3 /usr/lib/amarok --- amarok-1.4.9.1.orig/debian/copyright +++ amarok-1.4.9.1/debian/copyright @@ -0,0 +1,51 @@ +Debianized by Peter Rockai 2004-04-11 +New maintainer Adeodato Simó 2004-09-22 +New maintainer Modestas Vainius 2007-12-24 + +It was downloaded from: + + + +And the project homepage is: + + + +Upstream Authors: + + | Alexandre Oliveira + | Christian Muehlhaeuser + | Frederik Holljen + | Gábor Lehel + | Ian Monroe + | Jeff Mitchell + | Mark Kretschmann + | Martin Aumueller + | Max Howell + | Mike Diehl + | Pierpaolo Di Panfilo + | Roman Becker + | Seb Ruiz + | Stanislav Karchebny + +Copyright: + + | © 2002-2003, Mark Kretschmann + | © 2003-2006, The Amarok Development Squad + +License terms: + + | 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; version 2 dated June, 1991. + | + | This package 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 St, Fifth Floor, Boston, MA 02110-1301 USA + + The full text of the GNU General Public License version 2 is available on + Debian systems in /usr/share/common-licenses/GPL-2. --- amarok-1.4.9.1.orig/debian/kubuntu-media-amarok +++ amarok-1.4.9.1/debian/kubuntu-media-amarok @@ -0,0 +1,16 @@ +#!/bin/bash + +DEVICE=$@ + +if [ -n "$DEVICE" ];then + if [ ${DEVICE:0:7} = "audiocd" ]; then + amarok --cdplay ${DEVICE#*=} + elif [ ${DEVICE:0:1} = "/" ]; then + amarok --cdplay `dcop kded mediamanager fullList | grep -B1 $DEVICE | head -n1` + else + amarok --cdplay /dev/cdrom + fi +else + amarok --cdplay /dev/cdrom +fi + --- amarok-1.4.9.1.orig/debian/control +++ amarok-1.4.9.1/debian/control @@ -0,0 +1,103 @@ +Source: amarok +Section: kde +Priority: optional +Maintainer: Ubuntu Core developers +XSBC-Original-Maintainer: Modestas Vainius +Uploaders: Ana Beatriz Guerrero Lopez +Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, bzip2, automake, libtool, + kdelibs4-dev, + libxine-dev, libdbus-qt-1-dev, + libtag1-dev, libsqlite3-dev, libtunepimp-dev, + libmysqlclient15-dev, libpq-dev, + libvisual-0.4-dev, libsdl1.2-dev, + libifp-dev, libusb-dev, libgpod-nogtk-dev (>= 0.4.2), libnjb-dev, libmtp-dev, + ruby, ruby1.8-dev +Standards-Version: 3.8.0 +XS-VCS-Bzr: http://bazaar.launchpad.net/~kubuntu-members/amarok/debian +XS-Original-Vcs-Svn: svn://svn.debian.org/svn/pkg-kde/kde-extras/amarok/trunk/ +Homepage: http://amarok.kde.org + +Package: amarok +Architecture: any +Depends: amarok-common (>= ${source:Version}), amarok-engine-xine (= ${binary:Version}) | amarok-engine-yauap (= ${binary:Version}) | amarok-engine, unzip, ${shlibs:Depends} +Suggests: amarok-engines, moodbar, konqueror | www-browser, + python, python-qt3, libqt0-ruby1.8, libvisual-0.4-plugins +Description: versatile and easy to use audio player for KDE + Amarok tries to be a little different, providing a simple drag and drop + interface that really makes playlist handling easy. + . + Features include: + - rapid playlist creation, with drag and drop from a directory view + - nice playlist browser for your existing playlists (PLS or M3U formats) + - collection-indexing support, for smart browsing and playlist creation + - possibility of accessing media via kioslaves, allowing you to play + via smb:// or fish:// (normal streams are of course supported) + - inline ID3 tag editing, capable of retrieving tags via MusicBrainz + - album cover support: automatically displays album covers from the + filesystem, or downloaded on the fly + - miscellaneous audio effects, including crossfading + - easy bindable global shortcuts, rich DCOP interface + - On-Screen Display (OSD), on track change or at keypress + - iPod and iRiver support + - Last.fm stream playing support (if ruby is installed) + . + Support for libvisual visualization plugins is also compiled in (you need + to have libvisual-0.4-plugins installed to be able to use it). + +Package: amarok-common +Architecture: all +Depends: ruby +Recommends: amarok (>= ${source:Version}) +Suggests: libqt0-ruby1.8, python, python-qt3 +Replaces: amarok (<= 1.4.8-1) +Description: architecture independent files for Amarok + This package contains architecture independent files needed for Amarok to run + properly. It also provides Amarok documentation. Therefore, unless you have + 'amarok' package installed, you will hardly find this package useful. + . + You need to install Python if you intend to use Zeroconf support, WebControl + and/or playlist2html scripts. You will also need python-qt3 for the + WebControl script. + +Package: amarok-engines +Architecture: all +Depends: amarok-engine-xine (>= ${source:Version}), amarok-engine-yauap (>= ${source:Version}) +Description: output engines for the Amarok music player + This package serves merely as a reference point if you want to install + all available Amarok engines. It depends on those Amarok engines that + generally can be used by most users. You can safely remove this metapackage + as you can remove the amarok-engine-$engine packages that you don't use. + +Package: amarok-engine-xine +Architecture: any +Depends: ${shlibs:Depends} +Recommends: amarok (= ${binary:Version}) +Conflicts: amarok-xine +Replaces: amarok-xine +Provides: amarok-engine +Description: xine engine for the Amarok audio player + This package provides the xine engine for Amarok, which you may prefer + for some reason over the other engines (e.g., it is the lightest engine + Dependency-wise). + +Package: amarok-engine-yauap +Architecture: any +Depends: yauap, ${shlibs:Depends} +Recommends: amarok (= ${binary:Version}) +Provides: amarok-engine +Description: Yauap engine for the Amarok audio player + This package includes Amarok yauap engine, which provides a frontend + to Yauap Commandline Audio Player. DBus is used as a means of communication + between the engine and Yauap. Please note that some extra Amarok features + (like visualizations) might not be available while using this engine. + +Package: amarok-dbg +Priority: extra +Architecture: any +Depends: amarok (= ${binary:Version}) +Recommends: kdelibs-dbg +Description: debugging symbols for Amarok + This package provides debugging symbols for all binary packages built from + amarok source package. It's highly recommended to have this package installed + before reporting any Amarok crashes to either Amarok developers or Debian + package maintainers. --- amarok-1.4.9.1.orig/debian/KUBUNTU-DEBIAN-DIFFERENCES +++ amarok-1.4.9.1/debian/KUBUNTU-DEBIAN-DIFFERENCES @@ -0,0 +1,13 @@ +debian/install-mp3 /usr/lib/amarok +amarok/src/engine/xine/amarok_xine-mp3_install.desktop /usr/share/services +Depend on amarok-xine | amarok-engine +export KUBUNTU_DESKTOP_POT=extragear-multimedia_amarok +install debian/kubuntu-media-amarok and debian/amarok_play_audiocd.desktop in amarok.install +chmod x debian/amarok/usr/bin/kubuntu-media-amarok in debian/rules in section + common-binary-post-install-arch:: +remove amarok-common.lintian, amarok.lintian + +#### due to removal of KDE 3 packages #### +remove kdemultimedia-dev, kdebase-dev from Build-Depends +remove amarok-konqsidebar, kdemultimedia-kio-plugins from Recommends +remove complete amarok-konqsidebar package \ No newline at end of file --- amarok-1.4.9.1.orig/debian/compat +++ amarok-1.4.9.1/debian/compat @@ -0,0 +1 @@ +5 --- amarok-1.4.9.1.orig/debian/amarok-engine-xine.install +++ amarok-1.4.9.1/debian/amarok-engine-xine.install @@ -0,0 +1,4 @@ +debian/tmp/usr/share/services/amarok_xine-engine.desktop +debian/tmp/usr/share/config.kcfg/xinecfg.kcfg +debian/tmp/usr/lib/kde3/libamarok_xine-engine.so +debian/tmp/usr/lib/kde3/libamarok_xine-engine.la --- amarok-1.4.9.1.orig/debian/watch +++ amarok-1.4.9.1/debian/watch @@ -0,0 +1,2 @@ +version=3 +opts=pasv ftp://ftp.kde.org/pub/kde/stable/amarok/([0-9.]+) --- amarok-1.4.9.1.orig/debian/rules +++ amarok-1.4.9.1/debian/rules @@ -0,0 +1,104 @@ +#!/usr/bin/make -f + +### CDBS INCLUDES +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/kde.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk + +### VARIABLES +# Exempt amarok engines from being handled as proper public libraries +# by dh_makeshlibs +DEB_DH_MAKESHLIBS_ARGS_ALL = -Xlibamarok_\\w*-engine + +export KUBUNTU_DESKTOP_POT=extragear-multimedia_amarok + +DEB_CONFIGURE_EXTRA_FLAGS := --without-included-sqlite \ + --disable-final \ + --without-akode \ + --without-gstreamer10 \ + --without-libkarma \ + --with-ifp \ + --with-libgpod \ + --with-libnjb \ + --with-libmtp \ + --enable-mysql \ + --enable-postgresql \ + --with-yauap + +# Ship upstream README in amarok docs +DEB_INSTALL_DOCS_ALL = +DEB_INSTALL_DOCS_amarok = $(DEB_SRCDIR)/README + +# Amarok engines should not auto-depend on amarok. +# Appropriate relationships are set manually in the control file. +DEB_DH_SHLIBDEPS_ARGS_amarok-engine-xine = -- -xamarok +DEB_DH_SHLIBDEPS_ARGS_amarok-engine-yauap = -- -xamarok + +### Libtool and Automake updates +# Autoguess automake /usr/share subdirectory. Insure from failures +DEB_AUTOMAKE_SHARE_DIR = /usr/share/automake-$(shell automake --version | head -n 1 | sed 's/^automake (GNU automake) \([0-9]\+\.[0-9]\+\).*/\1/') +ifneq ($(words $(DEB_AUTOMAKE_SHARE_DIR)),1) +DEB_AUTOMAKE_SHARE_DIR = +endif + +post-patches:: debian/stamp-automake +debian/stamp-automake: + touch debian/stamp-automake-started + if test -n "$(DEB_AUTOMAKE_SHARE_DIR)"; then \ + for f in $(DEB_AUTOMAKE_SHARE_DIR)/*; do \ + if test -f $$f && \ + test -f $(DEB_SRCDIR)/admin/`basename $$f`; then \ + cp -f $$f $(DEB_SRCDIR)/admin; \ + fi; \ + done; \ + fi + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common + touch $@ + +# Install ${curpkg}.install as lintian overrides +$(patsubst %,binary-install/%,$(DEB_PACKAGES)):: + 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 + +clean:: + if test -d $(DEB_SRCDIR) && test -f debian/stamp-automake-started; 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-automake* + +binary-fixup/amarok-common:: + # Fix permissions of some amarok scripts + chmod a+x \ + debian/$(cdbs_curpkg)/usr/share/apps/amarok/scripts/lyrics_astraweb/lyrics_astraweb.rb \ + debian/$(cdbs_curpkg)/usr/share/apps/amarok/scripts/playlist2html/Playlist.py \ + debian/$(cdbs_curpkg)/usr/share/apps/amarok/scripts/ruby_debug/debug.rb \ + debian/$(cdbs_curpkg)/usr/share/apps/amarok/scripts/templates/python_qt_template.py \ + debian/$(cdbs_curpkg)/usr/share/apps/amarok/scripts/templates/ruby_qt_template.rb \ + debian/$(cdbs_curpkg)/usr/share/apps/amarok/scripts/webcontrol/Playlist.py \ + debian/$(cdbs_curpkg)/usr/share/apps/amarok/scripts/webcontrol/RequestHandler.py + +binary-post-install/amarok-common:: + # Remove excess COPYING files from script directories + rm -f \ + debian/$(cdbs_curpkg)/usr/share/apps/amarok/scripts/lyrics_astraweb/COPYING \ + debian/$(cdbs_curpkg)/usr/share/apps/amarok/scripts/lyrics_lyrc/COPYING \ + debian/$(cdbs_curpkg)/usr/share/apps/amarok/scripts/score_default/COPYING \ + debian/$(cdbs_curpkg)/usr/share/apps/amarok/scripts/score_impulsive/COPYING + # Remove Mac OSX resource fork file + rm -f debian/$(cdbs_curpkg)/usr/share/apps/amarok/ruby_lib/rubygems/._gem_commands.rb + +### POST-INSTALL HACKING +common-binary-post-install-arch:: + # Check for not installed files + dh_install --no-act --list-missing + + chmod a+x debian/amarok/usr/lib/amarok/install-mp3 + chmod +x debian/amarok/usr/bin/kubuntu-media-amarok + ln -s /usr/bin/amarokapp debian/amarok/usr/lib/amarok/amarokapp --- amarok-1.4.9.1.orig/debian/amarok_play_audiocd.desktop +++ amarok-1.4.9.1/debian/amarok_play_audiocd.desktop @@ -0,0 +1,46 @@ +[Desktop Entry] +ServiceTypes=media/audiocd +Actions=Play; +Encoding=UTF-8 +X-KDE-Priority=TopLevel + +[Desktop Action Play] +Name=Play Audio CD with amaroK +Name[ar]=قراءة قرص مدمج صوتي بواسطة amaroK +Name[bg]=Възпроизвеждане на аудио CD с amaroK +Name[bn]=ক্যাফিন দিয়ে অডিও সিডি চালাও +Name[br]=Seniñ ur bladenn klevet gant amaroK +Name[ca]=Reprodueix Audio CD amb amaroK +Name[cs]=Pehrát audio CD amaroK +Name[da]=Spil lyd-cd med amaroK +Name[de]=Audio-CD mit amaroK abspielen +Name[el]=Αναπαραγωγή CD ήχου με το amaroK +Name[es]=Reproducir CD de audio con amaroK +Name[et]=Esita audio-CD amaroK'is +Name[fi]=Soita musiikki-cd amaroKssa +Name[fr]=Jouer un CD Audio avec amaroK +Name[ga]=Seinn CD Fuaime le amaroK +Name[gl]=Reproducir o CD de Áudio con amaroK +Name[he]=נגן תקליטור שמע עם amaroK +Name[is]=Spila tónlistardisk með amaroK +Name[it]=Riproduci CD audio con amaroK +Name[ja]=amaroKで音楽CDを再生 +Name[ka]=აუდიო CD-ის დაკვრა amaroK-ით +Name[km]=ចាក់​ស៊ីឌី​អូឌីយ៉ូ​​ជាមួយ amaroK +Name[nb]=Spill lyd-CD med amaroK +Name[nl]=Audio-cd met amaroK afspelen +Name[nn]=Spel lyd-CD med amaroK +Name[pa]=ਕੈਫੀਨ ਨਾਲ ਆਡੀਓ CD ਚਲਾਓ +Name[pl]=Odtwarzaj audio CD w amaroK +Name[pt]=Tocar o CD de Áudio com o amaroK +Name[pt_BR]=Reproduzir o CD de Áudio com o amaroK +Name[sr]=Пустио аудио CD amaroK-ом +Name[sr@Latn]=Pustio audio CD amaroK-om +Name[sv]=Spela ljud-cd med amaroK +Name[tr]=amaroK ile Ses CD'si Çal +Name[uk]=Програти аудіо-КД з amaroK +Name[xx]=xxPlay Audio CD with amaroKxx +Name[zh_CN]=用 amaroK 播放音频 CD +Name[zh_TW]=使用 amaroK 播放音樂 CD +Icon=amarok +Exec=bash kubuntu-media-amarok %u --- amarok-1.4.9.1.orig/debian/changelog +++ amarok-1.4.9.1/debian/changelog @@ -0,0 +1,1525 @@ +amarok (2:1.4.9.1-2ubuntu2) intrepid; urgency=low + + * Add manpages - unbreak build + + -- Harald Sitter Fri, 27 Jun 2008 15:34:42 +0200 + +amarok (2:1.4.9.1-2ubuntu1) intrepid; urgency=low + + * Merge with Debian, remaining changes in debian/KUBUNTU-DEBIAN-DIFFERENCES + + -- Harald Sitter Wed, 25 Jun 2008 21:16:38 +0200 + +amarok (1.4.9.1-2) unstable; urgency=medium + + * Add 15_temptables_more_indices.diff patch which creates more indices for + some temporary tables that are used extensively while building collection + database. Apparently, SQLite 3.5.x is slower than 3.4.x when doing + matches on unindexed temporary table fields. This should solve (or improve + situation significantly) major performance problems with SQLite 3.5.x + (Closes: #479068). Urgency medium because this problem affects many + lenny and sid Amarok users having rather large (15k+ songs) collections. + + -- Modestas Vainius Sun, 11 May 2008 04:07:01 +0300 + +amarok (1.4.9.1-1) unstable; urgency=low + + * New upstream bugfix release: + - The last.fm dialog did not always properly disable options when the + username was not entered. + - Fix Amazon Cover fetching by using their new web service api. + (Closes: #474186) + - Don't insert items into Dynamic Mode that don't exist. + - If unavailable tracks are in the Playlist and random mode is on, don't + - stop those tracks if selected; continue with available tracks. + * Repackage original tarball as orig.tar.gz instead of doing tarball-in-orig + tarball thing. The previous way made patch testing and debugging more + painful unnecessarily. + * Resynchronize patches: + - 11_bug403340_cancel_rename_when_deleting_items.diff - fix offsets. + - 97_automake_cleanup.diff - adopt to upstream changes, fix offsets. + * Improve debian/rules stamp-automake and clean targets a bit not to rm + automake generated files uselessly (if they were not regenerated) + + -- Modestas Vainius Fri, 11 Apr 2008 10:12:31 +0300 + +amarok (1.4.8-2) unstable; urgency=low + + * Remove Adeodato Simó from Uploaders by his request. Thank you Adeodato for + all your hard work! + * Remove amarok-gstreamer.install because there is no gstreamer engine + anymore. + * Remove overrides/amarok-arts. arts engine is no longer available. + * Drop internal cdbs/kde.mk in favour of the one shipped with cdbs. Merge + missing functionality (cvs-make/automake) into debian/rules. + * Auto-guess automake /usr/share directory. + * Rework interdependences among amarok and its engines' packages: + - Drop amarok-engine virtual package. Amarok and its engines ABI are not + even compatible between Amarok point releases so virtual package, which, + unfortunately, is versionless by definition, is not practical here. + - Rename engine packages to amarok-engine-$engine. Make them conflict + and replace previous amarok-$engine packages. Also make amarok conflict + with amarok-engine virtual package. All these changes will ensure that + partial upgrades from etch are not allowed (Closes: #432219). + - Make amarok depend on any of its engines of the same binary version + via alternate dependences. Default engine is amarok-engine-xine. Edit + amarok-engine-xine description accordingly. + - Make all amarok engines recommend amarok strictly of the same binary + version. Recommends instead of Depends here breaks circular dependency + (Closes: #368485). + - Downgrade amarok-engines to amarok Suggests. + - Convert amarok-engines package to arch:all because it's a metapackage. + Edit amarok-engines description because it's no longer going to be + installed by default. + - Add amarok-yauap to amarok-engines Suggests. + * New binary packages: + - amarok-common - arch:all package for architecture independent files + split from amarok. It recommends amarok (>= ${source:Version}) to + avoid circular dependency as in case of stricter "Depends" relationship. + - amarok-konqsidebar - split konqsidebar into its own binary package. The + reason for this is that it's incompatible with konqueror (>= 4:4.0.0) + and needs to _conflict_ with it (due to *.desktop files). Add + amarok-konqsidebar to amarok Recommends and amarok to amarok-konqsidebar + Depends. + - amarok-dbg - package with debugging symbols (Closes: #368840). + - amarok-engine-yauap - Yauap Commandline Audio Player engine + (Closes: #445371): + * Add libdbus-qt-1-dev to Build-Depends + * Pass --with-yauap to configure + * Add amarok-yauap.install + * Depend on yauap. + * Add "Homepage" field to debian/control source section, remove homepage + reference from amarok binary package description. + * Disable /usr/share/doc/amarok-* symlinks in debian/rules. They just + complicate packaging unnecessarily and make lintian unhappy. + * Ship only README from upstream source in /usr/share/doc/amarok. + * debian/README.Debian: remove a note about installing ruby, because it's + a dependency and gets installed anyway. + * New patches: + - 01_libtool_update.diff - use ltmain.sh and libtool.m4.in from Debian + libtool. This patch is used instead of previous `cp` in debian/rules, + because the patch 02_ below depends on it. + - 02_admin_cleanup.diff - admin/* cleanup patch. + - 97_automake_cleanup.diff - automake cleanup patch to get rid of excess + dependencies and shut dpkg-shlibdeps up. Superseeds previous + 03_no_libadd_in_convenience_libs.diff patch. + - 11_bug403340_cancel_rename_when_deleting_items.diff - cancel a pending + 'rename' request for the playlist item that is about to be deleted. + The patch solves a popular crash. (Closes: #403340). + - 12_devicemanager_dcopcall_no_timeout.diff - do not use timeout for dcop + calls. It's very unsafe because it might break further dcop calls such + as the one in the debian bug #432752 (Closes: #432752). + - 13_lastfm_crash_434835.diff - resolve lastfm crash which could be + triggered by switching away from lastfm track while it was still + handshaking or buffering (Closes: #434835). Thanks to Raphael for the + excelent instructions how to reproduce the crash. + - 14_ruby_libs_not_scripts.diff - remove #! stanzas from ruby library + files. + * Prepend sequence number to the filenames of existing debian/patches/*. + Edit debian/patches/series accordingly. + * Move Depends/Recommends on ruby, python & friends from amarok to + amarok-common since they scripts have been moved here. + * Add moodbar to amarok Suggests (Closes: #421420). Tweak amarok package + description accordingly. + * Add DM-Upload-Allowed: yes to debian/control source section. + * s/XS-Vcs/Vcs/ in debian/control. + * Drop DEB_DH_SHLIBDEPS_ARGS_amarok from debian/rules. No longer needed with + recent dpkg-shlibdeps. + * Build-Depend on debhelper (>= 5.0.0) + * Add executable permissions for some amarok scripts to make lintian happy. + * s/.NF/.nf/ in debian/amarok.1 + * Drop DEB_INSTALL_DIRS_amarok from debian/rules. No longer needed. + * Use more accurate method to exclude (-X) amarok engines from being handled + by dh_makeshlibs instead of just DEB_DH_MAKESHLIBS_ARGS_ALL = -n. + * Do not amarok.install /usr/lib/libamarok.so and /usr/lib/libamarok.la. + They are devel-only and, hence, useless in the private library like + libamarok case. + * Install *.lintian files with overrides. + * Add manual pages: amarokapp.1 amarokcollectionscanner.1 amarok_libvisual.1 + * Do not install COPYING files which are present in some script directories. + Also remove useless (according to lintian) MacOS X resource fork file + rubygems/._gem_commands.rb + * Exclude amarok from amarok-engine-* packages dependency lists. + + -- Modestas Vainius Tue, 04 Mar 2008 15:28:46 +0200 + +amarok (1.4.8-1) unstable; urgency=low + + [ Adeodato Simó ] + * Build against libgpod-nogtk-dev. + + * Update Build-Standards to 3.7.3: + + move menu entry to Applications/Sound. + + * Build-depend on automake instead of automake1.9. + + [ Modestas Vainius ] + * Add myself as maintainer with the permission from Adeodato Simó. + * Add Adeodato Simó as uploader. + * debian/control: drop Vcs-Bazaar field. amarok debian packaging is + now hosted at kde-extras svn repo therefore I'm adding appropriate + XS-Vcs-Svn and XS-Vcs-Browser fields. + + * New upstream release (1.4.8) (Closes: #457352). + * Resync patches: + - proxy_lyrics.diff - removed, merged upstream. + - fix_gcc4.3_ftbfs.diff - removed, resolved upstream. + * Drop kdemultimedia-dev from Build-Depends. It's no longer needed. + * debian/rules: use /usr/share/automake-1.10 instead of *-1.9 + because 'automake' package provides version 1.10. + + -- Modestas Vainius Mon, 24 Dec 2007 23:10:02 +0200 + +amarok (2:1.4.9.1-0ubuntu3) hardy; urgency=low + + * Added kdebase-kio-plugins as a recommened package + + -- Jonathan Aquilina Tue, 15 Apr 2008 14:24:23 +0200 + +amarok (2:1.4.9.1-0ubuntu2) hardy; urgency=low + + [ Daniel Hahler] + * debian/patches/kubuntu_08_add_lastfm_recommended_radio.diff: + Add lastfm recommended radio station (LP: #103227) + * debian/patches/kubuntu_09_audio_mimetypes.diff: + - Add mimetypes audio/flac and audio/ogg (LP: #201291) + + [ Harald Sitter ] + * Unbreak manual media device configuration by enhancing + kubuntu_08_luks_device_detection.diff (LP: #207704) + + -- Harald Sitter Sat, 12 Apr 2008 13:47:12 +0200 + +amarok (2:1.4.9.1-0ubuntu1) hardy; urgency=low + + * Upstream patch release + + -- Jonathan Riddell Thu, 10 Apr 2008 23:07:12 +0100 + +amarok (2:1.4.9-0ubuntu1) hardy; urgency=low + + * New upstream release + + -- Harald Sitter Wed, 09 Apr 2008 13:09:03 +0200 + +amarok (2:1.4.8-0ubuntu5) hardy; urgency=low + + * Added kubuntu_08_luks_device_detection.diff to ajust Amarok's + media device detection to properly work with kdebase's + LUKS patch kubuntu_9913_kiomedialuks.diff) (LP: #186384) + + -- Harald Sitter Tue, 18 Mar 2008 01:10:01 +0100 + +amarok (2:1.4.8-0ubuntu4) hardy; urgency=low + + * Update install-mp3 to correctly error when something goes wrong + + -- Jonathan Riddell Thu, 13 Mar 2008 13:11:08 +0000 + +amarok (2:1.4.8-0ubuntu3) hardy; urgency=low + + [ Sven Boden ] + * Fix for bug "187406: Amarok install-mp3 fails silently" (LP #187406) + + [ Sarah Hobbs ] + * Sponsored upload. (Closes LP: #187406) + * Reworked patch to avoid setting absolute paths (eg /usr/bin/kdesu) + + -- Sarah Hobbs Wed, 12 Mar 2008 00:50:22 +1100 + +amarok (2:1.4.8-0ubuntu2) hardy; urgency=low + + * Fix install-mp3 installation path (LP: #179624) + + -- Guillaume Martres Mon, 31 Dec 2007 11:50:29 +0100 + +amarok (2:1.4.8-0ubuntu1) hardy; urgency=low + + * New upstream release. + * Removed kubuntu_05_utf8_to_mtp_devices_fix.diff (applied upstream). + * Removed kubuntu_06_fix_amarok_freeze_installing_mp3.diff (applied upstream). + * Removed proxy_lyrics.diff (applied upstream). + * Removed overrides/ and it's content since there is no amarok-arts anymore. + * Removed amarok-gstreamer.install since there is no amarok-gstreamer anymore. + * Changed Standards-Version to 3.7.3. + * Moved "Homepage" from Description stanza to the source section. + + -- Harald Sitter Mon, 17 Dec 2007 16:19:44 +0100 + +amarok (2:1.4.7-2ubuntu5) hardy; urgency=low + + * build without the libkerma-dev build dpendancy also ( realy fixed this + upload ) + + -- Brandon Holtsclaw Mon, 10 Dec 2007 01:56:48 -0600 + +amarok (2:1.4.7-2ubuntu4) hardy; urgency=low + + * build with --without-libkarma, as it seems to be default if left blank. + + -- Brandon Holtsclaw Sat, 08 Dec 2007 09:49:20 -0600 + +amarok (2:1.4.7-2ubuntu3) hardy; urgency=low + + * removed --with-libkarma, libkarma{0,-dev} is not in Main yet. + + -- Brandon Holtsclaw Wed, 05 Dec 2007 23:47:20 -0600 + +amarok (2:1.4.7-2ubuntu2) hardy; urgency=low + + * Rebuild for libmtp6 -> libmtp7 transition + + -- Jonathan Riddell Tue, 04 Dec 2007 14:01:22 +0000 + +amarok (2:1.4.7-2ubuntu1) hardy; urgency=low + + * Merge with Debian, remaining changes in debian/KUBUNTU-DEBIAN-DIFFERENCES + + -- Jonathan Riddell Mon, 03 Dec 2007 20:01:18 +0000 + +amarok (1.4.7-2) UNRELEASED; urgency=low + + * Build against libgpod-nogtk-dev. + + -- Adeodato Simó Sun, 26 Aug 2007 16:16:54 +0200 + +amarok (1.4.7-1) unstable; urgency=low + + * The "Are you breaking up with me?" release. + + -- Adeodato Simó Mon, 20 Aug 2007 11:00:49 +0200 + +amarok (1.4.6-1) unstable; urgency=low + + * New upstream version packaged. + + * Drop magnatune_CVE-2006-6980.diff; a (better) fix was applied upstream. + + -- Adeodato Simó Fri, 22 Jun 2007 22:12:29 +0100 + +amarok (1.4.5-5) unstable; urgency=low + + * Rebuild against libtunepimp 0.5; change Build-Depends from libtunepimp3-dev + to libtunepimp-dev. (Closes: #425884) + + -- Adeodato Simó Fri, 25 May 2007 11:02:17 +0200 + +amarok (1.4.5-4) unstable; urgency=low + + * Upload to unstable. (Closes: #421920) + + * Remove build-dependency on dpkg-dev (the version in stable groks + ${binary:Version}), and drop version requirement on debhelper and + libtag1-dev as well. + + * Drop the changes made to remove circular dependencies. (Reopens: #368485, + closes: #415484, #412464) + + * Add patch to fix FTBFS with gcc-4.3. (Closes: #417684) + + * Use ${binary:Version} instead of ${source:Version}. + + * Add XS-VCS-Bzr field. + + * Add watch file, and adjust download URL on debian/copyright. + + -- Adeodato Simó Fri, 11 May 2007 11:57:31 +0200 + +amarok (1.4.5-3) experimental; urgency=low + + * Add support for devices using MTP, build-dep on libmtp-dev added. + (Closes: #405399) + * Add support for karma devices, build-dep on libkarma-dev added. + (Closes: #400801) + * Added patch fixing CVE-2006-6980: amarok magnatune unsafe shell. + (Closes: #410850) + + -- Ana Beatriz Guerrero Lopez Mon, 12 Mar 2007 02:38:05 +0100 + +amarok (1.4.5-2) experimental; urgency=low + + * iPod support is back. Added versioned build-dep on libgpod-dev (>=0.4.2). + (Closes: #409985) + * Add patch to add the "Queue Track" functionality to the Amarok DCOP API: + queuemedia.patch. Patch by Isaac Clerencia + * Add patch to allow amarok get lyrics via http proxy with authentication. + Thanks to Filipe Lautert . (Closes: #409568) + * Added versioned dep on amarok-engines | amarok-engine, thanks to Andreas + Pakulat for pointing this. (Closes: #409996). + + -- Ana Beatriz Guerrero Lopez Sat, 10 Feb 2007 00:40:10 +0100 + +amarok (1.4.5-1) experimental; urgency=low + + * New upstream release: + - Remove patches merged by upstream: invoke_browser, sparc-asm, magnatune, + kde134333_negative_length_fix, revert-fix-for-bug-116127. + * The XMMS visualization interface has been removed by upstream: + - Remove xmms-dev build-dep. + - amarok's description updated. + - update amarok.install/rules. + * iPod support temporarily dropped. (It needs libgpod >= 0.4.2, which is not + yet in Debian). + + -- Ana Beatriz Guerrero Lopez Fri, 2 Feb 2007 05:15:29 +0100 + +amarok (1.4.4-4) unstable; urgency=high + + * Include final version of the magnatune.patch and really apply it. + + -- Ana Beatriz Guerrero Lopez Sun, 18 Feb 2007 01:17:49 +0100 + +amarok (1.4.4-3) unstable; urgency=high + + * Edited patch magnatune.patch fixing CVE-2006-6980: amarok magnatune + unsafe shell. (Closes: #410850). + The reference to the ruby scripts pointed in the bug report, is a problem + that was already solved in amarok 1.4.4. + * Add dep on unzip (needed to uncompress albums). + + -- Ana Beatriz Guerrero Lopez Thu, 15 Feb 2007 22:28:13 +0100 + +amarok (1.4.4-2) unstable; urgency=high + + * Patched magnatune code to avoid multiple credit-card charges. + (Closes: #402309) + + -- Ana Beatriz Guerrero Lopez Tue, 12 Dec 2006 16:51:13 +0100 + +amarok (1.4.4-1) unstable; urgency=medium + + * Adding myself as uploader. ACK my last three NMUs... + * Removed circular dependencies. Now amarok-engines and amarok-$engine + Recommends: amarok, instead of depends on amarok (Closes: #368485). + * Fix kde#134333: properly compute total playlist length if there are + tracks dynamic lengths (e.g. last.fm streams) in the playlist. Patch by + Modestas Vainius . + * Replaced ${Source-Version} with ${source:Version} and added versioned + build-dependency on dpkg-dev accordingly. + + -- Ana Beatriz Guerrero Lopez Sun, 26 Nov 2006 03:42:59 +0100 + +amarok (2:1.4.7-0ubuntu3) gutsy; urgency=low + + * Added kubuntu_05_utf8_to_mtp_devices_fix.diff from upstream. (KDE + Bug #139722) + * Added kubuntu_06_fix_amarok_freeze_installing_mp3.diff from + upstream. (KDE Bug #147126, LP: #58617) Thanks markey for fixing + this! + * Added amarok Suggests: libxine1-ffmpeg. (LP: #134741) + * Added kubuntu_07_gnome_multimedia_keys.diff, a script that lets the + multimedia keys in GNOME work in amarok. (LP: #87299) + * Use adept_batch update in install-mp3 not apt-get update + + -- Sarah Hobbs Sat, 01 Sep 2007 00:11:20 +1000 + +amarok (2:1.4.7-0ubuntu2) gutsy; urgency=low + + * Rebuild for libmtp5 -> libmtp6 library transition. + + -- Steve Kowalik Sat, 18 Aug 2007 00:55:59 +1000 + +amarok (2:1.4.7-0ubuntu1) gutsy; urgency=low + + * New Upstream version + * debian/control: replaced automake1.8 with automake1.9 + + -- Stephan Hermann Wed, 15 Aug 2007 09:47:17 +0200 + +amarok (2:1.4.6-0ubuntu2) gutsy; urgency=low + + * Rebuild for the libgpod1 -> libgpod2 library transition. + * Bump required version of the libgpod development headers. + + -- Steve Kowalik Tue, 17 Jul 2007 00:36:04 +1000 + +amarok (2:1.4.6-0ubuntu1) gutsy; urgency=low + + * New Upstream Release. (LP: #46526) + * Fixed kubuntu-media-amarok syntax (LP: #112252) + * Removed kubuntu_05_magnatune_security_fix.diff - fixed upstream + * Removed kubuntu_06_right_click_sound_control_fix.diff - fixed upstream + * Removed kubuntu_07_monge_exports_correct_symbols.diff - fixed + upstream + + -- Sarah Hobbs Tue, 19 Jun 2007 01:09:37 +1000 + +amarok (2:1.4.5-0ubuntu7) feisty; urgency=low + + * Spelling correction: amaroK -> Amarok + * Description update (no kio support with libxine - yet) + + -- Harald Sitter Tue, 3 Apr 2007 17:45:46 +0200 + +amarok (2:1.4.5-0ubuntu6) feisty; urgency=low + + * Fixed the install-mp3 script + + -- Ryan Kavanagh Tue, 6 Mar 2007 19:11:17 -0500 + +amarok (2:1.4.5-0ubuntu5) feisty; urgency=low + + * Added patches: + - kubuntu_05_magnatune_security_fix.diff. Fixes CVE #-2006-6979, + KDE Bug #138499 + - kubuntu_06_right_click_sound_control_fix.diff. KDE Bug #141672 + - kubuntu_07_monge_exports_correct_symbols.diff + * All patches from amarok SVN. + + -- Sarah Hobbs Thu, 15 Feb 2007 15:32:32 +1100 + +amarok (2:1.4.5-0ubuntu4) feisty; urgency=low + + * Correct thinko in .install for installing the missing files. + + -- Steve Kowalik Wed, 14 Feb 2007 00:17:29 +1100 + +amarok (2:1.4.5-0ubuntu3) feisty; urgency=low + + * Update libmtp build-dep to 0.1.3-0ubuntu1 + * Install missing files (cd player .desktop file, libhttp11, amarok_addaspodcast.desktop) + + -- Jonathan Riddell Wed, 7 Feb 2007 11:45:28 +0000 + +amarok (2:1.4.5-0ubuntu2) feisty; urgency=low + + * Added Build-dep libgpod-dev + * Fixed amarok.install + - Install collection bin files in the correct path + (Closes Malone #83454) + - Added back ipod lib (Closes Malone #83515) + + -- Anthony Mercatante Tue, 06 Feb 2007 19:36:32 +0100 + +amarok (2:1.4.5-0ubuntu1) feisty; urgency=low + + [ Brandon Holtsclaw ] + * New Upstream Release + * Removed the following patches , adopted upstream + - invoke_browser.patch + - kubuntu_05_lastfm_xine.diff + - some-binaries-in-usr-lib.patch + - sparc-asm.patch + + [ Sarah Hobbs ] + * Added dependancy kdebase-kio-plugins. Closes malone #66764 + * Compiling without stack smashing protection. Closes malone #81768 + + -- Brandon Holtsclaw Sun, 4 Feb 2007 00:46:12 -0600 + +amarok (2:1.4.4-0.3ubuntu4) feisty; urgency=low + + * No-change upload for the libpq4->libpq5 transition. + + -- Martin Pitt Mon, 15 Jan 2007 15:39:10 +0000 + +amarok (2:1.4.4-0.3ubuntu3) feisty; urgency=low + + * Rebuild against libtunepimp5 + + -- Jonathan Riddell Fri, 8 Dec 2006 10:47:51 +0000 + +amarok (2:1.4.4-0.3ubuntu2) feisty; urgency=low + + * Add patch kubuntu_05_lastfm_xine.diff from upstream to make + last.fm streams work with Xine 1.1.3 + + -- Jonathan Riddell Tue, 5 Dec 2006 13:03:34 +0000 + +amarok (2:1.4.4-0.3ubuntu1) feisty; urgency=low + + * Fake Sync from debian unstable + + -- Brandon Holtsclaw Thu, 23 Nov 2006 03:46:05 -0600 + +amarok (2:1.4.4-0ubuntu3) feisty; urgency=low + + * Compile with MTP Device Support + + -- Brandon Holtsclaw Tue, 14 Nov 2006 22:13:11 -0600 + +amarok (2:1.4.4-0ubuntu2) feisty; urgency=low + + * Add debian/kubuntu-media-amarok and + debian amarok_play_audiocd.desktop for good KDE integration + + -- Anthony Mercatante Fri, 03 Nov 2006 23:57:33 +0200 + +amarok (2:1.4.4-0ubuntu1) feisty; urgency=low + + * New Upstream Version + * Removed kubuntu_06_dapp_assert.diff and kubuntu_05_playlist_encoding.diff + adopted upstream + + -- Brandon Holtsclaw Thu, 26 Oct 2006 16:19:30 -0500 + +amarok (1.4.4-0.3) unstable; urgency=low + + * Non-maintainer upload. + * Applied patch invoke_browser.patch to allow amarok open external URLs. + (Closes: #397266). + * Removed dependency on xmms and updated README.Debian. Thanks to Bryan + Donlan and Michael Biebl. (Closes: #393141) + + -- Ana Beatriz Guerrero Lopez Sun, 19 Nov 2006 02:50:39 +0100 + +amarok (1.4.4-0.2) unstable; urgency=low + + * Non-maintainer upload. + * Applied patch to fix build on sparc. Thanks to Jurij Smakov for the patch. + + -- Ana Beatriz Guerrero Lopez Sat, 4 Nov 2006 10:19:37 +0100 + +amarok (1.4.4-0.1) unstable; urgency=low + + * Non-maintainer upload with permission from the maintainer. + * New upstream release. + * Dropped patch 143_provided_upstream_playlist_encoding.diff, + merged by upstream. + * Moved architecture-dependent files from /usr/share to + /usr/lib. Thanks to Ted Percival. (Closes: #392392) + * Updated debian/compat to 5. + + -- Ana Beatriz Guerrero Lopez Tue, 31 Oct 2006 21:59:59 +0100 + +amarok (2:1.4.3-0ubuntu10) edgy; urgency=low + + * Make sure amarok_njb support is installed to the correct location + * Closes Malone: #61492 + + -- Brandon Holtsclaw Sat, 14 Oct 2006 13:46:21 -0500 + +amarok (2:1.4.3-0ubuntu9) edgy; urgency=low + + * Set .pot name in debian/rules + + -- Jonathan Riddell Sun, 1 Oct 2006 12:44:07 +0100 + +amarok (2:1.4.3-0ubuntu8) edgy; urgency=low + + * The DAAP client would crash Amarok under certain conditions when + kdelibs was compiled with asserts on. Thanks to Ian Monroe + * Closes KDE: #132851 + + -- Brandon Holtsclaw Wed, 20 Sep 2006 21:10:11 -0500 + +amarok (2:1.4.3-0ubuntu7) edgy; urgency=low + + * Various fixes to install-mp3 + + -- Jonathan Riddell Wed, 20 Sep 2006 14:54:21 +0100 + +amarok (2:1.4.3-0ubuntu6) edgy; urgency=low + + * Added support for edgy ( and future TBA releases ) to install-mp3 + * Closes Malone #60637 + + -- Brandon Holtsclaw Sat, 16 Sep 2006 03:56:07 -0500 + +amarok (2:1.4.3-0ubuntu5) edgy; urgency=low + + * Fixed a typo that prevented Amarok configuring Nomad Jukebox + in debian/rules + + -- Brandon Holtsclaw Sat, 16 Sep 2006 01:48:11 -0500 + +amarok (2:1.4.3-0ubuntu4) edgy; urgency=low + + * Built --with-libnjb support ( Creative Nomad Devices ) + * Added kubuntu_05_playlist_encoding.diff. This bug could result + in failure to restore the current playlist. (BR 133613) + + -- Brandon Holtsclaw Fri, 15 Sep 2006 10:53:56 -0500 + +amarok (2:1.4.3-0ubuntu3) edgy; urgency=low + + * Fixed little error in install-mp3, in the case multiverse is + already activated. Code could be really optimized, but it works + as it is. I will probably make something clean after edgy release. + + -- Anthony Mercatante Tue, 13 Sep 2006 22:26:14 +0200 + +amarok (2:1.4.3-0ubuntu2) edgy; urgency=low + + * Improved install-mp3 to manage ubuntu/gnome and other desktops correctly. + (closes #59007) + + -- Anthony Mercatante Mon, 11 Sep 2006 17:02:14 +0200 + +amarok (2:1.4.3-0ubuntu1) edgy; urgency=low + + [ Brandon Holtsclaw ] + * New Upstream Release + * Removed kubuntu_0{5,6,7,8}_*.diff patches as they have been applyed upstream + * Added build-dep ruby1.8-dev and automake-1.9 as now required to build amarok + + [ Jonathan Riddell ] + * Remove automake1.7 build-dep + * Install all files + + -- Brandon Holtsclaw Mon, 4 Sep 2006 22:08:14 -0500 + +amarok (2:1.4.2-0ubuntu3) edgy; urgency=low + + [ Jonathan Riddell ] + * Remove kubuntu_03_podir.diff, not built with tar in .orig + + [ Sarah Hobbs ] + * Added a more verbose error message when install-mp3 script fails + + [ Brandon Holtsclaw ] + * Collection scanner would only restart a maximum of 2 times instead of + 20. (fixed in SVN revision 578922) - kubuntu_08_scanner.diff + * MTP mediadevice support would not compile against libmtp versions gt + 0.0.12. (fixed in SVN revision 576121) - kubuntu_06_mtp.diff + * AudioCD playback would stutter and sometimes freeze Amarok. (BR 133015) + - kubuntu_05_audiocd.diff + * Fixed bug which prevented Amarok from creating the collection database + in rare circumstances using SQLite. (BR 133072) - kubuntu_07_collection.diff + + -- Brandon Holtsclaw Thu, 31 Aug 2006 12:01:16 -0500 + +amarok (2:1.4.2-0ubuntu2) edgy; urgency=low + + * amarok_libvisual helper added to amarok.install (malone #57636) + * Fixed typo in Sugests for libvisual-0.4-plugins Closes Last Half malone #55779 + + -- Brandon Holtsclaw Sun, 27 Aug 2006 05:52:34 -0500 + +amarok (2:1.4.2-0ubuntu1) edgy; urgency=low + + [ Brandon Holtsclaw ] + * Removed libgstreamer0.10-dev as its not needed anylonger + gst support has been droped upstream and in kubuntu + * Added libhal-dev as a build dep (malone #55779) + + [ Daniel Molkentin ] + * Install DAAP media device + + [ Sarah Hobbs ] + * New upstream version. Closes #24063, #49098, #47179, #52958 and other bugs + * Moved python-qt3 from recommends to depends. Closes bugs #55075, #48724 + * Removed python from suggests (already a dep of python-qt3) + * Changed suggests libvisual-0.2 to libvisual0.4.0-plugins. Closes bug #55734 + * Compiled with libvisual support. Added build-dep libvisual-0.4-dev. Closes other half of bug #55734 + * Removed debian/amarok-gstreamer.install as we no longer distribute + amarok-gstreamer + * Change build-dep automake1.9 --> automake1.7 + * Changed build-dep debhelper --> debhelper (>=5) + * Bumped Compat to 5 + + -- Brandon Holtsclaw Wed, 23 Aug 2006 07:11:02 -0500 + +amarok (2:1.4.1-0ubuntu3) edgy; urgency=low + + * Make debian/install-mp3 executable. Closes bug #52994 + * Install amarokapp in /usr/bin. Closes bugs #16474, #52360 + * Stopped compiling with exscalibar support - upstream + removed the moodbar + + -- Sarah Hobbs Tue, 18 Jul 2006 13:55:53 +1000 + +amarok (2:1.4.1-0ubuntu2) edgy; urgency=low + + * Depend on amarok-xine not amarok-engines + + -- Jonathan Riddell Wed, 12 Jul 2006 00:01:33 +0000 + +amarok (2:1.4.1-0ubuntu1) edgy; urgency=low + + * New upstream release + + -- Jonathan Riddell Tue, 4 Jul 2006 22:46:21 +0000 + +amarok (1.4.0a-1) unstable; urgency=low + + * Revised tarball for 1.4.0 (closes: #367897), fixing the following issues: + + + does not botch migration from 1.3 SQLite collections, which in addition + caused further collection rebuilds to appear empty. (Closes: #368396) + + correctly closes database connections, thus not failing with "too many + open files" and deleting the collection after some hours in pause mode. + (Closes: #368086) + + audio CDs can be reproduced again. (Upstream #127388) + + * Switch to included SQLite; for some reason, dynamic linking against 3.3.5 + makes scores unfunctional. (Closes: #367468) + + -- Adeodato Simó Sat, 27 May 2006 15:23:14 +0200 + +amarok (1.4.0-1) unstable; urgency=low + + * New upstream release. The upstream tarball no longer ships the GStreamer + engine, and aRts support was dropped a while ago, and this upload only + includes the XINE engine. + + Bugs reported in the Debian BTS fixed in this version: + + + collection is updated at start up. (Closes: #330017) + + metadata for icecast streams is displayed. (Closes: #349796) + + the correct charset is used for lyrics URLs. (Closes: #352882) + + iPods are recognized even after emptying them. (Closes: #350305) + + non-ascii characters are displayed correctly under non UTF-8 + locales in the konqueror sidebar. (Closes: #353058) + + last.fm submission queue is flushed after network unavailability + even if no more tracks are played. (Closes: #344429) + + Regressions fixed since the latest beta: + + + iPod model detection works again, without needing libgpod-cvs. + (Closes: #364789) + + filling tags using MusicBrainz works again. (Closes: #364798) + + * Enable Moodbar support, now that Exscalibar has entered unstable. + (Closes: #364588) + + * Update Standards-Version to 3.7.2 (no changes required). + + -- Adeodato Simó Sun, 14 May 2006 16:42:14 -0500 + +amarok (1.4-beta3c-1) experimental; urgency=low + + * Third beta for the upcoming 1.4 version packaged. + + * Build against libtunepimp3-dev. + + -- Adeodato Simó Sat, 15 Apr 2006 19:47:54 +0200 + +amarok (1.4-beta2-3) experimental; urgency=low + + * Rebuild against libmysqlclient15off. (Closes: #358490) + + -- Adeodato Simó Thu, 23 Mar 2006 02:18:56 +0100 + +amarok (1.4-beta2-2) experimental; urgency=low + + * Fix yesterday's brainfart: aKode can't output to aRts, so remove this + statement from the description. + + * In addition, and after a bit of chit-chat with upstream, follow their + wishes and not package aKode at all (bye amarok-arts), and don't include + GStreamer 0.10 support for now. + + -- Adeodato Simó Mon, 6 Mar 2006 23:37:43 +0100 + +amarok (1.4-beta2-1) experimental; urgency=low + + * Second beta for the upcoming 1.4 version packaged. + + This release drops the aRts engine; in order to keep support for + outputting to aRts, ship the aKode engine in the amarok-arts package. + + Also, GStreamer 0.8 support is dropped in favour of GStreamer 0.10. Update + build-dependencies and amarok-gstreamer's dependencies accordingly. + + * Use strncpy instead of qstrdup in the patch for main.cpp, so that argv[0] + is overwritten correctly. This closes: #352171 (amaroK not remembering the + desktop it was on upon login), and incidentally makes Erich Schubert happy. + + * Drop build-dependency on libgtk2.0-dev now that #353590 is fixed. + + -- Adeodato Simó Mon, 6 Mar 2006 05:44:33 +0100 + +amarok (1.4-beta1-r511476b) experimental; urgency=low + + * First beta (plus SVN) for the upcoming 1.4 version packaged. + (Closes: #352590) + + * Update build-depends to support iRiver iFP (B-D: libifp-dev, libusb-dev), + and iPod via libgpod (B-D: libgpod-dev; plus libgtk2.0-dev due to #353590). + + * Since lyrics downloading is now implemented in a separate Ruby script, + promote ruby from Suggests to Recommends, so that functionality is ideally + not lost. Add a note with this information to README.Debian. + + * Link against sqlite dynamically again, since amaroK 1.4 can cope with the + restriction explained in the changelog entry for 1.3.1-1 and Bug#326648. + + -- Adeodato Simó Mon, 20 Feb 2006 05:42:15 +0100 + +amarok (1.3.9-1) unstable; urgency=medium + + * New upstream bugfix release. + + * Build against libtunepimp3-dev. (Closes: #359086) + + -- Adeodato Simó Thu, 27 Apr 2006 00:33:29 +0200 + +amarok (1.3.8-1) unstable; urgency=low + + * New upstream bugfix release: + + + fetching lyrics works again. (Closes: #344509) + + * Do not use g++-3.4 in arm, m68k and hppa anymore, sid's g++-4.0 is + expected to work. (Closes: #342953) + + * Update MySQL build-dependency to libmysqlclient15-dev. (Closes: #343759) + + * Switch patch management to quilt, and make use of patchsys-quilt.mk. + + * Drop build-depends version constraints that are satisfied with stable. + Drop the ones for kdebase-dev and kdemultimedia-dev as well, which were + transient and all arches have the minimum required versions in sid now. + + -- Adeodato Simó Wed, 18 Jan 2006 01:43:40 +0100 + +amarok (1.3.7-1) unstable; urgency=low + + * New upstream bugfix release. + + * Built against kdelibs4c2a, so installable in sid again. (Closes: #341959) + Temporarily bump build-deps on kdebase-dev and kdemultimedia-dev. + + * Remove debian/patches/taglib-1.3.1-suffices.diff, since taglib 1.4 is in + testing and unstable, and I'll be using a backport for sarge packages. + Bump version constraint in debian/control. + + * Again, update my e-mail address in debian/control, yada yada. + + -- Adeodato Simó Wed, 07 Dec 2005 06:44:59 +0100 + +amarok (2:1.3.9-0ubuntu4) dapper; urgency=low + + * debian/cdbs/kde.mk: + - added dh_iconcache. + + -- Daniel Holbach Sun, 21 May 2006 16:16:47 +0200 + +amarok (2:1.3.9-0ubuntu3) dapper; urgency=low + + * Don't install hr translations, it's really Hindi + Closes Malone #44517 + + -- Jonathan Riddell Tue, 16 May 2006 00:14:56 +0300 + +amarok (2:1.3.9-0ubuntu2) dapper; urgency=low + + * Rebuild against the new libmysqlclient15off with correct symbols. + + -- Adam Conrad Thu, 6 Apr 2006 12:46:44 +1000 + +amarok (2:1.3.9-0ubuntu1) dapper; urgency=low + + * New upstream release + * Use automake1.7, that's what the upstream file seems to use + + -- Jonathan Riddell Sat, 25 Mar 2006 17:32:01 +0000 + +amarok (2:1.3.8-0ubuntu7) dapper; urgency=low + + * Re-uploaded for new language-pack scripts, no changes + + -- Jonathan Riddell Wed, 15 Mar 2006 18:49:41 +0000 + +amarok (2:1.3.8-0ubuntu6) dapper; urgency=low + + * Re-uploaded for new language-pack scripts, no changes + + -- Jonathan Riddell Thu, 23 Feb 2006 12:28:47 +0000 + +amarok (2:1.3.8-0ubuntu5) dapper; urgency=low + + * Add kubuntu_03_podir.diff, change podir so .pot file gets + generated in a place that keeps the language pack scripts happy + + -- Jonathan Riddell Mon, 20 Feb 2006 19:09:30 +0000 + +amarok (2:1.3.8-0ubuntu4) dapper; urgency=low + + * Remove amarok-gstreamer from enginePackages substvars + + -- Jonathan Riddell Mon, 20 Feb 2006 11:44:19 +0000 + +amarok (2:1.3.8-0ubuntu3) dapper; urgency=low + + * Remove use of GCC 3.4 + + -- Jonathan Riddell Thu, 16 Feb 2006 10:52:51 +0000 + +amarok (2:1.3.8-0ubuntu2) dapper; urgency=low + + * Remove GStreamer 0.8 support, default to xine + * Change from libmysqlclient14-dev to libmysqlclient15-dev build-dep + + -- Jonathan Riddell Wed, 1 Feb 2006 11:56:01 +0000 + +amarok (2:1.3.8-0ubuntu1) dapper; urgency=low + + * New upstream release + + -- Jonathan Riddell Sun, 15 Jan 2006 19:10:14 +0000 + +amarok (2:1.3.7-0ubuntu4) dapper; urgency=low + + * weaken build dependencies + + -- Reinhard Tartler Fri, 30 Dec 2005 14:55:13 +0100 + +amarok (2:1.3.7-0ubuntu3) dapper; urgency=low + + * Add kubuntu_02_read_kubuntu_config.diff to make it read Kubuntu's + amarokrc file, which hides the splash screen + + -- Jonathan Riddell Thu, 15 Dec 2005 20:13:28 +0000 + +amarok (2:1.3.7-0ubuntu2) dapper; urgency=low + + * debian/control: Removed the text about libvisual. There is no libvisual + support right now in ubuntu + + -- Stephan Hermann Wed, 7 Dec 2005 23:52:58 +0100 + +amarok (2:1.3.7-0ubuntu1) dapper; urgency=low + + * New upstream release + + -- Jonathan Riddell Tue, 6 Dec 2005 20:59:31 +0000 + +amarok (2:1.3.6-1ubuntu3) dapper; urgency=low + + * Make amarok-gstreamer default engine + * Add kubuntu_01_kdepot.diff for pot generation + + -- Jonathan Riddell Tue, 29 Nov 2005 19:18:38 +0000 + +amarok (2:1.3.6-1ubuntu2) dapper; urgency=low + + * debian/substvars: moved gstreamer0.8-mad to Suggests section + * Update kde.mk for .pot generation + + -- Jonathan Riddell Sat, 26 Nov 2005 02:52:27 +0000 + +amarok (2:1.3.6-1ubuntu1) dapper; urgency=low + + * Sync with debian, and readded the Ubuntu specific Epoch + * Merged the debian/changelog + * debian/control: + - Removed libvisual-dev, libsdl1.2-dev from build-deps + - Removed libvisual-plugins from Suggests + * debian/amarok.install: prevent installing amarok_libvisual + + -- Stephan Hermann Sun, 20 Nov 2005 18:32:06 +0100 + +amarok (1.3.6-1) unstable; urgency=low + + * New upstream bugfix release: + + + last.fm submissions are properly saved on disk while offline again; they + had been broken by Qt 3.3.5. (Closes: #334469, #337109) + + includes missing semicolon in amarok.desktop. (Closes: #336026) + + * Update my e-mail address in debian/control. + + -- Adeodato Simó Tue, 08 Nov 2005 10:40:42 +0100 + +amarok (1.3.5-1) unstable; urgency=low + + * New upstream bugfix release, quickly released to fix a potential crash at + startup (upstream #114983). + + -- Adeodato Simó Tue, 25 Oct 2005 14:55:29 +0200 + +amarok (1.3.4-1) unstable; urgency=low + + * New upstream bugfix release, which makes this maintainer of yours + immensely happy because a fix for upstream #114195 is included. + ("Collection scanner ignored files with non-ascii characters"). + + * Add libvisual support (closes: #335053). Thanks to Jean-Rémy Falleri for + the heads-up. Changes needed: + + + add libvisual0.2-dev and libsdl1.2-dev to Build-Depends. + + add libvisual0.2-plugins to Suggests, and mention it in the paragraph + regarding visualization plugins in amarok's description. + + add the appropriate snippet to some-binaries-in-usr-lib.patch in order + to cope with amarok_libvisual installed in /usr/lib/amarok instead of + /usr/bin, as mandated by Policy. + + -- Adeodato Simó Mon, 24 Oct 2005 09:30:22 +0200 + +amarok (1.3.3-1) unstable; urgency=low + + * New upstream bugfix release: + + + does not loose playlist / podcasts on restart. (Closes: #329878) + + PostgreSQL configuration dialog no longer shows MySQL's. (Closes: #327630) + + * Updated the Debian menu icons to the new logo. + + * Updated copyright notice, list of authors, and FSF postal address in + debian/copyright. + + -- Adeodato Simó Thu, 13 Oct 2005 00:04:34 +0200 + +amarok (1.3.2-1) unstable; urgency=low + + * New upstream bugfix release, featuring the return of alsasink support. + + -- Adeodato Simó Wed, 21 Sep 2005 04:14:52 +0200 + +amarok (1.3.1-2) unstable; urgency=low + + * Use g++ 3.4 in arm, m68k and hppa. + + -- Adeodato Simó Tue, 06 Sep 2005 00:21:03 +0200 + +amarok (1.3.1-1) unstable; urgency=low + + * New upstream bugfix release. Beware, though, that the GStreamer engine has + been rewritten (!), and ALSASINK SUPPORT REMOVED due to temporary breakage. + + * Use the internal copy of sqlite for now. This fixes the collection being + non functional with SQLite 3.2.5 due to this version preventing a database + handle opened in one thread to be used in another. See Bug#326648 for + reference. (Closes: #326562, #312386) + + * Enable PostgreSQL support (closes: #326612, #326713): + + + debian/rules: pass --enable-postgresql to ./configure. + + debian/control: add libpq-dev to Build-Depends. + + (Before somebody comes around with the word "bloat" ready, libpq4 is 6 + times smaller than libmysqlclient14.) + + * Regain preciousss "my `grep -c NEEDED` is smaller than yours" karma by not + using LIBADD in the statusbar convenience lib. The Depends line had gained + some weight in 1.2.3-1. + + -- Adeodato Simó Mon, 05 Sep 2005 20:57:41 +0200 + +amarok (2:1.3.1-0ubuntu4) breezy; urgency=low + + * Add kubuntu_02_column_sort_crash.diff fix a + crash on column sort http://bugs.kde.org/113042 + + -- Jonathan Riddell Tue, 4 Oct 2005 16:14:12 +0100 + +amarok (2:1.3.1-0ubuntu3) breezy; urgency=low + + * Add kubuntu_01_alsasink.diff to fix and reenable alsasink + + -- Jonathan Riddell Mon, 3 Oct 2005 22:40:05 +0100 + +amarok (2:1.3.1-0ubuntu2) breezy; urgency=low + + * debian/control: added khelpcenter as suggestion + + -- Stephan Hermann Sat, 17 Sep 2005 02:23:08 +0200 + +amarok (2:1.3.1-0ubuntu1) breezy; urgency=low + + * New Upstream Release + * Merged the Debian package from Adeodato Simó + * debian/substvars: moved gstreamer0.8-mad to Suggests section + + -- Stephan Hermann Fri, 16 Sep 2005 19:59:06 +0200 + +amarok (1.3.0-1) unstable; urgency=low + + * New upstream release packaged (closes: #323249). Bugs reported in the + Debian BTS fixed in this version: + + + does not display advertisements in lyrics. (Closes: #321499) + + pre-amp in the equalizer works with XINE engine too. (Closes: #283750) + + includes PartyMode. (Closes: #293293) + + includes equalizer presets. (Closes: #283761) + + builds fine with GCC 4.0. (Closes: #314779) + + * Updated Build-Dependencies: + + + automake1.6 to automake1.9. + + libmysqlclient12-dev to libmysqlclient14-dev. + + temporarily bump version constraint in kdemultimedia-dev and kdebase-dev + in order to allow an early upload in the middle of the KDE transition. + + * Adjustments to the build-system: + + + do not require TagLib 1.4.0 since it's not in Debian yet (#323280). + + don't use KDE_FINAL in amarok/src since both MySQL and KDE have had the + brilliant idea to define a struct/class named "NET". + + * This version links against libtunepimp2c2, so libtunepimp2 0.3.0-4 + breakage does not affect us anymore. (Closes: #318000) + + * Update Standards-Version to 3.6.2 (no changes required). + + -- Adeodato Simó Sat, 03 Sep 2005 01:42:56 +0200 + +amarok (1.2.4-1) unstable; urgency=low + + * The "following Debian Policy is cool, except when it's not" release. + + * New upstream bugfix release: + + + amaroK now correctly displays the name of the first available engine, + instead of an empty line. (Closes: #307949) + + * The KDE Session Manager can now restore amaroK on login (closes: #302852, + #308099). Patch amarokapp to set its own argv[0] to 'amarok', since for the + session manager to restore an application the binary must be in the $PATH. + + * Made the crash handler aware that amarokapp is in /usr/lib/amarok, and not + in /usr/bin. + + * Include small patch to fix upstream bug 103510 ("systray icon continues + 'playing' after songs end, if 'clear list' was hit while playing"). + + -- Adeodato Simó Mon, 06 Jun 2005 00:08:28 +0200 + +amarok (2:1.2.4-0ubuntu4) breezy; urgency=low + + * Rebuild for the xorg -> mesa GL/GLU transition. + + -- Adam Conrad Sun, 21 Aug 2005 19:34:41 +1000 + +amarok (2:1.2.4-0ubuntu3) breezy; urgency=low + + * Add kubuntu_02_gstreamer_output.patch to default GStreamer to alsasink + + -- Jonathan Riddell Wed, 13 Jul 2005 18:19:28 +0000 + +amarok (2:1.2.4-0ubuntu2) breezy; urgency=low + + * Default to GStreamer plugin + + -- Jonathan Riddell Wed, 6 Jul 2005 15:30:52 +0000 + +amarok (2:1.2.4-0ubuntu1) breezy; urgency=low + + * New upstream release + * Add kubuntu_01_gcc4_fixes.patch to fix compiler errors + + -- Jonathan Riddell Fri, 3 Jun 2005 17:22:10 +0000 + +amarok (1.2.3-1) unstable; urgency=low + + * New upstream bugfix release. + + * This version fixes an important memory leak in the GStreamer engine that + happened when a radio stream stalled. (Closes: #299931) + + -- Adeodato Simó Tue, 29 Mar 2005 01:43:28 +0200 + +amarok (2:1.2.3-1ubuntu4) hoary; urgency=low + + * Revert back to amarok-arts on request of mdz + + -- Chris Halls Wed, 6 Apr 2005 09:33:35 +0100 + +amarok (2:1.2.3-1ubuntu3) hoary; urgency=low + + * Switch default engine to amarok-xine, which is better supported + upstream and is less buggy (Hoary: #8429, #8255) + + -- Chris Halls Mon, 4 Apr 2005 20:01:48 +0100 + +amarok (2:1.2.3-1ubuntu2) hoary; urgency=low + + * Add build-depend on libtool. + * Remove automake1.6 patch + + -- Jonathan Riddell Wed, 30 Mar 2005 14:35:20 +0100 + +amarok (2:1.2.3-1ubuntu1) hoary; urgency=low + + * Sync with Debian + + -- Jonathan Riddell Wed, 30 Mar 2005 04:25:27 +0000 + +amarok (1.2.2-1) kalyxo-unstable; urgency=low + + * New upstream bugfix release. + + * Added a menu file, plus XPM icons. + + * Switched to tarball-in-tarball for the .orig.tar.gz (which is sensibly + smaller now, since upstream uses bz2). Added bzip2 to Build-Depends. + + * Build-depend on automake1.6 and libtool, and regenerate configure and + Makefiles.in at build-time. + + * Use the kde.mk class maintained by the Debian KDE Maintainers, instead + of the one shipped with cdbs. + + -- Adeodato Simó Thu, 17 Mar 2005 19:38:34 +0100 + +amarok (1.2.1-1) unstable; urgency=low + + * New upstream bugfix release. + + * Include patch from CVS to make amaroK bind listening TCP connections to + the local interface only. Related to Bug#297693, but not the same. + + -- Adeodato Simó Fri, 04 Mar 2005 14:54:34 +0100 + +amarok (1.2.0-1) unstable; urgency=low + + * New upstream release packaged (closes: #296139). Lots of improvements and + new functionality, see the changelog or http://amarok.kde.org for details. + Bugs reported in the Debian BTS fixed with in this version: + + + the search text input element is now cleared when the user writes + something there. (Closes: #278359) + + + analyzers work with the XINE engine. (Closes: #287091) + + * amaroK's collection can be now stored in a MySQL database: + + + Build-Depend on libmysqlclient12-dev + + + Pass --enable-mysql to configure. + + * amaroK now includes a sidebar plugin for Konqueror: + + + debian/amarok.install: + - add files for the konqueror sidebar. + + + debian/control: + - added kdebase-dev as Build-Dependency. + + + debian/rules: + - exclude konqsidebar_universalamarok.so from dh_shlibdeps, so that + amarok doesn't end up depending on konqueror. (The plugin will be + ignored in systems without konqueror installed.) + + * Other changes: + + + amaroK now ships several scripts to enhance it. These are written in + Python and Ruby, so add those as suggested packages. Added note to + README.Debian about this, too. + + + removed sqlite3_in_configure.in.patch, no longer necessary in 1.2. + + + added www-browser as an alternative for the konqueror suggests, since + upstream fixed the code so that the configured browser is used. + + + renamed debian/README to debian/README.Debian, so that it gets + installed. D'oh! + + + debian/control: + - remove Build-Dependency on libkjsembed-dev, no longer needed. + + + debian/amarok.install: + - install amarok.profile.xml into /usr/share/apps/profiles. + + -- Adeodato Simó Wed, 23 Feb 2005 03:03:37 +0100 + +amarok (1.1.1-2) unstable; urgency=high + + * Upload to get rid of the dependency on libflac4, which is not longer in + the archive (closes: #289344). Urgency set to high as other packages with + RC bug fixes can't enter testing because of the libflac6 transition not + being ready. + + + Relibtoolized the package, so that binaries won't link against not + needed libraries. Introduced disable_no_undefined.patch, many thanks to + Daniel Schepler for his insight with this (and for providing the patch). + [This has reduced the number of NEEDED libraries from 45 to 18, libflac + being among them.] + + + debian/control: + - version Build-Dependency on libtunepimp2-dev to (>= 0.3.0-2.1). + + * Some new versions of libraries have become available in Debian since the + last upload: + + + Taglib 1.3 is now in the archive: + - removed debian/patches/taglib-1.2-suffices.patch. + - update Build-Depends to libtag1-dev (>> 1.3.1). + + + SQLite 3 is now in the archive: + - changed Build-Depends on libsqlite0-dev to libsqlite3-dev. + - pass --without-included-sqlite to ./configure. + - patch configure.in to check for sqlite3 (>= 3.0). Upstream forgot to + update this check in the 1.1 series. [sqlite3_in_configure.in.patch] + + * New package relationships: + + + amarok now recommends kdemultimedia-kio-plugins, which is needed to play + audio CDs. + + + amarok now suggests konqueror, since it's called in the MusicBrainz + dialog and some other places. (Closes: #282523) + + * Created a README.Debian files with the following: + + + Explain why the amarokapp and amarok_xmmswrapper2 binaries are shipped + in /usr/lib/amarok instead of /usr/bin, differing from upstream. + + + Describe a fix for the 'Socket-path is not a link or a directory' error. + + + Explicitly mention what is needed to play audio CDs in amarok. + + * Other changes: + + + Patched admin/configure.in.min to include AM_MAINTAINER_MODE. To make + the .diff.gz stuff smaller, force automake-1.6 (which upstream uses) in + admin/detect-autoconf.sh. [am_maintainer_mode.patch, automake-1.6.patch] + + + Prevent admin/cvs.sh from creating .gmo files at "make dist" time, since + those can't be shipped in the .diff.gz. [gmo_files_at_build_time.patch] + + + debian/amarok.1: + - correct "hyphen vs. minus sign" usage. + + -- Adeodato Simó Fri, 14 Jan 2005 01:54:47 +0100 + +amarok (1.1.1-1) unstable; urgency=low + + * New upstream release packaged. Most notably, fixes several GStreamer + engine related bugs. + + * debian/control: add to amarok-gstreamer's description that is not possible + to use artssink for output. + + * debian/rules: + - call dh_install with --list-missing (DEB_DH_INSTALL_ARGS). + + * debian/patches/: + - removed proper-otherlang-handbook-path.patch, issue fixed upstream. + + -- Adeodato Simó Sat, 09 Oct 2004 22:51:06 +0200 + +amarok (1.1.0-2) unstable; urgency=low + + * Fix the location of translated amaroK handbook: kde/HTML/$LANG/amarok, not + kde/HTML/$LANG directly. [debian/patches/proper-otherlang-handbook-path.patch] + + -- Adeodato Simó Mon, 27 Sep 2004 14:02:30 +0200 + +amarok (1.1.0-1) unstable; urgency=low + + * New upstream version: + - several last minute fixes. + - includes handbook in several languages (da, et, fr, it, pt, sv). + + * First upload to Debian (closes: #236696). + + -- Adeodato Simó Mon, 27 Sep 2004 01:53:56 +0200 + +amarok (1.1-cvs-0+kalyxo1) experimental; urgency=low + + * New maintainer. Thanks to Peter Rockai for his initial work. + + * Updated to amaroK 1.1 CVS (2004-09-24): + - temporarily link statically against libsqlite, since sqlite >= 3.0.7 is + required and is not available in Debian (requested in #272271). + - added debian/patches/taglib-1.2-suffices.patch to lower the requirement + from taglib 1.3 (requested in #273029) to 1.2, which is enough. + - new package amarok-xine (yet another engine for amaroK, hurray!) + - added the following Build-Dependencies: + + libkjsembed-dev (amaroK is now JavaScript scriptable). + + libtunepimp2-dev (MusicBrainz support). + + libxine-dev (for the xine engine). + + libtag1-dev (missing). + + * New package amarok-engines: + - depends on all the available engine packages and will be installed by + default unless the user specifies an specific engine. + - all the amarok-* packages Provide: amarok-engine, and amarok now + Depends: amarok-engines | amarok-engine. + + * Removed the amarok-xmms package: + - its single binary amarok_xmmswrapper2 is now included in the main amarok + package. + - include some hackery to prevent amarok from depending on xmms (!). + amaroK just does a no-op and issues a warning on stderr if xmms is not + installed and user opens the visualizations menu, so this seems safe. + A xmms-lib package (in which amarok could easily depend) is requested in + #272913. + + * Install amarokapp and amarok_xmmswrapper2 in /usr/lib/amarok instead of + /usr/bin: + - needed for FHS/Debian Policy compliance. + - added debian/patches/some-binaries-in-usr-lib.patch to fix locations in + source (amarok/src/loader/loader.cpp, amarok/src/socketserver.cpp). + + * Added lintian overrides for an aRts module which must go in /usr/lib + despite not being a shared library. noatun and some other arts-related + packages have the same problem, if someone has a solution please share. + + * Made /usr/share/doc/amarok-* symlinks to /usr/share/doc/amarok. + + * Do not make amarok-arts depend on the meta-package "arts"; the + dependencies given by ${shlib:Depends} do suffice. + + * debian/control: updated to Standars-Version 3.6.1. + + -- Adeodato Simó Fri, 24 Sep 2004 02:49:46 +0200 + +amarok (1.0.2-1) unstable; urgency=low + + * New upstream version. + + -- Peter Rockai (mornfall) Thu, 5 Aug 2004 14:23:23 +0200 + +amarok (1.0.1-1) unstable; urgency=low + + * New upstream version + * Make depends among amarok packages versioned + * Prepare to upload into Debian, closes: #236696 + * Add manpage for amarok by Alejandro Exojo + + -- Peter Rockai (mornfall) Wed, 30 Jun 2004 23:24:16 +0200 + +amarok (1.0.0-3) unstable; urgency=low + + * Dynamically link against libsqlite0 + * Fix gstreamer dependencies + * Various small fixes (sections, descriptions, doc dirs) + * Thanks go to Adeodato Simó for help with various issues + + -- Peter Rockai (mornfall) Sat, 26 Jun 2004 23:06:00 +0200 + +amarok (1.0.0-2) unstable; urgency=low + + * Make the depends on amarok-gstreamer a bit more tight. Only depend on + audiosink, recommend the decoder plugins. + * Make the amarok engines depend on amarok itself. + * Compile with xmms visualisation support. + + -- Peter Rockai (mornfall) Wed, 23 Jun 2004 13:58:12 +0200 + +amarok (1.0.0-1) unstable; urgency=low + + * Build official 1.0.0 release. + + -- Peter Rockai (mornfall) Wed, 16 Jun 2004 23:48:52 +0200 + +amarok (1.0-pre1-2) unstable; urgency=low + + * Fix amarok-arts package, was missing mcop files. Duh. + + -- Peter Rockai (mornfall) Wed, 16 Jun 2004 23:25:29 +0200 + +amarok (1.0-pre1-1) unstable; urgency=low + + * First 1.0.0 prerelease. + + -- Peter Rockai (mornfall) Wed, 16 Jun 2004 10:18:31 +0200 + +amarok (1.0-beta4-2) unstable; urgency=low + + * Patch to final beta4 version. + + -- Peter Rockai (mornfall) Tue, 1 Jun 2004 17:47:53 +0200 + +amarok (1.0-beta4-1) unstable; urgency=low + + * New upstream RC (beta4-rc1). + * Build with GST support. + + -- Peter Rockai (mornfall) Tue, 1 Jun 2004 10:24:09 +0200 + +amarok (1.0-beta3-1) unstable; urgency=low + + * New upstream release. + + -- Peter Rockai (mornfall) Sat, 29 May 2004 17:08:55 +0200 + +amarok (1.0-beta1-0) workstation-unstable; urgency=low + + * Initial packaging + + -- Peter Rockai (mornfall) Sun, 11 Apr 2004 17:05:00 +0200 --- amarok-1.4.9.1.orig/debian/amarok-engine-yauap.install +++ amarok-1.4.9.1/debian/amarok-engine-yauap.install @@ -0,0 +1,3 @@ +debian/tmp/usr/share/services/amarok_yauap-engine_plugin.desktop +debian/tmp/usr/lib/kde3/libamarok_yauap-engine_plugin.la +debian/tmp/usr/lib/kde3/libamarok_yauap-engine_plugin.so --- amarok-1.4.9.1.orig/debian/amarok.manpages +++ amarok-1.4.9.1/debian/amarok.manpages @@ -0,0 +1,4 @@ +debian/man/amarokapp.1 +debian/man/amarok.1 +debian/man/amarokcollectionscanner.1 +debian/man/amarok_libvisual.1 --- amarok-1.4.9.1.orig/debian/install-mp3 +++ amarok-1.4.9.1/debian/install-mp3 @@ -0,0 +1,40 @@ +check_mp3() { + + INSTALLED=`dpkg --get-selections libxine1-ffmpeg | grep install` + + if [ -z "$INSTALLED" ]; then + if [ -x /usr/bin/kdialog ]; then + kdialog --msgbox "There was an error installing MP3 support. You need to install the package \"libxine1-ffmpeg\" manually." --icon amarok + elif [ -x /usr/bin/zenity ]; then + zenity --info --text "There was an error installing MP3 support. You need to install the package \"libxine1-ffmpeg\" manually." + else + Xdialog --msgbox "There was an error installing MP3 support.\nYou need to install the package \"libxine1-ffmpeg\" manually." 10 60 + fi + exit 1 + else + if [ -x /usr/bin/kdialog ]; then + kdialog --msgbox "MP3 support now installed, you will need to restart Amarok." --icon amarok + elif [ -x /usr/bin/zenity ]; then + zenity --info --text "MP3 support now installed, you will need to restart Amarok." + else + Xdialog --msgbox "MP3 support now installed, you will need to restart Amarok." 5 60 + fi + exit 0 + fi +} + +INSTALLED=`dpkg --get-selections libxine1-ffmpeg | grep install` + +#is available, not installed +if [ -z "$INSTALLED" ]; then + if [ -x /usr/bin/kdesu ] && [ -x /usr/bin/adept_batch ]; then + kdesu -d "adept_batch update --icon amarok" && kdesu -d "adept_batch install libxine1-ffmpeg --icon amarok" + elif [ -x /usr/bin/gksudo ] && [ -x /usr/sbin/synaptic ]; then + gksudo "apt-get update" && gksudo "echo libxine1-ffmpeg i | synaptic --set-selections --non-interactive" + else + xterm -e 'sudo apt-get update && sudo apt-get install libxine1-ffmpeg' + fi + check_mp3 +fi + +exit 0 --- amarok-1.4.9.1.orig/debian/README.Debian +++ amarok-1.4.9.1/debian/README.Debian @@ -0,0 +1,28 @@ +Amarok packages for Debian +========================== + + A couple of notes which you may find useful: + + - starting with Amarok 1.4, lyrics downloading is implemented in a + separate Ruby script; + + - Last.fm stream support is also implemented with the help of a Ruby + script. + + - if you want amarok to be able to play CDs, you need to install the + kdemultimedia-kio-plugins package. + + - the scripts available in the 'Scripts' menu need that you install + some other packages for them to work. Those packages are listed in + the Suggests: field of the amarok package. + + Also, users not using the full KDE environment may get the following + error when executing amarok for the first time: "Socket-path is not a + link or a directory: /home/$USER/.kde/socket-$HOSTNAME". Just execute: + + $ lnusertemp socket + + Note that you only need to execute it once, not each time that you + start Amarok. + + -- Adeodato Simó --- amarok-1.4.9.1.orig/debian/amarok-common.install +++ amarok-1.4.9.1/debian/amarok-common.install @@ -0,0 +1,24 @@ +debian/tmp/usr/share/apps/amarok/* +debian/tmp/usr/share/apps/profiles/* +debian/tmp/usr/share/doc/* +debian/tmp/usr/share/icons/* +debian/tmp/usr/share/locale/* +debian/tmp/usr/share/config.kcfg/amarok.kcfg +debian/tmp/usr/share/services/amarok_void-engine_plugin.desktop +debian/tmp/usr/share/services/amarok_generic-mediadevice.desktop +debian/tmp/usr/share/services/amarok_ifp-mediadevice.desktop +debian/tmp/usr/share/services/amarok_ipod-mediadevice.desktop +debian/tmp/usr/share/services/amarok_njb-mediadevice.desktop +debian/tmp/usr/share/services/amarok_smb-device.desktop +debian/tmp/usr/share/services/amarok_massstorage-device.desktop +debian/tmp/usr/share/services/amarok_nfs-device.desktop +debian/tmp/usr/share/services/amarok_daap-mediadevice.desktop + +#libkarma is not in MAIN yet +#debian/tmp/usr/share/services/amarok_riokarma-mediadevice.desktop + +debian/tmp/usr/share/services/amarok_mtp-mediadevice.desktop +debian/tmp/usr/bin/amarok_proxy.rb +debian/tmp/usr/bin/amarok_daapserver.rb +debian/tmp/etc/* + --- amarok-1.4.9.1.orig/debian/man/amarokapp.1 +++ amarok-1.4.9.1/debian/man/amarokapp.1 @@ -0,0 +1,23 @@ +.\" Generated by kdemangen.pl and edited by hand +.TH AMAROK 1 "Feb 2008" "Amarok" "An audio player for KDE" +.SH NAME +amarokapp +\- A direct executable for Amarok. +.SH SYNOPSIS +amarokapp [Qt-options] [KDE-options] [URL(s)] +.SH DESCRIPTION +Amarok is a multimedia player based on the soundserver-independent framework. +There are many media players around these days, true. What's missing from most +players is a user interface, that doesn't get in the way of the user. +.P +This is direct Amarok executable. The recommend way to run Amarok is using +\fBamarok(1)\fP, which is a wrapper script around \fBamarokapp\fP. However, if you're +debugging Amarok with gdb, valgrind or similar program, you will probably want to +run it against this binary directly. +.P +\fBamarokapp(1)\fP takes the same command line options and arguments as +\fBamarok(1)\fP. See its manual page for more information how to run \fBamarokapp\fP. +.SH SEE ALSO +amarok(1) +.SH OTHER +This manual page was written by Modestas Vainius for Debian. --- amarok-1.4.9.1.orig/debian/man/amarokcollectionscanner.1 +++ amarok-1.4.9.1/debian/man/amarokcollectionscanner.1 @@ -0,0 +1,63 @@ +.\" This file was generated by kdemangen.pl and edited manually by Modestas Vainius +.TH AMAROKCOLLECTIONSCANNER 1 "Feb 2008" "Amarok" "Collection Scanner for Amarok" +.SH NAME +amarokcollectionscanner \- Collection Scanner for Amarok +.SH SYNOPSIS +amarokcollectionscanner [Qt\-options] [KDE\-options] Folder(s) +.SH DESCRIPTION +This Amarok helper utility scans folder(s) given on the command line or +restarts previous scan if \fB\-\-restart\fP option was given and writes a +specially structured XML file to standard output with extensive information +(including tags) about audio files it was able to find. XML file schema used +by this utility is Amarok specific. +.P +You may find his utility useful if you need to retreive and/or display extended +information about collection of audio files. +.SH OPTIONS +.SS +.SS Arguments: +Folder(s) Folders to scan +.SS +.SS Options: +.TP +.B \-r, \-\-recursive +Scan folders recursively +.TP +.B \-i, \-\-incremental +Incremental Scan (modified folders only) +.TP +.B \-p, \-\-importplaylists +Import playlist +.TP +.B \-s, \-\-restart +Restart the scanner at last position, after a crash [] +.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 +.SH AUTHORS +Amarok Developers +.SH OTHER +This manual page was written by Modestas Vainius for Debian. --- amarok-1.4.9.1.orig/debian/man/amarok_libvisual.1 +++ amarok-1.4.9.1/debian/man/amarok_libvisual.1 @@ -0,0 +1,14 @@ +.\" This file was generated by kdemangen.pl and edited manually by Modestas Vainius +.TH AMAROK_LIBVISUAL 1 "Feb 2008" "Amarok" "LibVisual support utility for Amarok" +.SH NAME +amarok_libvisual \- LibVisual support utility for Amarok +.SH SYNOPSIS +amarok_libvisual +.SH DESCRIPTION +This is LibVisual support helper utility for Amarok. It's used internally by Amarok +itself when needed and is not supposed to be invoked manually by user. +.SS +.SH AUTHORS +Amarok Developers +.SH OTHER +This manual page was written by Modestas Vainius for Debian. --- amarok-1.4.9.1.orig/debian/man/amarok.1 +++ amarok-1.4.9.1/debian/man/amarok.1 @@ -0,0 +1,181 @@ +.\" Generated by kdemangen.pl and edited by hand +.TH AMAROK 1 "Mar 2004" "K Desktop Environment" "An audio player for KDE" +.SH NAME +amarok +\- An audio player for KDE +.SH SYNOPSIS +amarok [Qt-options] [KDE-options] [URL(s)] +.SH DESCRIPTION +amaroK is a multimedia player based on the soundserver-independent framework. +There are many media players around these days, true. What's missing from most +players is a user interface, that doesn't get in the way of the user. +.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. +.SS +.SS Arguments: +URL(s) Files/URLs to Open +.SS +.SS Options: +.TP +.B \-r, \-\-previous +Skip backwards in playlist +.TP +.B \-p, \-\-play +Start playing current playlist +.TP +.B \-s, \-\-stop +Stop playback +.TP +.B \-\-pause +Pause playback +.TP +.B \-f, \-\-next +Skip forwards in playlist +.SS +.SS Additional options: +.TP +.B \-e, \-\-enqueue +Enqueue Files/URLs + +.SH SEE ALSO +Full user documentation is available through the KDE Help Center. You can also enter the URL +.BR help:/amarok/ +directly into konqueror or you can run +.BR "`khelpcenter help:/amarok/'" +from the command-line. +.BR +.SH AUTHORS +.nf +Christian Muehlhaeuser <chris@chris.de> +.BR +Mark Kretschmann <markey@web.de> +.BR +Max Howell <max.howell@methylblue.com> +.BR +Stanislav Karchebny <berk@upnet.ru> +.BR +Please use http://bugs.kde.org to report bugs, do not mail the authors directly. +.BR +.SH OTHER +This manual page was written by Alejandro Exojo <suy@badopi.org> for the Debian +system (but may be used by others). +.BR --- amarok-1.4.9.1.orig/debian/icons/amarok.xpm +++ amarok-1.4.9.1/debian/icons/amarok.xpm @@ -0,0 +1,220 @@ +/* XPM */ +static char *amarok[] = { +/* columns rows colors chars-per-pixel */ +"32 32 182 2", +" c #000000", +". c #020508", +"X c #03090E", +"o c #0E0E0E", +"O c #050A10", +"+ c #09131E", +"@ c #101112", +"# c #14191F", +"$ c #0A1622", +"% c #0B1926", +"& c #0D1C2C", +"* c #0E1F30", +"= c #161E26", +"- c #0F2032", +"; c #18222D", +": c #102336", +"> c #12273C", +", c #1A2632", +"< c #1C2B3B", +"1 c #142C44", +"2 c #162F48", +"3 c #16304A", +"4 c #18324E", +"5 c #183450", +"6 c #1B3A5A", +"7 c #20344A", +"8 c #223A52", +"9 c #1E4064", +"0 c #22456B", +"q c #23486E", +"w c #28496F", +"e c #244A72", +"r c #244D78", +"t c #2B4C72", +"y c #26517E", +"u c #2C5077", +"i c #2B537B", +"p c #325175", +"a c #355479", +"s c #33587E", +"d c #395575", +"f c #38567A", +"g c #3B597C", +"h c #405C7D", +"j c #49627D", +"k c #52677E", +"l c #275280", +"z c #285685", +"x c #295788", +"c c #2D5982", +"v c #2A598A", +"b c #2C5D91", +"n c #355C83", +"m c #395E83", +"M c #2E6094", +"N c #336189", +"B c #3A658C", +"V c #336395", +"C c #356892", +"Z c #386798", +"A c #3C6C93", +"S c #3C6A9A", +"D c #3D729A", +"F c #425D80", +"G c #456083", +"H c #41678D", +"J c #496485", +"K c #4C6688", +"L c #4F6889", +"P c #466E93", +"I c #426E9B", +"U c #417096", +"Y c #42739B", +"T c #47789F", +"R c #4B749C", +"E c #506782", +"W c #536A84", +"Q c #536C8B", +"! c #586C82", +"~ c #5D7084", +"^ c #5D748D", +"/ c #51769D", +"( c #55799E", +") c #5A7190", +"_ c #447AA1", +"` c #457CA8", +"' c #4F78A2", +"] c #5C7EA1", +"[ c #627B96", +"{ c #6A7F96", +"} c #4681AB", +"| c #4984AB", +" . c #4E8BB2", +".. c #5082A7", +"X. c #5084AA", +"o. c #5E80A4", +"O. c #5B81A9", +"+. c #548CB2", +"@. c #5390B6", +"#. c #5594BD", +"$. c #5B94BC", +"%. c #5E99BE", +"&. c #6C8197", +"*. c #69809B", +"=. c #758699", +"-. c #778A9D", +";. c #7C8691", +":. c #798A9D", +">. c #6080A2", +",. c #6A86A3", +"<. c #6E8CAB", +"1. c #608FB2", +"2. c #7389A3", +"3. c #7B91A6", +"4. c #7B9AB9", +"5. c #579AC1", +"6. c #5B9EC5", +"7. c #669EC2", +"8. c #68A8CC", +"9. c #6AACD0", +"0. c #72ABCD", +"q. c #78AFCE", +"w. c #71B0D2", +"e. c #7BB4D4", +"r. c #858F9B", +"t. c #87909A", +"y. c #8D949B", +"u. c #94989C", +"i. c #9D9D9D", +"p. c #8493A3", +"a. c #8395A8", +"s. c #8798A9", +"d. c #859FB9", +"f. c #9199A3", +"g. c #8EA2B7", +"h. c #8CA5BF", +"j. c #96A2AB", +"k. c #9BA4AD", +"l. c #9DA9B5", +"z. c #A3A3A3", +"x. c #A6A9AC", +"c. c #ACACAC", +"v. c #A3ABB2", +"b. c #A4AEB8", +"n. c #AAAEB1", +"m. c #ADB0B3", +"M. c #ADB4BB", +"N. c #B3B3B3", +"B. c #B0B7BE", +"V. c #B6B8B9", +"C. c #BBBBBB", +"Z. c #8FA7C1", +"A. c #87B6D1", +"S. c #85BBD7", +"D. c #A2B1C1", +"F. c #AFBBC7", +"G. c #ADBAC8", +"H. c #B2BCC7", +"J. c #B0BCCA", +"K. c #B8BDC3", +"L. c #93C2DA", +"P. c #9EC9DE", +"I. c #BFC3C7", +"U. c #B0C1D3", +"Y. c #AFD1E1", +"T. c #B4D6E4", +"R. c #C3C3C4", +"E. c #C1C4C8", +"W. c #CCCCCC", +"Q. c #C1CEDC", +"!. c #CFD4D9", +"~. c #D3D3D3", +"^. c #D6DADE", +"/. c #DBDBDB", +"(. c #DAE0E6", +"). c #E2E3E3", +"_. c #E2E5E8", +"`. c #ECECEC", +"'. c #EAEEF1", +"]. c #F4F4F4", +"[. c #FBFBFB", +"{. c None", +/* pixels */ +"{.{.{.{.{.{.{.{.{.{.{.o # , 7 8 8 < ; @ o {.{.{.{.{.{.{.{.{.{.{.", +"{.{.{.{.{.{.{.{.{.X 4 l M I / ( ( R Z v 9 * {.{.{.{.{.{.{.{.", +"{.{.{.{.{.{.{.X 6 M ( s.n.N.N.N.N.N.N.k.,.S r & {.{.{.{.{.{.{.", +"{.{.{.{.{.{.- v ( k.N.C.W.W.~.~.W.R.R.V.N.N.3.Z 6 . {.{.{.{.{.", +"{.{.{.{. 3 V a.N.C.~.)./././.~.~.~.W.W.R.V.N.n./ r X {.{.{.{.", +"{.{.{.{.2 Z j.N.W./././././.~.~.~.W.W.W.W.R.K.N.N.o.y . {.{.{.", +"{.{.{.& V j.N.W.).)././.~.~.~.~.~.W.W.W.W.R.n.R.C.V.] q {.{.", +"{.{.. v a.N.R.)././././.~./.~.~.W.~.W.W.R.E q n.R.C.V.I 1 {.{.", +"{.{.6 ( N.C././././.~.~.~.~.~.~.W.~.~.b.j ^ p j R.C.C.v.v X {.", +"{.X b k.N.W././././.~./.~.~.~.~.~.W.:.e Q ) K k x.R.R.R.o.5 {.", +"{.4 ' N.V././.~.~./.~.~.~.~.~.~.E.J p F ) ) p y.i.R.R.R.b.v . ", +"o r s.N.R./.~.~.~.~.~.~.~.W.I.B.h d s Q Q K ! z.c.W.W.R.R.I % ", +"@ M n.N.W.~.~.~.~.~.~.E.Q g g f p w L Q Q t u.z.W.W.W.W.W.<.4 . ", +", S N.N.W.~.~.~.~.~.K.h G &.D.Q 0 F K L j j z.C.l.M.~.W.W.g.0 . ", +"< / N.N.W.W.W.W.W.M.f h [ [.'.a g K G L p 0 d g w &.~.~.~.M.0 . ", +"8 ( N.N.W.W.W.p.Q w p w (.F.f f F F G K g a g d j t.c.!.~.K.i . ", +"7 ( N.N.R.R.{ 2.F 0 0 Q H.e g g F F F F G g g u.c.n.C././.H.r . ", +", I N.m.f.^ h 0 0 0 0 d t a f g g F F F p ! c.N.W./.)././.D.q ", +"= V y.h f t d m p 0 0 q p p d a g g F p ! N.C.).).).).).).d.6 ", +"o x :.t w t a d t 0 q t p a d s f f a 0 c.C.).`.`.`.).).).] , . ", +"o 8 ,.r.q 0 q 0 0 q t u p s s g m f e g V./.`.`.`.`.`._.^.M X . ", +"{.% Z m.;.q 0 0 q e i i s N h N m s r ^ C.`.].].].].`.`.Z.9 . ", +"{. r 2.N.! q q t n c m N B B B B c s =.R.].].].].].]._.S $ {.", +"{.. $ Z =.q q u m c H B A U U U B B n p.~.].].[.[.[.].4.9 {.", +"{.{. 6 z q r i c P U Y Y T _ _ D Y N j.~.].[.[.[.].U.v X {.{.", +"{.{.{.. e y r c A Y T ..| @. . .| ..D l./.`.].].[.Q.V % {.{.", +"{.{.{. . e c N A D @.@.8.6.6.%.%.+.T n./.`.].].J.Z * {.{.{.", +"{.{.{.{. . 9 M D X.@.6.q.w.w.8.8.%.| N./.`.(.4.v % {.{.{.{.", +"{.{.{.{.{. > N } #.9.S.L.L.S.w.0.@.c.~.h.S 9 X {.{.{.{.{.", +"{.{.{.{.{.{. X 2 C $.A.Y.T.P.q.#.` ' b 0 + {.{.{.{.{.{.", +"{.{.{.{.{.{.{.{. # < 9 p w w 0 5 - . {.{.{.{.{.{.{.{.", +"{.{.{.{.{.{.{.{.{.{. . . . . . . . . {.{.{.{.{.{.{.{.{.{." +}; --- amarok-1.4.9.1.orig/debian/icons/amarok-16.xpm +++ amarok-1.4.9.1/debian/icons/amarok-16.xpm @@ -0,0 +1,210 @@ +/* XPM */ +static char *amarok-16[] = { +/* columns rows colors chars-per-pixel */ +"16 16 188 2", +" c black", +". c #010203", +"X c #010304", +"o c #030405", +"O c #030406", +"+ c #05070A", +"@ c #03080C", +"# c #05090D", +"$ c #04090F", +"% c #050A10", +"& c #070F17", +"* c #071019", +"= c #0A1521", +"- c #0B1825", +"; c #0D1824", +": c #0D1926", +"> c #0F1A26", +", c #0F1E2C", +"< c #0E1F30", +"1 c #101D2A", +"2 c #0F2133", +"3 c #102030", +"4 c #132436", +"5 c #132639", +"6 c #142638", +"7 c #17293B", +"8 c #14283C", +"9 c #152A40", +"0 c #193047", +"q c #193149", +"w c #19324B", +"e c #203A55", +"r c #223D59", +"t c #26415E", +"y c #234562", +"u c #22456C", +"i c #23486F", +"p c #26486E", +"a c #284360", +"s c #294663", +"d c #244A71", +"f c #264F7A", +"g c #294A70", +"h c #2A4B71", +"j c #2D4D73", +"k c #29537B", +"l c #2D5178", +"z c #304F74", +"x c #35506D", +"c c #325176", +"v c #325277", +"b c #335377", +"n c #355377", +"m c #365575", +"M c #37567A", +"N c #32597F", +"B c #33587E", +"V c #375A7F", +"C c #385472", +"Z c #395572", +"A c #3A5675", +"S c #38567A", +"D c #3B5876", +"F c #3A597A", +"G c #3B587A", +"H c #3B5A7B", +"J c #3B587C", +"K c #405C7F", +"L c #445E7F", +"P c #46607E", +"I c #2B5781", +"U c #385C82", +"Y c #376088", +"T c #37628A", +"R c #3A688F", +"E c #3E6A90", +"W c #3F6B92", +"Q c #415D80", +"! c #435E81", +"~ c #445F80", +"^ c #445F82", +"/ c #466686", +"( c #476687", +") c #4A6486", +"_ c #4E6989", +"` c #4F6E8F", +"' c #42769E", +"] c #46769D", +"[ c #50698A", +"{ c #506A89", +"} c #516A89", +"| c #506F8F", +" . c #546D8C", +".. c #556E8E", +"X. c #5B7088", +"o. c #5B718A", +"O. c #587591", +"+. c #5B7491", +"@. c #5E7B9A", +"#. c #487BA2", +"$. c #6F7D8C", +"%. c #607790", +"&. c #637B97", +"*. c #627E9B", +"=. c #6B7D90", +"-. c #4980A8", +";. c #4A83AA", +":. c #5491B8", +">. c #5693B9", +",. c #5E99BE", +"<. c #658DAC", +"1. c #6A87A0", +"2. c #6A87A4", +"3. c #6D89A7", +"4. c #758BA2", +"5. c #758FA9", +"6. c #7E8FA1", +"7. c #7F93A7", +"8. c #7997AC", +"9. c #63A5CA", +"0. c #6CA7CA", +"q. c #6CA8CB", +"w. c #8B949E", +"e. c #8093A7", +"r. c #8594A4", +"t. c #8395A8", +"y. c #8D99A6", +"u. c #8F9DAB", +"i. c #93A0AD", +"p. c #9AA0A8", +"a. c #9EA7B1", +"s. c #A5A6A7", +"d. c #A3ACB7", +"f. c #A9AFB7", +"g. c #A5B2BF", +"h. c #B0B1B2", +"j. c #B2B2B2", +"k. c gray70", +"l. c #B1B3B6", +"z. c #B4B5B6", +"x. c #B6B6B6", +"c. c #BBBBBB", +"v. c #B8BBBE", +"b. c #BCBCBC", +"n. c #BDBEBF", +"m. c gray75", +"M. c #A8B8C9", +"N. c #B9BDC2", +"B. c #BABEC3", +"V. c #93C1D9", +"C. c #9BC7DD", +"Z. c #BFC5CB", +"A. c #B9C4D0", +"S. c #C1C1C1", +"D. c #C3C3C3", +"F. c #C6C6C6", +"G. c gray78", +"H. c #C5C8CB", +"J. c gray79", +"K. c #CACACA", +"L. c #CBCBCB", +"P. c gray80", +"I. c #CDCDCD", +"U. c #CECECE", +"Y. c gray81", +"T. c #C1C8D0", +"R. c #D0D0D0", +"E. c gray82", +"W. c #D1D1D2", +"Q. c #D2D2D2", +"!. c LightGray", +"~. c gray83", +"^. c #D5D5D5", +"/. c #D7D7D7", +"(. c #DADADA", +"). c gray86", +"_. c gainsboro", +"`. c gray87", +"'. c #CFD8E1", +"]. c #D0D9E1", +"[. c #E4E4E4", +"{. c gray90", +"}. c gray91", +"|. c gray92", +" X c #EAEDF1", +".X c gray94", +"XX c gray97", +"oX c None", +/* pixels */ +"oXoXoXoXX 6 a D Z r 1 oXoXoXoX", +"oXoXoX2 | i.n.D.n.l.t.F * oXoXoX", +"oXoXw e.G.).).~.Q.L.D.z.*.- oXoX", +"oX< 7.K._.(.(.~.Q.P.f.y.c.@.% oX", +"X ` b._.(./.~.~.Q.r. .L b.v.s ", +"4 u.L./.~.~.Q.H.+.! .$.z.G.5.# ", +"t k.Y.Q.Q.d._ +.c _ ~ s.B.P.g.3 ", +"Z k.P.B.6.n A.&.L ) z F o.G.H.9 ", +"x j.d._ h b _ J K ~ ! w.D.~.T.8 ", +"e X.j S h p c M J c p.).{.{.M.: ", +"> 4.D u u l N U J H R..X.X|.3.O ", +" C =.d I T E E T O.`.XXXX].w ", +"oX& f k E ] -.;.#.1.[.XX X/ oX", +"oXoX= I ' >.q.9.,.8.{.]./ @ oX", +"oXoXoX# y :.V.C.0.<.2.w X oXoX", +"oXoXoXoX + , 7 4 ; O oXoXoXoX" +}; --- amarok-1.4.9.1.orig/debian/patches/14_ruby_libs_not_scripts.diff +++ amarok-1.4.9.1/debian/patches/14_ruby_libs_not_scripts.diff @@ -0,0 +1,49 @@ +--- build-tree/amarok-1.4.8/amarok/src/mediadevice/daap/mongrel/lib/rbconfig/datadir.rb 2007-12-17 17:53:19.000000000 +0200 ++++ amarok-1.4.8/amarok/src/mediadevice/daap/mongrel/lib/rbconfig/datadir.rb 2008-02-27 16:58:05.000000000 +0200 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env ruby + #-- + # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others. + # All rights reserved. +--- amarok-1.4.8/amarok/src/mediadevice/daap/mongrel/lib/rubygems/config_file.rb 2007-12-17 17:53:19.000000000 +0200 ++++ amarok-1.4.8/amarok/src/mediadevice/daap/mongrel/lib/rubygems/config_file.rb 2008-02-27 16:57:22.000000000 +0200 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env ruby + #-- + # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others. + # All rights reserved. +--- amarok-1.4.8/amarok/src/mediadevice/daap/mongrel/lib/rubygems/dependency_list.rb 2007-12-17 17:53:19.000000000 +0200 ++++ amarok-1.4.8/amarok/src/mediadevice/daap/mongrel/lib/rubygems/dependency_list.rb 2008-02-27 16:57:38.000000000 +0200 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env ruby + #-- + # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others. + # All rights reserved. +--- amarok-1.4.8/amarok/src/mediadevice/daap/mongrel/lib/rubygems/gem_commands.rb 2007-12-17 17:53:19.000000000 +0200 ++++ amarok-1.4.8/amarok/src/mediadevice/daap/mongrel/lib/rubygems/gem_commands.rb 2008-02-27 16:56:56.000000000 +0200 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env ruby + #-- + # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others. + # All rights reserved. +--- amarok-1.4.8/amarok/src/mediadevice/daap/mongrel/lib/rubygems/gem_runner.rb 2007-12-17 17:53:19.000000000 +0200 ++++ amarok-1.4.8/amarok/src/mediadevice/daap/mongrel/lib/rubygems/gem_runner.rb 2008-02-27 16:57:15.000000000 +0200 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env ruby + #-- + # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others. + # All rights reserved. +--- amarok-1.4.8/amarok/src/mediadevice/daap/mongrel/lib/rubygems/security.rb 2007-12-17 17:53:19.000000000 +0200 ++++ amarok-1.4.8/amarok/src/mediadevice/daap/mongrel/lib/rubygems/security.rb 2008-02-27 16:57:30.000000000 +0200 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env ruby + #-- + # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others. + # All rights reserved. +--- amarok-1.4.8/amarok/src/mediadevice/daap/mongrel/lib/rubygems.rb 2008-02-27 18:16:36.000000000 +0200 ++++ amarok-1.4.8/amarok/src/mediadevice/daap/mongrel/lib/rubygems.rb 2008-02-27 18:16:39.000000000 +0200 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env ruby + # -*- ruby -*- + + #-- --- amarok-1.4.9.1.orig/debian/patches/05_gmo_files_at_build_time.patch +++ amarok-1.4.9.1/debian/patches/05_gmo_files_at_build_time.patch @@ -0,0 +1,11 @@ +--- admin/cvs.sh.orig ++++ admin/cvs.sh +@@ -204,7 +204,7 @@ + ### + ### Then make messages + ### +-if test -d po; then ++if test -d po && false; then + LIST=`find ./po -name "*.po"` + for i in $LIST; do + file2=`echo $i | sed -e "s#\.po#\.gmo#"` --- amarok-1.4.9.1.orig/debian/patches/kubuntu_07_gnome_multimedia_keys.diff +++ amarok-1.4.9.1/debian/patches/kubuntu_07_gnome_multimedia_keys.diff @@ -0,0 +1,83 @@ +diff -Nur amarok-1.4.7/amarok/src/scripts/gnome_media_keys/gnome_media_keys.py amarok-1.4.7.new/amarok/src/scripts/gnome_media_keys/gnome_media_keys.py +--- amarok-1.4.7/amarok/src/scripts/gnome_media_keys/gnome_media_keys.py 1970-01-01 10:00:00.000000000 +1000 ++++ amarok-1.4.7.new/amarok/src/scripts/gnome_media_keys/gnome_media_keys.py 2007-08-31 23:48:47.000000000 +1000 +@@ -0,0 +1,45 @@ ++#!/usr/bin/env python ++#Gnome Multimedia Key's event handler script. ++#This script will allow the use of multimedia buttons in amarok as configured using gnome keyboard shortcuts. ++#Author: Chris Brown ++#Date: 22June2007 ++#Version: 0.3 ++#bug reports to: chris.scotland[at]gmail.com ++ ++import os, gobject ++ ++try: ++ import dbus ++except: ++ os.system("kdialog --sorry 'the package python-dbus (DBUS bindings for Python) is required for this script.'") ++ raise ++ ++try: ++ from dbus import glib ++except: ++ os.system("kdialog --sorry 'the package libdbus-glib (Glib-based shared library for dbus) is required for this script.'") ++ raise ++ ++bus = dbus.SessionBus() ++object = bus.get_object('org.gnome.SettingsDaemon', '/org/gnome/SettingsDaemon') ++ ++def signal_handler(*mmkeys): ++ for mmk in mmkeys: ++ if mmk == "Play": ++ os.system("dcop amarok player playPause") ++ elif mmk == "Pause": ++ os.system("dcop amarok player pause") ++ elif mmk == "Stop": ++ os.system("dcop amarok player stop") ++ elif mmk == "Next": ++ os.system("dcop amarok player next") ++ elif mmk == "Previous": ++ os.system("dcop amarok player prev") ++ ++ ++object.connect_to_signal("MediaPlayerKeyPressed", signal_handler, dbus_interface='org.gnome.SettingsDaemon') ++ ++gobject.timeout_add(5000, signal_handler) ++ ++loop = gobject.MainLoop() ++loop.run() +diff -Nur amarok-1.4.7/amarok/src/scripts/gnome_media_keys/gnome_media_keys.spec amarok-1.4.7.new/amarok/src/scripts/gnome_media_keys/gnome_media_keys.spec +--- amarok-1.4.7/amarok/src/scripts/gnome_media_keys/gnome_media_keys.spec 1970-01-01 10:00:00.000000000 +1000 ++++ amarok-1.4.7.new/amarok/src/scripts/gnome_media_keys/gnome_media_keys.spec 2007-08-31 23:48:47.000000000 +1000 +@@ -0,0 +1,2 @@ ++name = Gnome Multimedia Key's ++type = {generic} +diff -Nur amarok-1.4.7/amarok/src/scripts/gnome_media_keys/README amarok-1.4.7.new/amarok/src/scripts/gnome_media_keys/README +--- amarok-1.4.7/amarok/src/scripts/gnome_media_keys/README 1970-01-01 10:00:00.000000000 +1000 ++++ amarok-1.4.7.new/amarok/src/scripts/gnome_media_keys/README 2007-08-31 23:48:47.000000000 +1000 +@@ -0,0 +1,24 @@ ++<div align="center"><b>Gnome Multimedia Key's</b><br>Version: 0.1</div> ++ ++<p> ++<b>About:</b><br> ++This script will allow the use of keyboard multimedia keys in Gnome 2.18 and above (eg. ubuntu feisty) to control playback. This includes most multimedia buttons found on many laptops.<br> ++Currently supported operations are:<br> ++<pre> Play/Pause ++ Pause ++ Stop ++ Next Track ++ Previous Track ++</pre></p> ++<p> ++<b>Usage:</b><br> ++Simply run the script, no configuration of the script itself is required.<br>The desired keyboard shortcuts can be configured by selecting <i>"System-->Prefrences-->Keyboard Shortcuts"</i> from the Gnome pannel. ++</p> ++<p> ++<b>Author:</b><br> ++Chris Brown: chris.scotland[at]gmail.com<br> ++This is my first ever script and would love your feedback and bug reports. ++</p> ++<p><b>ENJOY!</b></p> ++ ++ --- amarok-1.4.9.1.orig/debian/patches/04_disable_no_undefined.patch +++ amarok-1.4.9.1/debian/patches/04_disable_no_undefined.patch @@ -0,0 +1,18 @@ +--- admin/acinclude.m4.in.orig ++++ admin/acinclude.m4.in +@@ -1694,15 +1694,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) --- amarok-1.4.9.1.orig/debian/patches/kubuntu_10_audio_mimetypes.diff +++ amarok-1.4.9.1/debian/patches/kubuntu_10_audio_mimetypes.diff @@ -0,0 +1,12 @@ +diff -Nur -x '*.orig' -x '*~' amarok-1.4.8/amarok/src/amarok.desktop amarok-1.4.8.new/amarok/src/amarok.desktop +--- amarok-1.4.8/amarok/src/amarok.desktop 2008-04-03 00:50:58.509525000 +0200 ++++ amarok-1.4.8.new/amarok/src/amarok.desktop 2008-04-03 00:51:56.857526386 +0200 +@@ -104,7 +104,7 @@ + Icon=amarok + X-KDE-Protocols=http + #don't add inode/directory to mimetypes it leads to misbehavior +-MimeType=audio/aac;audio/mp4;audio/mpeg;audio/mpegurl;audio/vnd.rn-realaudio;audio/vorbis;audio/x-flac;audio/x-mp3;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-oggflac;audio/x-pn-realaudio;audio/x-scpls;audio/x-speex;audio/x-vorbis;audio/x-wav;video/x-ms-asf; ++MimeType=audio/aac;audio/mp4;audio/mpeg;audio/mpegurl;audio/vnd.rn-realaudio;audio/vorbis;audio/x-flac;audio/x-mp3;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-oggflac;audio/x-pn-realaudio;audio/x-scpls;audio/x-speex;audio/x-vorbis;audio/x-wav;video/x-ms-asf;audio/flac;audio/ogg; + DocPath=amarok/index.html + Terminal=false + Categories=Qt;KDE;AudioVideo;Audio;Player; --- amarok-1.4.9.1.orig/debian/patches/kubuntu_01_kdepot.diff +++ amarok-1.4.9.1/debian/patches/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 (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile + +- kdepotpath=${includedir:-`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 --- amarok-1.4.9.1.orig/debian/patches/02_admin_cleanup.diff +++ amarok-1.4.9.1/debian/patches/02_admin_cleanup.diff @@ -0,0 +1,116 @@ +--- kde/admin/acinclude.m4.in 2008-02-24 17:49:46.000000000 +0200 ++++ kde/admin/acinclude.m4.in 2008-02-24 17:19:06.000000000 +0200 +@@ -1589,6 +1589,11 @@ + fi + done + ++# Export just Qt libs in LIB_QT, "extended" version will be exported as LIB_QT_EXT ++LIB_QT_EXT="$LIB_QT" ++LIB_QT="$kde_int_qt" ++ ++AC_SUBST(LIB_QT_EXT) + AC_SUBST(LIB_QT) + AC_SUBST(LIB_QPE) + +@@ -2684,7 +2689,7 @@ + ], + [return (TIFFOpen( "", "r") == 0); ], + [ +- kde_cv_libtiff_$1="-l$1 $LIBJPEG $LIBZ" ++ kde_cv_libtiff_$1="-l$1" + ], [ + kde_cv_libtiff_$1=no + ]) +@@ -2748,7 +2753,8 @@ + EXRSTATUS=old + else + kde_save_LIBS="$LIBS" +- LIBS="$LIBS $all_libraries $USER_LDFLAGS `pkg-config --libs OpenEXR` $LIBZ" ++ kde_libexr_libs="`pkg-config --libs OpenEXR | sed -e 's/-lImath//' -e 's/-lIex//' -e 's/-lz//'`" ++ LIBS="$LIBS $all_libraries $USER_LDFLAGS $kde_libexr_libs" + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + kde_save_CXXFLAGS="$CXXFLAGS" +@@ -2764,7 +2770,7 @@ + RgbaInputFile file ("dummy"); + return 0; + ], +- eval "ac_cv_libexr='`pkg-config --libs OpenEXR`'", ++ eval "ac_cv_libexr='$kde_libexr_libs'", + eval "ac_cv_libexr=no" + ) + LIBS="$kde_save_LIBS" +@@ -2773,7 +2779,7 @@ + ])dnl + if eval "test ! \"`echo $ac_cv_libexr`\" = no"; then + AC_DEFINE_UNQUOTED(HAVE_EXR, 1, [Define if you have OpenEXR]) +- LIB_EXR="$ac_cv_libexr" ++ LIB_EXR="$kde_libexr_libs" + AC_MSG_RESULT($ac_cv_libexr) + else + AC_MSG_RESULT(no) +@@ -2840,7 +2846,7 @@ + AC_CACHE_VAL(ac_cv_jasper, + [ + kde_save_LIBS="$LIBS" +-LIBS="$LIBS $all_libraries $USER_LDFLAGS -ljasper $LIBJPEG -lm" ++LIBS="$LIBS $all_libraries $USER_LDFLAGS -ljasper -lm" + kde_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $all_includes $USER_INCLUDES" + +@@ -2851,7 +2857,7 @@ + [ + return( jas_init() ); + ], +- eval "ac_cv_jasper='-ljasper $LIBJPEG -lm'", ++ eval "ac_cv_jasper='-ljasper -lm'", + eval "ac_cv_jasper=no" + ) + LIBS="$kde_save_LIBS" +@@ -4474,7 +4480,7 @@ + kde_save_cflags="$CFLAGS" + CFLAGS="$CFLAGS $PYTHONINC" + kde_save_libs="$LIBS" +-LIBS="$LIBS $LIBPYTHON $2 $LIBDL $LIBSOCKET" ++LIBS="$LIBS $LIBPYTHON $2 $LIBSOCKET" + kde_save_ldflags="$LDFLAGS" + LDFLAGS="$LDFLAGS $PYTHONLIB" + +@@ -4612,7 +4618,7 @@ + and contact the authors to let them know about this problem]) + ]) + +- LIBPYTHON="$LIBPYTHON $LIBDL $LIBSOCKET" ++ LIBPYTHON="$LIBPYTHON $LIBSOCKET" + AC_SUBST(PYTHONINC) + AC_SUBST(PYTHONLIB) + AC_SUBST(LIBPYTHON) +--- kde/admin/ltmain.sh 2008-02-24 17:49:46.000000000 +0200 ++++ kde/admin/ltmain.sh 2008-02-24 16:51:22.000000000 +0200 +@@ -2395,16 +2395,16 @@ + # 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 ++# 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 $EXIT_FAILURE --- amarok-1.4.9.1.orig/debian/patches/kubuntu_04_install_mp3.diff +++ amarok-1.4.9.1/debian/patches/kubuntu_04_install_mp3.diff @@ -0,0 +1,10 @@ +--- amarok/amarok/src/engine/xine/amarok_xine-mp3_install.desktop~ 2006-07-02 19:37:44.000000000 +0000 ++++ amarok/amarok/src/engine/xine/amarok_xine-mp3_install.desktop 2006-07-05 01:07:35.000000000 +0000 +@@ -3,5 +3,6 @@ + ServiceTypes=Amarok/CodecInstall + X-KDE-Amarok-codec=mp3 + X-KDE-Amarok-engine=xine-engine +-Exec=kdialog --msgbox "Hello World" ++Exec=/usr/lib/amarok/install-mp3 ++ + --- amarok-1.4.9.1.orig/debian/patches/97_automake_cleanup.diff +++ amarok-1.4.9.1/debian/patches/97_automake_cleanup.diff @@ -0,0 +1,216 @@ +diff -uNr amarok-1.4.8_src/amarok/src/device/massstorage/Makefile.am amarok-1.4.8_dst/amarok/src/device/massstorage/Makefile.am +--- amarok-1.4.8_src/amarok/src/device/massstorage/Makefile.am 2008-02-27 03:47:00.000000000 +0200 ++++ amarok-1.4.8_dst/amarok/src/device/massstorage/Makefile.am 2008-02-27 03:50:52.000000000 +0200 +@@ -14,7 +14,7 @@ + + libamarok_massstorage_device_la_LIBADD = \ + $(top_builddir)/amarok/src/libamarok.la \ +- -lkdecore ++ $(LIB_KDECORE) $(LIB_QT) + + libamarok_massstorage_device_la_LDFLAGS = \ + $(KDE_PLUGIN) \ +diff -uNr amarok-1.4.8_src/amarok/src/device/nfs/Makefile.am amarok-1.4.8_dst/amarok/src/device/nfs/Makefile.am +--- amarok-1.4.8_src/amarok/src/device/nfs/Makefile.am 2008-02-27 03:47:00.000000000 +0200 ++++ amarok-1.4.8_dst/amarok/src/device/nfs/Makefile.am 2008-02-27 03:50:52.000000000 +0200 +@@ -14,7 +14,7 @@ + + libamarok_nfs_device_la_LIBADD = \ + $(top_builddir)/amarok/src/libamarok.la \ +- -lkdecore ++ $(LIB_KDECORE) $(LIB_QT) + + libamarok_nfs_device_la_LDFLAGS = \ + $(KDE_PLUGIN) \ +diff -uNr amarok-1.4.8_src/amarok/src/device/smb/Makefile.am amarok-1.4.8_dst/amarok/src/device/smb/Makefile.am +--- amarok-1.4.8_src/amarok/src/device/smb/Makefile.am 2008-02-27 03:47:00.000000000 +0200 ++++ amarok-1.4.8_dst/amarok/src/device/smb/Makefile.am 2008-02-27 03:50:52.000000000 +0200 +@@ -14,7 +14,7 @@ + + libamarok_smb_device_la_LIBADD = \ + $(top_builddir)/amarok/src/libamarok.la \ +- -lkdecore ++ $(LIB_KDECORE) $(LIB_QT) + + libamarok_smb_device_la_LDFLAGS = \ + $(KDE_PLUGIN) \ +diff -uNr amarok-1.4.8_src/amarok/src/engine/yauap/Makefile.am amarok-1.4.8_dst/amarok/src/engine/yauap/Makefile.am +--- amarok-1.4.8_src/amarok/src/engine/yauap/Makefile.am 2008-02-27 03:47:00.000000000 +0200 ++++ amarok-1.4.8_dst/amarok/src/engine/yauap/Makefile.am 2008-02-27 03:52:58.000000000 +0200 +@@ -13,7 +13,7 @@ + $(top_builddir)/amarok/src/libamarok.la \ + $(top_builddir)/amarok/src/plugin/libplugin.la \ + $(LIB_YAUAP)\ +- $(LIB_KDECORE) ++ $(LIB_KDECORE) $(LIB_QT) + + + libamarok_yauap_engine_plugin_la_SOURCES = \ +diff -uNr amarok-1.4.8_src/amarok/src/engine/void/Makefile.am amarok-1.4.8_dst/amarok/src/engine/void/Makefile.am +--- amarok-1.4.8_src/amarok/src/engine/void/Makefile.am 2008-02-27 03:47:00.000000000 +0200 ++++ amarok-1.4.8_dst/amarok/src/engine/void/Makefile.am 2008-02-27 03:51:55.000000000 +0200 +@@ -9,7 +9,7 @@ + libamarok_void_engine_plugin_la_LIBADD = \ + $(top_builddir)/amarok/src/libamarok.la \ + $(top_builddir)/amarok/src/plugin/libplugin.la \ +- $(LIB_KDECORE) ++ $(LIB_KDECORE) $(LIB_QT) + + libamarok_void_engine_plugin_la_SOURCES = \ + void-engine.cpp +diff -uNr amarok-1.4.8_src/amarok/src/engine/xine/Makefile.am amarok-1.4.8_dst/amarok/src/engine/xine/Makefile.am +--- amarok-1.4.8_src/amarok/src/engine/xine/Makefile.am 2008-02-27 03:47:00.000000000 +0200 ++++ amarok-1.4.8_dst/amarok/src/engine/xine/Makefile.am 2008-02-27 03:50:52.000000000 +0200 +@@ -12,7 +12,7 @@ + $(top_builddir)/amarok/src/libamarok.la \ + $(top_builddir)/amarok/src/plugin/libplugin.la \ + -lkdeui -lkdecore \ +- $(XINE_LIBS) ++ $(XINE_LIBS) $(LIB_QT) + + libamarok_xine_engine_la_SOURCES = \ + xine-scope.c \ +diff -uNr amarok-1.4.8_src/amarok/src/konquisidebar/Makefile.am amarok-1.4.8_dst/amarok/src/konquisidebar/Makefile.am +--- amarok-1.4.8_src/amarok/src/konquisidebar/Makefile.am 2008-02-27 03:47:00.000000000 +0200 ++++ amarok-1.4.8_dst/amarok/src/konquisidebar/Makefile.am 2008-02-27 04:00:19.000000000 +0200 +@@ -5,7 +5,7 @@ + + konqsidebar_universalamarok_la_SOURCES = universalamarok.cpp amarokdcopiface.stub + konqsidebar_universalamarok_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkonqsidebarplugin +-konqsidebar_universalamarok_la_LIBADD = $(LIB_KHTML) $(LIB_KPARTS) $(LIB_KFILE) ++konqsidebar_universalamarok_la_LIBADD = $(LIB_KHTML) $(LIB_QT) $(LIB_KDECORE) -lDCOP $(LIB_KDEUI) + + + amarokdcopiface_DIR=$(top_srcdir)/amarok/src/amarokcore +diff -uNr amarok-1.4.8_src/amarok/src/Makefile.am amarok-1.4.8_dst/amarok/src/Makefile.am +--- amarok-1.4.8_src/amarok/src/Makefile.am 2008-02-27 03:47:00.000000000 +0200 ++++ amarok-1.4.8_dst/amarok/src/Makefile.am 2008-02-27 03:59:57.000000000 +0200 +@@ -158,7 +158,7 @@ + $(top_builddir)/amarok/src/statusbar/libstatusbar.la \ + $(top_builddir)/amarok/src/metadata/libmetadata.la \ + $(top_builddir)/amarok/src/magnatunebrowser/libmagnatunebrowser.la \ +- $(LIB_KUTILS) $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KHTML) $(LIB_KNEWSTUFF) \ ++ $(LIB_QT) $(LIB_KPARTS) -lDCOP -lkdefx $(KDE_MT_LIBS) $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KHTML) $(LIB_KNEWSTUFF) \ + $(TAGLIB_LIBS) $(gl_libs) $(LIB_SQLITE) $(LIB_SQLITE_LOCAL) \ + $(LIB_TUNEPIMP) \ + $(mysql_libs) \ +@@ -196,11 +196,8 @@ + $(top_builddir)/amarok/src/plugin/libplugin.la \ + $(top_builddir)/amarok/src/statusbar/libstatusbar.la \ + $(top_builddir)/amarok/src/metadata/libmetadata.la \ +- $(LIB_KUTILS) $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KHTML) $(LIB_KNEWSTUFF) \ +- $(TAGLIB_LIBS) $(gl_libs) $(LIB_SQLITE) $(LIB_SQLITE_LOCAL) $(EXSCALIBAR_LIBS) \ +- $(LIB_TUNEPIMP) \ +- $(mysql_libs) \ +- $(postgresql_libs) ++ $(LIB_KDECORE) ++ $(EXSCALIBAR_LIBS) + + amarokapp_LDFLAGS = \ + $(all_libraries) \ +diff -uNr amarok-1.4.8_src/amarok/src/mediadevice/daap/Makefile.am amarok-1.4.8_dst/amarok/src/mediadevice/daap/Makefile.am +--- amarok-1.4.8_src/amarok/src/mediadevice/daap/Makefile.am 2008-02-27 03:47:00.000000000 +0200 ++++ amarok-1.4.8_dst/amarok/src/mediadevice/daap/Makefile.am 2008-02-27 03:50:52.000000000 +0200 +@@ -17,7 +17,7 @@ + libamarok_daap_mediadevice_la_LIBADD = \ + $(top_builddir)/amarok/src/libamarok.la \ + $(top_builddir)/amarok/src/mediadevice/daap/daapreader/libdaapreader.la \ +- $(DNSSD_LIBS) ${LIB_KDEUI} ${LIB_KDECORE} ${LIB_KIO} ++ $(DNSSD_LIBS) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KIO) $(LIB_QT) + + libamarok_daap_mediadevice_la_LDFLAGS = \ + $(KDE_PLUGIN) \ +diff -uNr amarok-1.4.8_src/amarok/src/mediadevice/generic/Makefile.am amarok-1.4.8_dst/amarok/src/mediadevice/generic/Makefile.am +--- amarok-1.4.8_src/amarok/src/mediadevice/generic/Makefile.am 2008-02-27 03:47:00.000000000 +0200 ++++ amarok-1.4.8_dst/amarok/src/mediadevice/generic/Makefile.am 2008-02-27 03:50:52.000000000 +0200 +@@ -15,7 +15,7 @@ + + libamarok_generic_mediadevice_la_LIBADD = \ + $(top_builddir)/amarok/src/libamarok.la \ +- -lkdeui -lkdecore -lkio ++ $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KIO) $(LIB_QT) + + libamarok_generic_mediadevice_la_LDFLAGS = \ + $(KDE_PLUGIN) \ +diff -uNr amarok-1.4.8_src/amarok/src/mediadevice/ifp/Makefile.am amarok-1.4.8_dst/amarok/src/mediadevice/ifp/Makefile.am +--- amarok-1.4.8_src/amarok/src/mediadevice/ifp/Makefile.am 2008-02-27 03:47:00.000000000 +0200 ++++ amarok-1.4.8_dst/amarok/src/mediadevice/ifp/Makefile.am 2008-02-27 03:50:52.000000000 +0200 +@@ -15,7 +15,7 @@ + libamarok_ifp_mediadevice_la_LIBADD = \ + $(top_builddir)/amarok/src/libamarok.la \ + -lusb -lifp \ +- -lkdeui -lkdecore -lkio ++ $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KIO) $(LIB_QT) + + libamarok_ifp_mediadevice_la_LDFLAGS = \ + $(KDE_PLUGIN) \ +diff -uNr amarok-1.4.8_src/amarok/src/mediadevice/ipod/Makefile.am amarok-1.4.8_dst/amarok/src/mediadevice/ipod/Makefile.am +--- amarok-1.4.8_src/amarok/src/mediadevice/ipod/Makefile.am 2008-02-27 03:47:00.000000000 +0200 ++++ amarok-1.4.8_dst/amarok/src/mediadevice/ipod/Makefile.am 2008-02-27 03:50:52.000000000 +0200 +@@ -16,7 +16,7 @@ + METASOURCES = AUTO + + libamarok_ipod_mediadevice_la_LIBADD = \ +- $(top_builddir)/amarok/src/libamarok.la ++ $(top_builddir)/amarok/src/libamarok.la $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KIO) + + libamarok_ipod_mediadevice_la_LDFLAGS = \ + $(KDE_PLUGIN) \ +diff -uNr amarok-1.4.8_src/amarok/src/mediadevice/mtp/Makefile.am amarok-1.4.8_dst/amarok/src/mediadevice/mtp/Makefile.am +--- amarok-1.4.8_src/amarok/src/mediadevice/mtp/Makefile.am 2008-02-27 03:47:00.000000000 +0200 ++++ amarok-1.4.8_dst/amarok/src/mediadevice/mtp/Makefile.am 2008-02-27 03:54:34.000000000 +0200 +@@ -16,7 +16,7 @@ + + libamarok_mtp_mediadevice_la_LIBADD = \ + $(top_builddir)/amarok/src/libamarok.la \ +- $(LIBMTP_LIBS) ++ $(LIBMTP_LIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) + + libamarok_mtp_mediadevice_la_LDFLAGS = \ + $(KDE_PLUGIN) \ +diff -uNr amarok-1.4.8_src/amarok/src/mediadevice/njb/Makefile.am amarok-1.4.8_dst/amarok/src/mediadevice/njb/Makefile.am +--- amarok-1.4.8_src/amarok/src/mediadevice/njb/Makefile.am 2008-02-27 03:47:00.000000000 +0200 ++++ amarok-1.4.8_dst/amarok/src/mediadevice/njb/Makefile.am 2008-02-27 03:50:52.000000000 +0200 +@@ -16,7 +16,7 @@ + kde_module_LTLIBRARIES = libamarok_njb-mediadevice.la + + libamarok_njb_mediadevice_la_LIBADD = $(top_builddir)/amarok/src/libamarok.la \ +- -lkdeui -lkdecore -lnjb ++ $(LIB_KDEUI) $(LIB_KDECORE) -lnjb $(LIB_QT) $(LIB_KIO) + + libamarok_njb_mediadevice_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) + +diff -uNr amarok-1.4.8_src/amarok/src/mediadevice/riokarma/Makefile.am amarok-1.4.8_dst/amarok/src/mediadevice/riokarma/Makefile.am +--- amarok-1.4.8_src/amarok/src/mediadevice/riokarma/Makefile.am 2008-02-27 03:47:00.000000000 +0200 ++++ amarok-1.4.8_dst/amarok/src/mediadevice/riokarma/Makefile.am 2008-02-27 03:56:15.000000000 +0200 +@@ -16,7 +16,7 @@ + + libamarok_riokarma_mediadevice_la_LIBADD = \ + $(top_builddir)/amarok/src/libamarok.la \ +- -ltag_c -lz -lusb -lkarma ++ -lkarma $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) + + libamarok_riokarma_mediadevice_la_LDFLAGS = \ + $(KDE_PLUGIN) \ +--- amarok-1.4.8_dst/amarok/configure.in.in 2007-12-17 17:53:19.000000000 +0200 ++++ amarok-1.4.8_dst/amarok/configure.in.in 2008-02-27 11:15:25.000000000 +0200 +@@ -573,7 +573,10 @@ + + if test x$PKGCONFIGFOUND = xyes -a x$SDL_CONFIG = xyes; then + +- PKG_CHECK_MODULES(LIBVISUAL, libvisual-0.4 >= 0.4.0, [build_libvisual="yes"], [build_libvisual="no"]) ++ PKG_CHECK_MODULES(LIBVISUAL, libvisual-0.4 >= 0.4.0, [ ++ LIBVISUAL_LIBS=`echo $LIBVISUAL_LIBS | sed -e 's/-lpthread//' -e 's/-ldl//'` ++ build_libvisual="yes" ++ ], [build_libvisual="no"]) + + AC_SUBST(LIBVISUAL_LIBS) + AC_SUBST(LIBVISUAL_CFLAGS) +@@ -770,6 +773,7 @@ + if test "$PKGCONFIGFOUND" = "yes" ; then + PKG_CHECK_MODULES(LIBMTP, libmtp >= 0.1.1, + [ ++ LIBMTP_LIBS=`echo ${LIBMTP_LIBS} | sed 's/-lusb//'` + have_libmtp=yes + ], + [ --- amarok-1.4.9.1.orig/debian/patches/03_am_maintainer_mode.patch +++ amarok-1.4.9.1/debian/patches/03_am_maintainer_mode.patch @@ -0,0 +1,11 @@ +--- admin/configure.in.min.orig ++++ 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 --- amarok-1.4.9.1.orig/debian/patches/10_queuemedia.patch +++ amarok-1.4.9.1/debian/patches/10_queuemedia.patch @@ -0,0 +1,37 @@ +diff -u -Nrua amarok.orig/src/amarokcore/amarokdcophandler.cpp amarok/src/amarokcore/amarokdcophandler.cpp +--- amarok.orig/src/amarokcore/amarokdcophandler.cpp 2006-10-26 22:40:20.000000000 +0200 ++++ amarok/src/amarokcore/amarokdcophandler.cpp 2007-02-08 21:11:45.000000000 +0100 +@@ -585,6 +585,11 @@ + Playlist::instance()->insertMedia(urls); + } + ++ void DcopPlaylistHandler::queueMedia(const KURL &url) ++ { ++ Playlist::instance()->insertMedia(KURL::List( url ), Playlist::Queue); ++ } ++ + void DcopPlaylistHandler::clearPlaylist() + { + Playlist::instance()->clear(); +diff -u -Nrua amarok.orig/src/amarokcore/amarokdcophandler.h amarok/src/amarokcore/amarokdcophandler.h +--- amarok.orig/src/amarokcore/amarokdcophandler.h 2006-10-26 22:40:20.000000000 +0200 ++++ amarok/src/amarokcore/amarokdcophandler.h 2007-02-08 21:11:56.000000000 +0100 +@@ -125,6 +125,7 @@ + virtual int getTotalTrackCount(); + virtual QString saveCurrentPlaylist(); + virtual void addMedia(const KURL &); ++ virtual void queueMedia(const KURL &); + virtual void addMediaList(const KURL::List &); + virtual void clearPlaylist(); + virtual QString currentTrackUniqueId(); +diff -u -Nrua amarok.orig/src/amarokcore/amarokdcopiface.h amarok/src/amarokcore/amarokdcopiface.h +--- amarok.orig/src/amarokcore/amarokdcopiface.h 2006-10-26 22:40:20.000000000 +0200 ++++ amarok/src/amarokcore/amarokdcopiface.h 2007-02-08 21:12:12.000000000 +0100 +@@ -127,6 +127,7 @@ + + /* These two methods are used by mediacontrol. DO NOT TOUCH! */ + virtual void addMedia(const KURL &) = 0; ///< Add audio media specified by the url. ++ virtual void queueMedia(const KURL &) = 0; ///< Queue audio media specified by the url. + virtual void addMediaList(const KURL::List &) = 0; ///< Add some audio media specified by the url. + virtual void clearPlaylist() = 0; ///< Clears the playlist. + virtual QString currentTrackUniqueId() = 0; ///< Return the current track's unique ID --- amarok-1.4.9.1.orig/debian/patches/13_lastfm_crash_434835.diff +++ amarok-1.4.9.1/debian/patches/13_lastfm_crash_434835.diff @@ -0,0 +1,205 @@ +diff -uNr -x debian -x .pc build-tree/amarok-1.4.8/amarok/src/enginecontroller.cpp build-tree.n/amarok-1.4.8/amarok/src/enginecontroller.cpp +--- amarok-1.4.8/amarok/src/enginecontroller.cpp 2007-12-17 17:53:19.000000000 +0200 ++++ amarok-1.4.8/amarok/src/enginecontroller.cpp 2008-02-27 01:39:47.000000000 +0200 +@@ -403,7 +403,9 @@ + { + if( LastFm::Controller::instance()->isPlaying() ) + { +- LastFm::Controller::instance()->getService()->changeStation( url.url() ); ++ if (LastFm::Controller::instance()->changeStation( url.url() ) == -1) ++ // Request was canceled, return immediately. ++ return; + connect( m_engine, SIGNAL( lastFmTrackChange() ), LastFm::Controller::instance()->getService() + , SLOT( requestMetaData() ) ); + connect( LastFm::Controller::instance()->getService(), SIGNAL( metaDataResult( const MetaBundle& ) ), +@@ -413,7 +415,12 @@ + else + { + url = LastFm::Controller::instance()->getNewProxy( url.url(), m_engine->lastFmProxyRequired() ); +- if( url.isEmpty() ) goto some_kind_of_failure; ++ if( url.isEmpty() ) ++ goto some_kind_of_failure; ++ else if ( !url.isValid() && url.url() == "lastfm://" ) ++ // Request was canceled, return immediately. ++ return; ++ + m_lastFm = true; + connect( m_engine, SIGNAL( lastFmTrackChange() ), LastFm::Controller::instance()->getService() + , SLOT( requestMetaData() ) ); +diff -uNr -x debian -x .pc build-tree/amarok-1.4.8/amarok/src/lastfm.cpp build-tree.n/amarok-1.4.8/amarok/src/lastfm.cpp +--- amarok-1.4.8/amarok/src/lastfm.cpp 2007-12-17 17:53:19.000000000 +0200 ++++ amarok-1.4.8/amarok/src/lastfm.cpp 2008-02-27 01:41:17.000000000 +0200 +@@ -166,17 +166,20 @@ + + if ( m_service ) playbackStopped(); + +- m_service = new WebService( this, useProxy ); ++ WebService* service; ++ // m_service might have already been reset until changeStation() and/or handshare() ++ // calls return ++ service = m_service = new WebService( this, useProxy ); + + if( checkCredentials() ) + { + QString user = AmarokConfig::scrobblerUsername(); + QString pass = AmarokConfig::scrobblerPassword(); +- ++ + if( !user.isEmpty() && !pass.isEmpty() && +- m_service->handshake( user, pass ) ) ++ service->handshake( user, pass ) ) + { +- bool ok = m_service->changeStation( m_genreUrl ); ++ bool ok = service->changeStation( m_genreUrl ); + if( ok ) // else playbackStopped() + { + if( !AmarokConfig::submitPlayedSongs() ) +@@ -185,6 +188,11 @@ + return KURL( m_service->proxyUrl() ); + } + } ++ if (service->wasCanceled()) { ++ // It was canceled before (during kapp->processEvents() loop) ++ delete service; ++ return KURL("lastfm://"); // construct invalid url ++ } + } + + // Some kind of failure happened, so crap out +@@ -192,14 +200,34 @@ + return KURL(); + } + ++int ++Controller::changeStation( QString url ) ++{ ++ if (isPlaying()) { ++ WebService* service = getService(); ++ if (service->changeStation( url )) { ++ return 1; // success ++ } else if (service->wasCanceled()) { ++ delete service; ++ return -1; // canceled ++ } else { ++ return 0; // failed ++ } ++ } else { ++ return 0; // impossible, failed ++ } ++} + + void + Controller::playbackStopped() //SLOT + { + setActionsEnabled( false ); + +- delete m_service; +- m_service = 0; ++ if (m_service) { ++ if (m_service->cancel()) ++ delete m_service;; ++ m_service = 0; ++ } + } + + +@@ -357,6 +385,8 @@ + WebService::WebService( QObject* parent, bool useProxy ) + : QObject( parent, "lastfmParent" ) + , m_useProxy( useProxy ) ++ , m_deletionUnsafe( false ) ++ , m_wasCanceled( false ) + { + debug() << "Initialising Web Service" << endl; + } +@@ -367,6 +397,11 @@ + DEBUG_BLOCK + } + ++bool ++WebService::cancel() { ++ m_wasCanceled = true; ++ return !m_deletionUnsafe; ++} + + void + WebService::readProxy() //SLOT +@@ -401,10 +436,16 @@ + .arg( "0" ); + + http.get( path ); +- ++ ++ // We don't know what might happen within processEvents() loop. ++ // Therefore this service instance must be protected from deletion. ++ m_deletionUnsafe = true; + do + kapp->processEvents(); + while( http.state() != QHttp::Unconnected ); ++ m_deletionUnsafe = false; ++ if (this->wasCanceled()) ++ return false; + + if ( http.error() != QHttp::NoError ) + return false; +@@ -454,11 +495,15 @@ + } + + QString line; ++ m_deletionUnsafe = true; + while( true ) { + kapp->processEvents(); + m_server->readln( line ); + if( line == "AMAROK_PROXY: startup" ) break; + } ++ m_deletionUnsafe = false; ++ if (this->wasCanceled()) ++ return false; + + connect( m_server, SIGNAL( readReady( KProcIO* ) ), this, SLOT( readProxy() ) ); + connect( m_server, SIGNAL( processExited( KProcess* ) ), Controller::instance(), SLOT( playbackStopped() ) ); +@@ -481,9 +526,13 @@ + .arg( m_session ) + .arg( url ) ); + ++ m_deletionUnsafe = true; + do + kapp->processEvents(); + while( http.state() != QHttp::Unconnected ); ++ m_deletionUnsafe = false; ++ if (this->wasCanceled()) ++ return false; + + if ( http.error() != QHttp::NoError ) + { +diff -uNr -x debian -x .pc build-tree/amarok-1.4.8/amarok/src/lastfm.h build-tree.n/amarok-1.4.8/amarok/src/lastfm.h +--- amarok-1.4.8/amarok/src/lastfm.h 2007-12-17 17:53:19.000000000 +0200 ++++ amarok-1.4.8/amarok/src/lastfm.h 2008-02-27 01:20:46.000000000 +0200 +@@ -79,6 +79,7 @@ + static Controller* instance(); + + KURL getNewProxy( QString genreUrl, bool useProxy ); ++ int changeStation ( QString url ); + + bool isPlaying() const { return m_service != 0; } + WebService* getService() const { return m_service; } +@@ -147,6 +148,9 @@ + **/ + void verifyUser( const QString& user, const QString& pass ); + ++ bool cancel(); ++ bool wasCanceled() const { return m_wasCanceled; } ++ + QString proxyUrl() { return m_proxyUrl; } + + public slots: +@@ -203,6 +207,9 @@ + QString m_proxyUrl; + MetaBundle m_metaBundle; + ++ bool m_deletionUnsafe; ++ bool m_wasCanceled; ++ + private slots: + void readProxy(); + void metaDataFinished( int id, bool error ); --- amarok-1.4.9.1.orig/debian/patches/kubuntu_09_add_lastfm_recommended_radio.diff +++ amarok-1.4.9.1/debian/patches/kubuntu_09_add_lastfm_recommended_radio.diff @@ -0,0 +1,14 @@ +diff -Nur -x '*.orig' -x '*~' amarok-1.4.8/amarok/src/playlistbrowser.cpp amarok-1.4.8.new/amarok/src/playlistbrowser.cpp +--- amarok-1.4.8/amarok/src/playlistbrowser.cpp 2007-12-31 15:21:43.331246000 +0100 ++++ amarok-1.4.8.new/amarok/src/playlistbrowser.cpp 2007-12-31 17:33:45.446046817 +0100 +@@ -566,6 +566,10 @@ + last = new LastFmEntry( m_lastfmCategory, tagsFolder, url, i18n( "Neighbor Radio" ) ); + last->setKept( false ); + ++ url = KURL::fromPathOrURL( QString("lastfm://user/%1/recommended/100").arg( user ) ); ++ last = new LastFmEntry( m_lastfmCategory, last, url, i18n( "Recommended Radio" ) ); ++ last->setKept( false ); ++ + if( subscriber ) + { + url = KURL::fromPathOrURL( QString("lastfm://user/%1/personal").arg( user ) ); --- amarok-1.4.9.1.orig/debian/patches/series +++ amarok-1.4.9.1/debian/patches/series @@ -0,0 +1,19 @@ +01_libtool_update.diff +02_admin_cleanup.diff +03_am_maintainer_mode.patch -p0 +04_disable_no_undefined.patch -p0 +05_gmo_files_at_build_time.patch -p0 +06_disable-final.diff -p0 +10_queuemedia.patch -p0 +11_bug403340_cancel_rename_when_deleting_items.diff -p0 +12_devicemanager_dcopcall_no_timeout.diff +13_lastfm_crash_434835.diff +14_ruby_libs_not_scripts.diff +15_temptables_more_indices.diff +97_automake_cleanup.diff +kubuntu_01_kdepot.diff -p1 +kubuntu_04_install_mp3.diff -p1 +kubuntu_07_gnome_multimedia_keys.diff -p1 +kubuntu_08_luks_device_detection.diff +kubuntu_09_add_lastfm_recommended_radio.diff +kubuntu_10_audio_mimetypes.diff --- amarok-1.4.9.1.orig/debian/patches/15_temptables_more_indices.diff +++ amarok-1.4.9.1/debian/patches/15_temptables_more_indices.diff @@ -0,0 +1,14 @@ +--- amarok-1.4.9.1.orig/amarok/src/collectiondb.cpp ++++ amarok-1.4.9.1/amarok/src/collectiondb.cpp +@@ -701,6 +701,11 @@ + query( "CREATE UNIQUE INDEX url_tagtemp ON tags_temp( url, deviceid );" ); + query( "CREATE UNIQUE INDEX embed_urltemp ON embed_temp( url, deviceid );" ); + query( "CREATE UNIQUE INDEX dir_temp_dir ON directories_temp( dir, deviceid );" ); ++ query( "CREATE INDEX album_tagtemp ON tags_temp( album );" ); ++ query( "CREATE INDEX artist_tagtemp ON tags_temp( artist );" ); ++ query( "CREATE INDEX sampler_tagtemp ON tags_temp( sampler );" ); ++ query( "CREATE INDEX uniqueidtemp_uniqueid ON uniqueid_temp( uniqueid );"); ++ query( "CREATE INDEX uniqueidtemp_url ON uniqueid_temp( url, deviceid );"); + } + } + --- amarok-1.4.9.1.orig/debian/patches/kubuntu_08_luks_device_detection.diff +++ amarok-1.4.9.1/debian/patches/kubuntu_08_luks_device_detection.diff @@ -0,0 +1,76 @@ +Index: amarok-1.4.9.1/amarok/src/medium.cpp +=================================================================== +--- amarok-1.4.9.1.orig/amarok/src/medium.cpp 2008-04-10 22:16:37.000000000 +0200 ++++ amarok-1.4.9.1/amarok/src/medium.cpp 2008-04-12 13:45:47.000000000 +0200 +@@ -40,6 +40,8 @@ + m_properties+= QString::null; /* BASE_URL */ + m_properties+= QString::null; /* MIME_TYPE */ + m_properties+= QString::null; /* ICON_NAME */ ++ m_properties+= "false"; /* ENCRYPTED */ ++ m_properties+= QString::null; /* CLEAR_DEVICE_UDI */ + + loadUserLabel(); + } +@@ -78,6 +80,8 @@ + m_properties+= QString::null; /* BASE_URL */ + m_properties+= QString::null; /* MIME_TYPE */ + m_properties+= QString::null; /* ICON_NAME */ ++ m_properties+= QString::null; /* ENCRYPTED */ ++ m_properties+= QString::null; /* CLEAR_DEVICE_UDI */ + } + + const Medium Medium::create(const QStringList &properties) +@@ -100,6 +104,8 @@ + m.m_properties[BASE_URL] = properties[BASE_URL]; + m.m_properties[MIME_TYPE] = properties[MIME_TYPE]; + m.m_properties[ICON_NAME] = properties[ICON_NAME]; ++ m.m_properties[ENCRYPTED] = properties[ENCRYPTED]; ++ m.m_properties[CLEAR_DEVICE_UDI] = properties[CLEAR_DEVICE_UDI]; + } + + return m; +@@ -125,7 +131,6 @@ + props.erase(first, last); + } + } +- + return l; + } + +Index: amarok-1.4.9.1/amarok/src/medium.h +=================================================================== +--- amarok-1.4.9.1.orig/amarok/src/medium.h 2008-04-10 22:16:37.000000000 +0200 ++++ amarok-1.4.9.1/amarok/src/medium.h 2008-04-12 13:45:47.000000000 +0200 +@@ -43,7 +43,9 @@ + static const uint BASE_URL = 10; + static const uint MIME_TYPE = 11; + static const uint ICON_NAME = 12; +- static const uint PROPERTIES_COUNT = 13; ++ static const uint ENCRYPTED = 13; ++ static const uint CLEAR_DEVICE_UDI = 14; ++ static const uint PROPERTIES_COUNT = 15; + static const QString SEPARATOR; + + Medium(); +@@ -67,6 +69,8 @@ + QString baseURL() const { return m_properties[BASE_URL]; }; + QString mimeType() const { return m_properties[MIME_TYPE]; }; + QString iconName() const { return m_properties[ICON_NAME]; }; ++ bool isEncrypted() const { return m_properties[ENCRYPTED]=="true"; }; ++ QString clearDeviceUdi() const { return m_properties[CLEAR_DEVICE_UDI]; }; + + bool needMounting() const; + KURL prettyBaseURL() const; +Index: amarok-1.4.9.1/amarok/src/mediadevicemanager.cpp +=================================================================== +--- amarok-1.4.9.1.orig/amarok/src/mediadevicemanager.cpp 2008-04-12 13:46:11.000000000 +0200 ++++ amarok-1.4.9.1/amarok/src/mediadevicemanager.cpp 2008-04-12 13:46:47.000000000 +0200 +@@ -77,6 +77,8 @@ + manualDevices.append( QString::null ); //baseURL + manualDevices.append( QString::null ); //MIMEtype + manualDevices.append( QString::null ); //iconName ++ manualDevices.append( "false" ); //encrypted ++ manualDevices.append( QString::null ); //clearDeviceUdi + manualDevices.append( "---" ); //separator + } + } --- amarok-1.4.9.1.orig/debian/patches/01_libtool_update.diff +++ amarok-1.4.9.1/debian/patches/01_libtool_update.diff @@ -0,0 +1,8958 @@ +--- amarok-1.4.8/admin/libtool.m4.in 2007-12-17 17:53:19.000000000 +0200 ++++ amarok-1.4.8/admin/libtool.m4.in 2008-02-02 15:06:18.000000000 +0200 +@@ -1,28 +1,13 @@ + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- +-## Copyright 1996, 1997, 1998, 1999, 2000, 2001 +-## Free Software Foundation, Inc. ++## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007, ++## 2008 Free Software Foundation, Inc. + ## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 + ## +-## This program is free software; you can redistribute it and/or modify +-## it under the terms of the GNU General Public License as published by +-## the Free Software Foundation; either version 2 of the License, or +-## (at your option) any later version. +-## +-## This program is distributed in the hope that it will be useful, but +-## WITHOUT ANY WARRANTY; without even the implied warranty of +-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +-## General Public License for more details. +-## +-## You should have received a copy of the GNU General Public License +-## along with this program; if not, write to the Free Software +-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-## +-## As a special exception to the GNU General Public License, if you +-## distribute this file as part of a program that contains a +-## configuration script generated by Autoconf, you may include it under +-## the same distribution terms that you use for the rest of that program. ++## 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 52 Debian 1.5.26-1 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 +@@ -110,7 +95,6 @@ + AC_REQUIRE([AC_OBJEXT])dnl + AC_REQUIRE([AC_EXEEXT])dnl + dnl +- + AC_LIBTOOL_SYS_MAX_CMD_LEN + AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE + AC_LIBTOOL_OBJDIR +@@ -132,7 +116,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 +136,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 +156,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" +@@ -184,22 +169,24 @@ + test -z "$ac_objext" && ac_objext=o + + # Determine commands to create old-style static archives. +-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' ++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' + old_postinstall_cmds='chmod 644 $oldlib' + old_postuninstall_cmds= + + if test -n "$RANLIB"; then + case $host_os in + openbsd*) +- 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*) +@@ -209,6 +196,8 @@ + ;; + esac + ++_LT_REQUIRED_DARWIN_CHECKS ++ + AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) + AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], + enable_win32_dll=yes, enable_win32_dll=no) +@@ -240,11 +229,129 @@ + # 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_REQUIRE([LT_AC_PROG_SED])dnl ++ac_outfile=conftest.$ac_objext ++echo "$lt_simple_compile_test_code" >conftest.$ac_ext ++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err ++_lt_compiler_boilerplate=`cat conftest.err` ++$rm conftest* ++])# _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_REQUIRE([LT_AC_PROG_SED])dnl ++ac_outfile=conftest.$ac_objext ++echo "$lt_simple_link_test_code" >conftest.$ac_ext ++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err ++_lt_linker_boilerplate=`cat conftest.err` ++$rm -r conftest* ++])# _LT_LINKER_BOILERPLATE ++ ++# _LT_REQUIRED_DARWIN_CHECKS ++# -------------------------- ++# Check for some things on darwin ++AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[ ++ case $host_os in ++ rhapsody* | darwin*) ++ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) ++ AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) ++ ++ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], ++ [lt_cv_apple_cc_single_mod=no ++ if test -z "${LT_MULTI_MODULE}"; then ++ # By default we will add the -single_module flag. You can override ++ # by either setting the environment variable LT_MULTI_MODULE ++ # non-empty at configure time, or by adding -multi_module to the ++ # link flags. ++ echo "int foo(void){return 1;}" > conftest.c ++ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ ++ -dynamiclib ${wl}-single_module conftest.c ++ if test -f libconftest.dylib; then ++ lt_cv_apple_cc_single_mod=yes ++ rm -rf libconftest.dylib* ++ fi ++ rm conftest.c ++ fi]) ++ AC_CACHE_CHECK([for -exported_symbols_list linker flag], ++ [lt_cv_ld_exported_symbols_list], ++ [lt_cv_ld_exported_symbols_list=no ++ save_LDFLAGS=$LDFLAGS ++ echo "_main" > conftest.sym ++ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], ++ [lt_cv_ld_exported_symbols_list=yes], ++ [lt_cv_ld_exported_symbols_list=no]) ++ LDFLAGS="$save_LDFLAGS" ++ ]) ++ case $host_os in ++ rhapsody* | darwin1.[[0123]]) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; ++ darwin1.*) ++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; ++ darwin*) ++ # if running on 10.5 or later, the deployment target defaults ++ # to the OS version, if on x86, and 10.4, the deployment ++ # target defaults to 10.4. Don't you love it? ++ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in ++ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++ 10.[[012]]*) ++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; ++ 10.*) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++ esac ++ ;; ++ esac ++ if test "$lt_cv_apple_cc_single_mod" = "yes"; then ++ _lt_dar_single_mod='$single_module' ++ fi ++ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then ++ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' ++ else ++ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" ++ fi ++ if test "$DSYMUTIL" != ":"; then ++ _lt_dsymutil="~$DSYMUTIL \$lib || :" ++ else ++ _lt_dsymutil= ++ fi ++ ;; ++ esac ++]) ++ + # _LT_AC_SYS_LIBPATH_AIX + # ---------------------- + # Links a minimal program and checks the executable +@@ -254,12 +361,20 @@ + # If we don't find anything, use the default library path according + # to the aix ld manual. + AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], +-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[ +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'` ++[AC_REQUIRE([LT_AC_PROG_SED])dnl ++AC_LINK_IFELSE(AC_LANG_PROGRAM,[ ++lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\(.*\)$/\1/ ++ p ++ } ++ }' ++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'`; fi],[]) ++if test -z "$aix_libpath"; then ++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++fi],[]) + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + ])# _LT_AC_SYS_LIBPATH_AIX + +@@ -317,15 +432,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 +@@ -490,18 +605,21 @@ + rm -rf conftest* + ;; + +-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) ++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ ++s390*-*linux*|sparc*-*linux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then +- 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-*kfreebsd*-gnu) ++ LD="${LD-ld} -m elf_i386_fbsd" ++ ;; + x86_64-*linux*) + LD="${LD-ld} -m elf_i386" + ;; +- ppc64-*linux*) ++ ppc64-*linux*|powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" + ;; + s390x-*linux*) +@@ -513,8 +631,10 @@ + esac + ;; + *64-bit*) +- LINUX_64_MODE="64" + case $host in ++ x86_64-*kfreebsd*-gnu) ++ LD="${LD-ld} -m elf_x86_64_fbsd" ++ ;; + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; +@@ -547,6 +667,26 @@ + 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" ;; ++ *) ++ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then ++ LD="${LD-ld} -64" ++ fi ++ ;; ++ esac ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; ++ + AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], + [*-*-cygwin* | *-*-mingw* | *-*-pw32*) + AC_CHECK_TOOL(DLLTOOL, dlltool, false) +@@ -570,7 +710,7 @@ + AC_CACHE_CHECK([$1], [$2], + [$2=no + ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$3" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. +@@ -578,7 +718,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 +728,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 +@@ -609,22 +751,28 @@ + # ------------------------------------------------------------ + # Check whether the given compiler option works + AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], +-[AC_CACHE_CHECK([$1], [$2], ++[AC_REQUIRE([LT_AC_PROG_SED])dnl ++AC_CACHE_CHECK([$1], [$2], + [$2=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $3" +- printf "$lt_simple_link_test_code" > conftest.$ac_ext ++ echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then +- # The compiler can only warn and ignore the option if not recognized ++ # The linker can only warn and ignore the option if not recognized + # 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 + fi +- $rm conftest* ++ $rm -r conftest* + LDFLAGS="$save_LDFLAGS" + ]) + +@@ -643,7 +791,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,24 +820,77 @@ + lt_cv_sys_max_cmd_len=8192; + ;; + +- *) +- # If test is not a shell built-in, we'll probably end up computing a +- # maximum length that is only half of the actual maximum length, but +- # we can't tell. +- while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \ +- = "XX$testring") >/dev/null 2>&1 && +- new_result=`expr "X$testring" : ".*" 2>&1` && +- lt_cv_sys_max_cmd_len=$new_result && +- test $i != 17 # 1/2 MB should be enough +- do +- i=`expr $i + 1` +- testring=$testring$testring +- done +- testring= +- # Add a significant safety factor because C++ compilers can tack on massive +- # amounts of additional arguments before passing them to the linker. +- # It appears as though 1/2 is a usable value. +- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` ++ amigaos*) ++ # On AmigaOS with pdksh, this test takes hours, literally. ++ # So we just punt and use a minimum line length of 8192. ++ 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 ++ ;; ++ *) ++ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` ++ if test -n "$lt_cv_sys_max_cmd_len"; then ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` ++ else ++ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} ++ while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ ++ = "XX$teststring") >/dev/null 2>&1 && ++ new_result=`expr "X$teststring" : ".*" 2>&1` && ++ lt_cv_sys_max_cmd_len=$new_result && ++ test $i != 17 # 1/2 MB should be enough ++ do ++ i=`expr $i + 1` ++ teststring=$teststring$teststring ++ done ++ teststring= ++ # Add a significant safety factor because C++ compilers can tack on massive ++ # amounts of additional arguments before passing them to the linker. ++ # It appears as though 1/2 is a usable value. ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` ++ fi + ;; + esac + ]) +@@ -702,7 +903,7 @@ + + + # _LT_AC_CHECK_DLFCN +-# -------------------- ++# ------------------ + AC_DEFUN([_LT_AC_CHECK_DLFCN], + [AC_CHECK_HEADERS(dlfcn.h)dnl + ])# _LT_AC_CHECK_DLFCN +@@ -710,7 +911,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 +977,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 +1001,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,12 +1038,12 @@ + lt_cv_dlopen_self=yes + ]) + ;; +- ++ + *) + AC_CHECK_FUNC([shl_load], + [lt_cv_dlopen="shl_load"], + [AC_CHECK_LIB([dld], [shl_load], +- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], ++ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], + [AC_CHECK_FUNC([dlopen], + [lt_cv_dlopen="dlopen"], + [AC_CHECK_LIB([dl], [dlopen], +@@ -848,7 +1051,7 @@ + [AC_CHECK_LIB([svld], [dlopen], + [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], + [AC_CHECK_LIB([dld], [dld_link], +- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) ++ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) + ]) + ]) + ]) +@@ -869,7 +1072,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 +1085,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( +@@ -914,7 +1117,8 @@ + # --------------------------------- + # Check to see if options -c and -o are simultaneously supported by compiler + AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], +-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl ++[AC_REQUIRE([LT_AC_PROG_SED])dnl ++AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl + AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], + [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], + [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no +@@ -922,14 +1126,7 @@ + mkdir conftest + cd conftest + 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 . ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or +@@ -937,7 +1134,7 @@ + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ +- -e 's:.*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 +1146,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 +1216,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 && +@@ -1064,6 +1266,7 @@ + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" ++ old_striplib="$STRIP -S" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) +@@ -1072,7 +1275,7 @@ + *) + AC_MSG_RESULT([no]) + ;; +- esac ++ esac + fi + ])# AC_LIBTOOL_SYS_LIB_STRIP + +@@ -1081,11 +1284,12 @@ + # ----------------------------- + # PORTME Fill in your ld.so characteristics + AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], +-[AC_MSG_CHECKING([dynamic linker characteristics]) ++[AC_REQUIRE([LT_AC_PROG_SED])dnl ++AC_MSG_CHECKING([dynamic linker characteristics]) + library_names_spec= + libname_spec='lib$name' + soname_spec= +-shrext=".so" ++shrext_cmds=".so" + postinstall_cmds= + postuninstall_cmds= + finish_cmds= +@@ -1095,7 +1299,58 @@ + version_type=none + dynamic_linker="$host_os ld.so" + sys_lib_dlsearch_path_spec="/lib /usr/lib" +-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" ++m4_if($1,[],[ ++if test "$GCC" = yes; then ++ case $host_os in ++ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; ++ *) lt_awk_arg="/^libraries:/" ;; ++ esac ++ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` ++ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then ++ # if the path contains ";" then we assume it to be the separator ++ # otherwise default to the standard path separator (i.e. ":") - it is ++ # assumed that no part of a normal pathname contains ";" but that should ++ # okay in the real world where ";" in dirpaths is itself problematic. ++ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` ++ else ++ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ fi ++ # Ok, now we have the path, separated by spaces, we can step through it ++ # and add multilib dir if necessary. ++ lt_tmp_lt_search_path_spec= ++ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` ++ for lt_sys_path in $lt_search_path_spec; do ++ if test -d "$lt_sys_path/$lt_multi_os_dir"; then ++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" ++ else ++ test -d "$lt_sys_path" && \ ++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" ++ fi ++ done ++ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk ' ++BEGIN {RS=" "; FS="/|\n";} { ++ lt_foo=""; ++ lt_count=0; ++ for (lt_i = NF; lt_i > 0; lt_i--) { ++ if ($lt_i != "" && $lt_i != ".") { ++ if ($lt_i == "..") { ++ lt_count++; ++ } else { ++ if (lt_count == 0) { ++ lt_foo="/" $lt_i lt_foo; ++ } else { ++ lt_count--; ++ } ++ } ++ } ++ } ++ if (lt_foo != "") { lt_freq[[lt_foo]]++; } ++ if (lt_freq[[lt_foo]] == 1) { print lt_foo; } ++}'` ++ sys_lib_search_path_spec=`echo $lt_search_path_spec` ++else ++ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" ++fi]) + need_lib_prefix=unknown + hardcode_into_libs=no + +@@ -1113,7 +1368,7 @@ + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +-aix4* | aix5*) ++aix[[4-9]]*) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -1160,7 +1415,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 +1424,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 +1440,7 @@ + + cygwin* | mingw* | pw32*) + version_type=windows +- shrext=".dll" ++ shrext_cmds=".dll" + need_version=no + need_lib_prefix=no + +@@ -1197,7 +1452,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 +1483,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,13 +1506,9 @@ + soname_spec='${libname}${release}${major}$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH +- shrext='$(test .$module = .yes && echo .so || echo .dylib)' +- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. +- if test "$GCC" = yes; then +- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` +- else +- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' +- fi ++ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' ++ m4_if([$1], [],[ ++ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; + +@@ -1273,20 +1525,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 +1553,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 + ;; ++ *) # from 4.6 on, and DragonFly ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; + esac + ;; + +@@ -1331,9 +1585,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 +1602,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 +1613,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 +1625,18 @@ + postinstall_cmds='chmod 555 $lib' + ;; + ++interix[[3-9]]*) ++ 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 +1680,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>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" ++ fi ++ + # We used to test for /lib/ld.so.1 and disable shared libraries on + # powerpc, because MkLinux only supported shared libraries with the + # GNU dynamic linker. Since this was broken with cross compilers, +@@ -1446,6 +1709,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 +1730,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 +1758,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 +1784,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,11 +1802,8 @@ + 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 ++rdos*) ++ dynamic_linker=no + ;; + + solaris*) +@@ -1554,7 +1831,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 +1864,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,13 +1900,26 @@ + esac + AC_MSG_RESULT([$dynamic_linker]) + test "$dynamic_linker" = no && can_build_shared=no ++ ++AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec], ++[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"]) ++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" ++AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec], ++[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"]) ++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" ++ ++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 + + + # _LT_AC_TAGCONFIG + # ---------------- + AC_DEFUN([_LT_AC_TAGCONFIG], +-[AC_ARG_WITH([tags], ++[AC_REQUIRE([LT_AC_PROG_SED])dnl ++AC_ARG_WITH([tags], + [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], + [include additional configurations @<:@automatic@:>@])], + [tagnames="$withval"]) +@@ -1624,6 +1937,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 +1966,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 +2030,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 +2068,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) +@@ -1862,7 +2180,7 @@ + + # AC_PATH_TOOL_PREFIX + # ------------------- +-# find a file program which can recognise shared library ++# find a file program which can recognize shared library + AC_DEFUN([AC_PATH_TOOL_PREFIX], + [AC_REQUIRE([AC_PROG_EGREP])dnl + AC_MSG_CHECKING([for $1]) +@@ -1886,7 +2204,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 +@@ -1925,7 +2243,7 @@ + + # AC_PATH_MAGIC + # ------------- +-# find a file program which can recognise a shared library ++# find a file program which can recognize a shared library + AC_DEFUN([AC_PATH_MAGIC], + [AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) + if test -z "$lt_cv_path_MAGIC_CMD"; then +@@ -1996,7 +2314,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 </dev/null` in + *GNU* | *'with BFD'*) +@@ -2028,7 +2346,7 @@ + AC_DEFUN([AC_PROG_LD_GNU], + [AC_REQUIRE([AC_PROG_EGREP])dnl + AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld, +-[# 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 </dev/null` in + *GNU* | *'with BFD'*) + lt_cv_prog_gnu_ld=yes +@@ -2055,6 +2373,15 @@ + *) reload_flag=" $reload_flag" ;; + esac + reload_cmds='$LD$reload_flag -o $output$reload_objs' ++case $host_os in ++ darwin*) ++ if test "$GCC" = yes; then ++ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' ++ else ++ reload_cmds='$LD$reload_flag -o $output$reload_objs' ++ fi ++ ;; ++esac + ])# AC_PROG_LD_RELOAD_FLAG + + +@@ -2063,7 +2390,7 @@ + # how to check for library dependencies + # -- PORTME fill in with the dynamic library characteristics + AC_DEFUN([AC_DEPLIBS_CHECK_METHOD], +-[AC_CACHE_CHECK([how to recognise dependent libraries], ++[AC_CACHE_CHECK([how to recognize dependent libraries], + lt_cv_deplibs_check_method, + [lt_cv_file_magic_cmd='$MAGIC_CMD' + lt_cv_file_magic_test_file= +@@ -2080,7 +2407,7 @@ + # whether `pass_all' will *always* work, you probably want this one. + + case $host_os in +-aix4* | aix5*) ++aix[[4-9]]*) + lt_cv_deplibs_check_method=pass_all + ;; + +@@ -2088,44 +2415,42 @@ + 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', ++ # unless we find 'file', for example because we are cross-compiling. ++ if ( file / ) >/dev/null 2>&1; then ++ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' ++ lt_cv_file_magic_cmd='func_win32_libid' ++ else ++ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' ++ lt_cv_file_magic_cmd='$OBJDUMP -f' ++ fi + ;; + + darwin* | rhapsody*) +- # 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.*` + ;; +@@ -2141,7 +2466,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 +2482,27 @@ + esac + ;; + ++interix[[3-9]]*) ++ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here ++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' ++ ;; ++ + 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 +2521,26 @@ + ;; + + 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*) ++rdos*) + 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 +2561,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 +2587,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 +2655,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 +2680,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 +2724,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 +2778,7 @@ + + + # AC_LIBTOOL_RC +-# -------------- ++# ------------- + # enable support for Windows resource files + AC_DEFUN([AC_LIBTOOL_RC], + [AC_REQUIRE([LT_AC_PROG_RC]) +@@ -2480,43 +2804,16 @@ + _LT_AC_TAGVAR(objext, $1)=$objext + + # Code to be used in simple compile tests +-lt_simple_compile_test_code="int some_variable = 0;\n" ++lt_simple_compile_test_code="int some_variable = 0;" + + # Code to be used in simple link tests +-lt_simple_link_test_code='int main(){return(0);}\n' ++lt_simple_link_test_code='int main(){return(0);}' + + _LT_AC_SYS_COMPILER + +-# +-# 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 +2827,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 +2838,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 +2847,11 @@ + fi + ;; + +-aix4*) ++aix[[4-9]]*) + 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 +2876,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 +2888,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)= +@@ -2643,23 +2904,28 @@ + _LT_AC_TAGVAR(predeps, $1)= + _LT_AC_TAGVAR(postdeps, $1)= + _LT_AC_TAGVAR(compiler_lib_search_path, $1)= ++_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= + + # Source file extension for C++ test sources. +-ac_ext=cc ++ac_ext=cpp + + # Object file extension for compiled C++ test sources. + objext=o + _LT_AC_TAGVAR(objext, $1)=$objext + + # Code to be used in simple compile tests +-lt_simple_compile_test_code="int some_variable = 0;\n" ++lt_simple_compile_test_code="int some_variable = 0;" + + # Code to be used in simple link tests +-lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n' ++lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' + + # 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 +2936,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 +2965,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 +2992,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 +@@ -2748,7 +3014,7 @@ + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; +- aix4* | aix5*) ++ aix[[4-9]]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. +@@ -2756,8 +3022,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]].*|aix[[5-9]]*) ++ 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 +3055,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` +@@ -2782,7 +3063,7 @@ + strings "$collect2name" | grep resolve_lib_name >/dev/null + then + # We have reworked collect2 +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ : + else + # We have old collect2 + _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported +@@ -2793,8 +3074,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 +3088,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 +3106,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 +3120,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 <jrb3@best.com> 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 +3153,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 +3167,53 @@ + 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*) +- 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' ++ darwin* | rhapsody*) ++ _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 ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" ++ if test "$GXX" = 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_dar_single_mod${_lt_dsymutil}" ++ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ if test "$lt_cv_apple_cc_single_mod" != "yes"; then ++ _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${_lt_dsymutil}" ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed '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${_lt_dar_export_syms}${_lt_dsymutil}" ++ fi + 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 ++ case $cc_basename in ++ xlc*) ++ output_verbose_link_cmd='echo' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' ++ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' ++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ ;; ++ *) ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac + fi +- ;; +- esac +- lt_int_apple_cc_single_mod=no +- 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 +- ;; ++ ;; + + 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 +3224,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 +3248,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 +3262,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 +3276,20 @@ + ;; + hpux10*|hpux11*) + if test $with_gnu_ld = no; then +- case "$host_cpu" in +- hppa*64*) +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- ;; +- ia64*) +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- ;; ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ ++ case $host_cpu in ++ hppa*64*|ia64*) ;; + *) +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $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 +3300,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 +3329,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 +3348,25 @@ + ;; + esac + ;; ++ interix[[3-9]]*) ++ _LT_AC_TAGVAR(hardcode_direct, $1)=no ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _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 +3377,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 +3388,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 +3415,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* | pgcpp*) ++ # 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' +@@ -3159,6 +3468,29 @@ + # dependencies. + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + ;; ++ *) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C++ 5.9 ++ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ ++ # Not sure whether something based on ++ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 ++ # would be better. ++ output_verbose_link_cmd='echo' ++ ++ # Archives containing C++ object files must be created using ++ # "CC -xar", where "CC" is the Sun C++ compiler. This is ++ # necessary to make sure instantiated templates are included ++ # in the archive. ++ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' ++ ;; ++ esac ++ ;; + esac + ;; + lynxos*) +@@ -3171,7 +3503,7 @@ + ;; + mvs*) + case $cc_basename in +- cxx) ++ cxx*) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; +@@ -3181,7 +3513,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 +3524,35 @@ + # Workaround some broken pre-1.5 toolchains + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' + ;; ++ openbsd2*) ++ # C++ shared libraries are fairly broken ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ openbsd*) ++ if test -f /usr/libexec/ld.so; then ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ fi ++ output_verbose_link_cmd='echo' ++ else ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; + 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 +3562,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 +3587,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 +3606,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 +3621,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 +3650,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 +3671,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 +3691,28 @@ + ;; + 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. ++ # The compiler driver will combine and reorder linker options, ++ # but understands `-z linker_flag'. + # Supported since Solaris 2.6 (maybe 2.5.1?) +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z 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 +3720,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 +3732,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 +3743,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 +@@ -3423,16 +3754,73 @@ + fi + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' ++ case $host_os in ++ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; ++ *) ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ++ ;; ++ esac + fi + ;; + esac + ;; +- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*) ++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) ++ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_AC_TAGVAR(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 +3857,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,12 +3874,13 @@ + ])# 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 + # objects, libraries and library flags. +-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[ ++AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP], ++[AC_REQUIRE([LT_AC_PROG_SED])dnl + dnl we can't use the lt_simple_compile_test_code here, + dnl because it contains code intended for an executable, + dnl not a library. It's possible we should let each +@@ -3542,7 +3929,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 +3969,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 +4005,74 @@ + + $rm -f confest.$objext + ++_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= ++if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then ++ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` ++fi ++ ++# PORTME: override above test on systems where it is broken ++ifelse([$1],[CXX], ++[case $host_os in ++interix[[3-9]]*) ++ # Interix 3.5 installs completely hosed .la files for C++, so rather than ++ # hack all around it, let's just trust "g++" to DTRT. ++ _LT_AC_TAGVAR(predep_objects,$1)= ++ _LT_AC_TAGVAR(postdep_objects,$1)= ++ _LT_AC_TAGVAR(postdeps,$1)= ++ ;; ++ ++linux*) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C++ 5.9 ++ # ++ # The more standards-conforming stlport4 library is ++ # incompatible with the Cstd library. Avoid specifying ++ # it if it's in CXXFLAGS. Ignore libCrun as ++ # -library=stlport4 depends on it. ++ case " $CXX $CXXFLAGS " in ++ *" -library=stlport4 "*) ++ solaris_use_stlport4=yes ++ ;; ++ esac ++ if test "$solaris_use_stlport4" != yes; then ++ _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' ++ fi ++ ;; ++ esac ++ ;; ++ ++solaris*) ++ case $cc_basename in ++ CC*) ++ # The more standards-conforming stlport4 library is ++ # incompatible with the Cstd library. Avoid specifying ++ # it if it's in CXXFLAGS. Ignore libCrun as ++ # -library=stlport4 depends on it. ++ case " $CXX $CXXFLAGS " in ++ *" -library=stlport4 "*) ++ solaris_use_stlport4=yes ++ ;; ++ esac ++ ++ # Adding this requires a known-good setup of shared libraries for ++ # Sun compiler versions before 5.6, else PIC objects from an old ++ # archive will be linked into the output, leading to subtle bugs. ++ if test "$solaris_use_stlport4" != yes; then ++ _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' ++ fi ++ ;; ++ 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'. +@@ -3660,20 +4108,31 @@ + _LT_AC_TAGVAR(objext, $1)=$objext + + # Code to be used in simple compile tests +-lt_simple_compile_test_code=" subroutine t\n return\n end\n" ++lt_simple_compile_test_code="\ ++ subroutine t ++ return ++ end ++" + + # Code to be used in simple link tests +-lt_simple_link_test_code=" program t\n end\n" ++lt_simple_link_test_code="\ ++ program t ++ end ++" + + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + _LT_AC_SYS_COMPILER + ++# 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 +4142,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 +4150,10 @@ + postinstall_cmds='$RANLIB $lib' + fi + ;; +-aix4*) +- test "$enable_shared" = yes && enable_static=no ++aix[[4-9]]*) ++ 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 +4163,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 +4172,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) + +@@ -3740,23 +4197,30 @@ + _LT_AC_TAGVAR(objext, $1)=$objext + + # Code to be used in simple compile tests +-lt_simple_compile_test_code="class foo {}\n" ++lt_simple_compile_test_code="class foo {}" + + # Code to be used in simple link tests +-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n' ++lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' + + # 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 +4232,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 +4241,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'. +@@ -3795,7 +4257,7 @@ + _LT_AC_TAGVAR(objext, $1)=$objext + + # Code to be used in simple compile tests +-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n' ++lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' + + # Code to be used in simple link tests + lt_simple_link_test_code="$lt_simple_compile_test_code" +@@ -3803,11 +4265,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 +4300,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 \ +@@ -3863,6 +4331,7 @@ + _LT_AC_TAGVAR(predeps, $1) \ + _LT_AC_TAGVAR(postdeps, $1) \ + _LT_AC_TAGVAR(compiler_lib_search_path, $1) \ ++ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \ + _LT_AC_TAGVAR(archive_cmds, $1) \ + _LT_AC_TAGVAR(archive_expsym_cmds, $1) \ + _LT_AC_TAGVAR(postinstall_cmds, $1) \ +@@ -3878,6 +4347,7 @@ + _LT_AC_TAGVAR(module_cmds, $1) \ + _LT_AC_TAGVAR(module_expsym_cmds, $1) \ + _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \ ++ _LT_AC_TAGVAR(fix_srcfile_path, $1) \ + _LT_AC_TAGVAR(exclude_expsyms, $1) \ + _LT_AC_TAGVAR(include_expsyms, $1); do + +@@ -3887,7 +4357,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 | \ +@@ -3924,7 +4394,7 @@ + # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) + # NOTE: Changes made to this file will be lost: look at ltmain.sh. + # +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 + # Free Software Foundation, Inc. + # + # This file is part of GNU Libtool: +@@ -3953,11 +4423,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 +4458,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 +4475,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 +4497,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 +4528,7 @@ + libext="$libext" + + # Shared library suffix (normally ".so"). +-shrext='$shrext' ++shrext_cmds='$shrext_cmds' + + # Executable file suffix (normally ""). + exeext="$exeext" +@@ -4064,7 +4543,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? +@@ -4152,6 +4631,10 @@ + # shared library. + postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) + ++# The directories searched by this compiler when creating a shared ++# library ++compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1) ++ + # The library search path used internally by the compiler when linking + # a shared library. + compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) +@@ -4240,7 +4723,7 @@ + sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec + + # Fix the shell variable \$srcfile for the compiler. +-fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)" ++fix_srcfile_path=$lt_fix_srcfile_path + + # Set to yes if exported symbols are required. + always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1) +@@ -4293,7 +4776,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 + +@@ -4320,6 +4806,7 @@ + # --------------------------------- + AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], + [AC_REQUIRE([AC_CANONICAL_HOST]) ++AC_REQUIRE([LT_AC_PROG_SED]) + AC_REQUIRE([AC_PROG_NM]) + AC_REQUIRE([AC_OBJEXT]) + # Check for command to grab the raw symbol name followed by C symbol from nm. +@@ -4335,9 +4822,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 +4843,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 +4884,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 +@@ -4481,7 +4984,7 @@ + echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD + cat conftest.$ac_ext >&5 + fi +- rm -f conftest* conftst* ++ rm -rf conftest* conftst* + + # Do not use the global_symbol_pipe unless it works. + if test "$pipe_works" = yes; then +@@ -4530,13 +5033,16 @@ + # like `-m68040'. + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' + ;; +- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) ++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; +- mingw* | os2* | pw32*) ++ mingw* | cygwin* | os2* | pw32*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' ++ # Although the cygwin gcc ignores -fPIC, still need this for old-style ++ # (--disable-auto-import) libraries ++ m4_if([$1], [GCJ], [], ++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; + darwin* | rhapsody*) + # PIC is the default on this platform +@@ -4547,6 +5053,10 @@ + # DJGPP does not support shared libraries at all + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= + ;; ++ interix[[3-9]]*) ++ # Interix 3.x gcc -fpic/-fPIC options generate broken code. ++ # Instead, we relocate shared libraries at runtime. ++ ;; + sysv4*MP*) + if test -d /usr/nec; then + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic +@@ -4555,7 +5065,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*) + ;; + *) +@@ -4569,7 +5079,7 @@ + esac + else + case $host_os in +- aix4* | aix5*) ++ aix[[4-9]]*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor +@@ -4580,18 +5090,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 +5119,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 +5147,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 +5162,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* | pgcpp*) ++ # 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. +@@ -4659,6 +5189,14 @@ + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + *) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C++ 5.9 ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' ++ ;; ++ esac + ;; + esac + ;; +@@ -4668,25 +5206,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 +5238,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 +5256,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 +5271,7 @@ + ;; + tandem*) + case $cc_basename in +- NCC) ++ NCC*) + # NonStop-UX NCC 3.20 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + ;; +@@ -4750,7 +5279,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*) + ;; +@@ -4781,14 +5317,17 @@ + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' + ;; + +- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) ++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + +- mingw* | pw32* | os2*) ++ mingw* | cygwin* | pw32* | os2*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' ++ # Although the cygwin gcc ignores -fPIC, still need this for old-style ++ # (--disable-auto-import) libraries ++ m4_if([$1], [GCJ], [], ++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; + + darwin* | rhapsody*) +@@ -4797,6 +5336,11 @@ + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + ;; + ++ interix[[3-9]]*) ++ # 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 +5357,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,18 +5383,29 @@ + _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*) ++ mingw* | cygwin* | pw32* | os2*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' ++ m4_if([$1], [GCJ], [], ++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; + + hpux9* | hpux10* | hpux11*) + _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,18 +5428,41 @@ + _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. + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; ++ *) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C 5.9 ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ ;; ++ *Sun\ F*) ++ # Sun Fortran 8.3 passes all unrecognized flags to the linker ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='' ++ ;; ++ esac ++ ;; + esac + ;; + +@@ -4894,15 +5472,19 @@ + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + +- sco3.2v5*) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn' ++ rdos*) ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + + solaris*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _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 +5493,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 +5506,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' +@@ -4942,7 +5535,7 @@ + # + if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then + AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], +- _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1), ++ _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1), + [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], + [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in + "" | " "*) ;; +@@ -4951,7 +5544,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 +5553,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_cv_prog_compiler_static_works, $1), ++ $lt_tmp_static_flag, ++ [], ++ [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) + ]) + + +@@ -4967,11 +5570,12 @@ + # ------------------------------------ + # See if the linker supports building shared libraries. + AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS], +-[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) ++[AC_REQUIRE([LT_AC_PROG_SED])dnl ++AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) + ifelse([$1],[CXX],[ + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + case $host_os in +- aix4* | aix5*) ++ aix[[4-9]]*) + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + if $NM -V 2>&1 | grep 'GNU' > /dev/null; then +@@ -4984,12 +5588,16 @@ + _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' + ;; + esac ++ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] + ],[ + runpath_var= + _LT_AC_TAGVAR(allow_undefined_flag, $1)= +@@ -5010,7 +5618,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* +@@ -5020,14 +5628,17 @@ + # it will be wrapped by ` (' and `)$', so one must not match beginning or + # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', + # as well as any symbol that contains `d'. +- _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_" ++ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. ++ # Exclude shared library initialization/finalization symbols. ++dnl Note also adjust exclude_expsyms for C++ above. + 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 +5648,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,9 +5662,30 @@ + # 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*) ++ aix[[3-9]]*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + _LT_AC_TAGVAR(ld_shlibs, $1)=no +@@ -5084,7 +5720,7 @@ + _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported + # Joseph Beckenbach <jrb3@best.com> 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 +5730,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/'\'' -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 +5745,79 @@ + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ +- $CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' ++ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ else ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ ++ interix[[3-9]]*) ++ _LT_AC_TAGVAR(hardcode_direct, $1)=no ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _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' ++ ;; ++ ++ gnu* | linux* | k*bsd*-gnu) ++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ tmp_addflag= ++ case $cc_basename,$host_cpu in ++ 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 ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) # Sun C 5.9 ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ tmp_sharedflag='-G' ;; ++ *Sun\ F*) # Sun Fortran 8.3 ++ tmp_sharedflag='-G' ;; ++ *) ++ tmp_sharedflag='-shared' ;; ++ esac ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ ++ if test $supports_anon_versioning = yes; then ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~ ++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ ++ $echo "local: *; };" >> $output_objdir/$libname.ver~ ++ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' ++ fi ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=no + else +- ld_shlibs=no ++ _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 <<EOF 1>&2 +@@ -5139,13 +5831,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 +5874,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,14 +5898,14 @@ + # 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 + fi + ;; + +- aix4* | aix5*) ++ aix[[4-9]]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. +@@ -5206,9 +5920,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]].*|aix[[5-9]]*) ++ 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 +5951,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` +@@ -5233,7 +5959,7 @@ + strings "$collect2name" | grep resolve_lib_name >/dev/null + then + # We have reworked collect2 +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ : + else + # We have old collect2 + _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported +@@ -5244,8 +5970,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 +5983,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 +6015,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 +6032,7 @@ + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + +- bsdi4*) ++ bsdi[[45]]*) + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic + ;; + +@@ -5314,69 +6042,68 @@ + # 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(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' ++ _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' + _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + + 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_dar_single_mod${_lt_dsymutil}" ++ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ 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` $xlcverstring' ++ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' ++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ ;; ++ *) ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac ++ fi + ;; + + dgux*) +@@ -5409,8 +6136,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 +6145,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 +6159,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 +6228,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 +6238,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 +@@ -5516,23 +6258,28 @@ + ;; + + openbsd*) +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ if test -f /usr/libexec/ld.so; then ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ else ++ case $host_os in ++ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ ;; ++ *) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ ;; ++ esac ++ fi + else +- case $host_os in +- openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- ;; +- *) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- ;; +- esac ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + +@@ -5540,14 +6287,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 +6306,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 +6320,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 +6337,17 @@ + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; +- *) # Supported since Solaris 2.6 (maybe 2.5.1?) +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; ++ *) ++ # The compiler driver will combine and reorder linker options, ++ # but understands `-z linker_flag'. GCC discards it without `$wl', ++ # but is careful enough not to reorder. ++ # Supported since Solaris 2.6 (maybe 2.5.1?) ++ if test "$GCC" = yes; then ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ++ else ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ++ fi ++ ;; + esac + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + ;; +@@ -5606,7 +6356,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 +6404,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* | 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 +- 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 +6460,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? + # +@@ -5725,14 +6479,15 @@ + # to ld, don't add -lc before -lgcc. + AC_MSG_CHECKING([whether -lc should be explicitly linked in]) + $rm conftest* +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext +- ++ echo "$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= +@@ -5827,6 +6582,30 @@ + [AC_CHECK_TOOL(RC, windres, no) + ]) + ++ ++# Cheap backport of AS_EXECUTABLE_P and required macros ++# from Autoconf 2.59; we should not use $as_executable_p directly. ++ ++# _AS_TEST_PREPARE ++# ---------------- ++m4_ifndef([_AS_TEST_PREPARE], ++[m4_defun([_AS_TEST_PREPARE], ++[if test -x / >/dev/null 2>&1; then ++ as_executable_p='test -x' ++else ++ as_executable_p='test -f' ++fi ++])])# _AS_TEST_PREPARE ++ ++# AS_EXECUTABLE_P ++# --------------- ++# Check whether a file is executable. ++m4_ifndef([AS_EXECUTABLE_P], ++[m4_defun([AS_EXECUTABLE_P], ++[AS_REQUIRE([_AS_TEST_PREPARE])dnl ++$as_executable_p $1[]dnl ++])])# AS_EXECUTABLE_P ++ + ############################################################ + # NOTE: This macro has been submitted for inclusion into # + # GNU Autoconf as AC_PROG_SED. When it is available in # +@@ -5849,18 +6628,19 @@ + test -z "$as_dir" && as_dir=. + for lt_ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then ++ if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then + lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" + fi + done + done + done ++IFS=$as_save_IFS + lt_ac_max=0 + lt_ac_count=0 + # Add /usr/xpg4/bin/sed as it is typically found on Solaris + # along with /bin/sed that truncates output. + for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do +- 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 +@@ -5887,5 +6667,6 @@ + done + ]) + SED=$lt_cv_path_SED ++AC_SUBST([SED]) + AC_MSG_RESULT([$SED]) + ]) +--- amarok-1.4.8/admin/ltmain.sh 2007-12-17 17:53:19.000000000 +0200 ++++ amarok-1.4.8/admin/ltmain.sh 2008-02-02 15:06:18.000000000 +0200 +@@ -1,8 +1,8 @@ + # ltmain.sh - Provide generalized library-building support services. + # NOTE: Changing this file will not affect anything until you rerun configure. + # +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, ++# 2007, 2008 Free Software Foundation, Inc. + # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 + # + # This program is free software; you can redistribute it and/or modify +@@ -24,6 +24,42 @@ + # configuration script generated by Autoconf, you may include it under + # the same distribution terms that you use for the rest of that program. + ++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.26 Debian 1.5.26-1" ++TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)" ++ ++# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). ++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then ++ emulate sh ++ NULLCMD=: ++ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which ++ # is contrary to our usage. Disable this feature. ++ alias -g '${1+"$@"}'='"$@"' ++ setopt NO_GLOB_SUBST ++else ++ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac ++fi ++BIN_SH=xpg4; export BIN_SH # for Tru64 ++DUALCASE=1; export DUALCASE # for MKS sh ++ + # Check that we have a working $echo. + if test "X$1" = X--no-reexec; then + # Discard the --no-reexec flag, and continue. +@@ -36,7 +72,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 +81,9 @@ + cat <<EOF + $* + EOF +- exit 0 ++ exit $EXIT_SUCCESS + fi + +-# The name of this program. +-progname=`$echo "$0" | ${SED} 's%^.*/%%'` +-modename="$progname" +- +-# Constants. +-PROGRAM=ltmain.sh +-PACKAGE=libtool +-VERSION=1.5a +-TIMESTAMP=" (1.1240 2003/06/26 06:55:19)" +- + default_mode= + help="Try \`$progname --help' for more information." + magic="%%%MAGIC variable%%%" +@@ -70,14 +96,15 @@ + Xsed="${SED}"' -e 1s/^X//' + sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g' + # test EBCDIC or ASCII +-case `echo A|tr A '\301'` in +- A) # EBCDIC based system +- SP2NL="tr '\100' '\n'" +- NL2SP="tr '\r\n' '\100\100'" ++case `echo X|tr X '\101'` in ++ A) # ASCII based system ++ # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr ++ SP2NL='tr \040 \012' ++ NL2SP='tr \015\012 \040\040' + ;; +- *) # Assume ASCII based system +- SP2NL="tr '\040' '\012'" +- NL2SP="tr '\015\012' '\040\040'" ++ *) # EBCDIC based system ++ SP2NL='tr \100 \n' ++ NL2SP='tr \r\n \100\100' + ;; + esac + +@@ -86,20 +113,30 @@ + # These must not be set unconditionally because not all systems understand + # e.g. LANG=C (notably SCO). + # We save the old values to restore during execute mode. +-if test "${LC_ALL+set}" = set; then +- save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL +-fi +-if test "${LANG+set}" = set; then +- save_LANG="$LANG"; LANG=C; export LANG ++lt_env= ++for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES ++do ++ eval "if test \"\${$lt_var+set}\" = set; then ++ save_$lt_var=\$$lt_var ++ lt_env=\"$lt_var=\$$lt_var \$lt_env\" ++ $lt_var=C ++ export $lt_var ++ fi" ++done ++ ++if test -n "$lt_env"; then ++ lt_env="env $lt_env" + fi + + # Make sure IFS has a sensible default +-: ${IFS=" "} ++lt_nl=' ++' ++IFS=" $lt_nl" + + if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then + $echo "$modename: not configured to build any kind of library" 1>&2 + $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + # Global variables. +@@ -111,17 +148,62 @@ + show="$echo" + show_help= + execute_dlfiles= ++duplicate_deps=no ++preserve_args= + lo2o="s/\\.lo\$/.${objext}/" + o2lo="s/\\.${objext}\$/.lo/" ++extracted_archives= ++extracted_serial=0 + + ##################################### + # 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 +212,22 @@ + ;; + *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 +241,191 @@ + $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_xlib_u=$my_xlib ++ while :; do ++ case " $extracted_archives " in ++ *" $my_xlib_u "*) ++ extracted_serial=`expr $extracted_serial + 1` ++ my_xlib_u=lt$extracted_serial-$my_xlib ;; ++ *) break ;; ++ esac ++ done ++ extracted_archives="$extracted_archives $my_xlib_u" ++ my_xdir="$my_gentop/$my_xlib_u" ++ ++ $show "${rm}r $my_xdir" ++ $run ${rm}r "$my_xdir" ++ $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 +445,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 +461,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 +@@ -218,26 +488,28 @@ + ;; + + --version) +- $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP" +- $echo +- $echo "Copyright (C) 2003 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 ++ echo "\ ++$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP ++ ++Copyright (C) 2008 Free Software Foundation, Inc. ++This is free software; see the source for copying conditions. There is NO ++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." ++ exit $? + ;; + + --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 +528,7 @@ + else + $echo "disable static libraries" + fi +- exit 0 ++ exit $? + ;; + + --finish) mode="finish" ;; +@@ -268,13 +540,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 +563,7 @@ + -*) + $echo "$modename: unrecognized option \`$arg'" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + + *) +@@ -298,9 +576,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 +601,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 +644,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 +659,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 +686,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 +- continue +- ;; +- +- -prefer-pic) +- pic_mode=yes ++ -static | -prefer-pic | -prefer-non-pic) ++ later="$later $arg" + continue + ;; + +- -prefer-non-pic) +- pic_mode=no ++ -no-suppress) ++ suppress_opt=no + continue + ;; + +@@ -424,7 +711,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 +749,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 +764,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. +@@ -500,9 +790,11 @@ + *.class) xform=class ;; + *.cpp) xform=cpp ;; + *.cxx) xform=cxx ;; +- *.f90) xform=f90 ;; ++ *.[fF][09]?) xform=[fF][09]. ;; + *.for) xform=for ;; + *.java) xform=java ;; ++ *.obj) xform=obj ;; ++ *.sx) xform=sx ;; + esac + + libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"` +@@ -511,51 +803,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 +848,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 +859,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 +878,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 +888,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 +906,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 +940,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 + +@@ -678,10 +963,10 @@ + $run $rm "$lobj" "$output_obj" + + $show "$command" +- if $run eval "$command"; then : ++ if $run eval $lt_env "$command"; then : + else + test -n "$output_obj" && $run $rm $removelist +- exit 1 ++ exit $EXIT_FAILURE + fi + + if test "$need_locks" = warn && +@@ -701,7 +986,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 +1007,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 +1023,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" +@@ -748,10 +1035,10 @@ + command="$command$suppress_output" + $run $rm "$obj" "$output_obj" + $show "$command" +- if $run eval "$command"; then : ++ if $run eval $lt_env "$command"; then : + else + $run $rm $removelist +- exit 1 ++ exit $EXIT_FAILURE + fi + + if test "$need_locks" = warn && +@@ -771,7 +1058,7 @@ + compiler." + + $run $rm $removelist +- exit 1 ++ exit $EXIT_FAILURE + fi + + # Just move the object if needed +@@ -809,7 +1096,7 @@ + $run $rm "$lockfile" + fi + +- exit 0 ++ exit $EXIT_SUCCESS + ;; + + # libtool link mode +@@ -835,7 +1122,7 @@ + ;; + esac + libtool_args="$nonopt" +- base_compile="$nonopt" ++ base_compile="$nonopt $@" + compile_command="$nonopt" + finalize_command="$nonopt" + +@@ -847,7 +1134,6 @@ + old_convenience= + deplibs= + old_deplibs= +- add_flags= + compiler_flags= + linker_flags= + dllsearchpath= +@@ -868,6 +1154,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= +@@ -880,27 +1168,40 @@ + thread_safe=no + vinfo= + vinfo_number=no ++ single_module="${wl}-single_module" ++ ++ func_infer_tag $base_compile + + # We need to know -static, to get the right output filenames. + for arg + do + case $arg in +- -all-static | -static) +- if test "X$arg" = "X-all-static"; then ++ -all-static | -static | -static-libtool-libs) ++ case $arg in ++ -all-static) + if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then + $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2 + fi + if test -n "$link_static_flag"; then + dlopen_self=$dlopen_self_static + fi +- else ++ prefer_static_libs=yes ++ ;; ++ -static) + if test -z "$pic_flag" && test -n "$link_static_flag"; then + dlopen_self=$dlopen_self_static + fi +- fi ++ prefer_static_libs=built ++ ;; ++ -static-libtool-libs) ++ if test -z "$pic_flag" && test -n "$link_static_flag"; then ++ dlopen_self=$dlopen_self_static ++ fi ++ prefer_static_libs=yes ++ ;; ++ esac + build_libtool_libs=no + build_old_libs=yes +- prefer_static_libs=yes + break + ;; + esac +@@ -912,7 +1213,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 +1276,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 +1291,11 @@ + prev= + continue + ;; ++ precious_regex) ++ precious_files_regex="$arg" ++ prev= ++ continue ++ ;; + release) + release="-$arg" + prev= +@@ -1023,7 +1328,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 +1376,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 +1407,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 +1419,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 +1459,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 +1519,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 +1529,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 +1567,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 +1582,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 +1599,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 +1637,47 @@ + 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|-threads) ++ compiler_flags="$compiler_flags $arg" ++ compile_command="$compile_command $arg" ++ finalize_command="$finalize_command $arg" ++ continue ++ ;; ++ ++ -multi_module) ++ single_module="${wl}-multi_module" ++ 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 ++ # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC ++ # -F/path gives path to uninstalled frameworks, gcc on darwin ++ # @file GCC response files ++ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ ++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) ++ + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. + arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` +@@ -1323,9 +1688,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 + ;; + +@@ -1341,9 +1704,9 @@ + + -no-install) + case $host in +- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) ++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*) + # The PATH hackery in wrapper scripts is required on Windows +- # in order for the loader to find any dlls it needs. ++ # and Darwin in order for the loader to find any dlls it needs. + $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2 + $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2 + fast_install=no +@@ -1365,6 +1728,11 @@ + + -o) prev=output ;; + ++ -precious-files-regex) ++ prev=precious_regex ++ continue ++ ;; ++ + -release) + prev=release + continue +@@ -1387,7 +1755,7 @@ + [\\/]* | [A-Za-z]:[\\/]*) ;; + *) + $echo "$modename: only absolute run-paths are allowed" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + esac + case "$xrpath " in +@@ -1397,7 +1765,7 @@ + continue + ;; + +- -static) ++ -static | -static-libtool-libs) + # The effects of -static are defined in a previous loop. + # We used to do the same as -all-static on platforms that + # didn't have a PIC flag, but the assumption that the effects +@@ -1473,11 +1841,6 @@ + continue + ;; + +- -framework) +- prev=framework +- continue +- ;; +- + # Some other compiler flag. + -* | +*) + # Unknown arguments in both finalize_command and compile_command need +@@ -1488,7 +1851,6 @@ + arg="\"$arg\"" + ;; + esac +- add_flags="$add_flags $arg" + ;; + + *.$objext) +@@ -1516,7 +1878,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 +1926,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 +1990,6 @@ + arg="\"$arg\"" + ;; + esac +- add_flags="$add_flags $arg" + ;; + esac # arg + +@@ -1637,48 +2003,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 +2036,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 +2047,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 +2057,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 +2101,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 +2109,7 @@ + *.la) ;; + *) + $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + esac + done +@@ -1811,7 +2135,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 +2150,28 @@ + lib= + found=no + case $deplib in ++ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) ++ if test "$linkmode,$pass" = "prog,link"; then ++ compile_deplibs="$deplib $compile_deplibs" ++ finalize_deplibs="$deplib $finalize_deplibs" ++ 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 ++ if test "$linkmode" = lib; then ++ searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" ++ else ++ searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" ++ fi ++ for searchdir in $searchdirs; 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 +2232,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 +2247,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 +2279,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 +2344,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 +2368,8 @@ + # it will not redefine variables installed, or shouldnotlink + installed=yes + shouldnotlink=no ++ avoidtemprpath= ++ + + # Read the .la file + case $lib in +@@ -2035,13 +2377,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 +2387,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 +2420,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 +2468,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 +2488,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 +2515,7 @@ + continue + fi + +- ++ + if test "$linkmode" = prog && test "$pass" != link; then + newlib_search_path="$newlib_search_path $ladir" + deplibs="$lib $deplibs" +@@ -2207,14 +2551,16 @@ + + if test "$linkmode,$pass" = "prog,link"; then + if test -n "$library_names" && +- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then ++ { { test "$prefer_static_libs" = no || ++ test "$prefer_static_libs,$installed" = "built,yes"; } || ++ test -z "$old_library"; }; then + # We need to hardcode the library path +- if test -n "$shlibpath_var"; then ++ if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then + # 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 +2597,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 +2677,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 +2691,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 +2715,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 +2731,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 +2754,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 +2773,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 +2816,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 +2827,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 +2888,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 +2911,7 @@ + esac + done + dependency_libs="$temp_deplibs" +- #fi ++ fi + + newlib_search_path="$newlib_search_path $absdir" + # Link against this library +@@ -2596,76 +2953,70 @@ + 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` ++ eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + if test -n "$deplibrary_names" ; then + for tmp in $deplibrary_names ; do + depdepl=$tmp + done +- if test -f "$path/$depdepl" ; then ++ if test -f "$deplibdir/$depdepl" ; then ++ depdepl="$deplibdir/$depdepl" ++ elif test -f "$path/$depdepl" ; then + depdepl="$path/$depdepl" +- fi ++ else ++ # Can't find it, oh well... ++ depdepl= ++ 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 +3103,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 +@@ -2773,9 +3125,10 @@ + + case $linkmode in + oldlib) +- if test -n "$deplibs"; then +- $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 +- fi ++ case " $deplibs" in ++ *\ -l* | *\ -L*) ++ $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;; ++ esac + + if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2 +@@ -2812,19 +3165,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 +3188,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 +3236,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" +@@ -2903,7 +3256,7 @@ + # which has an extra 1 added just for fun + # + case $version_type in +- darwin|linux|osf|windows) ++ darwin|linux|osf|windows|none) + current=`expr $number_major + $number_minor` + age="$number_minor" + revision="$number_revision" +@@ -2914,9 +3267,15 @@ + age="0" + ;; + irix|nonstopux) +- current=`expr $number_major + $number_minor - 1` ++ current=`expr $number_major + $number_minor` + age="$number_minor" + revision="$number_minor" ++ lt_irix_increment=no ++ ;; ++ *) ++ $echo "$modename: unknown library version type \`$version_type'" 1>&2 ++ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 ++ exit $EXIT_FAILURE + ;; + esac + ;; +@@ -2929,36 +3288,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,6 +3334,7 @@ + versuffix="$major.$age.$revision" + # Darwin ld doesn't like 0 for these options... + minor_current=`expr $current + 1` ++ xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" + verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" + ;; + +@@ -2989,8 +3349,11 @@ + ;; + + irix | nonstopux) +- major=`expr $current - $age + 1` +- ++ if test "X$lt_irix_increment" = "Xno"; then ++ major=`expr $current - $age` ++ else ++ major=`expr $current - $age + 1` ++ fi + case $version_type in + nonstopux) verstring_prefix=nonstopux ;; + *) verstring_prefix=sgi ;; +@@ -3047,7 +3410,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 +3461,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" + ;; + *) ;; +@@ -3121,11 +3490,11 @@ + fi + + # 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'` +- done ++ #for path in $notinst_path; do ++ # lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"` ++ # deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"` ++ # dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"` ++ #done + + if test -n "$xrpath"; then + # If the user specified any rpath flags, then add them. +@@ -3137,7 +3506,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 +3539,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,13 +3595,12 @@ + int main() { return 0; } + EOF + $rm conftest +- $LTCC -o conftest conftest.c $deplibs +- if test "$?" -eq 0 ; then ++ if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then + ldd_output=`ldd conftest` + for i in $deplibs; do +- name="`expr $i : '-l\(.*\)'`" ++ name=`expr $i : '-l\(.*\)'` + # If $name is empty we are operating on a -L argument. +- if test "$name" != "" && test "$name" -ne "0"; then ++ if test "$name" != "" && test "$name" != "0"; then + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in + *" $i "*) +@@ -3262,13 +3635,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 +- # Did it work? +- if test "$?" -eq 0 ; then ++ if $LTCC $LTCFLAGS -o conftest conftest.c $i; then + ldd_output=`ldd conftest` + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in +@@ -3300,7 +3671,7 @@ + droppeddeps=yes + $echo + $echo "*** Warning! Library $i is needed by this library but I was not able to" +- $echo "*** make it link in! You will probably need to install it or some" ++ $echo "*** make it link in! You will probably need to install it or some" + $echo "*** library that it depends on before this library will be fully" + $echo "*** functional. Installing it before continuing would be even better." + fi +@@ -3314,7 +3685,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 +3754,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 +3834,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 +3880,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 +3925,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 +@@ -3564,7 +3957,10 @@ + test -n "$hardcode_libdirs"; then + libdir="$hardcode_libdirs" + if test -n "$hardcode_libdir_flag_spec_ld"; then +- eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ++ case $archive_cmds in ++ *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;; ++ *) eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;; ++ esac + else + eval dep_rpath=\"$hardcode_libdir_flag_spec\" + fi +@@ -3587,7 +3983,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 +3999,7 @@ + fi + + lib="$output_objdir/$realname" ++ linknames= + for link + do + linknames="$linknames $link" +@@ -3617,10 +4014,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 +4028,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 +4051,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 +4064,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 +4081,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 +4120,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 +4130,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 +4150,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 +4172,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 +4203,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. +@@ -3900,9 +4270,10 @@ + ;; + + obj) +- if test -n "$deplibs"; then +- $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 +- fi ++ case " $deplibs" in ++ *\ -l* | *\ -L*) ++ $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;; ++ esac + + if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2 +@@ -3928,7 +4299,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"` +@@ -3949,72 +4320,20 @@ + reload_conv_objs= + gentop= + # reload_cmds runs $LD directly, so let us get rid of +- # -Wl from whole_archive_flag_spec ++ # -Wl from whole_archive_flag_spec and hope we can get by with ++ # turning comma into space.. + wl= + + if test -n "$convenience"; then + if test -n "$whole_archive_flag_spec"; then +- eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\" ++ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" ++ reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'` + else + gentop="$output_objdir/${obj}x" +- $show "${rm}r $gentop" +- $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 +4341,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 +4358,7 @@ + $run ${rm}r $gentop + fi + +- exit 0 ++ exit $EXIT_SUCCESS + fi + + if test "$build_libtool_libs" != yes; then +@@ -4051,17 +4371,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 +4394,7 @@ + $run ${rm}r $gentop + fi + +- exit 0 ++ exit $EXIT_SUCCESS + ;; + + prog) +@@ -4098,24 +4419,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 +4507,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 +4629,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 +4698,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 +4764,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" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP` ++ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP` ++ else ++ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` ++ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` ++ fi ++ ;; ++ * ) ++ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` ++ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` ++ ;; ++ esac + ;; + *) + $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + esac + else +@@ -4403,30 +4799,19 @@ + # really was required. + + # Nullify the symbol file. +- compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` +- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` ++ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP` ++ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP` + fi + +- # AIX runtime linking requires linking programs with -Wl,-brtl and libs with -Wl,-G +- # 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'` ++ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP` + link_command="$compile_command$compile_rpath" + + # We have no uninstalled library dependencies, so finalize right now. + $show "$link_command" + $run eval "$link_command" +- status=$? ++ exit_status=$? + + # Delete the generated files. + if test -n "$dlsyms"; then +@@ -4434,7 +4819,7 @@ + $run $rm "$output_objdir/${outputname}S.${objext}" + fi + +- exit $status ++ exit $exit_status + fi + + if test -n "$shlibpath_var"; then +@@ -4493,7 +4878,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 +@@ -4507,7 +4892,7 @@ + if test "$fast_install" != no; then + link_command="$finalize_var$compile_command$finalize_rpath" + if test "$fast_install" = yes; then +- relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'` ++ relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP` + else + # fast_install is set to needless + relink_command= +@@ -4544,14 +4929,14 @@ + fi + done + relink_command="(cd `pwd`; $relink_command)" +- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` ++ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP` + fi + + # Quote $echo for shipping. +- 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 +4958,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 <<EOF + +@@ -4586,7 +4973,7 @@ + + The $output program cannot be directly executed until all the libtool + libraries that it depends on are installed. +- ++ + This wrapper executable should never be moved out of the build directory. + If it is, it will not operate correctly. + +@@ -4602,6 +4989,9 @@ + #include <malloc.h> + #include <stdarg.h> + #include <assert.h> ++#include <string.h> ++#include <ctype.h> ++#include <sys/stat.h> + + #if defined(PATH_MAX) + # define LT_PATHMAX PATH_MAX +@@ -4612,15 +5002,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 +5024,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 +5058,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 <<EOF +- newargz[0] = "$SHELL"; ++ cat >> $cwrappersource <<EOF ++ newargz[0] = (char *) xstrdup("$SHELL"); + EOF + +- cat >> $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<argc+1; i++) ++ { ++ DEBUG("(main) newargz[%d] : %s\n",i,newargz[i]); ++ ; ++ } ++ + EOF + +- cat >> $cwrappersource <<EOF ++ case $host_os in ++ mingw*) ++ cat >> $cwrappersource <<EOF ++ execv("$SHELL",(char const **)newargz); ++EOF ++ ;; ++ *) ++ cat >> $cwrappersource <<EOF + execv("$SHELL",newargz); + EOF ++ ;; ++ esac + +- cat >> $cwrappersource <<"EOF" ++ cat >> $cwrappersource <<"EOF" ++ return 127; + } + + void * +@@ -4685,59 +5116,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; ++} ++ ++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; + } + +-char * +-fnqualify(const char *path) ++/* 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 +5288,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 +5308,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 +@@ -4805,9 +5336,23 @@ + Xsed='${SED} -e 1s/^X//' + sed_quote_subst='$sed_quote_subst' + ++# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). ++if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then ++ emulate sh ++ NULLCMD=: ++ # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which ++ # is contrary to our usage. Disable this feature. ++ alias -g '\${1+\"\$@\"}'='\"\$@\"' ++ setopt NO_GLOB_SUBST ++else ++ case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac ++fi ++BIN_SH=xpg4; export BIN_SH # for Tru64 ++DUALCASE=1; export DUALCASE # for MKS sh ++ + # The HP-UX ksh and POSIX shell print the target directory to stdout + # if CDPATH is set. +-if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + relink_command=\"$relink_command\" + +@@ -4886,7 +5431,7 @@ + else + $echo \"\$relink_command_output\" >&2 + $rm \"\$progdir/\$file\" +- exit 1 ++ exit $EXIT_FAILURE + fi + fi + +@@ -4936,34 +5481,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 ++ \$echo \"\$0: cannot exec \$program \$*\" ++ 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 +5529,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 +5609,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 +5628,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 +5639,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 +5677,13 @@ + fi + done + # Quote the link command for shipping. +- relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)" +- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` ++ relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" ++ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP` + 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 +5701,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 +5715,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 +5726,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 +5793,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 +5806,7 @@ + $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $? + ;; + esac +- exit 0 ++ exit $EXIT_SUCCESS + ;; + + # libtool install mode +@@ -5265,11 +5817,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 +5830,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 +5855,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 +5888,7 @@ + # Aesthetically quote the argument. + arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` + case $arg in +- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + arg="\"$arg\"" + ;; + esac +@@ -5343,13 +5898,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 +5914,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 +5935,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 +5947,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 +5976,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,14 +6018,14 @@ + # but it's something to keep an eye on. + if test "$inst_prefix_dir" = "$destdir"; then + $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + if test -n "$inst_prefix_dir"; then + # Stick the inst_prefix_dir data into the link command. +- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` ++ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP` + else +- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"` ++ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP` + fi + + $echo "$modename: warning: relinking \`$file'" 1>&2 +@@ -5478,7 +6033,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 +6057,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 +6124,7 @@ + *) + $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + esac + +@@ -5574,7 +6142,7 @@ + $show "$install_prog $staticobj $staticdest" + $run eval "$install_prog \$staticobj \$staticdest" || exit $? + fi +- exit 0 ++ exit $EXIT_SUCCESS + ;; + + *) +@@ -5612,23 +6180,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,34 +6216,25 @@ + 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. +- relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` ++ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP` + + $show "$relink_command" + if $run eval "$relink_command"; then : +@@ -5697,7 +6254,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 +6286,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 +6310,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 +6331,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 +6352,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 +6387,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 +6400,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 +6408,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 +6419,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. +@@ -5886,8 +6445,10 @@ + if test -f "$dir/$objdir/$dlname"; then + dir="$dir/$objdir" + else +- $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 +- exit 1 ++ if test ! -f "$dir/$dlname"; then ++ $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 ++ exit $EXIT_FAILURE ++ fi + fi + ;; + +@@ -5951,12 +6512,12 @@ + fi + + # Restore saved environment variables +- if test "${save_LC_ALL+set}" = set; then +- LC_ALL="$save_LC_ALL"; export LC_ALL +- fi +- if test "${save_LANG+set}" = set; then +- LANG="$save_LANG"; export LANG +- fi ++ for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES ++ do ++ eval "if test \"\${save_$lt_var+set}\" = set; then ++ $lt_var=\$save_$lt_var; export $lt_var ++ fi" ++ done + + # Now prepare to actually exec the command. + exec_cmd="\$cmd$args" +@@ -5967,7 +6528,7 @@ + $echo "export $shlibpath_var" + fi + $echo "$cmd$args" +- exit 0 ++ exit $EXIT_SUCCESS + fi + ;; + +@@ -5995,7 +6556,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 +6606,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 +6635,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 +6649,8 @@ + IFS="$save_ifs" + fi + # FIXME: should reinstall the best remaining shared library. +- fi ++ ;; ++ esac + fi + ;; + +@@ -6107,7 +6679,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 +6724,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 +6773,7 @@ + a more detailed description of MODE. + + Report bugs to <bug-libtool@gnu.org>." +- exit 0 ++ exit $EXIT_SUCCESS + ;; + + clean) +@@ -6302,9 +6874,9 @@ + -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols + -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) + -export-symbols SYMFILE +- try to export only the symbols listed in SYMFILE ++ try to export only the symbols listed in SYMFILE + -export-symbols-regex REGEX +- try to export only the symbols matching REGEX ++ try to export only the symbols matching REGEX + -LLIBDIR search LIBDIR for required installed libraries + -lNAME OUTPUT-FILE requires the installed library libNAME + -module build a library that can dlopened +@@ -6313,12 +6885,16 @@ + -no-undefined declare that a library does not refer to external symbols + -o OUTPUT-FILE create OUTPUT-FILE from the specified objects + -objectlist FILE Use a list of object files found in FILE to specify objects ++ -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 +- -static do not do any dynamic linking of libtool libraries ++ -static do not do any dynamic linking of uninstalled libtool libraries ++ -static-libtool-libs ++ do not do any dynamic linking of libtool libraries + -version-info CURRENT[:REVISION[:AGE]] +- specify library version info [each variable defaults to 0] ++ specify library version info [each variable defaults to 0] + + All other options (arguments beginning with \`-') are ignored. + +@@ -6354,14 +6930,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 +6951,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: --- amarok-1.4.9.1.orig/debian/patches/06_disable-final.diff +++ amarok-1.4.9.1/debian/patches/06_disable-final.diff @@ -0,0 +1,10 @@ +--- amarok/src/Makefile.am.orig ++++ amarok/src/Makefile.am +@@ -8,6 +8,7 @@ + KONQSIDEBAR_SUBDIR = konquisidebar + endif + ++KDE_OPTIONS = nofinal + + lib_LTLIBRARIES = libamarok.la + --- amarok-1.4.9.1.orig/debian/patches/12_devicemanager_dcopcall_no_timeout.diff +++ amarok-1.4.9.1/debian/patches/12_devicemanager_dcopcall_no_timeout.diff @@ -0,0 +1,11 @@ +--- amarok-1.4.8/amarok/src/devicemanager.cpp 2007-12-17 17:53:19.000000000 +0200 ++++ amarok-1.4.8/amarok/src/devicemanager.cpp 2008-02-26 20:48:26.000000000 +0200 +@@ -65,7 +65,7 @@ + QDataStream arg(data, IO_WriteOnly); + QStringList result; + arg << 5; +- if (!m_dc->call("kded", "mediamanager", "fullList()", data, replyType, replyData, false, 5000)) ++ if (!m_dc->call("kded", "mediamanager", "fullList()", data, replyType, replyData, false, -1)) + { + debug() << "During DeviceManager init, error during DCOP call" << endl; + } --- amarok-1.4.9.1.orig/debian/patches/11_bug403340_cancel_rename_when_deleting_items.diff +++ amarok-1.4.9.1/debian/patches/11_bug403340_cancel_rename_when_deleting_items.diff @@ -0,0 +1,15 @@ +--- amarok/src/playlist.cpp 2007-12-25 23:53:35.000000000 +0200 ++++ amarok/src/playlist.cpp 2007-12-26 00:00:38.000000000 +0200 +@@ -4381,6 +4381,12 @@ + setStopAfterMode( DoNotStop ); + } + ++ //cancel rename if it is pending (Bug: #147587) ++ if ( m_itemToRename == item ) { ++ m_clicktimer->stop(); ++ m_itemToRename = 0; ++ } ++ + //keep m_nextTracks queue synchronized + if( m_nextTracks.removeRef( item ) && !multi ) + emit queueChanged( PLItemList(), PLItemList( item ) );