From d8e1ce857bedb9d018ae0918b4c90686d604c2df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Mon, 24 Jun 2013 19:58:32 +0200 Subject: [PATCH] RPM Packaging: add 3.5.13.2 build patches --- .../digikam-3.5.13.2-fix_png12_support.patch | 22 + .../k9copy/k9copy-3.5.13.2-fix_k3b_link.patch | 11 + .../koffice-3.5.13.2-fix_wpd_09_support.patch | 16418 ++++++++++++++++ ...office-3.5.13.2-fix_wpd_09_support_2.patch | 88 + .../kvirc/kvirc-3.5.13.2-fix_ftbfs.patch | 11 + .../arts/arts-3.5.13.2-debug.patch | 12 + .../arts/arts-3.5.13.2-fix_esd_buffer.patch | 20 + ...nsions-3.5.13.2-fix_extra_module_dir.patch | 41 + ...eextensions-3.5.13.2-fix_include_dir.patch | 11 + ...-trinity-3.5.13.2-fix_tde_includedir.patch | 11 + redhat/tde-i18n/tde-3.5.13.2-admin.patch | 44 + ...trinity-tde-i18n-fr-3.5.13.2-updates.patch | 578 + .../kdebase-3.5.13.2-add_ck_shutdown.patch | 15 + ....5.13.2-add_disable_composite_option.patch | 81 + ...ebase-3.5.13.2-build_without_dbustqt.patch | 139 + .../kdebase-3.5.13.2-set_kdm_minuid.patch | 39 + ...debase-3.5.13.2-bookmark_global_copy.patch | 27 + ...e-3.5.13.2-displayconfig_translation.patch | 37 + ...base-3.5.13.2-fix_media_safelyremove.patch | 10 + ...se-3.5.13.2-kbackground_xml_selector.patch | 701 + ...tdebase-3.5.13.2-kcontrol_menu_entry.patch | 20 + .../tdebase-3.5.13.2-kdesktop_crossfade.patch | 1002 + ...debase-3.5.13.2-kdesu-noignorebutton.patch | 26 + .../tdebase-3.5.13.2-kdm_theme_selector.patch | 229 + .../tdebase-3.5.13.2-kdm_utf8_password.patch | 297 + ...13.2-kickoff_add_packagekit_shortcut.patch | 12 + ...debase-3.5.13.2-kickoff_default_favs.patch | 16 + .../tdebase-3.5.13.2-kickoff_xdg_dirs.patch | 45 + .../tdebase-3.5.13.2-select_wm_gui.patch | 639 + .../tdebase-3.5.13.2-suspend_unmount.patch | 152 + .../tdebase-3.5.13.2-vibrate_dialog.patch | 186 + redhat/tdeedu/kdeedu-3.5.13.2-fix_ftbfs.patch | 170 + ...delibs-3.5.13.2-kpassivepopup_latin1.patch | 11 + .../tdelibs-3.5.13.2-cups_by_default.patch | 33 + ...bs-3.5.13.2-fix_kzip_empty_directory.patch | 38 + .../tdelibs-3.5.13.2-xdg_dirs_set_path.patch | 150 + ...ultimedia-3.5.13.2-fix_gstreamer_1.0.patch | 11 + ...imedia-3.5.13.2-fix_pulseaudio_mixer.patch | 26 + .../tdemultimedia-3.5.13.2-ftbfs.patch | 11 + ...emultimedia-3.5.13.2-kmix_pulseaudio.patch | 1519 ++ ...3.5.13.2-fix_conflicting_definitions.patch | 35 + ....5.13.2-kmail_networkmanager_support.patch | 251 + redhat/tdeutils/kdeutils-3.5.13.2-rhel4.patch | 11 + 43 files changed, 23206 insertions(+) create mode 100644 redhat/applications/digikam/digikam-3.5.13.2-fix_png12_support.patch create mode 100644 redhat/applications/k9copy/k9copy-3.5.13.2-fix_k3b_link.patch create mode 100644 redhat/applications/koffice/koffice-3.5.13.2-fix_wpd_09_support.patch create mode 100644 redhat/applications/koffice/koffice-3.5.13.2-fix_wpd_09_support_2.patch create mode 100644 redhat/applications/kvirc/kvirc-3.5.13.2-fix_ftbfs.patch create mode 100644 redhat/dependencies/arts/arts-3.5.13.2-debug.patch create mode 100644 redhat/dependencies/arts/arts-3.5.13.2-fix_esd_buffer.patch create mode 100644 redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.2-fix_extra_module_dir.patch create mode 100644 redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.2-fix_include_dir.patch create mode 100644 redhat/libraries/python-trinity/python-trinity-3.5.13.2-fix_tde_includedir.patch create mode 100644 redhat/tde-i18n/tde-3.5.13.2-admin.patch create mode 100644 redhat/tde-i18n/trinity-tde-i18n-fr-3.5.13.2-updates.patch create mode 100644 redhat/tdebase/kdebase-3.5.13.2-add_ck_shutdown.patch create mode 100644 redhat/tdebase/kdebase-3.5.13.2-add_disable_composite_option.patch create mode 100644 redhat/tdebase/kdebase-3.5.13.2-build_without_dbustqt.patch create mode 100644 redhat/tdebase/kdebase-3.5.13.2-set_kdm_minuid.patch create mode 100644 redhat/tdebase/tdebase-3.5.13.2-bookmark_global_copy.patch create mode 100644 redhat/tdebase/tdebase-3.5.13.2-displayconfig_translation.patch create mode 100644 redhat/tdebase/tdebase-3.5.13.2-fix_media_safelyremove.patch create mode 100644 redhat/tdebase/tdebase-3.5.13.2-kbackground_xml_selector.patch create mode 100644 redhat/tdebase/tdebase-3.5.13.2-kcontrol_menu_entry.patch create mode 100644 redhat/tdebase/tdebase-3.5.13.2-kdesktop_crossfade.patch create mode 100644 redhat/tdebase/tdebase-3.5.13.2-kdesu-noignorebutton.patch create mode 100644 redhat/tdebase/tdebase-3.5.13.2-kdm_theme_selector.patch create mode 100644 redhat/tdebase/tdebase-3.5.13.2-kdm_utf8_password.patch create mode 100644 redhat/tdebase/tdebase-3.5.13.2-kickoff_add_packagekit_shortcut.patch create mode 100644 redhat/tdebase/tdebase-3.5.13.2-kickoff_default_favs.patch create mode 100644 redhat/tdebase/tdebase-3.5.13.2-kickoff_xdg_dirs.patch create mode 100644 redhat/tdebase/tdebase-3.5.13.2-select_wm_gui.patch create mode 100644 redhat/tdebase/tdebase-3.5.13.2-suspend_unmount.patch create mode 100644 redhat/tdebase/tdebase-3.5.13.2-vibrate_dialog.patch create mode 100644 redhat/tdeedu/kdeedu-3.5.13.2-fix_ftbfs.patch create mode 100644 redhat/tdelibs/kdelibs-3.5.13.2-kpassivepopup_latin1.patch create mode 100644 redhat/tdelibs/tdelibs-3.5.13.2-cups_by_default.patch create mode 100644 redhat/tdelibs/tdelibs-3.5.13.2-fix_kzip_empty_directory.patch create mode 100644 redhat/tdelibs/tdelibs-3.5.13.2-xdg_dirs_set_path.patch create mode 100644 redhat/tdemultimedia/kdemultimedia-3.5.13.2-fix_gstreamer_1.0.patch create mode 100644 redhat/tdemultimedia/tdemultimedia-3.5.13.2-fix_pulseaudio_mixer.patch create mode 100644 redhat/tdemultimedia/tdemultimedia-3.5.13.2-ftbfs.patch create mode 100644 redhat/tdemultimedia/tdemultimedia-3.5.13.2-kmix_pulseaudio.patch create mode 100644 redhat/tdenetwork/tdenetwork-3.5.13.2-fix_conflicting_definitions.patch create mode 100644 redhat/tdepim/tdepim-3.5.13.2-kmail_networkmanager_support.patch create mode 100644 redhat/tdeutils/kdeutils-3.5.13.2-rhel4.patch diff --git a/redhat/applications/digikam/digikam-3.5.13.2-fix_png12_support.patch b/redhat/applications/digikam/digikam-3.5.13.2-fix_png12_support.patch new file mode 100644 index 000000000..8a5262dda --- /dev/null +++ b/redhat/applications/digikam/digikam-3.5.13.2-fix_png12_support.patch @@ -0,0 +1,22 @@ +--- trinity-digikam-3.5.13.2/digikam/libs/dimg/loaders/pngloader.cpp.ORI 2013-03-10 21:44:37.468543760 +0100 ++++ trinity-digikam-3.5.13.2/digikam/libs/dimg/loaders/pngloader.cpp 2013-03-10 21:45:23.246560198 +0100 +@@ -258,7 +258,7 @@ + #ifdef ENABLE_DEBUG_MESSAGES + DDebug() << "PNG in PNG_COLOR_TYPE_GRAY" << endl; + #endif +- png_set_expand_gray_1_2_4_to_8(png_ptr); ++ png_set_gray_1_2_4_to_8(png_ptr); + png_set_gray_to_rgb(png_ptr); + + if (TQImage::systemByteOrder() == TQImage::LittleEndian) // Intel +--- trinity-digikam-3.5.13.2/digikam/kioslave/digikamthumbnail.cpp.ORI 2013-03-10 21:50:56.994910746 +0100 ++++ trinity-digikam-3.5.13.2/digikam/kioslave/digikamthumbnail.cpp 2013-03-10 21:51:09.150668622 +0100 +@@ -465,7 +465,7 @@ + { + png_set_gray_to_rgb(png_ptr); + if (png_get_bit_depth(png_ptr, info_ptr) < 8) +- png_set_expand_gray_1_2_4_to_8(png_ptr); ++ png_set_gray_1_2_4_to_8(png_ptr); + } + + int sizeOfUint = sizeof(unsigned int); diff --git a/redhat/applications/k9copy/k9copy-3.5.13.2-fix_k3b_link.patch b/redhat/applications/k9copy/k9copy-3.5.13.2-fix_k3b_link.patch new file mode 100644 index 000000000..f7858c0a0 --- /dev/null +++ b/redhat/applications/k9copy/k9copy-3.5.13.2-fix_k3b_link.patch @@ -0,0 +1,11 @@ +--- trinity-k9copy-3.5.13.2/src/Makefile.am.ORI 2013-06-17 20:59:49.620929488 +0200 ++++ trinity-k9copy-3.5.13.2/src/Makefile.am 2013-06-17 21:00:11.150425671 +0200 +@@ -35,7 +35,7 @@ + $(top_builddir)/k9author/libk9author.la $(top_builddir)/k9decmpeg/libk9decmpeg.la \ + $(top_builddir)/k9devices/libk9devices.la $(top_builddir)/k9vamps/libk9vamps.la \ + $(top_builddir)/libdvdnav/libk9dvdnav.la $(top_builddir)/libk9copy/libk9copy.la \ +- $(top_builddir)/dvdread/libdvdread.la $(LIB_KDEUI) -lkmdi $(LIBDL) ++ $(top_builddir)/dvdread/libdvdread.la $(LIB_KDEUI) -lkmdi $(LIBDL) -lk3b -lk3bdevice + + # this is where the desktop file will go + shelldesktopdir = $(kde_appsdir)/Utilities diff --git a/redhat/applications/koffice/koffice-3.5.13.2-fix_wpd_09_support.patch b/redhat/applications/koffice/koffice-3.5.13.2-fix_wpd_09_support.patch new file mode 100644 index 000000000..c3519a0af --- /dev/null +++ b/redhat/applications/koffice/koffice-3.5.13.2-fix_wpd_09_support.patch @@ -0,0 +1,16418 @@ +From efca1544fd2475b9f1198e793dde8da1a39de4e2 Mon Sep 17 00:00:00 2001 +From: Timothy Pearson +Date: Fri, 05 Apr 2013 20:17:32 +0000 +Subject: Fix FTBFS with libwpd 0.9 and above + +This resolves Bug 1169 +Remove spurious build files +--- +diff --git a/acinclude.m4 b/acinclude.m4 +deleted file mode 100644 +index b8033f8..0000000 +--- a/acinclude.m4 ++++ b/dev/null +@@ -1,12406 +0,0 @@ +-## -*- autoconf -*- +- +-dnl This file is part of the KDE libraries/packages +-dnl Copyright (C) 1997 Janos Farkas (chexum@shadow.banki.hu) +-dnl (C) 1997,98,99 Stephan Kulow (coolo@kde.org) +- +-dnl This file is free software; you can redistribute it and/or +-dnl modify it under the terms of the GNU Library General Public +-dnl License as published by the Free Software Foundation; either +-dnl version 2 of the License, or (at your option) any later version. +- +-dnl This library is distributed in the hope that it will be useful, +-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +-dnl Library General Public License for more details. +- +-dnl You should have received a copy of the GNU Library General Public License +-dnl along with this library; see the file COPYING.LIB. If not, write to +-dnl the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +-dnl Boston, MA 02110-1301, USA. +- +-dnl IMPORTANT NOTE: +-dnl Please do not modify this file unless you expect your modifications to be +-dnl carried into every other module in the repository. +-dnl +-dnl Single-module modifications are best placed in configure.in for kdelibs +-dnl and kdebase or configure.in.in if present. +- +-# KDE_PATH_X_DIRECT +-dnl Internal subroutine of AC_PATH_X. +-dnl Set ac_x_includes and/or ac_x_libraries. +-AC_DEFUN([KDE_PATH_X_DIRECT], +-[ +-AC_REQUIRE([KDE_CHECK_LIB64]) +- +-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. +-AC_TRY_CPP([#include <$x_direct_test_include>], +-[# We can compile using X headers with no special include directory. +-ac_x_includes=], +-[# 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 # $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" +-AC_TRY_LINK([#include ], [${x_direct_test_function}(1)], +-[LIBS="$ac_save_LIBS" +-# We can link X programs with no special library path. +-ac_x_libraries=], +-[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 +-dnl Don't even attempt the hair of trying to link an X program! +- 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 # $ac_x_libraries = NO +-]) +- +- +-dnl ------------------------------------------------------------------------ +-dnl Find a file (or one of more files in a list of dirs) +-dnl ------------------------------------------------------------------------ +-dnl +-AC_DEFUN([AC_FIND_FILE], +-[ +-$3=NO +-for i in $2; +-do +- for j in $1; +- do +- echo "configure: __oline__: $i/$j" >&AC_FD_CC +- if test -r "$i/$j"; then +- echo "taking that" >&AC_FD_CC +- $3=$i +- break 2 +- fi +- done +-done +-]) +- +-dnl KDE_FIND_PATH(program-name, variable-name, list-of-dirs, +-dnl if-not-found, test-parameter, prepend-path) +-dnl +-dnl Look for program-name in list-of-dirs+$PATH. +-dnl If prepend-path is set, look in $PATH+list-of-dirs instead. +-dnl If found, $variable-name is set. If not, if-not-found is evaluated. +-dnl test-parameter: if set, the program is executed with this arg, +-dnl and only a successful exit code is required. +-AC_DEFUN([KDE_FIND_PATH], +-[ +- AC_MSG_CHECKING([for $1]) +- if test -n "$$2"; then +- kde_cv_path="$$2"; +- else +- kde_cache=`echo $1 | sed 'y%./+-%__p_%'` +- +- AC_CACHE_VAL(kde_cv_path_$kde_cache, +- [ +- kde_cv_path="NONE" +- kde_save_IFS=$IFS +- IFS=':' +- dirs="" +- for dir in $PATH; do +- dirs="$dirs $dir" +- done +- if test -z "$6"; then dnl Append dirs in PATH (default) +- dirs="$3 $dirs" +- else dnl Prepend dirs in PATH (if 6th arg is set) +- dirs="$dirs $3" +- fi +- IFS=$kde_save_IFS +- +- for dir in $dirs; do +- if test -x "$dir/$1"; then +- if test -n "$5" +- then +- evalstr="$dir/$1 $5 2>&1 " +- if eval $evalstr; then +- kde_cv_path="$dir/$1" +- break +- fi +- else +- kde_cv_path="$dir/$1" +- break +- fi +- fi +- done +- +- eval "kde_cv_path_$kde_cache=$kde_cv_path" +- +- ]) +- +- eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\"" +- +- fi +- +- if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then +- AC_MSG_RESULT(not found) +- $4 +- else +- AC_MSG_RESULT($kde_cv_path) +- $2=$kde_cv_path +- +- fi +-]) +- +-AC_DEFUN([KDE_MOC_ERROR_MESSAGE], +-[ +- AC_MSG_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. +-]) +-]) +- +-AC_DEFUN([KDE_UIC_ERROR_MESSAGE], +-[ +- AC_MSG_WARN([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. +-]) +-]) +- +- +-AC_DEFUN([KDE_CHECK_UIC_FLAG], +-[ +- AC_MSG_CHECKING([whether uic supports -$1 ]) +- kde_cache=`echo $1 | sed 'y% .=/+-%____p_%'` +- AC_CACHE_VAL(kde_cv_prog_uic_$kde_cache, +- [ +- cat >conftest.ui < +-EOT +- ac_uic_testrun="$UIC_PATH -$1 $2 conftest.ui >/dev/null" +- if AC_TRY_EVAL(ac_uic_testrun); then +- eval "kde_cv_prog_uic_$kde_cache=yes" +- else +- eval "kde_cv_prog_uic_$kde_cache=no" +- fi +- rm -f conftest* +- ]) +- +- if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then +- AC_MSG_RESULT([yes]) +- : +- $3 +- else +- AC_MSG_RESULT([no]) +- : +- $4 +- fi +-]) +- +- +-dnl ------------------------------------------------------------------------ +-dnl Find the meta object compiler and the ui compiler in the PATH, +-dnl in $QTDIR/bin, and some more usual places +-dnl ------------------------------------------------------------------------ +-dnl +-AC_DEFUN([AC_PATH_QT_MOC_UIC], +-[ +- AC_REQUIRE([KDE_CHECK_PERL]) +- 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 +- +- KDE_FIND_PATH(moc, MOC, [$qt_bindirs], [KDE_MOC_ERROR_MESSAGE]) +- if test -z "$UIC_NOT_NEEDED"; then +- KDE_FIND_PATH(uic, UIC_PATH, [$qt_bindirs], [UIC_PATH=""]) +- if test -z "$UIC_PATH" ; then +- KDE_UIC_ERROR_MESSAGE +- exit 1 +- else +- UIC=$UIC_PATH +- +- if test $kde_qtver = 3; then +- KDE_CHECK_UIC_FLAG(L,[/nonexistent],ac_uic_supports_libpath=yes,ac_uic_supports_libpath=no) +- KDE_CHECK_UIC_FLAG(nounload,,ac_uic_supports_nounload=yes,ac_uic_supports_nounload=no) +- +- 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 +- +- AC_SUBST(MOC) +- AC_SUBST(UIC) +- +- UIC_TR="i18n" +- if test $kde_qtver = 3; then +- UIC_TR="tr2i18n" +- fi +- +- AC_SUBST(UIC_TR) +-]) +- +-AC_DEFUN([KDE_1_CHECK_PATHS], +-[ +- KDE_1_CHECK_PATH_HEADERS +- +- 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 +- +-AC_MSG_CHECKING([for KDE libraries installed]) +-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 AC_TRY_EVAL(ac_link) && test -s conftest; then +- AC_MSG_RESULT(yes) +-else +- AC_MSG_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.]) +-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_SET_PATHS($kde_result) +- +-]) +- +-AC_DEFUN([KDE_SET_PATHS], +-[ +- 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=$1" +-]) +- +-AC_DEFUN([KDE_SET_DEFAULT_PATHS], +-[ +-if test "$1" = "default"; then +- +- if test -z "$kde_htmldir"; then +- kde_htmldir='\${datadir}/doc/tde/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}/trinity' +- fi +- fi +- if test -z "$kde_styledir"; then +- kde_styledir='\${libdir}/trinity/plugins/styles' +- fi +- if test -z "$kde_widgetdir"; then +- kde_widgetdir='\${libdir}/trinity/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_SET_PATHS(defaults) +- +-else +- +- if test $kde_qtver = 1; then +- AC_MSG_RESULT([compiling]) +- KDE_1_CHECK_PATHS +- else +- AC_MSG_ERROR([path checking not yet supported for KDE 2]) +- fi +- +-fi +-]) +- +-AC_DEFUN([KDE_CHECK_PATHS_FOR_COMPLETENESS], +-[ 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 +-]) +- +-AC_DEFUN([KDE_MISSING_PROG_ERROR], +-[ +- AC_MSG_ERROR([The important program $1 was not found! +-Please check whether you installed KDE correctly. +-]) +-]) +- +-AC_DEFUN([KDE_MISSING_ARTS_ERROR], +-[ +- AC_MSG_ERROR([The important program $1 was not found! +-Please check whether you installed aRts correctly or use +---without-arts to compile without aRts support (this will remove functionality). +-]) +-]) +- +-AC_DEFUN([KDE_SET_DEFAULT_BINDIRS], +-[ +- kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/trinity/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 +-]) +- +-AC_DEFUN([KDE_SUBST_PROGRAMS], +-[ +- AC_ARG_WITH(arts, +- AC_HELP_STRING([--without-arts],[build without aRts [default=no]]), +- [build_arts=$withval], +- [build_arts=yes] +- ) +- AM_CONDITIONAL(include_ARTS, test "$build_arts" '!=' "no") +- if test "$build_arts" = "no"; then +- AC_DEFINE(WITHOUT_ARTS, 1, [Defined if compiling without arts]) +- fi +- +- KDE_SET_DEFAULT_BINDIRS +- kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs" +- KDE_FIND_PATH(dcopidl, DCOPIDL, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl)]) +- KDE_FIND_PATH(dcopidl2cpp, DCOPIDL2CPP, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl2cpp)]) +- if test "$build_arts" '!=' "no"; then +- KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)]) +- KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)]) +- fi +- KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs]) +- +- trinity2ornewer=1 +- trinity3ornewer=1 +- if test -n "$kde_qtver" && test "$kde_qtver" -lt 3; then +- trinity2ornewer= +- trinity3ornewer= +- else +- if test "$kde_qtver" = "3"; then +- if test "$kde_qtsubver" -le 1; then +- trinity2ornewer= +- fi +- if test "$kde_qtsubver" -le 2; then +- trinity3ornewer= +- fi +- if test "$KDECONFIG" != "compiled"; then +- if test `$KDECONFIG --version | grep KDE | sed 's/KDE: \(...\).*/\1/'` = 3.2; then +- trinity3ornewer= +- fi +- fi +- fi +- fi +- +- if test -n "$trinity2ornewer"; then +- KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)]) +- KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) +- fi +- if test -n "$trinity3ornewer"; then +- KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)]) +- AC_SUBST(MAKEKDEWIDGETS) +- fi +- KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""]) +- +- if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then +- kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/trinity/share /opt/kde/share $prefix/share" +- test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs" +- AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET) +- 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 "$trinity2ornewer"; then +- KCFG_DEPENDENCIES='$(KCONFIG_COMPILER)' +- DCOP_DEPENDENCIES='$(DCOPIDL) $(DCOPIDLNG)' +- AC_SUBST(KCONFIG_COMPILER) +- AC_SUBST(KCFG_DEPENDENCIES) +- AC_SUBST(DCOPIDLNG) +- fi +- AC_SUBST(DCOPIDL) +- AC_SUBST(DCOPIDL2CPP) +- AC_SUBST(DCOP_DEPENDENCIES) +- AC_SUBST(MCOPIDL) +- AC_SUBST(ARTSCCONFIG) +- AC_SUBST(MEINPROC) +- AC_SUBST(KDE_XSL_STYLESHEET) +- AC_SUBST(XMLLINT) +-])dnl +- +-AC_DEFUN([AC_CREATE_KFSSTND], +-[ +-AC_REQUIRE([AC_CHECK_RPATH]) +- +-AC_MSG_CHECKING([for KDE paths]) +-kde_result="" +-kde_cached_paths=yes +-AC_CACHE_VAL(kde_cv_all_paths, +-[ +- KDE_SET_DEFAULT_PATHS($1) +- kde_cached_paths=no +-]) +-eval "$kde_cv_all_paths" +-KDE_CHECK_PATHS_FOR_COMPLETENESS +-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= +- KDE_SET_DEFAULT_PATHS($1) +- eval "$kde_cv_all_paths" +- KDE_CHECK_PATHS_FOR_COMPLETENESS +- kde_result="$kde_result (cache overridden)" +-fi +-if test "$kde_have_all_paths" = "no"; then +- AC_MSG_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!) +-]) +-else +- rm -f conftest* +- AC_MSG_RESULT($kde_result) +-fi +- +-bindir=$kde_bindir +- +-KDE_SUBST_PROGRAMS +- +-]) +- +-AC_DEFUN([AC_SUBST_KFSSTND], +-[ +-AC_SUBST(kde_htmldir) +-AC_SUBST(kde_appsdir) +-AC_SUBST(kde_icondir) +-AC_SUBST(kde_sounddir) +-AC_SUBST(kde_datadir) +-AC_SUBST(kde_locale) +-AC_SUBST(kde_confdir) +-AC_SUBST(kde_kcfgdir) +-AC_SUBST(kde_mimedir) +-AC_SUBST(kde_wallpaperdir) +-AC_SUBST(kde_bindir) +-dnl X Desktop Group standards +-AC_SUBST(xdg_appsdir) +-AC_SUBST(xdg_menudir) +-AC_SUBST(xdg_directorydir) +-dnl for KDE 2 +-AC_SUBST(kde_templatesdir) +-AC_SUBST(kde_servicesdir) +-AC_SUBST(kde_servicetypesdir) +-AC_SUBST(kde_moduledir) +-AC_SUBST(kdeinitdir, '$(kde_moduledir)') +-AC_SUBST(kde_styledir) +-AC_SUBST(kde_widgetdir) +-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 +-dnl AC_SUBST(kde_minidir) +-dnl AC_SUBST(kde_cgidir) +-dnl AC_SUBST(kde_toolbardir) +-]) +- +-AC_DEFUN([KDE_MISC_TESTS], +-[ +- dnl Checks for libraries. +- AC_CHECK_LIB(util, main, [LIBUTIL="-lutil"]) dnl for *BSD +- AC_SUBST(LIBUTIL) +- AC_CHECK_LIB(compat, main, [LIBCOMPAT="-lcompat"]) dnl for *BSD +- AC_SUBST(LIBCOMPAT) +- kde_have_crypt= +- AC_CHECK_LIB(crypt, crypt, [LIBCRYPT="-lcrypt"; kde_have_crypt=yes], +- AC_CHECK_LIB(c, crypt, [kde_have_crypt=yes], [ +- AC_MSG_WARN([you have no crypt in either libcrypt or libc. +-You should install libcrypt from another source or configure with PAM +-support]) +- kde_have_crypt=no +- ])) +- AC_SUBST(LIBCRYPT) +- if test $kde_have_crypt = yes; then +- AC_DEFINE_UNQUOTED(HAVE_CRYPT, 1, [Defines if your system has the crypt function]) +- fi +- AC_CHECK_SOCKLEN_T +- AC_CHECK_LIB(dnet, dnet_ntoa, [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"]) +- if test $ac_cv_lib_dnet_dnet_ntoa = no; then +- AC_CHECK_LIB(dnet_stub, dnet_ntoa, +- [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"]) +- fi +- AC_CHECK_FUNC(inet_ntoa) +- if test $ac_cv_func_inet_ntoa = no; then +- AC_CHECK_LIB(nsl, inet_ntoa, X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl") +- fi +- AC_CHECK_FUNC(connect) +- if test $ac_cv_func_connect = no; then +- AC_CHECK_LIB(socket, connect, X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS", , +- $X_EXTRA_LIBS) +- fi +- +- AC_CHECK_FUNC(remove) +- if test $ac_cv_func_remove = no; then +- AC_CHECK_LIB(posix, remove, X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix") +- fi +- +- # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. +- AC_CHECK_FUNC(shmat, , +- AC_CHECK_LIB(ipc, shmat, X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc")) +- +- # more headers that need to be explicitly included on darwin +- AC_CHECK_HEADERS(sys/types.h stdint.h) +- +- # sys/bitypes.h is needed for uint32_t and friends on Tru64 +- AC_CHECK_HEADERS(sys/bitypes.h) +- +- # darwin requires a poll emulation library +- AC_CHECK_LIB(poll, poll, LIB_POLL="-lpoll") +- +- # for some image handling on Mac OS X +- AC_CHECK_HEADERS(Carbon/Carbon.h) +- +- # CoreAudio framework +- AC_CHECK_HEADER(CoreAudio/CoreAudio.h, [ +- AC_DEFINE(HAVE_COREAUDIO, 1, [Define if you have the CoreAudio API]) +- FRAMEWORK_COREAUDIO="-Wl,-framework,CoreAudio" +- ]) +- +- AC_CHECK_RES_INIT +- AC_SUBST(LIB_POLL) +- AC_SUBST(FRAMEWORK_COREAUDIO) +- LIBSOCKET="$X_EXTRA_LIBS" +- AC_SUBST(LIBSOCKET) +- AC_SUBST(X_EXTRA_LIBS) +- AC_CHECK_LIB(ucb, killpg, [LIBUCB="-lucb"]) dnl for Solaris2.4 +- AC_SUBST(LIBUCB) +- +- case $host in dnl this *is* LynxOS specific +- *-*-lynxos* ) +- AC_MSG_CHECKING([LynxOS header file wrappers]) +- [CFLAGS="$CFLAGS -D__NO_INCLUDE_WARN__"] +- AC_MSG_RESULT(disabled) +- AC_CHECK_LIB(bsd, gethostbyname, [LIBSOCKET="-lbsd"]) dnl for LynxOS +- ;; +- esac +- +- KDE_CHECK_TYPES +- KDE_CHECK_LIBDL +- KDE_CHECK_STRLCPY +- KDE_CHECK_PIE_SUPPORT +- +-# darwin needs this to initialize the environment +-AC_CHECK_HEADERS(crt_externs.h) +-AC_CHECK_FUNC(_NSGetEnviron, [AC_DEFINE(HAVE_NSGETENVIRON, 1, [Define if your system needs _NSGetEnviron to set up the environment])]) +- +-AH_VERBATIM(_DARWIN_ENVIRON, +-[ +-#if defined(HAVE_NSGETENVIRON) && defined(HAVE_CRT_EXTERNS_H) +-# include +-# include +-# define environ (*_NSGetEnviron()) +-#endif +-]) +- +-AH_VERBATIM(_AIX_STRINGS_H_BZERO, +-[ +-/* +- * AIX defines FD_SET in terms of bzero, but fails to include +- * that defines bzero. +- */ +- +-#if defined(_AIX) +-#include +-#endif +-]) +- +-AC_CHECK_FUNCS([vsnprintf snprintf]) +- +-AH_VERBATIM(_TRU64,[ +-/* +- * On HP-UX, the declaration of vsnprintf() is needed every time ! +- */ +- +-#if !defined(HAVE_VSNPRINTF) || defined(hpux) +-#if __STDC__ +-#include +-#include +-#else +-#include +-#endif +-#ifdef __cplusplus +-extern "C" +-#endif +-int vsnprintf(char *str, size_t n, char const *fmt, va_list ap); +-#ifdef __cplusplus +-extern "C" +-#endif +-int snprintf(char *str, size_t n, char const *fmt, ...); +-#endif +-]) +- +-]) +- +-dnl ------------------------------------------------------------------------ +-dnl Find the header files and libraries for X-Windows. Extended the +-dnl macro AC_PATH_X +-dnl ------------------------------------------------------------------------ +-dnl +-AC_DEFUN([K_PATH_X], +-[ +-AC_REQUIRE([KDE_MISC_TESTS])dnl +-AC_REQUIRE([KDE_CHECK_LIB64]) +- +-AC_ARG_ENABLE( +- embedded, +- AC_HELP_STRING([--enable-embedded],[link to Qt-embedded, don't use X]), +- kde_use_qt_emb=$enableval, +- kde_use_qt_emb=no +-) +- +-AC_ARG_ENABLE( +- qtopia, +- AC_HELP_STRING([--enable-qtopia],[link to Qt-embedded, link to the Qtopia Environment]), +- kde_use_qt_emb_palm=$enableval, +- kde_use_qt_emb_palm=no +-) +- +-AC_ARG_ENABLE( +- mac, +- AC_HELP_STRING([--enable-mac],[link to Qt/Mac (don't use X)]), +- kde_use_qt_mac=$enableval, +- kde_use_qt_mac=no +-) +- +-# used to disable x11-specific stuff on special platforms +-AM_CONDITIONAL(include_x11, test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no") +- +-if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then +- +-AC_MSG_CHECKING(for X) +- +-AC_CACHE_VAL(kde_cv_have_x, +-[# 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 +- +-KDE_PATH_X_DIRECT +-dnl AC_PATH_X_XMKMF picks /usr/lib as the path for the X libraries. +-dnl Unfortunately, if compiling with the N32 ABI, this is not the correct +-dnl location. The correct location is /usr/lib32 or an undefined value +-dnl (the linker is smart enough to pick the correct default library). +-dnl Things work just fine if you use just AC_PATH_X_DIRECT. +-dnl Solaris has a similar problem. AC_PATH_X_XMKMF forces x_includes to +-dnl /usr/openwin/include, which doesn't work. /usr/include does work, so +-dnl x_includes should be left alone. +-case "$host" in +-mips-sgi-irix6*) +- ;; +-*-*-solaris*) +- ;; +-*) +- _AC_PATH_X_XMKMF +- 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 +- AC_MSG_ERROR([Can't find X includes. Please check your installation and add the correct paths!]) +-fi +- +-if test "$kde_x_libraries" = NO; then +- AC_MSG_ERROR([Can't find X libraries. Please check your installation and add the correct paths!]) +-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" +-])dnl +- +-eval "$kde_cv_have_x" +- +-if test "$have_x" != yes; then +- AC_MSG_RESULT($have_x) +- no_x=yes +-else +- AC_MSG_RESULT([libraries $kde_x_libraries, headers $kde_x_includes]) +-fi +- +-if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then +- X_INCLUDES="" +- x_includes="."; dnl better than nothing :- +- 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"; dnl better than nothing :- +- 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. +-AC_CHECK_LIB(ICE, IceConnectionNumber, +- [LIBSM="-lSM -lICE"], , $X_EXTRA_LIBS) +-LDFLAGS="$ac_save_LDFLAGS" +- +-LIB_X11='-lX11 $(LIBSOCKET)' +- +-AC_MSG_CHECKING(for libXext) +-AC_CACHE_VAL(kde_cv_have_libXext, +-[ +-kde_ldflags_safe="$LDFLAGS" +-kde_libs_safe="$LIBS" +- +-LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS" +-LIBS="-lXext -lX11 $LIBSOCKET" +- +-AC_TRY_LINK([ +-#include +-#ifdef STDC_HEADERS +-# include +-#endif +-], +-[ +-printf("hello Xext\n"); +-], +-kde_cv_have_libXext=yes, +-kde_cv_have_libXext=no +-) +- +-LDFLAGS=$kde_ldflags_safe +-LIBS=$kde_libs_safe +-]) +- +-AC_MSG_RESULT($kde_cv_have_libXext) +- +-if test "$kde_cv_have_libXext" = "no"; then +- AC_MSG_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.]) +-fi +- +-LIB_XEXT="-lXext" +-QTE_NORTTI="" +- +-elif test "$kde_use_qt_emb" = "yes"; then +- dnl We're using QT Embedded +- 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 +- dnl We're using QT/Mac (I use QT_MAC so that qglobal.h doesn't *have* to +- dnl be included to get the information) --Sam +- 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 +-AC_SUBST(X_PRE_LIBS) +-AC_SUBST(LIB_X11) +-AC_SUBST(LIB_XRENDER) +-AC_SUBST(LIBSM) +-AC_SUBST(X_INCLUDES) +-AC_SUBST(X_LDFLAGS) +-AC_SUBST(x_includes) +-AC_SUBST(x_libraries) +-AC_SUBST(QTE_NORTTI) +-AC_SUBST(LIB_XEXT) +- +-]) +- +-AC_DEFUN([KDE_PRINT_QT_PROGRAM], +-[ +-AC_REQUIRE([KDE_USE_QT]) +-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 <&AC_FD_CC +- cat conftest.$ac_ext >&AC_FD_CC +-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_LANG_RESTORE +-]) +- +-if test "$kde_cv_qt_direct" = "yes"; then +- AC_MSG_RESULT(yes) +- $1 +-else +- AC_MSG_RESULT(no) +- $2 +-fi +-]) +- +-dnl ------------------------------------------------------------------------ +-dnl Try to find the Qt headers and libraries. +-dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed) +-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed) +-dnl ------------------------------------------------------------------------ +-dnl +-AC_DEFUN([AC_PATH_QT_1_3], +-[ +-AC_REQUIRE([K_PATH_X]) +-AC_REQUIRE([KDE_USE_QT]) +-AC_REQUIRE([KDE_CHECK_LIB64]) +- +-dnl ------------------------------------------------------------------------ +-dnl Add configure flag to enable linking to MT version of Qt library. +-dnl ------------------------------------------------------------------------ +- +-AC_ARG_ENABLE( +- mt, +- AC_HELP_STRING([--disable-mt],[link to non-threaded Qt (deprecated)]), +- kde_use_qt_mt=$enableval, +- [ +- if test $kde_qtver = 3; then +- kde_use_qt_mt=yes +- else +- kde_use_qt_mt=no +- fi +- ] +-) +- +-USING_QT_MT="" +- +-dnl ------------------------------------------------------------------------ +-dnl If we not get --disable-qt-mt then adjust some vars for the host. +-dnl ------------------------------------------------------------------------ +- +-KDE_MT_LDFLAGS= +-KDE_MT_LIBS= +-if test "x$kde_use_qt_mt" = "xyes"; then +- KDE_CHECK_THREADING +- 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 +-AC_SUBST(KDE_MT_LDFLAGS) +-AC_SUBST(KDE_MT_LIBS) +- +-kde_qt_was_given=yes +- +-dnl ------------------------------------------------------------------------ +-dnl If we haven't been told how to link to Qt, we work it out for ourselves. +-dnl ------------------------------------------------------------------------ +-if test -z "$LIBQT_GLOB"; then +- if test "x$kde_use_qt_emb" = "xyes"; then +- LIBQT_GLOB="libqte.*" +- else +- LIBQT_GLOB="libqt.*" +- fi +-fi +- +-dnl ------------------------------------------------------------ +-dnl If we got --enable-embedded then adjust the Qt library name. +-dnl ------------------------------------------------------------ +-if test "x$kde_use_qt_emb" = "xyes"; then +- qtlib="qte" +-else +- qtlib="qt" +-fi +- +-kde_int_qt="-l$qtlib" +- +-if test -z "$LIBQPE"; then +-dnl ------------------------------------------------------------ +-dnl If we got --enable-palmtop then add -lqpe to the link line +-dnl ------------------------------------------------------------ +- 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 +- +-dnl ------------------------------------------------------------------------ +-dnl If we got --enable-qt-mt then adjust the Qt library name for the host. +-dnl ------------------------------------------------------------------------ +- +-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 +- +- AC_REQUIRE([AC_FIND_PNG]) +- AC_REQUIRE([AC_FIND_JPEG]) +- LIBQT="$LIBQT $LIBPNG $LIBJPEG" +-fi +- +-if test $kde_qtver = 3; then +- AC_REQUIRE([KDE_CHECK_LIBDL]) +- LIBQT="$LIBQT $LIBDL" +-fi +- +-AC_MSG_CHECKING([for Qt]) +- +-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="" +-AC_ARG_WITH(qt-dir, +- AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]), +- [ ac_qt_includes="$withval"/include +- ac_qt_libraries="$withval"/lib${kdelibsuff} +- ac_qt_bindir="$withval"/bin +- ]) +- +-AC_ARG_WITH(qt-includes, +- AC_HELP_STRING([--with-qt-includes=DIR],[where the Qt includes are. ]), +- [ +- ac_qt_includes="$withval" +- ]) +- +-kde_qt_libs_given=no +- +-AC_ARG_WITH(qt-libraries, +- AC_HELP_STRING([--with-qt-libraries=DIR],[where the Qt library is installed.]), +- [ ac_qt_libraries="$withval" +- kde_qt_libs_given=yes +- ]) +- +-AC_CACHE_VAL(ac_cv_have_qt, +-[#try to guess Qt locations +- +-qt_incdirs="" +-for dir in $kde_qt_dirs; do +- qt_incdirs="$qt_incdirs $dir/include $dir" +-done +-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 +- +-AC_FIND_FILE($kde_qt_header, $qt_incdirs, qt_incdir) +-ac_qt_includes="$qt_incdir" +- +-qt_libdirs="" +-for dir in $kde_qt_dirs; do +- qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir" +-done +-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" >&AC_FD_CC ; 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_LANG_SAVE +-AC_LANG_CPLUSPLUS +- +-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" +- +-KDE_PRINT_QT_PROGRAM +- +-if AC_TRY_EVAL(ac_link) && test -s conftest; then +- rm -f conftest* +-else +- echo "configure: failed program was:" >&AC_FD_CC +- cat conftest.$ac_ext >&AC_FD_CC +- ac_qt_libraries="NO" +-fi +-rm -f conftest* +-CXXFLAGS="$ac_cxxflags_safe" +-LDFLAGS="$ac_ldflags_safe" +-LIBS="$ac_libs_safe" +- +-AC_LANG_RESTORE +-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 +- +- AC_MSG_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]) +-else +- have_qt="yes" +-fi +-]) +- +-eval "$ac_cv_have_qt" +- +-if test "$have_qt" != yes; then +- AC_MSG_RESULT([$have_qt]); +-else +- ac_cv_have_qt="have_qt=yes \ +- ac_qt_includes=$ac_qt_includes ac_qt_libraries=$ac_qt_libraries" +- AC_MSG_RESULT([libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT]) +- +- qt_libraries="$ac_qt_libraries" +- qt_includes="$ac_qt_includes" +-fi +- +-if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then +- KDE_CHECK_QT_DIRECT(qt_libraries= ,[]) +-fi +- +-AC_SUBST(qt_libraries) +-AC_SUBST(qt_includes) +- +-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" +- +-AC_SUBST(QT_INCLUDES) +-AC_SUBST(QT_LDFLAGS) +-AC_PATH_QT_MOC_UIC +- +-KDE_CHECK_QT_JPEG +- +-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 +- +-AC_SUBST(LIB_QT) +-AC_SUBST(LIB_QPE) +- +-AC_SUBST(kde_qtver) +-]) +- +-AC_DEFUN([AC_PATH_QT], +-[ +-AC_PATH_QT_1_3 +-]) +- +-AC_DEFUN([KDE_CHECK_UIC_PLUGINS], +-[ +-AC_REQUIRE([AC_PATH_QT_MOC_UIC]) +- +-if test x$ac_uic_supports_libpath = xyes; then +- +-AC_MSG_CHECKING([if UIC has KDE plugins available]) +-AC_CACHE_VAL(kde_cv_uic_plugins, +-[ +-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 AC_TRY_EVAL(kde_line); 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 +-]) +- +-AC_MSG_RESULT([$kde_cv_uic_plugins]) +-if test "$kde_cv_uic_plugins" != yes; then +- AC_MSG_ERROR([ +-you need to install kdelibs first. +- +-If you did install kdelibs, then the Qt version that is picked up by +-this configure is not the same version you used to compile kdelibs. +-The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the +-_same Qt version_, compiled with the _same compiler_ and the same Qt +-configuration settings. +-]) +-fi +-fi +-]) +- +-AC_DEFUN([KDE_CHECK_FINAL], +-[ +- AC_ARG_ENABLE(final, +- AC_HELP_STRING([--enable-final], +- [build size optimized apps (experimental - needs lots of memory)]), +- kde_use_final=$enableval, kde_use_final=no) +- +- if test "x$kde_use_final" = "xyes"; then +- KDE_USE_FINAL_TRUE="" +- KDE_USE_FINAL_FALSE="#" +- else +- KDE_USE_FINAL_TRUE="#" +- KDE_USE_FINAL_FALSE="" +- fi +- AC_SUBST(KDE_USE_FINAL_TRUE) +- AC_SUBST(KDE_USE_FINAL_FALSE) +-]) +- +-AC_DEFUN([KDE_CHECK_CLOSURE], +-[ +- AC_ARG_ENABLE(closure, +- AC_HELP_STRING([--enable-closure],[delay template instantiation]), +- kde_use_closure=$enableval, kde_use_closure=no) +- +- KDE_NO_UNDEFINED="" +- if test "x$kde_use_closure" = "xyes"; then +- KDE_USE_CLOSURE_TRUE="" +- KDE_USE_CLOSURE_FALSE="#" +-# CXXFLAGS="$CXXFLAGS $REPO" +- else +- KDE_USE_CLOSURE_TRUE="#" +- KDE_USE_CLOSURE_FALSE="" +- KDE_NO_UNDEFINED="" +- fi +- AC_SUBST(KDE_USE_CLOSURE_TRUE) +- AC_SUBST(KDE_USE_CLOSURE_FALSE) +- AC_SUBST(KDE_NO_UNDEFINED) +-]) +- +-dnl Check if the linker supports --enable-new-dtags and --as-needed +-AC_DEFUN([KDE_CHECK_NEW_LDFLAGS], +-[ +- AC_ARG_ENABLE(new_ldflags, +- AC_HELP_STRING([--enable-new-ldflags], +- [enable the new linker flags]), +- kde_use_new_ldflags=$enableval, +- kde_use_new_ldflags=no) +- +- LDFLAGS_AS_NEEDED="" +- LDFLAGS_NEW_DTAGS="" +- if test "x$kde_use_new_ldflags" = "xyes"; then +- LDFLAGS_NEW_DTAGS="" +- KDE_CHECK_COMPILER_FLAG([Wl,--enable-new-dtags], +- [LDFLAGS_NEW_DTAGS="-Wl,--enable-new-dtags"],) +- +- KDE_CHECK_COMPILER_FLAG([Wl,--as-needed], +- [LDFLAGS_AS_NEEDED="-Wl,--as-needed"],) +- fi +- AC_SUBST(LDFLAGS_AS_NEEDED) +- AC_SUBST(LDFLAGS_NEW_DTAGS) +-]) +- +-AC_DEFUN([KDE_CHECK_NMCHECK], +-[ +- AC_ARG_ENABLE(nmcheck,AC_HELP_STRING([--enable-nmcheck],[enable automatic namespace cleanness check]), +- kde_use_nmcheck=$enableval, kde_use_nmcheck=no) +- +- if test "$kde_use_nmcheck" = "yes"; then +- KDE_USE_NMCHECK_TRUE="" +- KDE_USE_NMCHECK_FALSE="#" +- else +- KDE_USE_NMCHECK_TRUE="#" +- KDE_USE_NMCHECK_FALSE="" +- fi +- AC_SUBST(KDE_USE_NMCHECK_TRUE) +- AC_SUBST(KDE_USE_NMCHECK_FALSE) +-]) +- +-AC_DEFUN([KDE_EXPAND_MAKEVAR], [ +-savex=$exec_prefix +-test "x$exec_prefix" = xNONE && exec_prefix=$prefix +-tmp=$$2 +-while $1=`eval echo "$tmp"`; test "x$$1" != "x$tmp"; do tmp=$$1; done +-exec_prefix=$savex +-]) +- +-dnl ------------------------------------------------------------------------ +-dnl Now, the same with KDE +-dnl $(KDE_LDFLAGS) will be the kdeliblocation (if needed) +-dnl and $(kde_includes) will be the kdehdrlocation (if needed) +-dnl ------------------------------------------------------------------------ +-dnl +-AC_DEFUN([AC_BASE_PATH_KDE], +-[ +-AC_REQUIRE([KDE_CHECK_STL]) +-AC_REQUIRE([AC_PATH_QT])dnl +-AC_REQUIRE([KDE_CHECK_LIB64]) +- +-AC_CHECK_RPATH +-AC_MSG_CHECKING([for KDE]) +- +-if test "${prefix}" != NONE; then +- kde_includes=${includedir} +- KDE_EXPAND_MAKEVAR(ac_kde_includes, includedir) +- +- kde_libraries=${libdir} +- KDE_EXPAND_MAKEVAR(ac_kde_libraries, libdir) +- +-else +- ac_kde_includes= +- ac_kde_libraries= +- kde_libraries="" +- kde_includes="" +-fi +- +-AC_CACHE_VAL(ac_cv_have_kde, +-[#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 "$1"; 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/trinity/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" +-AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir) +-ac_kde_includes="$kde_incdir" +- +-if test -n "$ac_kde_includes" && test ! -r "$ac_kde_includes/$kde_check_header"; then +- AC_MSG_ERROR([ +-in the prefix, you've chosen, are no KDE headers installed. This will fail. +-So, check this please and use another prefix!]) +-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}/trinity /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/trinity/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" +-AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir) +-ac_kde_libraries="$kde_libdir" +- +-kde_widgetdir=NO +-dnl this might be somewhere else +-AC_FIND_FILE("trinity/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir) +- +-if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then +-AC_MSG_ERROR([ +-in the prefix, you've chosen, are no KDE libraries installed. This will fail. +-So, check this please and use another prefix!]) +-fi +- +-if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then +-AC_MSG_ERROR([ +-I can't find the designer plugins. These are required and should have been installed +-by kdelibs]) +-fi +- +-if test -n "$kde_widgetdir"; then +- kde_widgetdir="$kde_widgetdir/trinity/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 dnl test -z $1, e.g. from kdelibs +- +- ac_cv_have_kde="have_kde=no" +- +-fi +-])dnl +- +-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" +- AC_MSG_RESULT([will be installed in $ac_kde_prefix]) +- else +- ac_kde_exec_prefix="$exec_prefix" +- AC_MSG_RESULT([will be installed in $ac_kde_prefix and $ac_kde_exec_prefix]) +- 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" +- AC_MSG_RESULT([libraries $ac_kde_libraries, headers $ac_kde_includes]) +- +- kde_libraries="$ac_kde_libraries" +- kde_includes="$ac_kde_includes" +-fi +-AC_SUBST(kde_libraries) +-AC_SUBST(kde_includes) +- +-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 +- +-AC_SUBST(KDE_LDFLAGS) +-AC_SUBST(KDE_INCLUDES) +- +-AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) +- +-all_libraries="$all_libraries $USER_LDFLAGS" +-all_includes="$all_includes $USER_INCLUDES" +-AC_SUBST(all_includes) +-AC_SUBST(all_libraries) +- +-if test -z "$1"; then +-KDE_CHECK_UIC_PLUGINS +-fi +- +-ac_kde_libraries="$kde_libdir" +- +-AC_SUBST(AUTODIRS) +- +- +-]) +- +-AC_DEFUN([KDE_CHECK_EXTRA_LIBS], +-[ +-AC_MSG_CHECKING(for extra includes) +-AC_ARG_WITH(extra-includes,AC_HELP_STRING([--with-extra-includes=DIR],[adds non standard include paths]), +- kde_use_extra_includes="$withval", +- kde_use_extra_includes=NONE +-) +-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 +-AC_SUBST(USER_INCLUDES) +- +-AC_MSG_RESULT($kde_use_extra_includes) +- +-kde_extra_libs= +-AC_MSG_CHECKING(for extra libs) +-AC_ARG_WITH(extra-libs,AC_HELP_STRING([--with-extra-libs=DIR],[adds non standard library paths]), +- kde_use_extra_libs=$withval, +- kde_use_extra_libs=NONE +-) +-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 +- +-AC_SUBST(USER_LDFLAGS) +- +-AC_MSG_RESULT($kde_use_extra_libs) +- +-]) +- +-AC_DEFUN([KDE_1_CHECK_PATH_HEADERS], +-[ +- AC_MSG_CHECKING([for KDE headers installed]) +- AC_LANG_SAVE +- AC_LANG_CPLUSPLUS +-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 AC_TRY_EVAL(ac_compile); then +- AC_MSG_RESULT(yes) +- else +- AC_MSG_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.]) +- fi +- CPPFLAGS=$ac_save_CPPFLAGS +- +- AC_LANG_RESTORE +-]) +- +-AC_DEFUN([KDE_CHECK_KDEQTADDON], +-[ +-AC_MSG_CHECKING(for kde-qt-addon) +-AC_CACHE_VAL(kde_cv_have_kdeqtaddon, +-[ +- kde_ldflags_safe="$LDFLAGS" +- kde_libs_safe="$LIBS" +- kde_cxxflags_safe="$CXXFLAGS" +- +- LIBS="-lkde-qt-addon $LIBQT $LIBS" +- CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes" +- LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS" +- +- AC_TRY_LINK([ +- #include +- ], +- [ +- QDomDocument doc; +- ], +- kde_cv_have_kdeqtaddon=yes, +- kde_cv_have_kdeqtaddon=no +- ) +- +- LDFLAGS=$kde_ldflags_safe +- LIBS=$kde_libs_safe +- CXXFLAGS=$kde_cxxflags_safe +-]) +- +-AC_MSG_RESULT($kde_cv_have_kdeqtaddon) +- +-if test "$kde_cv_have_kdeqtaddon" = "no"; then +- AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first. +-It is a separate package (and CVS module) named kde-qt-addon.]) +-fi +-]) +- +-AC_DEFUN([KDE_CREATE_LIBS_ALIASES], +-[ +- AC_REQUIRE([KDE_MISC_TESTS]) +- AC_REQUIRE([KDE_CHECK_LIBDL]) +- AC_REQUIRE([K_PATH_X]) +- +-if test $kde_qtver = 3; then +- case $host in +- *cygwin*) lib_kded="-lkdeinit_kded" ;; +- *) lib_kded="" ;; +- esac +- AC_SUBST(LIB_KDED, $lib_kded) +- AC_SUBST(LIB_KDECORE, "-lkdecore") +- AC_SUBST(LIB_KDEUI, "-lkdeui") +- AC_SUBST(LIB_KIO, "-lkio") +- AC_SUBST(LIB_KJS, "-lkjs") +- AC_SUBST(LIB_SMB, "-lsmb") +- AC_SUBST(LIB_KAB, "-lkab") +- AC_SUBST(LIB_KABC, "-lkabc") +- AC_SUBST(LIB_KHTML, "-lkhtml") +- AC_SUBST(LIB_KSPELL, "-lkspell") +- AC_SUBST(LIB_KPARTS, "-lkparts") +- AC_SUBST(LIB_KDEPRINT, "-lkdeprint") +- AC_SUBST(LIB_KUTILS, "-lkutils") +- AC_SUBST(LIB_KDEPIM, "-lkdepim") +- AC_SUBST(LIB_KIMPROXY, "-lkimproxy") +- AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") +- AC_SUBST(LIB_KDNSSD, "-lkdnssd") +- AC_SUBST(LIB_KUNITTEST, "-lkunittest") +-# these are for backward compatibility +- AC_SUBST(LIB_KSYCOCA, "-lkio") +- AC_SUBST(LIB_KFILE, "-lkio") +-elif test $kde_qtver = 2; then +- AC_SUBST(LIB_KDECORE, "-lkdecore") +- AC_SUBST(LIB_KDEUI, "-lkdeui") +- AC_SUBST(LIB_KIO, "-lkio") +- AC_SUBST(LIB_KSYCOCA, "-lksycoca") +- AC_SUBST(LIB_SMB, "-lsmb") +- AC_SUBST(LIB_KFILE, "-lkfile") +- AC_SUBST(LIB_KAB, "-lkab") +- AC_SUBST(LIB_KHTML, "-lkhtml") +- AC_SUBST(LIB_KSPELL, "-lkspell") +- AC_SUBST(LIB_KPARTS, "-lkparts") +- AC_SUBST(LIB_KDEPRINT, "-lkdeprint") +-else +- AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)") +- AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)") +- AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)") +- AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)") +- AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)") +-fi +-]) +- +-AC_DEFUN([AC_PATH_KDE], +-[ +- AC_BASE_PATH_KDE +- AC_ARG_ENABLE(path-check,AC_HELP_STRING([--disable-path-check],[don't try to find out, where to install]), +- [ +- if test "$enableval" = "no"; +- then ac_use_path_checking="default" +- else ac_use_path_checking="" +- fi +- ], +- [ +- if test "$kde_qtver" = 1; +- then ac_use_path_checking="" +- else ac_use_path_checking="default" +- fi +- ] +- ) +- +- AC_CREATE_KFSSTND($ac_use_path_checking) +- +- AC_SUBST_KFSSTND +- KDE_CREATE_LIBS_ALIASES +-]) +- +-dnl KDE_CHECK_FUNC_EXT(, [headers], [sample-use], [C prototype], [autoheader define], [call if found]) +-AC_DEFUN([KDE_CHECK_FUNC_EXT], +-[ +-AC_MSG_CHECKING(for $1) +-AC_CACHE_VAL(kde_cv_func_$1, +-[ +-AC_LANG_SAVE +-AC_LANG_CPLUSPLUS +-save_CXXFLAGS="$CXXFLAGS" +-kde_safe_LIBS="$LIBS" +-LIBS="$LIBS $X_EXTRA_LIBS" +-AC_TRY_COMPILE([ +-$2 +-], +-[ +-$3 +-], +-kde_cv_func_$1=yes, +-kde_cv_func_$1=no) +-CXXFLAGS="$save_CXXFLAGS" +-LIBS="$kde_safe_LIBS" +-AC_LANG_RESTORE +-]) +- +-AC_MSG_RESULT($kde_cv_func_$1) +- +-AC_MSG_CHECKING([if $1 needs custom prototype]) +-AC_CACHE_VAL(kde_cv_proto_$1, +-[ +-if test "x$kde_cv_func_$1" = xyes; then +- kde_cv_proto_$1=no +-else +- case "$1" in +- setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat) +- kde_cv_proto_$1="yes - in libkdefakes" +- ;; +- *) +- kde_cv_proto_$1=unknown +- ;; +- esac +-fi +- +-if test "x$kde_cv_proto_$1" = xunknown; then +- +-AC_LANG_SAVE +-AC_LANG_CPLUSPLUS +- kde_safe_libs=$LIBS +- LIBS="$LIBS $X_EXTRA_LIBS" +- AC_TRY_LINK([ +-$2 +- +-extern "C" $4; +-], +-[ +-$3 +-], +-[ kde_cv_func_$1=yes +- kde_cv_proto_$1=yes ], +- [kde_cv_proto_$1="$1 unavailable"] +-) +-LIBS=$kde_safe_libs +-AC_LANG_RESTORE +-fi +-]) +-AC_MSG_RESULT($kde_cv_proto_$1) +- +-if test "x$kde_cv_func_$1" = xyes; then +- AC_DEFINE(HAVE_$5, 1, [Define if you have $1]) +- $6 +-fi +-if test "x$kde_cv_proto_$1" = xno; then +- AC_DEFINE(HAVE_$5_PROTO, 1, +- [Define if you have the $1 prototype]) +-fi +- +-AH_VERBATIM([_HAVE_$5_PROTO], +-[ +-#if !defined(HAVE_$5_PROTO) +-#ifdef __cplusplus +-extern "C" { +-#endif +-$4; +-#ifdef __cplusplus +-} +-#endif +-#endif +-]) +-]) +- +-AC_DEFUN([AC_CHECK_SETENV], +-[ +- KDE_CHECK_FUNC_EXT(setenv, [ +-#include +-], +- [setenv("VAR", "VALUE", 1);], +- [int setenv (const char *, const char *, int)], +- [SETENV]) +-]) +- +-AC_DEFUN([AC_CHECK_UNSETENV], +-[ +- KDE_CHECK_FUNC_EXT(unsetenv, [ +-#include +-], +- [unsetenv("VAR");], +- [void unsetenv (const char *)], +- [UNSETENV]) +-]) +- +-AC_DEFUN([AC_CHECK_GETDOMAINNAME], +-[ +- KDE_CHECK_FUNC_EXT(getdomainname, [ +-#include +-#include +-#include +-], +- [ +-char buffer[200]; +-getdomainname(buffer, 200); +-], +- [#include +- int getdomainname (char *, size_t)], +- [GETDOMAINNAME]) +-]) +- +-AC_DEFUN([AC_CHECK_GETHOSTNAME], +-[ +- KDE_CHECK_FUNC_EXT(gethostname, [ +-#include +-#include +-], +- [ +-char buffer[200]; +-gethostname(buffer, 200); +-], +- [int gethostname (char *, unsigned int)], +- [GETHOSTNAME]) +-]) +- +-AC_DEFUN([AC_CHECK_USLEEP], +-[ +- KDE_CHECK_FUNC_EXT(usleep, [ +-#include +-], +- [ +-usleep(200); +-], +- [int usleep (unsigned int)], +- [USLEEP]) +-]) +- +- +-AC_DEFUN([AC_CHECK_RANDOM], +-[ +- KDE_CHECK_FUNC_EXT(random, [ +-#include +-], +- [ +-random(); +-], +- [long int random(void)], +- [RANDOM]) +- +- KDE_CHECK_FUNC_EXT(srandom, [ +-#include +-], +- [ +-srandom(27); +-], +- [void srandom(unsigned int)], +- [SRANDOM]) +- +-]) +- +-AC_DEFUN([AC_CHECK_INITGROUPS], +-[ +- KDE_CHECK_FUNC_EXT(initgroups, [ +-#include +-#include +-#include +-], +- [ +-char buffer[200]; +-initgroups(buffer, 27); +-], +- [int initgroups(const char *, gid_t)], +- [INITGROUPS]) +-]) +- +-AC_DEFUN([AC_CHECK_MKSTEMPS], +-[ +- KDE_CHECK_FUNC_EXT(mkstemps, [ +-#include +-#include +-], +- [ +-mkstemps("/tmp/aaaXXXXXX", 6); +-], +- [int mkstemps(char *, int)], +- [MKSTEMPS]) +-]) +- +-AC_DEFUN([AC_CHECK_MKSTEMP], +-[ +- KDE_CHECK_FUNC_EXT(mkstemp, [ +-#include +-#include +-], +- [ +-mkstemp("/tmp/aaaXXXXXX"); +-], +- [int mkstemp(char *)], +- [MKSTEMP]) +-]) +- +-AC_DEFUN([AC_CHECK_MKDTEMP], +-[ +- KDE_CHECK_FUNC_EXT(mkdtemp, [ +-#include +-#include +-], +- [ +-mkdtemp("/tmp/aaaXXXXXX"); +-], +- [char *mkdtemp(char *)], +- [MKDTEMP]) +-]) +- +- +-AC_DEFUN([AC_CHECK_RES_INIT], +-[ +- AC_MSG_CHECKING([if res_init needs -lresolv]) +- kde_libs_safe="$LIBS" +- LIBS="$LIBS $X_EXTRA_LIBS -lresolv" +- AC_TRY_LINK( +- [ +-#include +-#include +-#include +-#include +- ], +- [ +- res_init(); +- ], +- [ +- LIBRESOLV="-lresolv" +- AC_MSG_RESULT(yes) +- AC_DEFINE(HAVE_RES_INIT, 1, [Define if you have the res_init function]) +- ], +- [ AC_MSG_RESULT(no) ] +- ) +- LIBS=$kde_libs_safe +- AC_SUBST(LIBRESOLV) +- +- KDE_CHECK_FUNC_EXT(res_init, +- [ +-#include +-#include +-#include +-#include +- ], +- [res_init()], +- [int res_init(void)], +- [RES_INIT]) +-]) +- +-AC_DEFUN([AC_CHECK_STRLCPY], +-[ +- KDE_CHECK_FUNC_EXT(strlcpy, [ +-#include +-], +-[ char buf[20]; +- strlcpy(buf, "KDE function test", sizeof(buf)); +-], +- [unsigned long strlcpy(char*, const char*, unsigned long)], +- [STRLCPY]) +-]) +- +-AC_DEFUN([AC_CHECK_STRLCAT], +-[ +- KDE_CHECK_FUNC_EXT(strlcat, [ +-#include +-], +-[ char buf[20]; +- buf[0]='\0'; +- strlcat(buf, "KDE function test", sizeof(buf)); +-], +- [unsigned long strlcat(char*, const char*, unsigned long)], +- [STRLCAT]) +-]) +- +-AC_DEFUN([AC_CHECK_RES_QUERY], +-[ +- KDE_CHECK_FUNC_EXT(res_query, [ +-#include +-#include +-#include +-#include +-#include +-], +-[ +-res_query(NULL, 0, 0, NULL, 0); +-], +- [int res_query(const char *, int, int, unsigned char *, int)], +- [RES_QUERY]) +-]) +- +-AC_DEFUN([AC_CHECK_DN_SKIPNAME], +-[ +- KDE_CHECK_FUNC_EXT(dn_skipname, [ +-#include +-#include +-#include +-#include +-], +-[ +-dn_skipname (NULL, NULL); +-], +- [int dn_skipname (unsigned char *, unsigned char *)], +- [DN_SKIPNAME]) +-]) +- +- +-AC_DEFUN([AC_FIND_GIF], +- [AC_MSG_CHECKING([for giflib]) +-AC_CACHE_VAL(ac_cv_lib_gif, +-[ac_save_LIBS="$LIBS" +-if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then +-LIBS="$all_libraries -lgif -lX11 $LIBSOCKET" +-else +-LIBS="$all_libraries -lgif" +-fi +-AC_TRY_LINK(dnl +-[ +-#ifdef __cplusplus +-extern "C" { +-#endif +-int GifLastError(void); +-#ifdef __cplusplus +-} +-#endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-], +- [return GifLastError();], +- eval "ac_cv_lib_gif=yes", +- eval "ac_cv_lib_gif=no") +-LIBS="$ac_save_LIBS" +-])dnl +-if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then +- AC_MSG_RESULT(yes) +- AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif]) +-else +- AC_MSG_ERROR(You need giflib30. Please install the kdesupport package) +-fi +-]) +- +-AC_DEFUN([KDE_FIND_JPEG_HELPER], +-[ +-AC_MSG_CHECKING([for libjpeg$2]) +-AC_CACHE_VAL(ac_cv_lib_jpeg_$1, +-[ +-ac_save_LIBS="$LIBS" +-LIBS="$all_libraries $USER_LDFLAGS -ljpeg$2 -lm" +-ac_save_CFLAGS="$CFLAGS" +-CFLAGS="$CFLAGS $all_includes $USER_INCLUDES" +-AC_TRY_LINK( +-[ +-#ifdef __cplusplus +-extern "C" { +-#endif +-void jpeg_CreateDecompress(); +-#ifdef __cplusplus +-} +-#endif +-], +-[jpeg_CreateDecompress();], +- eval "ac_cv_lib_jpeg_$1=-ljpeg$2", +- eval "ac_cv_lib_jpeg_$1=no") +-LIBS="$ac_save_LIBS" +-CFLAGS="$ac_save_CFLAGS" +-]) +- +-if eval "test ! \"`echo $ac_cv_lib_jpeg_$1`\" = no"; then +- LIBJPEG="$ac_cv_lib_jpeg_$1" +- AC_MSG_RESULT($ac_cv_lib_jpeg_$1) +-else +- AC_MSG_RESULT(no) +- $3 +-fi +- +-]) +- +-AC_DEFUN([AC_FIND_JPEG], +-[ +-dnl first look for libraries +-KDE_FIND_JPEG_HELPER(6b, 6b, +- KDE_FIND_JPEG_HELPER(normal, [], +- [ +- LIBJPEG= +- ] +- ) +-) +- +-dnl then search the headers (can't use simply AC_TRY_xxx, as jpeglib.h +-dnl requires system dependent includes loaded before it) +-jpeg_incdirs="$includedir /usr/include /usr/local/include $kde_extra_includes" +-AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir) +-test "x$jpeg_incdir" = xNO && jpeg_incdir= +- +-dnl if headers _and_ libraries are missing, this is no error, and we +-dnl continue with a warning (the user will get no jpeg support in khtml) +-dnl if only one is missing, it means a configuration error, but we still +-dnl only warn +-if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then +- AC_DEFINE_UNQUOTED(HAVE_LIBJPEG, 1, [Define if you have libjpeg]) +-else +- if test -n "$jpeg_incdir" || test -n "$LIBJPEG" ; then +- AC_MSG_WARN([ +-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. +-]) +- else +- AC_MSG_WARN([libjpeg not found. disable JPEG support.]) +- fi +- jpeg_incdir= +- LIBJPEG= +-fi +- +-AC_SUBST(LIBJPEG) +-AH_VERBATIM(_AC_CHECK_JPEG, +-[/* +- * jpeg.h needs HAVE_BOOLEAN, when the system uses boolean in system +- * headers and I'm too lazy to write a configure test as long as only +- * unixware is related +- */ +-#ifdef _UNIXWARE +-#define HAVE_BOOLEAN +-#endif +-]) +-]) +- +-AC_DEFUN([KDE_CHECK_QT_JPEG], +-[ +-if test -n "$LIBJPEG"; then +-AC_MSG_CHECKING([if Qt needs $LIBJPEG]) +-AC_CACHE_VAL(kde_cv_qt_jpeg, +-[ +-AC_LANG_SAVE +-AC_LANG_CPLUSPLUS +-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_TRY_LINK( +-[#include ], +- [ +- int argc; +- char** argv; +- QApplication app(argc, argv);], +- eval "kde_cv_qt_jpeg=no", +- eval "kde_cv_qt_jpeg=yes") +-LIBS="$ac_save_LIBS" +-CXXFLAGS="$ac_save_CXXFLAGS" +-AC_LANG_RESTORE +-fi +-]) +- +-if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then +- AC_MSG_RESULT(yes) +- LIBJPEG_QT='$(LIBJPEG)' +-else +- AC_MSG_RESULT(no) +- LIBJPEG_QT= +-fi +- +-]) +- +-AC_DEFUN([AC_FIND_ZLIB], +-[ +-AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) +-AC_MSG_CHECKING([for libz]) +-AC_CACHE_VAL(ac_cv_lib_z, +-[ +-kde_save_LIBS="$LIBS" +-LIBS="$all_libraries $USER_LDFLAGS -lz $LIBSOCKET" +-kde_save_CFLAGS="$CFLAGS" +-CFLAGS="$CFLAGS $all_includes $USER_INCLUDES" +-AC_TRY_LINK(dnl +-[ +-#include +-], +-[ +- char buf[42]; +- gzFile f = (gzFile) 0; +- /* this would segfault.. but we only link, don't run */ +- (void) gzgets(f, buf, sizeof(buf)); +- +- return (zlibVersion() == ZLIB_VERSION); +-], +- eval "ac_cv_lib_z='-lz'", +- eval "ac_cv_lib_z=no") +-LIBS="$kde_save_LIBS" +-CFLAGS="$kde_save_CFLAGS" +-])dnl +-if test ! "$ac_cv_lib_z" = no; then +- AC_DEFINE_UNQUOTED(HAVE_LIBZ, 1, [Define if you have libz]) +- LIBZ="$ac_cv_lib_z" +- AC_MSG_RESULT($ac_cv_lib_z) +-else +- AC_MSG_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) +- LIBZ="" +-fi +-AC_SUBST(LIBZ) +-]) +- +-AC_DEFUN([KDE_TRY_TIFFLIB], +-[ +-AC_MSG_CHECKING([for libtiff $1]) +- +-AC_CACHE_VAL(kde_cv_libtiff_$1, +-[ +-AC_LANG_SAVE +-AC_LANG_CPLUSPLUS +-kde_save_LIBS="$LIBS" +-if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then +-LIBS="$all_libraries $USER_LDFLAGS -l$1 $LIBJPEG $LIBZ -lX11 $LIBSOCKET -lm" +-else +-LIBS="$all_libraries $USER_LDFLAGS -l$1 $LIBJPEG $LIBZ -lm" +-fi +-kde_save_CXXFLAGS="$CXXFLAGS" +-CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES" +- +-AC_TRY_LINK(dnl +-[ +-#include +-], +- [return (TIFFOpen( "", "r") == 0); ], +-[ +- kde_cv_libtiff_$1="-l$1 $LIBJPEG $LIBZ" +-], [ +- kde_cv_libtiff_$1=no +-]) +- +-LIBS="$kde_save_LIBS" +-CXXFLAGS="$kde_save_CXXFLAGS" +-AC_LANG_RESTORE +-]) +- +-if test "$kde_cv_libtiff_$1" = "no"; then +- AC_MSG_RESULT(no) +- LIBTIFF="" +- $3 +-else +- LIBTIFF="$kde_cv_libtiff_$1" +- AC_MSG_RESULT(yes) +- AC_DEFINE_UNQUOTED(HAVE_LIBTIFF, 1, [Define if you have libtiff]) +- $2 +-fi +- +-]) +- +-AC_DEFUN([AC_FIND_TIFF], +-[ +-AC_REQUIRE([K_PATH_X]) +-AC_REQUIRE([AC_FIND_ZLIB]) +-AC_REQUIRE([AC_FIND_JPEG]) +-AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) +- +-KDE_TRY_TIFFLIB(tiff, [], +- KDE_TRY_TIFFLIB(tiff34)) +- +-AC_SUBST(LIBTIFF) +-]) +- +-AC_DEFUN([KDE_FIND_LIBEXR], +-[ +-AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) +-AC_REQUIRE([AC_FIND_ZLIB]) +-AC_CACHE_VAL(ac_cv_libexr, +-[ +- if test -z "$PKG_CONFIG"; then +- AC_PATH_PROG(PKG_CONFIG, pkg-config, no) +- fi +- +- AC_MSG_CHECKING([for OpenEXR libraries]) +- +- if test "$PKG_CONFIG" = "no" ; then +- AC_MSG_RESULT(no) +- echo "*** The pkg-config script could not be found. Make sure it is" +- echo "*** in your path, or set the PKG_CONFIG environment variable" +- echo "*** to the full path to pkg-config." +- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." +- else +- if !(`$PKG_CONFIG --exists OpenEXR`) ; then +- AC_MSG_RESULT(no) +- EXRSTATUS=no +- else +- if !(`$PKG_CONFIG --atleast-version="1.1.1" OpenEXR`) ; then +- AC_MSG_RESULT(no) +- EXRSTATUS=old +- else +- kde_save_LIBS="$LIBS" +- LIBS="$LIBS $all_libraries $USER_LDFLAGS `pkg-config --libs OpenEXR` $LIBZ" +- AC_LANG_SAVE +- AC_LANG_CPLUSPLUS +- kde_save_CXXFLAGS="$CXXFLAGS" +- EXR_FLAGS=`$PKG_CONFIG --cflags OpenEXR` +- CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES $EXR_FLAGS" +- +- AC_TRY_LINK(dnl +- [ +- #include +- ], +- [ +- using namespace Imf; +- RgbaInputFile file ("dummy"); +- return 0; +- ], +- eval "ac_cv_libexr='`pkg-config --libs OpenEXR`'", +- eval "ac_cv_libexr=no" +- ) +- LIBS="$kde_save_LIBS" +- CXXFLAGS="$kde_save_CXXFLAGS" +- AC_LANG_RESTORE +- ])dnl +- if eval "test ! \"`echo $ac_cv_libexr`\" = no"; then +- AC_DEFINE_UNQUOTED(HAVE_EXR, 1, [Define if you have OpenEXR]) +- LIB_EXR="$ac_cv_libexr" +- AC_MSG_RESULT($ac_cv_libexr) +- else +- AC_MSG_RESULT(no) +- LIB_EXR="" +- fi +- fi +- fi +- fi +- AC_SUBST(LIB_EXR) +- AC_SUBST(EXR_FLAGS) +-]) +- +- +- +-AC_DEFUN([AC_FIND_PNG], +-[ +-AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) +-AC_REQUIRE([AC_FIND_ZLIB]) +-AC_MSG_CHECKING([for libpng]) +-AC_CACHE_VAL(ac_cv_lib_png, +-[ +-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" +- +-AC_TRY_LINK(dnl +- [ +- #include +- ], +- [ +- png_structp png_ptr = png_create_read_struct( /* image ptr */ +- PNG_LIBPNG_VER_STRING, 0, 0, 0 ); +- return( png_ptr != 0 ); +- ], +- eval "ac_cv_lib_png='-lpng $LIBZ -lm'", +- eval "ac_cv_lib_png=no" +-) +-LIBS="$kde_save_LIBS" +-CFLAGS="$kde_save_CFLAGS" +-])dnl +-if eval "test ! \"`echo $ac_cv_lib_png`\" = no"; then +- AC_DEFINE_UNQUOTED(HAVE_LIBPNG, 1, [Define if you have libpng]) +- LIBPNG="$ac_cv_lib_png" +- AC_SUBST(LIBPNG) +- AC_MSG_RESULT($ac_cv_lib_png) +-else +- AC_MSG_RESULT(no) +- LIBPNG="" +- AC_SUBST(LIBPNG) +-fi +-]) +- +- +-AC_DEFUN([AC_FIND_JASPER], +-[ +-AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) +-AC_REQUIRE([AC_FIND_JPEG]) +-AC_MSG_CHECKING([for jasper]) +-AC_CACHE_VAL(ac_cv_jasper, +-[ +-kde_save_LIBS="$LIBS" +-LIBS="$LIBS $all_libraries $USER_LDFLAGS -ljasper $LIBJPEG -lm" +-kde_save_CFLAGS="$CFLAGS" +-CFLAGS="$CFLAGS $all_includes $USER_INCLUDES" +- +-AC_TRY_LINK(dnl +- [ +- #include +- ], +- [ +- return( jas_init() ); +- ], +- eval "ac_cv_jasper='-ljasper $LIBJPEG -lm'", +- eval "ac_cv_jasper=no" +-) +-LIBS="$kde_save_LIBS" +-CFLAGS="$kde_save_CFLAGS" +-])dnl +-if eval "test ! \"`echo $ac_cv_jasper`\" = no"; then +- AC_DEFINE_UNQUOTED(HAVE_JASPER, 1, [Define if you have jasper]) +- LIB_JASPER="$ac_cv_jasper" +- AC_MSG_RESULT($ac_cv_jasper) +-else +- AC_MSG_RESULT(no) +- LIB_JASPER="" +-fi +-AC_SUBST(LIB_JASPER) +-]) +- +-AC_DEFUN([AC_CHECK_BOOL], +-[ +- AC_DEFINE_UNQUOTED(HAVE_BOOL, 1, [You _must_ have bool]) +-]) +- +-AC_DEFUN([AC_CHECK_GNU_EXTENSIONS], +-[ +-AC_MSG_CHECKING(if you need GNU extensions) +-AC_CACHE_VAL(ac_cv_gnu_extensions, +-[ +-cat > conftest.c << EOF +-#include +- +-#ifdef __GNU_LIBRARY__ +-yes +-#endif +-EOF +- +-if (eval "$ac_cpp conftest.c") 2>&5 | +- egrep "yes" >/dev/null 2>&1; then +- rm -rf conftest* +- ac_cv_gnu_extensions=yes +-else +- ac_cv_gnu_extensions=no +-fi +-]) +- +-AC_MSG_RESULT($ac_cv_gnu_extensions) +-if test "$ac_cv_gnu_extensions" = "yes"; then +- AC_DEFINE_UNQUOTED(_GNU_SOURCE, 1, [Define if you need to use the GNU extensions]) +-fi +-]) +- +-AC_DEFUN([KDE_CHECK_COMPILER_FLAG], +-[ +-AC_MSG_CHECKING([whether $CXX supports -$1]) +-kde_cache=`echo $1 | sed 'y% .=/+-,%____p__%'` +-AC_CACHE_VAL(kde_cv_prog_cxx_$kde_cache, +-[ +- AC_LANG_SAVE +- AC_LANG_CPLUSPLUS +- save_CXXFLAGS="$CXXFLAGS" +- CXXFLAGS="$CXXFLAGS -$1" +- AC_TRY_LINK([],[ return 0; ], [eval "kde_cv_prog_cxx_$kde_cache=yes"], []) +- CXXFLAGS="$save_CXXFLAGS" +- AC_LANG_RESTORE +-]) +-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then +- AC_MSG_RESULT(yes) +- : +- $2 +-else +- AC_MSG_RESULT(no) +- : +- $3 +-fi +-]) +- +-AC_DEFUN([KDE_CHECK_C_COMPILER_FLAG], +-[ +-AC_MSG_CHECKING([whether $CC supports -$1]) +-kde_cache=`echo $1 | sed 'y% .=/+-,%____p__%'` +-AC_CACHE_VAL(kde_cv_prog_cc_$kde_cache, +-[ +- AC_LANG_SAVE +- AC_LANG_C +- save_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS -$1" +- AC_TRY_LINK([],[ return 0; ], [eval "kde_cv_prog_cc_$kde_cache=yes"], []) +- CFLAGS="$save_CFLAGS" +- AC_LANG_RESTORE +-]) +-if eval "test \"`echo '$kde_cv_prog_cc_'$kde_cache`\" = yes"; then +- AC_MSG_RESULT(yes) +- : +- $2 +-else +- AC_MSG_RESULT(no) +- : +- $3 +-fi +-]) +- +- +-dnl AC_REMOVE_FORBIDDEN removes forbidden arguments from variables +-dnl use: AC_REMOVE_FORBIDDEN(CC, [-forbid -bad-option whatever]) +-dnl it's all white-space separated +-AC_DEFUN([AC_REMOVE_FORBIDDEN], +-[ __val=$$1 +- __forbid=" $2 " +- if test -n "$__val"; then +- __new="" +- ac_save_IFS=$IFS +- IFS=" " +- for i in $__val; do +- case "$__forbid" in +- *" $i "*) AC_MSG_WARN([found forbidden $i in $1, removing it]) ;; +- *) # Careful to not add spaces, where there were none, because otherwise +- # libtool gets confused, if we change e.g. CXX +- if test -z "$__new" ; then __new=$i ; else __new="$__new $i" ; fi ;; +- esac +- done +- IFS=$ac_save_IFS +- $1=$__new +- fi +-]) +- +- +-AC_DEFUN([KDE_CHECK_FOR_BAD_COMPILER], +-[ +- AC_MSG_CHECKING([whether $CC is blacklisted]) +- +- dnl In theory we have tu run this test against $CC and $CXX +- dnl in C and in C++ mode, because its perfectly legal for +- dnl the user to mix compiler versions, since C has a defined +- dnl ABI. +- dnl +- dnl For now, we assume the user is not on crack. +- +- AC_TRY_COMPILE([ +-#ifdef __GNUC__ +-#if __GNUC__ == 4 && __GNUC_MINOR__ == 0 && __GNUC_PATCHLEVEL__ == 0 +-choke me +-#endif +-#endif +-], , +- kde_bad_compiler=no, +- kde_bad_compiler=yes +-) +- +- AC_MSG_RESULT($kde_bad_compiler) +- +-if test "$kde_bad_compiler" = "yes"; then +- AC_MSG_ERROR([ +- +-This particular compiler version is blacklisted because it +-is known to miscompile KDE. Please use a newer version, or +-if that is not yet available, choose an older version. +- +-Please do not report a bug or bother us reporting this +-configure error. We know about it, and we introduced +-it by intention to avoid untraceable bugs or crashes in KDE. +- +-]) +-fi +- +-]) +- +- +-AC_DEFUN([KDE_CHECK_FOR_OPT_NOINLINE_MATCH], +-[ +- AC_CACHE_CHECK([whether system headers can cope with -O2 -fno-inline], +- kde_cv_opt_noinline_match, +- [ +- kde_cv_opt_noinline_match=irrelevant +- dnl if we don't use both -O2 and -fno-inline, this check is moot +- if echo "$CFLAGS" | grep -e -O2 >/dev/null 2>/dev/null \ +- && echo "$CFLAGS" | grep -e -fno-inline >/dev/null 2>/dev/null ; then +- +- ac_cflags_save="$CFLAGS" +- CFLAGS="$CFLAGS -D_USE_GNU" +- +- AC_TRY_LINK([ +- #include +-], [ const char *pt, *et; +- et = __extension__ ({ char __a0, __a1, __a2; (__builtin_constant_p ( ";," ) && ((size_t)(const void *)(( ";," )+ 1) - (size_t)(const void *)( ";," ) == 1) ? ((__a0 =((__const char *) ( ";," ))[0], __a0 == '\0') ? ((void) ( pt ),((void *)0) ) : ((__a1 = ((__const char *) ( ";," ))[1], __a1== '\0') ? (__extension__ (__builtin_constant_p ( __a0 ) && ( __a0 ) == '\0' ? (char *) __rawmemchr ( pt , __a0) : strchr( pt , __a0 ))) : ((__a2 = ((__const char *) ( ";," ))[2], __a2 == '\0') ? __strpbrk_c2 ( pt , __a0, __a1) :(((__const char *) ( ";," ))[3] == '\0' ? __strpbrk_c3 ( pt ,__a0, __a1, __a2): strpbrk ( pt , ";," ))))) : strpbrk ( pt , ";," )); }) ; +-], +- kde_cv_opt_noinline_match=yes, +- kde_cv_opt_noinline_match=no +- ) +- +- CFLAGS="$ac_cflags_save" +- fi +- ]) +-]) +- +- +-dnl AC_VALIDIFY_CXXFLAGS checks for forbidden flags the user may have given +-AC_DEFUN([AC_VALIDIFY_CXXFLAGS], +-[dnl +-if test "x$kde_use_qt_emb" != "xyes"; then +- AC_REMOVE_FORBIDDEN(CXX, [-fno-rtti -rpath]) +- AC_REMOVE_FORBIDDEN(CXXFLAGS, [-fno-rtti -rpath]) +-else +- AC_REMOVE_FORBIDDEN(CXX, [-rpath]) +- AC_REMOVE_FORBIDDEN(CXXFLAGS, [-rpath]) +-fi +-]) +- +-AC_DEFUN([AC_CHECK_COMPILERS], +-[ +- AC_ARG_ENABLE(debug, +- AC_HELP_STRING([--enable-debug=ARG],[enables debug symbols (yes|no|full) [default=no]]), +- [ +- case $enableval in +- yes) +- kde_use_debug_code="yes" +- kde_use_debug_define=no +- ;; +- full) +- kde_use_debug_code="full" +- kde_use_debug_define=no +- ;; +- *) +- kde_use_debug_code="no" +- kde_use_debug_define=yes +- ;; +- esac +- ], +- [kde_use_debug_code="no" +- kde_use_debug_define=no +- ]) +- +- dnl Just for configure --help +- AC_ARG_ENABLE(dummyoption, +- AC_HELP_STRING([--disable-debug], +- [disables debug output and debug symbols [default=no]]), +- [],[]) +- +- AC_ARG_ENABLE(strict, +- AC_HELP_STRING([--enable-strict], +- [compiles with strict compiler options (may not work!)]), +- [ +- if test $enableval = "no"; then +- kde_use_strict_options="no" +- else +- kde_use_strict_options="yes" +- fi +- ], [kde_use_strict_options="no"]) +- +- AC_ARG_ENABLE(warnings,AC_HELP_STRING([--disable-warnings],[disables compilation with -Wall and similar]), +- [ +- if test $enableval = "no"; then +- kde_use_warnings="no" +- else +- kde_use_warnings="yes" +- fi +- ], [kde_use_warnings="yes"]) +- +- dnl enable warnings for debug build +- if test "$kde_use_debug_code" != "no"; then +- kde_use_warnings=yes +- fi +- +- AC_ARG_ENABLE(profile,AC_HELP_STRING([--enable-profile],[creates profiling infos [default=no]]), +- [kde_use_profiling=$enableval], +- [kde_use_profiling="no"] +- ) +- +- dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS +- CFLAGS=" $CFLAGS" +- +- AC_PROG_CC +- +- AC_PROG_CPP +- +- if test "$GCC" = "yes"; then +- if test "$kde_use_debug_code" != "no"; then +- if test $kde_use_debug_code = "full"; then +- CFLAGS="-g3 -fno-inline $CFLAGS" +- else +- CFLAGS="-g -O2 -fno-schedule-insns -fno-inline $CFLAGS" +- fi +- else +- CFLAGS="-O2 $CFLAGS" +- fi +- fi +- +- if test "$kde_use_debug_define" = "yes"; then +- CFLAGS="-DNDEBUG $CFLAGS" +- fi +- +- +- case "$host" in +- *-*-sysv4.2uw*) CFLAGS="-D_UNIXWARE $CFLAGS";; +- *-*-sysv5uw7*) CFLAGS="-D_UNIXWARE7 $CFLAGS";; +- esac +- +- if test -z "$LDFLAGS" && test "$kde_use_debug_code" = "no" && test "$GCC" = "yes"; then +- LDFLAGS="" +- fi +- +- CXXFLAGS=" $CXXFLAGS" +- +- AC_PROG_CXX +- +- KDE_CHECK_FOR_BAD_COMPILER +- +- if test "$GXX" = "yes" || test "$CXX" = "KCC"; then +- if test "$kde_use_debug_code" != "no"; then +- if test "$CXX" = "KCC"; then +- CXXFLAGS="+K0 -Wall -pedantic -W -Wpointer-arith -Wwrite-strings $CXXFLAGS" +- else +- if test "$kde_use_debug_code" = "full"; then +- CXXFLAGS="-g3 -fno-inline $CXXFLAGS" +- else +- CXXFLAGS="-g -O2 -fno-schedule-insns -fno-inline $CXXFLAGS" +- fi +- fi +- KDE_CHECK_COMPILER_FLAG(fno-builtin,[CXXFLAGS="-fno-builtin $CXXFLAGS"]) +- +- dnl convenience compiler flags +- KDE_CHECK_COMPILER_FLAG(Woverloaded-virtual, [WOVERLOADED_VIRTUAL="-Woverloaded-virtual"], [WOVERLOADED_VRITUAL=""]) +- AC_SUBST(WOVERLOADED_VIRTUAL) +- else +- if test "$CXX" = "KCC"; then +- CXXFLAGS="+K3 $CXXFLAGS" +- else +- CXXFLAGS="-O2 $CXXFLAGS" +- fi +- fi +- fi +- +- if test "$kde_use_debug_define" = "yes"; then +- CXXFLAGS="-DNDEBUG -DNO_DEBUG $CXXFLAGS" +- fi +- +- if test "$kde_use_profiling" = "yes"; then +- KDE_CHECK_COMPILER_FLAG(pg, +- [ +- CFLAGS="-pg $CFLAGS" +- CXXFLAGS="-pg $CXXFLAGS" +- ]) +- fi +- +- if test "$kde_use_warnings" = "yes"; then +- if test "$GCC" = "yes"; then +- CXXFLAGS="-Wall -W -Wpointer-arith $CXXFLAGS" +- case $host in +- *-*-linux-gnu) +- CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS" +- CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wchar-subscripts $CXXFLAGS" +- KDE_CHECK_COMPILER_FLAG(Wmissing-format-attribute, [CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"]) +- KDE_CHECK_C_COMPILER_FLAG(Wmissing-format-attribute, [CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"]) +- ;; +- esac +- KDE_CHECK_COMPILER_FLAG(Wundef,[CXXFLAGS="-Wundef $CXXFLAGS"]) +- KDE_CHECK_COMPILER_FLAG(Wno-long-long,[CXXFLAGS="-Wno-long-long $CXXFLAGS"]) +- dnl ### FIXME: revert for KDE 4 +- KDE_CHECK_COMPILER_FLAG(Wno-non-virtual-dtor,[CXXFLAGS="$CXXFLAGS -Wno-non-virtual-dtor"]) +- fi +- fi +- +- if test "$GXX" = "yes" && test "$kde_use_strict_options" = "yes"; then +- CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS" +- fi +- +- AC_ARG_ENABLE(pch, +- AC_HELP_STRING([--enable-pch], +- [enables precompiled header support (currently only KCC or gcc >=3.4+unsermake) [default=no]]), +- [ kde_use_pch=$enableval ],[ kde_use_pch=no ]) +- +- HAVE_GCC_VISIBILITY=0 +- AC_SUBST([HAVE_GCC_VISIBILITY]) +- +- if test "$GXX" = "yes"; then +- gcc_no_reorder_blocks=NO +- KDE_CHECK_COMPILER_FLAG(fno-reorder-blocks,[gcc_no_reorder_blocks=YES]) +- if test $kde_use_debug_code != "no" && \ +- test $kde_use_debug_code != "full" && \ +- test "YES" = "$gcc_no_reorder_blocks" ; then +- CXXFLAGS="$CXXFLAGS -fno-reorder-blocks" +- CFLAGS="$CFLAGS -fno-reorder-blocks" +- fi +- KDE_CHECK_COMPILER_FLAG(fno-exceptions,[CXXFLAGS="$CXXFLAGS -fno-exceptions"]) +- KDE_CHECK_COMPILER_FLAG(fno-check-new, [CXXFLAGS="$CXXFLAGS -fno-check-new"]) +- KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"]) +- KDE_CHECK_COMPILER_FLAG(fexceptions, [USE_EXCEPTIONS="-fexceptions"], USE_EXCEPTIONS= ) +- ENABLE_PERMISSIVE_FLAG="-fpermissive" +- +- if test "$kde_use_pch" = "yes"; then +- AC_MSG_CHECKING(whether gcc supports precompiling c header files) +- echo >conftest.h +- if $CC -x c-header conftest.h >/dev/null 2>/dev/null; then +- kde_gcc_supports_pch=yes +- AC_MSG_RESULT(yes) +- else +- kde_gcc_supports_pch=no +- AC_MSG_RESULT(no) +- fi +- if test "$kde_gcc_supports_pch" = "yes"; then +- AC_MSG_CHECKING(whether gcc supports precompiling c++ header files) +- if $CXX -x c++-header conftest.h >/dev/null 2>/dev/null; then +- kde_gcc_supports_pch=yes +- AC_MSG_RESULT(yes) +- else +- kde_gcc_supports_pch=no +- AC_MSG_RESULT(no) +- fi +- fi +- rm -f conftest.h conftest.h.gch +- fi +- +- KDE_CHECK_FOR_OPT_NOINLINE_MATCH +- if test "x$kde_cv_opt_noinline_match" = "xno" ; then +- CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`" +- fi +- fi +- AM_CONDITIONAL(unsermake_enable_pch, test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes") +- if test "$CXX" = "KCC"; then +- dnl unfortunately we currently cannot disable exception support in KCC +- dnl because doing so is binary incompatible and Qt by default links with exceptions :-( +- dnl KDE_CHECK_COMPILER_FLAG(-no_exceptions,[CXXFLAGS="$CXXFLAGS --no_exceptions"]) +- dnl KDE_CHECK_COMPILER_FLAG(-exceptions, [USE_EXCEPTIONS="--exceptions"], USE_EXCEPTIONS= ) +- +- if test "$kde_use_pch" = "yes"; then +- dnl TODO: support --pch-dir! +- KDE_CHECK_COMPILER_FLAG(-pch,[CXXFLAGS="$CXXFLAGS --pch"]) +- dnl the below works (but the dir must exist), but it's +- dnl useless for a whole package. +- dnl The are precompiled headers for each source file, so when compiling +- dnl from scratch, it doesn't make a difference, and they take up +- dnl around ~5Mb _per_ sourcefile. +- dnl KDE_CHECK_COMPILER_FLAG(-pch_dir /tmp, +- dnl [CXXFLAGS="$CXXFLAGS --pch_dir `pwd`/pcheaders"]) +- fi +- dnl this flag controls inlining. by default KCC inlines in optimisation mode +- dnl all implementations that are defined inside the class {} declaration. +- dnl because of templates-compatibility with broken gcc compilers, this +- dnl can cause excessive inlining. This flag limits it to a sane level +- KDE_CHECK_COMPILER_FLAG(-inline_keyword_space_time=6,[CXXFLAGS="$CXXFLAGS --inline_keyword_space_time=6"]) +- KDE_CHECK_COMPILER_FLAG(-inline_auto_space_time=2,[CXXFLAGS="$CXXFLAGS --inline_auto_space_time=2"]) +- KDE_CHECK_COMPILER_FLAG(-inline_implicit_space_time=2.0,[CXXFLAGS="$CXXFLAGS --inline_implicit_space_time=2.0"]) +- KDE_CHECK_COMPILER_FLAG(-inline_generated_space_time=2.0,[CXXFLAGS="$CXXFLAGS --inline_generated_space_time=2.0"]) +- dnl Some source files are shared between multiple executables +- dnl (or libraries) and some of those need template instantiations. +- dnl In that case KCC needs to compile those sources with +- dnl --one_instantiation_per_object. To make it easy for us we compile +- dnl _all_ objects with that flag (--one_per is a shorthand). +- KDE_CHECK_COMPILER_FLAG(-one_per, [CXXFLAGS="$CXXFLAGS --one_per"]) +- fi +- AC_SUBST(USE_EXCEPTIONS) +- dnl obsolete macro - provided to keep things going +- USE_RTTI= +- AC_SUBST(USE_RTTI) +- +- case "$host" in +- *-*-irix*) test "$GXX" = yes && CXXFLAGS="-D_LANGUAGE_C_PLUS_PLUS -D__LANGUAGE_C_PLUS_PLUS $CXXFLAGS" ;; +- *-*-sysv4.2uw*) CXXFLAGS="-D_UNIXWARE $CXXFLAGS";; +- *-*-sysv5uw7*) CXXFLAGS="-D_UNIXWARE7 $CXXFLAGS";; +- *-*-solaris*) +- if test "$GXX" = yes; then +- libstdcpp=`$CXX -print-file-name=libstdc++.so` +- if test ! -f $libstdcpp; then +- AC_MSG_ERROR([You've compiled gcc without --enable-shared. This doesn't work with KDE. Please recompile gcc with --enable-shared to receive a libstdc++.so]) +- fi +- fi +- ;; +- esac +- +- AC_VALIDIFY_CXXFLAGS +- +- AC_PROG_CXXCPP +- +- if test "$GCC" = yes; then +- NOOPT_CFLAGS=-O0 +- fi +- KDE_CHECK_COMPILER_FLAG(O0,[NOOPT_CXXFLAGS=-O0]) +- +- AC_ARG_ENABLE(coverage, +- AC_HELP_STRING([--enable-coverage],[use gcc coverage testing]), [ +- if test "$am_cv_CC_dependencies_compiler_type" = "gcc3"; then +- ac_coverage_compiler="-fprofile-arcs -ftest-coverage" +- ac_coverage_linker="-lgcc" +- elif test "$am_cv_CC_dependencies_compiler_type" = "gcc"; then +- ac_coverage_compiler="-fprofile-arcs -ftest-coverage" +- ac_coverage_linker="" +- else +- AC_MSG_ERROR([coverage with your compiler is not supported]) +- fi +- CFLAGS="$CFLAGS $ac_coverage_compiler" +- CXXFLAGS="$CXXFLAGS $ac_coverage_compiler" +- LDFLAGS="$LDFLAGS $ac_coverage_linker" +- ]) +- +- AC_SUBST(NOOPT_CXXFLAGS) +- AC_SUBST(NOOPT_CFLAGS) +- AC_SUBST(ENABLE_PERMISSIVE_FLAG) +- +- KDE_CHECK_NEW_LDFLAGS +- KDE_CHECK_FINAL +- KDE_CHECK_CLOSURE +- KDE_CHECK_NMCHECK +- +- ifdef([AM_DEPENDENCIES], AC_REQUIRE([KDE_ADD_DEPENDENCIES]), []) +-]) +- +-AC_DEFUN([KDE_CHECK_VISIBILITY_GCC_BUG], +- [ +- AC_CACHE_CHECK([for gcc -fvisibility-inlines-hidden bug], kde_cv_val_gcc_visibility_bug, +- [ +- AC_LANG_SAVE +- AC_LANG_CPLUSPLUS +- +- safe_CXXFLAGS=$CXXFLAGS +- safe_LDFLAGS=$LDFLAGS +- CXXFLAGS="$CXXFLAGS -fPIC -fvisibility-inlines-hidden -O0" +- LDFLAGS="$LDFLAGS -shared -fPIC" +- +- AC_TRY_LINK( +- [ +- /* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19664 */ +- #include +- int some_function( void ) __attribute__ ((visibility("default"))); +- int some_function( void ) +- { +- std::string s("blafasel"); +- return 0; +- } +- ], [/* elvis is alive */], +- kde_cv_val_gcc_visibility_bug=no, kde_cv_val_gcc_visibility_bug=yes) +- +- CXXFLAGS=$safe_CXXFLAGS +- LDFLAGS=$safe_LDFLAGS +- AC_LANG_RESTORE +- ] +- ) +- +- if test x$kde_cv_val_gcc_visibility_bug = xno; then +- CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden" +- fi +- ] +-) +- +-AC_DEFUN([KDE_ENABLE_HIDDEN_VISIBILITY], +-[ +- AC_BEFORE([AC_PATH_QT_1_3], [KDE_ENABLE_HIDDEN_VISIBILITY]) +- +- AC_MSG_CHECKING([grepping for visibility push/pop in headers]) +- +- if test "x$GXX" = "xyes"; then +- AC_LANG_SAVE +- AC_LANG_CPLUSPLUS +- AC_EGREP_CPP( +- [GCC visibility push], +- [ #include +- ], +- [ +- AC_MSG_RESULT(yes) +- kde_stdc_visibility_patched=yes ], +- [ +- AC_MSG_RESULT(no) +- AC_MSG_WARN([Your libstdc++ doesn't appear to be patched for +- visibility support. Disabling -fvisibility=hidden]) +- +- kde_stdc_visibility_patched=no ]) +- +- AC_LANG_RESTORE +- +- kde_have_gcc_visibility=no +- KDE_CHECK_COMPILER_FLAG(fvisibility=hidden, +- [ +- kde_have_gcc_visibility=yes +- dnl the whole toolchain is just a mess, gcc is just too buggy +- dnl to handle STL with visibility enabled. Lets reconsider +- dnl when gcc 4.2 is out or when things get fixed in the compiler. +- dnl Contact mueller@kde.org for details. +- AC_ARG_ENABLE(gcc-hidden-visibility, +- AC_HELP_STRING([--enable-gcc-hidden-visibility],[toolchain hidden visibility [default=no]]), +- [kde_have_gcc_visibility=$enableval], +- [kde_have_gcc_visibility=no]) +- +- AC_CACHE_CHECK([if Qt is patched for -fvisibility], kde_cv_val_qt_gcc_visibility_patched, +- [ +- AC_LANG_SAVE +- AC_LANG_CPLUSPLUS +- +- safe_CXXFLAGS=$CXXFLAGS +- CXXFLAGS="$CXXFLAGS $all_includes" +- +- AC_TRY_COMPILE( +- [ +-#include +-#if Q_EXPORT - 0 != 0 +-/* if this compiles, then Q_EXPORT is undefined */ +-/* if Q_EXPORT is nonempty, this will break compilation */ +-#endif +- ], [/* elvis is alive */], +- kde_cv_val_qt_gcc_visibility_patched=no, kde_cv_val_qt_gcc_visibility_patched=yes) +- +- CXXFLAGS=$safe_CXXFLAGS +- AC_LANG_RESTORE +- ] +- ) +- +- if test x$kde_have_gcc_visibility = "xyes" && test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then +- CXXFLAGS="$CXXFLAGS -fvisibility=hidden" +- KDE_CHECK_VISIBILITY_GCC_BUG +- HAVE_GCC_VISIBILITY=1 +- AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported]) +- fi +- ]) +- fi +-]) +- +-AC_DEFUN([KDE_ADD_DEPENDENCIES], +-[ +- [A]M_DEPENDENCIES(CC) +- [A]M_DEPENDENCIES(CXX) +-]) +- +-dnl just a wrapper to clean up configure.in +-AC_DEFUN([KDE_PROG_LIBTOOL], +-[ +-AC_REQUIRE([AC_CHECK_COMPILERS]) +-AC_REQUIRE([AC_ENABLE_SHARED]) +-AC_REQUIRE([AC_ENABLE_STATIC]) +- +-AC_REQUIRE([AC_LIBTOOL_DLOPEN]) +-AC_REQUIRE([KDE_CHECK_LIB64]) +- +-AC_OBJEXT +-AC_EXEEXT +- +-AM_PROG_LIBTOOL +-AC_LIBTOOL_CXX +- +-LIBTOOL_SHELL="/bin/sh ./libtool" +-# LIBTOOL="$LIBTOOL --silent" +-KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)" +-AC_SUBST(KDE_PLUGIN) +- +-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs. +-KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)" +-AC_SUBST(KDE_CHECK_PLUGIN) +- +-# we patch configure quite some so we better keep that consistent for incremental runs +-AC_SUBST(AUTOCONF,'$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch configure') +-]) +- +-AC_DEFUN([KDE_CHECK_LIB64], +-[ +- AC_ARG_ENABLE(libsuffix, +- AC_HELP_STRING([--enable-libsuffix], +- [/lib directory suffix (64,32,none,auto[=default])]), +- kdelibsuff=$enableval, kdelibsuff="auto") +- +- if test "$kdelibsuff" = "auto"; then +- +-cat > conftest.c << EOF +-#include +-int main() { +- return 0; +-} +-EOF +- kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{ +- s,.*/lib\([[^\/]]*\)/.*,\1, +- p +-}'` +- rm -rf conftest.* +- fi +- +- if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then +- kdelibsuff= +- fi +- if test -z "$kdelibsuff"; then +- AC_MSG_RESULT([not using lib directory suffix]) +- AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories) +- else +- if test "$libdir" = '${exec_prefix}/lib'; then +- libdir="$libdir${kdelibsuff}" +- AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms +- fi +- AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${kdelibsuff}"], Suffix for lib directories) +- AC_MSG_RESULT([using lib directory suffix $kdelibsuff]) +- fi +-]) +- +-AC_DEFUN([KDE_CHECK_TYPES], +-[ AC_CHECK_SIZEOF(int, 4)dnl +- AC_CHECK_SIZEOF(short)dnl +- AC_CHECK_SIZEOF(long, 4)dnl +- AC_CHECK_SIZEOF(char *, 4)dnl +-])dnl +- +-dnl Not used - kept for compat only? +-AC_DEFUN([KDE_DO_IT_ALL], +-[ +-AC_CANONICAL_SYSTEM +-AC_ARG_PROGRAM +-AM_INIT_AUTOMAKE($1, $2) +-AM_DISABLE_LIBRARIES +-AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) +-AC_CHECK_COMPILERS +-KDE_PROG_LIBTOOL +-AM_KDE_WITH_NLS +-AC_PATH_KDE +-]) +- +-AC_DEFUN([AC_CHECK_RPATH], +-[ +-AC_MSG_CHECKING(for rpath) +-AC_ARG_ENABLE(rpath, +- AC_HELP_STRING([--disable-rpath],[do not use the rpath feature of ld]), +- USE_RPATH=$enableval, USE_RPATH=yes) +- +-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 +- dnl $x_libraries is set to /usr/lib in case +- 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 +-AC_SUBST(KDE_EXTRA_RPATH) +-AC_SUBST(KDE_RPATH) +-AC_SUBST(X_RPATH) +-AC_MSG_RESULT($USE_RPATH) +-]) +- +-dnl Check for the type of the third argument of getsockname +-AC_DEFUN([AC_CHECK_SOCKLEN_T], +-[ +- AC_MSG_CHECKING(for socklen_t) +- AC_CACHE_VAL(kde_cv_socklen_t, +- [ +- AC_LANG_PUSH(C++) +- kde_cv_socklen_t=no +- AC_TRY_COMPILE([ +- #include +- #include +- ], +- [ +- socklen_t len; +- getpeername(0,0,&len); +- ], +- [ +- kde_cv_socklen_t=yes +- kde_cv_socklen_t_equiv=socklen_t +- ]) +- AC_LANG_POP(C++) +- ]) +- AC_MSG_RESULT($kde_cv_socklen_t) +- if test $kde_cv_socklen_t = no; then +- AC_MSG_CHECKING([for socklen_t equivalent for socket functions]) +- AC_CACHE_VAL(kde_cv_socklen_t_equiv, +- [ +- kde_cv_socklen_t_equiv=int +- AC_LANG_PUSH(C++) +- for t in int size_t unsigned long "unsigned long"; do +- AC_TRY_COMPILE([ +- #include +- #include +- ], +- [ +- $t len; +- getpeername(0,0,&len); +- ], +- [ +- kde_cv_socklen_t_equiv="$t" +- break +- ]) +- done +- AC_LANG_POP(C++) +- ]) +- AC_MSG_RESULT($kde_cv_socklen_t_equiv) +- fi +- AC_DEFINE_UNQUOTED(kde_socklen_t, $kde_cv_socklen_t_equiv, +- [type to use in place of socklen_t if not defined]) +- AC_DEFINE_UNQUOTED(ksize_t, $kde_cv_socklen_t_equiv, +- [type to use in place of socklen_t if not defined (deprecated, use kde_socklen_t)]) +-]) +- +-dnl This is a merge of some macros out of the gettext aclocal.m4 +-dnl since we don't need anything, I took the things we need +-dnl the copyright for them is: +-dnl > +-dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +-dnl This Makefile.in is free software; the Free Software Foundation +-dnl gives unlimited permission to copy and/or distribute it, +-dnl with or without modifications, as long as this notice is preserved. +- +-dnl This program is distributed in the hope that it will be useful, +-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without +-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A +-dnl PARTICULAR PURPOSE. +-dnl > +-dnl for this file it is relicensed under LGPL +- +-AC_DEFUN([AM_KDE_WITH_NLS], +- [ +- dnl If we use NLS figure out what method +- +- AM_PATH_PROG_WITH_TEST_KDE(MSGFMT, msgfmt, +- [test -n "`$ac_dir/$ac_word --version 2>&1 | grep 'GNU gettext'`"], msgfmt) +- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) +- +- if test -z "`$GMSGFMT --version 2>&1 | grep 'GNU gettext'`"; then +- AC_MSG_RESULT([found msgfmt program is not GNU msgfmt; ignore it]) +- GMSGFMT=":" +- fi +- MSGFMT=$GMSGFMT +- AC_SUBST(GMSGFMT) +- AC_SUBST(MSGFMT) +- +- AM_PATH_PROG_WITH_TEST_KDE(XGETTEXT, xgettext, +- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) +- +- dnl Test whether we really found GNU xgettext. +- if test "$XGETTEXT" != ":"; then +- dnl If it is no GNU xgettext we define it as : so that the +- dnl Makefiles still can work. +- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then +- : ; +- else +- AC_MSG_RESULT( +- [found xgettext programs is not GNU xgettext; ignore it]) +- XGETTEXT=":" +- fi +- fi +- AC_SUBST(XGETTEXT) +- +- ]) +- +-# Search path for a program which passes the given test. +-# Ulrich Drepper , 1996. +- +-# serial 1 +-# Stephan Kulow: I appended a _KDE against name conflicts +- +-dnl AM_PATH_PROG_WITH_TEST_KDE(VARIABLE, PROG-TO-CHECK-FOR, +-dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) +-AC_DEFUN([AM_PATH_PROG_WITH_TEST_KDE], +-[# Extract the first word of "$2", so it can be a program name with args. +-set dummy $2; ac_word=[$]2 +-AC_MSG_CHECKING([for $ac_word]) +-AC_CACHE_VAL(ac_cv_path_$1, +-[case "[$]$1" in +- /*) +- ac_cv_path_$1="[$]$1" # Let the user override the test with a path. +- ;; +- *) +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" +- for ac_dir in ifelse([$5], , $PATH, [$5]); do +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$ac_word; then +- if [$3]; then +- ac_cv_path_$1="$ac_dir/$ac_word" +- break +- fi +- fi +- done +- IFS="$ac_save_ifs" +-dnl If no 4th arg is given, leave the cache variable unset, +-dnl so AC_PATH_PROGS will keep looking. +-ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" +-])dnl +- ;; +-esac])dnl +-$1="$ac_cv_path_$1" +-if test -n "[$]$1"; then +- AC_MSG_RESULT([$]$1) +-else +- AC_MSG_RESULT(no) +-fi +-AC_SUBST($1)dnl +-]) +- +- +-# Check whether LC_MESSAGES is available in . +-# Ulrich Drepper , 1995. +- +-# serial 1 +- +-AC_DEFUN([AM_LC_MESSAGES], +- [if test $ac_cv_header_locale_h = yes; then +- AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, +- [AC_TRY_LINK([#include ], [return LC_MESSAGES], +- am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) +- if test $am_cv_val_LC_MESSAGES = yes; then +- AC_DEFINE(HAVE_LC_MESSAGES, 1, [Define if your locale.h file contains LC_MESSAGES]) +- fi +- fi]) +- +-dnl From Jim Meyering. +-dnl FIXME: migrate into libit. +- +-AC_DEFUN([AM_FUNC_OBSTACK], +-[AC_CACHE_CHECK([for obstacks], am_cv_func_obstack, +- [AC_TRY_LINK([#include "obstack.h"], +- [struct obstack *mem;obstack_free(mem,(char *) 0)], +- am_cv_func_obstack=yes, +- am_cv_func_obstack=no)]) +- if test $am_cv_func_obstack = yes; then +- AC_DEFINE(HAVE_OBSTACK) +- else +- LIBOBJS="$LIBOBJS obstack.o" +- fi +-]) +- +-dnl From Jim Meyering. Use this if you use the GNU error.[ch]. +-dnl FIXME: Migrate into libit +- +-AC_DEFUN([AM_FUNC_ERROR_AT_LINE], +-[AC_CACHE_CHECK([for error_at_line], am_cv_lib_error_at_line, +- [AC_TRY_LINK([],[error_at_line(0, 0, "", 0, "");], +- am_cv_lib_error_at_line=yes, +- am_cv_lib_error_at_line=no)]) +- if test $am_cv_lib_error_at_line = no; then +- LIBOBJS="$LIBOBJS error.o" +- fi +- AC_SUBST(LIBOBJS)dnl +-]) +- +-# Macro to add for using GNU gettext. +-# Ulrich Drepper , 1995. +- +-# serial 1 +-# Stephan Kulow: I put a KDE in it to avoid name conflicts +- +-AC_DEFUN([AM_KDE_GNU_GETTEXT], +- [AC_REQUIRE([AC_PROG_MAKE_SET])dnl +- AC_REQUIRE([AC_PROG_RANLIB])dnl +- AC_REQUIRE([AC_HEADER_STDC])dnl +- AC_REQUIRE([AC_TYPE_OFF_T])dnl +- AC_REQUIRE([AC_TYPE_SIZE_T])dnl +- AC_REQUIRE([AC_FUNC_ALLOCA])dnl +- AC_REQUIRE([AC_FUNC_MMAP])dnl +- AC_REQUIRE([AM_KDE_WITH_NLS])dnl +- AC_CHECK_HEADERS([limits.h locale.h nl_types.h string.h values.h alloca.h]) +- AC_CHECK_FUNCS([getcwd munmap putenv setlocale strchr strcasecmp \ +-__argz_count __argz_stringify __argz_next]) +- +- AC_MSG_CHECKING(for stpcpy) +- AC_CACHE_VAL(kde_cv_func_stpcpy, +- [ +- kde_safe_cxxflags=$CXXFLAGS +- CXXFLAGS="-Werror" +- AC_LANG_SAVE +- AC_LANG_CPLUSPLUS +- AC_TRY_COMPILE([ +- #include +- ], +- [ +- char buffer[200]; +- stpcpy(buffer, buffer); +- ], +- kde_cv_func_stpcpy=yes, +- kde_cv_func_stpcpy=no) +- AC_LANG_RESTORE +- CXXFLAGS=$kde_safe_cxxflags +- ]) +- AC_MSG_RESULT($kde_cv_func_stpcpy) +- if eval "test \"`echo $kde_cv_func_stpcpy`\" = yes"; then +- AC_DEFINE(HAVE_STPCPY, 1, [Define if you have stpcpy]) +- fi +- +- AM_LC_MESSAGES +- +- if test "x$CATOBJEXT" != "x"; then +- if test "x$ALL_LINGUAS" = "x"; then +- LINGUAS= +- else +- AC_MSG_CHECKING(for catalogs to be installed) +- NEW_LINGUAS= +- for lang in ${LINGUAS=$ALL_LINGUAS}; do +- case "$ALL_LINGUAS" in +- *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;; +- esac +- done +- LINGUAS=$NEW_LINGUAS +- AC_MSG_RESULT($LINGUAS) +- fi +- +- dnl Construct list of names of catalog files to be constructed. +- if test -n "$LINGUAS"; then +- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done +- fi +- fi +- +- ]) +- +-AC_DEFUN([AC_HAVE_XPM], +- [AC_REQUIRE_CPP()dnl +- AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) +- +- test -z "$XPM_LDFLAGS" && XPM_LDFLAGS= +- test -z "$XPM_INCLUDE" && XPM_INCLUDE= +- +- AC_ARG_WITH(xpm,AC_HELP_STRING([--without-xpm],[disable color pixmap XPM tests]), +- xpm_test=$withval, xpm_test="yes") +- if test "x$xpm_test" = xno; then +- ac_cv_have_xpm=no +- else +- AC_MSG_CHECKING(for XPM) +- AC_CACHE_VAL(ac_cv_have_xpm, +- [ +- ac_save_ldflags="$LDFLAGS" +- ac_save_cflags="$CFLAGS" +- if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then +- LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS $LDFLAGS $XPM_LDFLAGS $all_libraries -lXpm -lX11 -lXext $LIBZ $LIBSOCKET" +- else +- LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS $LDFLAGS $XPM_LDFLAGS $all_libraries -lXpm $LIBZ $LIBSOCKET" +- fi +- CFLAGS="$CFLAGS $X_INCLUDES $USER_INCLUDES" +- test -n "$XPM_INCLUDE" && CFLAGS="-I$XPM_INCLUDE $CFLAGS" +- AC_TRY_LINK([#include ],[], +- ac_cv_have_xpm="yes",ac_cv_have_xpm="no") +- LDFLAGS="$ac_save_ldflags" +- CFLAGS="$ac_save_cflags" +- ])dnl +- +- if test "$ac_cv_have_xpm" = no; then +- AC_MSG_RESULT(no) +- XPM_LDFLAGS="" +- XPMINC="" +- $2 +- else +- AC_DEFINE(HAVE_XPM, 1, [Define if you have XPM support]) +- if test "$XPM_LDFLAGS" = ""; then +- XPMLIB='-lXpm $(LIB_X11)' +- else +- XPMLIB="-L$XPM_LDFLAGS -lXpm "'$(LIB_X11)' +- fi +- if test "$XPM_INCLUDE" = ""; then +- XPMINC="" +- else +- XPMINC="-I$XPM_INCLUDE" +- fi +- AC_MSG_RESULT(yes) +- $1 +- fi +- fi +- AC_SUBST(XPMINC) +- AC_SUBST(XPMLIB) +-]) +- +-AC_DEFUN([AC_HAVE_DPMS], +- [AC_REQUIRE_CPP()dnl +- AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) +- +- test -z "$DPMS_LDFLAGS" && DPMS_LDFLAGS= +- test -z "$DPMS_INCLUDE" && DPMS_INCLUDE= +- DPMS_LIB= +- +- AC_ARG_WITH(dpms,AC_HELP_STRING([--without-dpms],[disable DPMS power saving]), +- dpms_test=$withval, dpms_test="yes") +- if test "x$dpms_test" = xno; then +- ac_cv_have_dpms=no +- else +- AC_MSG_CHECKING(for DPMS) +- dnl Note: ac_cv_have_dpms can be no, yes, or -lXdpms. +- dnl 'yes' means DPMS_LIB="", '-lXdpms' means DPMS_LIB="-lXdpms". +- AC_CACHE_VAL(ac_cv_have_dpms, +- [ +- if test "x$kde_use_qt_emb" = "xyes" || test "x$kde_use_qt_mac" = "xyes"; then +- AC_MSG_RESULT(no) +- ac_cv_have_dpms="no" +- else +- ac_save_ldflags="$LDFLAGS" +- ac_save_cflags="$CFLAGS" +- ac_save_libs="$LIBS" +- LDFLAGS="$LDFLAGS $DPMS_LDFLAGS $all_libraries" +- LIBS="-lX11 -lXext $LIBSOCKET" +- CFLAGS="$CFLAGS $X_INCLUDES" +- test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS" +- AC_TRY_LINK([ +- #include +- #include +- #include +- #include +- int foo_test_dpms() +- { return DPMSSetTimeouts( 0, 0, 0, 0 ); }],[], +- ac_cv_have_dpms="yes", [ +- LIBS="-lXdpms $LIBS" +- AC_TRY_LINK([ +- #include +- #include +- #include +- #include +- int foo_test_dpms() +- { return DPMSSetTimeouts( 0, 0, 0, 0 ); }],[], +- [ +- ac_cv_have_dpms="-lXdpms" +- ],ac_cv_have_dpms="no") +- ]) +- LDFLAGS="$ac_save_ldflags" +- CFLAGS="$ac_save_cflags" +- LIBS="$ac_save_libs" +- fi +- ])dnl +- +- if test "$ac_cv_have_dpms" = no; then +- AC_MSG_RESULT(no) +- DPMS_LDFLAGS="" +- DPMSINC="" +- $2 +- else +- AC_DEFINE(HAVE_DPMS, 1, [Define if you have DPMS support]) +- if test "$ac_cv_have_dpms" = "-lXdpms"; then +- DPMS_LIB="-lXdpms" +- fi +- if test "$DPMS_LDFLAGS" = ""; then +- DPMSLIB="$DPMS_LIB "'$(LIB_X11)' +- else +- DPMSLIB="$DPMS_LDFLAGS $DPMS_LIB "'$(LIB_X11)' +- fi +- if test "$DPMS_INCLUDE" = ""; then +- DPMSINC="" +- else +- DPMSINC="-I$DPMS_INCLUDE" +- fi +- AC_MSG_RESULT(yes) +- $1 +- fi +- fi +- ac_save_cflags="$CFLAGS" +- CFLAGS="$CFLAGS $X_INCLUDES" +- test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS" +- AH_TEMPLATE(HAVE_DPMSCAPABLE_PROTO, +- [Define if you have the DPMSCapable prototype in ]) +- AC_CHECK_DECL(DPMSCapable, +- AC_DEFINE(HAVE_DPMSCAPABLE_PROTO),, +- [#include +- #include ]) +- AH_TEMPLATE(HAVE_DPMSINFO_PROTO, +- [Define if you have the DPMSInfo prototype in ]) +- AC_CHECK_DECL(DPMSInfo, +- AC_DEFINE(HAVE_DPMSINFO_PROTO),, +- [#include +- #include ]) +- CFLAGS="$ac_save_cflags" +- AC_SUBST(DPMSINC) +- AC_SUBST(DPMSLIB) +-]) +- +-AC_DEFUN([AC_HAVE_GL], +- [AC_REQUIRE_CPP()dnl +- AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) +- +- test -z "$GL_LDFLAGS" && GL_LDFLAGS= +- test -z "$GL_INCLUDE" && GL_INCLUDE= +- +- AC_ARG_WITH(gl,AC_HELP_STRING([--without-gl],[disable 3D GL modes]), +- gl_test=$withval, gl_test="yes") +- if test "x$kde_use_qt_emb" = "xyes"; then +- # GL and Qt Embedded is a no-go for now. +- ac_cv_have_gl=no +- elif test "x$gl_test" = xno; then +- ac_cv_have_gl=no +- else +- AC_MSG_CHECKING(for GL) +- AC_CACHE_VAL(ac_cv_have_gl, +- [ +- AC_LANG_SAVE +- AC_LANG_CPLUSPLUS +- ac_save_ldflags=$LDFLAGS +- ac_save_cxxflags=$CXXFLAGS +- ac_save_libs=$LIBS +- LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries" +- LIBS="$LIBS -lGL -lGLU" +- test "x$kde_use_qt_mac" != xyes && test "x$kde_use_qt_emb" != xyes && LIBS="$LIBS -lX11" +- LIBS="$LIBS $LIB_XEXT -lm $LIBSOCKET" +- CXXFLAGS="$CFLAGS $X_INCLUDES" +- test -n "$GL_INCLUDE" && CFLAGS="-I$GL_INCLUDE $CFLAGS" +- AC_TRY_LINK([#include +-#include +-], [], +- ac_cv_have_gl="yes", ac_cv_have_gl="no") +- AC_LANG_RESTORE +- LDFLAGS=$ac_save_ldflags +- CXXFLAGS=$ac_save_cxxflags +- LIBS=$ac_save_libs +- ])dnl +- +- if test "$ac_cv_have_gl" = "no"; then +- AC_MSG_RESULT(no) +- GL_LDFLAGS="" +- GLINC="" +- $2 +- else +- AC_DEFINE(HAVE_GL, 1, [Defines if you have GL (Mesa, OpenGL, ...)]) +- if test "$GL_LDFLAGS" = ""; then +- GLLIB='-lGLU -lGL $(LIB_X11)' +- else +- GLLIB="$GL_LDFLAGS -lGLU -lGL "'$(LIB_X11)' +- fi +- if test "$GL_INCLUDE" = ""; then +- GLINC="" +- else +- GLINC="-I$GL_INCLUDE" +- fi +- AC_MSG_RESULT($ac_cv_have_gl) +- $1 +- fi +- fi +- AC_SUBST(GLINC) +- AC_SUBST(GLLIB) +-]) +- +- +- dnl shadow password and PAM magic - maintained by ossi@kde.org +- +-AC_DEFUN([KDE_PAM], [ +- AC_REQUIRE([KDE_CHECK_LIBDL]) +- +- want_pam= +- AC_ARG_WITH(pam, +- AC_HELP_STRING([--with-pam[=ARG]],[enable support for PAM: ARG=[yes|no|service name]]), +- [ if test "x$withval" = "xyes"; then +- want_pam=yes +- pam_service=kde +- elif test "x$withval" = "xno"; then +- want_pam=no +- else +- want_pam=yes +- pam_service=$withval +- fi +- ], [ pam_service=kde ]) +- +- use_pam= +- PAMLIBS= +- if test "x$want_pam" != xno; then +- AC_CHECK_LIB(pam, pam_start, [ +- AC_CHECK_HEADER(security/pam_appl.h, +- [ pam_header=security/pam_appl.h ], +- [ AC_CHECK_HEADER(pam/pam_appl.h, +- [ pam_header=pam/pam_appl.h ], +- [ +- AC_MSG_WARN([PAM detected, but no headers found! +-Make sure you have the necessary development packages installed.]) +- ] +- ) +- ] +- ) +- ], , $LIBDL) +- if test -z "$pam_header"; then +- if test "x$want_pam" = xyes; then +- AC_MSG_ERROR([--with-pam was specified, but cannot compile with PAM!]) +- fi +- else +- AC_DEFINE(HAVE_PAM, 1, [Defines if you have PAM (Pluggable Authentication Modules)]) +- PAMLIBS="$PAM_MISC_LIB -lpam $LIBDL" +- use_pam=yes +- +- dnl darwin claims to be something special +- if test "$pam_header" = "pam/pam_appl.h"; then +- AC_DEFINE(HAVE_PAM_PAM_APPL_H, 1, [Define if your PAM headers are in pam/ instead of security/]) +- fi +- +- dnl test whether struct pam_message is const (Linux) or not (Sun) +- AC_MSG_CHECKING(for const pam_message) +- AC_EGREP_HEADER([struct pam_message], $pam_header, +- [ AC_EGREP_HEADER([const struct pam_message], $pam_header, +- [AC_MSG_RESULT([const: Linux-type PAM])], +- [AC_MSG_RESULT([nonconst: Sun-type PAM]) +- AC_DEFINE(PAM_MESSAGE_NONCONST, 1, [Define if your PAM support takes non-const arguments (Solaris)])] +- )], +- [AC_MSG_RESULT([not found - assume const, Linux-type PAM])]) +- fi +- fi +- +- AC_SUBST(PAMLIBS) +-]) +- +-dnl DEF_PAM_SERVICE(arg name, full name, define name) +-AC_DEFUN([DEF_PAM_SERVICE], [ +- AC_ARG_WITH($1-pam, +- AC_HELP_STRING([--with-$1-pam=[val]],[override PAM service from --with-pam for $2]), +- [ if test "x$use_pam" = xyes; then +- $3_PAM_SERVICE=$withval +- else +- AC_MSG_ERROR([Cannot use use --with-$1-pam, as no PAM was detected. +-You may want to enforce it by using --with-pam.]) +- fi +- ], +- [ if test "x$use_pam" = xyes; then +- $3_PAM_SERVICE="$pam_service" +- fi +- ]) +- if test -n "$$3_PAM_SERVICE"; then +- AC_MSG_RESULT([The PAM service used by $2 will be $$3_PAM_SERVICE]) +- AC_DEFINE_UNQUOTED($3_PAM_SERVICE, "$$3_PAM_SERVICE", [The PAM service to be used by $2]) +- fi +- AC_SUBST($3_PAM_SERVICE) +-]) +- +-AC_DEFUN([KDE_SHADOWPASSWD], [ +- AC_REQUIRE([KDE_PAM]) +- +- AC_CHECK_LIB(shadow, getspent, +- [ LIBSHADOW="-lshadow" +- ac_use_shadow=yes +- ], +- [ dnl for UnixWare +- AC_CHECK_LIB(gen, getspent, +- [ LIBGEN="-lgen" +- ac_use_shadow=yes +- ], +- [ AC_CHECK_FUNC(getspent, +- [ ac_use_shadow=yes ], +- [ ac_use_shadow=no ]) +- ]) +- ]) +- AC_SUBST(LIBSHADOW) +- AC_SUBST(LIBGEN) +- +- AC_MSG_CHECKING([for shadow passwords]) +- +- AC_ARG_WITH(shadow, +- AC_HELP_STRING([--with-shadow],[If you want shadow password support]), +- [ if test "x$withval" != "xno"; then +- use_shadow=yes +- else +- use_shadow=no +- fi +- ], [ +- use_shadow="$ac_use_shadow" +- ]) +- +- if test "x$use_shadow" = xyes; then +- AC_MSG_RESULT(yes) +- AC_DEFINE(HAVE_SHADOW, 1, [Define if you use shadow passwords]) +- else +- AC_MSG_RESULT(no) +- LIBSHADOW= +- LIBGEN= +- fi +- +- dnl finally make the relevant binaries setuid root, if we have shadow passwds. +- dnl this still applies, if we could use it indirectly through pam. +- if test "x$use_shadow" = xyes || +- ( test "x$use_pam" = xyes && test "x$ac_use_shadow" = xyes ); then +- case $host in +- *-*-freebsd* | *-*-netbsd* | *-*-openbsd*) +- SETUIDFLAGS="-m 4755 -o root";; +- *) +- SETUIDFLAGS="-m 4755";; +- esac +- fi +- AC_SUBST(SETUIDFLAGS) +- +-]) +- +-AC_DEFUN([KDE_PASSWDLIBS], [ +- AC_REQUIRE([KDE_MISC_TESTS]) dnl for LIBCRYPT +- AC_REQUIRE([KDE_PAM]) +- AC_REQUIRE([KDE_SHADOWPASSWD]) +- +- if test "x$use_pam" = "xyes"; then +- PASSWDLIBS="$PAMLIBS" +- else +- PASSWDLIBS="$LIBCRYPT $LIBSHADOW $LIBGEN" +- fi +- +- dnl FreeBSD uses a shadow-like setup, where /etc/passwd holds the users, but +- dnl /etc/master.passwd holds the actual passwords. /etc/master.passwd requires +- dnl root to read, so kcheckpass needs to be root (even when using pam, since pam +- dnl may need to read /etc/master.passwd). +- case $host in +- *-*-freebsd*) +- SETUIDFLAGS="-m 4755 -o root" +- ;; +- *) +- ;; +- esac +- +- AC_SUBST(PASSWDLIBS) +-]) +- +-AC_DEFUN([KDE_CHECK_LIBDL], +-[ +-AC_CHECK_LIB(dl, dlopen, [ +-LIBDL="-ldl" +-ac_cv_have_dlfcn=yes +-]) +- +-AC_CHECK_LIB(dld, shl_unload, [ +-LIBDL="-ldld" +-ac_cv_have_shload=yes +-]) +- +-AC_SUBST(LIBDL) +-]) +- +-AC_DEFUN([KDE_CHECK_DLOPEN], +-[ +-KDE_CHECK_LIBDL +-AC_CHECK_HEADERS(dlfcn.h dl.h) +-if test "$ac_cv_header_dlfcn_h" = "no"; then +- ac_cv_have_dlfcn=no +-fi +- +-if test "$ac_cv_header_dl_h" = "no"; then +- ac_cv_have_shload=no +-fi +- +-dnl XXX why change enable_dlopen? its already set by autoconf's AC_ARG_ENABLE +-dnl (MM) +-AC_ARG_ENABLE(dlopen, +-AC_HELP_STRING([--disable-dlopen],[link statically [default=no]]), +-enable_dlopen=$enableval, +-enable_dlopen=yes) +- +-# override the user's opinion, if we know it better ;) +-if test "$ac_cv_have_dlfcn" = "no" && test "$ac_cv_have_shload" = "no"; then +- enable_dlopen=no +-fi +- +-if test "$ac_cv_have_dlfcn" = "yes"; then +- AC_DEFINE_UNQUOTED(HAVE_DLFCN, 1, [Define if you have dlfcn]) +-fi +- +-if test "$ac_cv_have_shload" = "yes"; then +- AC_DEFINE_UNQUOTED(HAVE_SHLOAD, 1, [Define if you have shload]) +-fi +- +-if test "$enable_dlopen" = no ; then +- test -n "$1" && eval $1 +-else +- test -n "$2" && eval $2 +-fi +- +-]) +- +-AC_DEFUN([KDE_CHECK_DYNAMIC_LOADING], +-[ +-KDE_CHECK_DLOPEN(libtool_enable_shared=yes, libtool_enable_static=no) +-KDE_PROG_LIBTOOL +-AC_MSG_CHECKING([dynamic loading]) +-eval "`egrep '^build_libtool_libs=' libtool`" +-if test "$build_libtool_libs" = "yes" && test "$enable_dlopen" = "yes"; then +- dynamic_loading=yes +- AC_DEFINE_UNQUOTED(HAVE_DYNAMIC_LOADING) +-else +- dynamic_loading=no +-fi +-AC_MSG_RESULT($dynamic_loading) +-if test "$dynamic_loading" = "yes"; then +- $1 +-else +- $2 +-fi +-]) +- +-AC_DEFUN([KDE_ADD_INCLUDES], +-[ +-if test -z "$1"; then +- test_include="Pix.h" +-else +- test_include="$1" +-fi +- +-AC_MSG_CHECKING([for libg++ ($test_include)]) +- +-AC_CACHE_VAL(kde_cv_libgpp_includes, +-[ +-kde_cv_libgpp_includes=no +- +- for ac_dir in \ +- \ +- /usr/include/g++ \ +- /usr/include \ +- /usr/unsupported/include \ +- /opt/include \ +- $extra_include \ +- ; \ +- do +- if test -r "$ac_dir/$test_include"; then +- kde_cv_libgpp_includes=$ac_dir +- break +- fi +- done +-]) +- +-AC_MSG_RESULT($kde_cv_libgpp_includes) +-if test "$kde_cv_libgpp_includes" != "no"; then +- all_includes="-I$kde_cv_libgpp_includes $all_includes $USER_INCLUDES" +-fi +-]) +-]) +- +-AC_DEFUN([KDE_CHECK_LIBPTHREAD], +-[ +- dnl This code is here specifically to handle the +- dnl various flavors of threading library on FreeBSD +- dnl 4-, 5-, and 6-, and the (weird) rules around it. +- dnl There may be an environment PTHREAD_LIBS that +- dnl specifies what to use; otherwise, search for it. +- dnl -pthread is special cased and unsets LIBPTHREAD +- dnl below if found. +- 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'` +- AC_MSG_CHECKING([for pthread_create in $PTHREAD_LIBS]) +- KDE_CHECK_LIB($PTHREAD_LIBS, pthread_create, [ +- LIBPTHREAD="$PTHREAD_LIBS_save"]) +- PTHREAD_LIBS="$PTHREAD_LIBS_save" +- fi +- fi +- +- dnl Is this test really needed, in the face of the Tru64 test below? +- if test -z "$LIBPTHREAD"; then +- AC_CHECK_LIB(pthread, pthread_create, [LIBPTHREAD="-lpthread"]) +- fi +- +- dnl This is a special Tru64 check, see BR 76171 issue #18. +- if test -z "$LIBPTHREAD" ; then +- AC_MSG_CHECKING([for pthread_create in -lpthread]) +- kde_safe_libs=$LIBS +- LIBS="$LIBS -lpthread" +- AC_TRY_LINK([#include ],[(void)pthread_create(0,0,0,0);],[ +- AC_MSG_RESULT(yes) +- LIBPTHREAD="-lpthread"],[ +- AC_MSG_RESULT(no)]) +- LIBS=$kde_safe_libs +- fi +- +- dnl Un-special-case for FreeBSD. +- if test "x$LIBPTHREAD" = "xPTHREAD" ; then +- LIBPTHREAD="" +- fi +- +- AC_SUBST(LIBPTHREAD) +-]) +- +-AC_DEFUN([KDE_CHECK_PTHREAD_OPTION], +-[ +- USE_THREADS="" +- if test -z "$LIBPTHREAD"; then +- KDE_CHECK_COMPILER_FLAG(pthread, [USE_THREADS="-D_THREAD_SAFE -pthread"]) +- fi +- +- AH_VERBATIM(__svr_define, [ +-#if defined(__SVR4) && !defined(__svr4__) +-#define __svr4__ 1 +-#endif +-]) +- case $host_os in +- solaris*) +- KDE_CHECK_COMPILER_FLAG(mt, [USE_THREADS="-mt"]) +- 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 +- AC_SUBST(USE_THREADS) +- AC_SUBST(LIBPTHREAD) +-]) +- +-AC_DEFUN([KDE_CHECK_THREADING], +-[ +- AC_REQUIRE([KDE_CHECK_LIBPTHREAD]) +- AC_REQUIRE([KDE_CHECK_PTHREAD_OPTION]) +- dnl default is yes if libpthread is found and no if no libpthread is available +- 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 +- AC_ARG_ENABLE(threading,AC_HELP_STRING([--disable-threading],[disables threading even if libpthread found]), +- kde_use_threading=$enableval, kde_use_threading=$kde_check_threading_default) +- if test "x$kde_use_threading" = "xyes"; then +- AC_DEFINE(HAVE_LIBPTHREAD, 1, [Define if you have a working libpthread (will enable threaded code)]) +- fi +-]) +- +-AC_DEFUN([KDE_TRY_LINK_PYTHON], +-[ +-if test "$kde_python_link_found" = no; then +- +-if test "$1" = normal; then +- AC_MSG_CHECKING(if a Python application links) +-else +- AC_MSG_CHECKING(if Python depends on $2) +-fi +- +-AC_CACHE_VAL(kde_cv_try_link_python_$1, +-[ +-kde_save_cflags="$CFLAGS" +-CFLAGS="$CFLAGS $PYTHONINC" +-kde_save_libs="$LIBS" +-LIBS="$LIBS $LIBPYTHON $2 $LIBDL $LIBSOCKET" +-kde_save_ldflags="$LDFLAGS" +-LDFLAGS="$LDFLAGS $PYTHONLIB" +- +-AC_TRY_LINK( +-[ +-#include +-],[ +- PySys_SetArgv(1, 0); +-], +- [kde_cv_try_link_python_$1=yes], +- [kde_cv_try_link_python_$1=no] +-) +-CFLAGS="$kde_save_cflags" +-LIBS="$kde_save_libs" +-LDFLAGS="$kde_save_ldflags" +-]) +- +-if test "$kde_cv_try_link_python_$1" = "yes"; then +- AC_MSG_RESULT(yes) +- kde_python_link_found=yes +- if test ! "$1" = normal; then +- LIBPYTHON="$LIBPYTHON $2" +- fi +- $3 +-else +- AC_MSG_RESULT(no) +- $4 +-fi +- +-fi +- +-]) +- +-AC_DEFUN([KDE_CHECK_PYTHON_DIR], +-[ +-AC_MSG_CHECKING([for Python directory]) +- +-AC_CACHE_VAL(kde_cv_pythondir, +-[ +- if test -z "$PYTHONDIR"; then +- kde_cv_pythondir=/usr/local +- else +- kde_cv_pythondir="$PYTHONDIR" +- fi +-]) +- +-AC_ARG_WITH(pythondir, +-AC_HELP_STRING([--with-pythondir=pythondir],[use python installed in pythondir]), +-[ +- ac_python_dir=$withval +-], ac_python_dir=$kde_cv_pythondir +-) +- +-AC_MSG_RESULT($ac_python_dir) +-]) +- +-AC_DEFUN([KDE_CHECK_PYTHON_INTERN], +-[ +-AC_REQUIRE([KDE_CHECK_LIBDL]) +-AC_REQUIRE([KDE_CHECK_LIBPTHREAD]) +-AC_REQUIRE([KDE_CHECK_PYTHON_DIR]) +- +-if test -z "$1"; then +- version="1.5" +-else +- version="$1" +-fi +- +-AC_MSG_CHECKING([for Python$version]) +- +-python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes" +-AC_FIND_FILE(Python.h, $python_incdirs, python_incdir) +-if test ! -r $python_incdir/Python.h; then +- AC_FIND_FILE(python$version/Python.h, $python_incdirs, python_incdir) +- python_incdir=$python_incdir/python$version +- if test ! -r $python_incdir/Python.h; then +- python_incdir=no +- fi +-fi +- +-PYTHONINC=-I$python_incdir +- +-python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs" +-AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir) +-if test ! -r $python_libdir/libpython$version.so; then +- AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir) +- if test ! -r $python_libdir/libpython$version.a; then +- AC_FIND_FILE(python$version/config/libpython$version.a, $python_libdirs, python_libdir) +- python_libdir=$python_libdir/python$version/config +- if test ! -r $python_libdir/libpython$version.a; then +- python_libdir=no +- fi +- fi +-fi +- +-PYTHONLIB=-L$python_libdir +-kde_orig_LIBPYTHON=$LIBPYTHON +-if test -z "$LIBPYTHON"; then +- LIBPYTHON=-lpython$version +-fi +- +-AC_FIND_FILE(python$version/copy.py, $python_libdirs, python_moddir) +-python_moddir=$python_moddir/python$version +-if test ! -r $python_moddir/copy.py; then +- python_moddir=no +-fi +- +-PYTHONMODDIR=$python_moddir +- +-AC_MSG_RESULT(header $python_incdir library $python_libdir modules $python_moddir) +- +-if test x$python_incdir = xno || test x$python_libdir = xno || test x$python_moddir = xno; then +- LIBPYTHON=$kde_orig_LIBPYTHON +- test "x$PYTHONLIB" = "x-Lno" && PYTHONLIB="" +- test "x$PYTHONINC" = "x-Ino" && PYTHONINC="" +- $2 +-else +- dnl Note: this test is very weak +- kde_python_link_found=no +- KDE_TRY_LINK_PYTHON(normal) +- KDE_TRY_LINK_PYTHON(m, -lm) +- KDE_TRY_LINK_PYTHON(pthread, $LIBPTHREAD) +- KDE_TRY_LINK_PYTHON(tcl, -ltcl) +- KDE_TRY_LINK_PYTHON(db2, -ldb2) +- KDE_TRY_LINK_PYTHON(m_and_thread, [$LIBPTHREAD -lm]) +- KDE_TRY_LINK_PYTHON(m_and_thread_and_util, [$LIBPTHREAD -lm -lutil]) +- KDE_TRY_LINK_PYTHON(m_and_thread_and_db3, [$LIBPTHREAD -lm -ldb-3 -lutil]) +- KDE_TRY_LINK_PYTHON(pthread_and_db3, [$LIBPTHREAD -ldb-3]) +- KDE_TRY_LINK_PYTHON(m_and_thread_and_db, [$LIBPTHREAD -lm -ldb -ltermcap -lutil]) +- KDE_TRY_LINK_PYTHON(pthread_and_dl, [$LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm]) +- KDE_TRY_LINK_PYTHON(pthread_and_panel_curses, [$LIBPTHREAD $LIBDL -lm -lpanel -lcurses]) +- KDE_TRY_LINK_PYTHON(m_and_thread_and_db_special, [$LIBPTHREAD -lm -ldb -lutil], [], +- [AC_MSG_WARN([it seems, Python depends on another library. +- Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this +- and contact the authors to let them know about this problem]) +- ]) +- +- LIBPYTHON="$LIBPYTHON $LIBDL $LIBSOCKET" +- AC_SUBST(PYTHONINC) +- AC_SUBST(PYTHONLIB) +- AC_SUBST(LIBPYTHON) +- AC_SUBST(PYTHONMODDIR) +- AC_DEFINE(HAVE_PYTHON, 1, [Define if you have the development files for python]) +-fi +- +-]) +- +- +-AC_DEFUN([KDE_CHECK_PYTHON], +-[ +- KDE_CHECK_PYTHON_INTERN("2.5", +- [KDE_CHECK_PYTHON_INTERN("2.4", +- [KDE_CHECK_PYTHON_INTERN("2.3", +- [KDE_CHECK_PYTHON_INTERN("2.2", +- [KDE_CHECK_PYTHON_INTERN("2.1", +- [KDE_CHECK_PYTHON_INTERN("2.0", +- [KDE_CHECK_PYTHON_INTERN($1, $2) ]) +- ]) +- ]) +- ]) +- ]) +- ]) +-]) +- +-AC_DEFUN([KDE_CHECK_STL], +-[ +- AC_LANG_SAVE +- AC_LANG_CPLUSPLUS +- ac_save_CXXFLAGS="$CXXFLAGS" +- CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`" +- +- AC_MSG_CHECKING([if C++ programs can be compiled]) +- AC_CACHE_VAL(kde_cv_stl_works, +- [ +- AC_TRY_COMPILE([ +-#include +-using namespace std; +-],[ +- string astring="Hallo Welt."; +- astring.erase(0, 6); // now astring is "Welt" +- return 0; +-], kde_cv_stl_works=yes, +- kde_cv_stl_works=no) +-]) +- +- AC_MSG_RESULT($kde_cv_stl_works) +- +- if test "$kde_cv_stl_works" = "yes"; then +- # back compatible +- AC_DEFINE_UNQUOTED(HAVE_SGI_STL, 1, [Define if you have a STL implementation by SGI]) +- else +- AC_MSG_ERROR([Your Installation isn't able to compile simple C++ programs. +-Check config.log for details - if you're using a Linux distribution you might miss +-a package named similar to libstdc++-dev.]) +- fi +- +- CXXFLAGS="$ac_save_CXXFLAGS" +- AC_LANG_RESTORE +-]) +- +-AC_DEFUN([AC_FIND_QIMGIO], +- [AC_REQUIRE([AC_FIND_JPEG]) +-AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) +-AC_MSG_CHECKING([for qimgio]) +-AC_CACHE_VAL(ac_cv_lib_qimgio, +-[ +-AC_LANG_SAVE +-AC_LANG_CPLUSPLUS +-ac_save_LIBS="$LIBS" +-ac_save_CXXFLAGS="$CXXFLAGS" +-LIBS="$all_libraries -lqimgio -lpng -lz $LIBJPEG $LIBQT" +-CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes" +-AC_TRY_RUN(dnl +-[ +-#include +-#include +-int main() { +- QString t = "hallo"; +- t.fill('t'); +- qInitImageIO(); +-} +-], +- ac_cv_lib_qimgio=yes, +- ac_cv_lib_qimgio=no, +- ac_cv_lib_qimgio=no) +-LIBS="$ac_save_LIBS" +-CXXFLAGS="$ac_save_CXXFLAGS" +-AC_LANG_RESTORE +-])dnl +-if eval "test \"`echo $ac_cv_lib_qimgio`\" = yes"; then +- LIBQIMGIO="-lqimgio -lpng -lz $LIBJPEG" +- AC_MSG_RESULT(yes) +- AC_DEFINE_UNQUOTED(HAVE_QIMGIO, 1, [Define if you have the Qt extension qimgio available]) +- AC_SUBST(LIBQIMGIO) +-else +- AC_MSG_RESULT(not found) +-fi +-]) +- +-AC_DEFUN([AM_DISABLE_LIBRARIES], +-[ +- AC_PROVIDE([AM_ENABLE_STATIC]) +- AC_PROVIDE([AM_ENABLE_SHARED]) +- enable_static=no +- enable_shared=yes +-]) +- +- +-AC_DEFUN([AC_CHECK_UTMP_FILE], +-[ +- AC_MSG_CHECKING([for utmp file]) +- +- AC_CACHE_VAL(kde_cv_utmp_file, +- [ +- kde_cv_utmp_file=no +- +- for ac_file in \ +- \ +- /var/run/utmp \ +- /var/adm/utmp \ +- /etc/utmp \ +- ; \ +- do +- if test -r "$ac_file"; then +- kde_cv_utmp_file=$ac_file +- break +- fi +- done +- ]) +- +- if test "$kde_cv_utmp_file" != "no"; then +- AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries]) +- $1 +- AC_MSG_RESULT($kde_cv_utmp_file) +- else +- $2 +- AC_MSG_RESULT([non found]) +- fi +-]) +- +- +-AC_DEFUN([KDE_CREATE_SUBDIRSLIST], +-[ +- +-DO_NOT_COMPILE="$DO_NOT_COMPILE CVS debian bsd-port admin" +-TOPSUBDIRS="" +- +-if test ! -s $srcdir/subdirs; then +- dnl Note: Makefile.common creates subdirs, so this is just a fallback +- files=`cd $srcdir && ls -1` +- dirs=`for i in $files; do if test -d $i; then echo $i; fi; done` +- for i in $dirs; do +- echo $i >> $srcdir/subdirs +- done +-fi +- +-ac_topsubdirs= +-if test -s $srcdir/inst-apps; then +- ac_topsubdirs="`cat $srcdir/inst-apps`" +-elif test -s $srcdir/subdirs; then +- ac_topsubdirs="`cat $srcdir/subdirs`" +-fi +- +-for i in $ac_topsubdirs; do +- AC_MSG_CHECKING([if $i should be compiled]) +- if test -d $srcdir/$i; then +- install_it="yes" +- for j in $DO_NOT_COMPILE; do +- if test $i = $j; then +- install_it="no" +- fi +- done +- else +- install_it="no" +- fi +- AC_MSG_RESULT($install_it) +- vari=`echo $i | sed -e 's,[[-+.@]],_,g'` +- if test $install_it = "yes"; then +- TOPSUBDIRS="$TOPSUBDIRS $i" +- eval "$vari""_SUBDIR_included=yes" +- else +- eval "$vari""_SUBDIR_included=no" +- fi +-done +- +-AC_SUBST(TOPSUBDIRS) +-]) +- +-AC_DEFUN([KDE_CHECK_NAMESPACES], +-[ +-AC_MSG_CHECKING(whether C++ compiler supports namespaces) +-AC_LANG_SAVE +-AC_LANG_CPLUSPLUS +-AC_TRY_COMPILE([ +-], +-[ +-namespace Foo { +- extern int i; +- namespace Bar { +- extern int i; +- } +-} +- +-int Foo::i = 0; +-int Foo::Bar::i = 1; +-],[ +- AC_MSG_RESULT(yes) +- AC_DEFINE(HAVE_NAMESPACES) +-], [ +-AC_MSG_RESULT(no) +-]) +-AC_LANG_RESTORE +-]) +- +-dnl ------------------------------------------------------------------------ +-dnl Check for S_ISSOCK macro. Doesn't exist on Unix SCO. faure@kde.org +-dnl ------------------------------------------------------------------------ +-dnl +-AC_DEFUN([AC_CHECK_S_ISSOCK], +-[ +-AC_MSG_CHECKING(for S_ISSOCK) +-AC_CACHE_VAL(ac_cv_have_s_issock, +-[ +-AC_TRY_LINK( +-[ +-#include +-], +-[ +-struct stat buff; +-int b = S_ISSOCK( buff.st_mode ); +-], +-ac_cv_have_s_issock=yes, +-ac_cv_have_s_issock=no) +-]) +-AC_MSG_RESULT($ac_cv_have_s_issock) +-if test "$ac_cv_have_s_issock" = "yes"; then +- AC_DEFINE_UNQUOTED(HAVE_S_ISSOCK, 1, [Define if sys/stat.h declares S_ISSOCK.]) +-fi +- +-AH_VERBATIM(_ISSOCK, +-[ +-#ifndef HAVE_S_ISSOCK +-#define HAVE_S_ISSOCK +-#define S_ISSOCK(mode) (1==0) +-#endif +-]) +- +-]) +- +-dnl ------------------------------------------------------------------------ +-dnl Check for MAXPATHLEN macro, defines KDEMAXPATHLEN. faure@kde.org +-dnl ------------------------------------------------------------------------ +-dnl +-AC_DEFUN([AC_CHECK_KDEMAXPATHLEN], +-[ +-AC_MSG_CHECKING(for MAXPATHLEN) +-AC_CACHE_VAL(ac_cv_maxpathlen, +-[ +-cat > conftest.$ac_ext < +-#endif +-#include +-#include +-#ifndef MAXPATHLEN +-#define MAXPATHLEN 1024 +-#endif +- +-KDE_HELLO MAXPATHLEN +- +-EOF +- +-ac_try="$ac_cpp conftest.$ac_ext 2>/dev/null | grep '^KDE_HELLO' >conftest.out" +- +-if AC_TRY_EVAL(ac_try) && test -s conftest.out; then +- ac_cv_maxpathlen=`sed 's#KDE_HELLO ##' conftest.out` +-else +- ac_cv_maxpathlen=1024 +-fi +- +-rm conftest.* +- +-]) +-AC_MSG_RESULT($ac_cv_maxpathlen) +-AC_DEFINE_UNQUOTED(KDEMAXPATHLEN,$ac_cv_maxpathlen, [Define a safe value for MAXPATHLEN] ) +-]) +- +-AC_DEFUN([KDE_CHECK_HEADER], +-[ +- kde_safe_cppflags=$CPPFLAGS +- CPPFLAGS="$CPPFLAGS $all_includes" +- AC_LANG_SAVE +- AC_LANG_CPLUSPLUS +- AC_CHECK_HEADER([$1], [$2], [$3], [$4]) +- AC_LANG_RESTORE +- CPPFLAGS=$kde_safe_cppflags +-]) +- +-AC_DEFUN([KDE_CHECK_HEADERS], +-[ +- AH_CHECK_HEADERS([$1]) +- AC_LANG_SAVE +- kde_safe_cppflags=$CPPFLAGS +- CPPFLAGS="$CPPFLAGS $all_includes" +- AC_LANG_CPLUSPLUS +- AC_CHECK_HEADERS([$1], [$2], [$3], [$4]) +- CPPFLAGS=$kde_safe_cppflags +- AC_LANG_RESTORE +-]) +- +-AC_DEFUN([KDE_FAST_CONFIGURE], +-[ +- dnl makes configure fast (needs perl) +- AC_ARG_ENABLE(fast-perl, AC_HELP_STRING([--disable-fast-perl],[disable fast Makefile generation (needs perl)]), +- with_fast_perl=$enableval, with_fast_perl=yes) +-]) +- +-AC_DEFUN([KDE_CONF_FILES], +-[ +- val= +- if test -f $srcdir/configure.files ; then +- val=`sed -e 's%^%\$(top_srcdir)/%' $srcdir/configure.files` +- fi +- CONF_FILES= +- if test -n "$val" ; then +- for i in $val ; do +- CONF_FILES="$CONF_FILES $i" +- done +- fi +- AC_SUBST(CONF_FILES) +-])dnl +- +-dnl This sets the prefix, for arts and kdelibs +-dnl Do NOT use in any other module. +-dnl It only looks at --prefix, KDEDIR and falls back to /usr/local/kde +-AC_DEFUN([KDE_SET_PREFIX_CORE], +-[ +- unset CDPATH +- dnl make $KDEDIR the default for the installation +- AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) +- +- if test "x$prefix" = "xNONE"; then +- prefix=$ac_default_prefix +- ac_configure_args="$ac_configure_args --prefix=$prefix" +- fi +- # And delete superfluous '/' to make compares easier +- prefix=`echo "$prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'` +- exec_prefix=`echo "$exec_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'` +- +- kde_libs_prefix='$(prefix)' +- kde_libs_htmldir='$(kde_htmldir)' +- AC_SUBST(kde_libs_prefix) +- AC_SUBST(kde_libs_htmldir) +- KDE_FAST_CONFIGURE +- KDE_CONF_FILES +-]) +- +- +-AC_DEFUN([KDE_SET_PREFIX], +-[ +- unset CDPATH +- dnl We can't give real code to that macro, only a value. +- dnl It only matters for --help, since we set the prefix in this function anyway. +- AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix}) +- +- KDE_SET_DEFAULT_BINDIRS +- if test "x$prefix" = "xNONE"; then +- dnl no prefix given: look for kde-config in the PATH and deduce the prefix from it +- KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend) +- else +- dnl prefix given: look for kde-config, preferrably in prefix, otherwise in PATH +- kde_save_PATH="$PATH" +- PATH="$exec_prefix/bin:$prefix/bin:$PATH" +- KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend) +- PATH="$kde_save_PATH" +- fi +- +- kde_libs_prefix=`$KDECONFIG --prefix` +- if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then +- AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs. +- This means it has been moved since you installed it. +- This won't work. Please recompile kdelibs for the new prefix. +- ]) +- fi +- kde_libs_htmldir=`$KDECONFIG --install html --expandvars` +- +- AC_MSG_CHECKING([where to install]) +- if test "x$prefix" = "xNONE"; then +- prefix=$kde_libs_prefix +- AC_MSG_RESULT([$prefix (as returned by kde-config)]) +- else +- dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different +- given_prefix=$prefix +- AC_MSG_RESULT([$prefix (as requested)]) +- fi +- +- # And delete superfluous '/' to make compares easier +- prefix=`echo "$prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'` +- exec_prefix=`echo "$exec_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'` +- given_prefix=`echo "$given_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'` +- +- AC_SUBST(KDECONFIG) +- AC_SUBST(kde_libs_prefix) +- AC_SUBST(kde_libs_htmldir) +- +- KDE_FAST_CONFIGURE +- KDE_CONF_FILES +-]) +- +-pushdef([AC_PROG_INSTALL], +-[ +- dnl our own version, testing for a -p flag +- popdef([AC_PROG_INSTALL]) +- dnl as AC_PROG_INSTALL works as it works we first have +- dnl to save if the user didn't specify INSTALL, as the +- dnl autoconf one overwrites INSTALL and we have no chance to find +- dnl out afterwards +- test -n "$INSTALL" && kde_save_INSTALL_given=$INSTALL +- test -n "$INSTALL_PROGRAM" && kde_save_INSTALL_PROGRAM_given=$INSTALL_PROGRAM +- test -n "$INSTALL_SCRIPT" && kde_save_INSTALL_SCRIPT_given=$INSTALL_SCRIPT +- AC_PROG_INSTALL +- +- if test -z "$kde_save_INSTALL_given" ; then +- # OK, user hasn't given any INSTALL, autoconf found one for us +- # now we test, if it supports the -p flag +- AC_MSG_CHECKING(for -p flag to install) +- rm -f confinst.$$.* > /dev/null 2>&1 +- echo "Testtest" > confinst.$$.orig +- ac_res=no +- if ${INSTALL} -p confinst.$$.orig confinst.$$.new > /dev/null 2>&1 ; then +- if test -f confinst.$$.new ; then +- # OK, -p seems to do no harm to install +- INSTALL="${INSTALL} -p" +- ac_res=yes +- fi +- fi +- rm -f confinst.$$.* +- AC_MSG_RESULT($ac_res) +- fi +- dnl the following tries to resolve some signs and wonders coming up +- dnl with different autoconf/automake versions +- dnl e.g.: +- dnl *automake 1.4 install-strip sets A_M_INSTALL_PROGRAM_FLAGS to -s +- dnl and has INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(A_M_INSTALL_PROGRAM_FLAGS) +- dnl it header-vars.am, so there the actual INSTALL_PROGRAM gets the -s +- dnl *automake 1.4a (and above) use INSTALL_STRIP_FLAG and only has +- dnl INSTALL_PROGRAM = @INSTALL_PROGRAM@ there, but changes the +- dnl install-@DIR@PROGRAMS targets to explicitly use that flag +- dnl *autoconf 2.13 is dumb, and thinks it can use INSTALL_PROGRAM as +- dnl INSTALL_SCRIPT, which breaks with automake <= 1.4 +- dnl *autoconf >2.13 (since 10.Apr 1999) has not that failure +- dnl *sometimes KDE does not use the install-@DIR@PROGRAM targets from +- dnl automake (due to broken Makefile.am or whatever) to install programs, +- dnl and so does not see the -s flag in automake > 1.4 +- dnl to clean up that mess we: +- dnl +set INSTALL_PROGRAM to use INSTALL_STRIP_FLAG +- dnl which cleans KDE's program with automake > 1.4; +- dnl +set INSTALL_SCRIPT to only use INSTALL, to clean up autoconf's problems +- dnl with automake<=1.4 +- dnl note that dues to this sometimes two '-s' flags are used (if KDE +- dnl properly uses install-@DIR@PROGRAMS, but I don't care +- dnl +- dnl And to all this comes, that I even can't write in comments variable +- dnl names used by automake, because it is so stupid to think I wanted to +- dnl _use_ them, therefor I have written A_M_... instead of AM_ +- dnl hmm, I wanted to say something ... ahh yes: Arghhh. +- +- if test -z "$kde_save_INSTALL_PROGRAM_given" ; then +- INSTALL_PROGRAM='${INSTALL} $(INSTALL_STRIP_FLAG)' +- fi +- if test -z "$kde_save_INSTALL_SCRIPT_given" ; then +- INSTALL_SCRIPT='${INSTALL}' +- fi +-])dnl +- +-AC_DEFUN([KDE_LANG_CPLUSPLUS], +-[AC_LANG_CPLUSPLUS +-ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&AC_FD_CC' +-pushdef([AC_LANG_CPLUSPLUS], [popdef([AC_LANG_CPLUSPLUS]) KDE_LANG_CPLUSPLUS]) +-]) +- +-pushdef([AC_LANG_CPLUSPLUS], +-[popdef([AC_LANG_CPLUSPLUS]) +-KDE_LANG_CPLUSPLUS +-]) +- +-AC_DEFUN([KDE_CHECK_LONG_LONG], +-[ +-AC_MSG_CHECKING(for long long) +-AC_CACHE_VAL(kde_cv_c_long_long, +-[ +- AC_LANG_SAVE +- AC_LANG_CPLUSPLUS +- AC_TRY_LINK([], [ +- long long foo = 0; +- foo = foo+1; +- ], +- kde_cv_c_long_long=yes, kde_cv_c_long_long=no) +- AC_LANG_RESTORE +-]) +-AC_MSG_RESULT($kde_cv_c_long_long) +-if test "$kde_cv_c_long_long" = yes; then +- AC_DEFINE(HAVE_LONG_LONG, 1, [Define if you have long long as datatype]) +-fi +-]) +- +-AC_DEFUN([KDE_CHECK_LIB], +-[ +- kde_save_LDFLAGS="$LDFLAGS" +- dnl AC_CHECK_LIB modifies LIBS, so save it here +- kde_save_LIBS="$LIBS" +- LDFLAGS="$LDFLAGS $all_libraries" +- case $host_os in +- aix*) LDFLAGS="-brtl $LDFLAGS" +- test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS" +- ;; +- esac +- AC_CHECK_LIB($1, $2, $3, $4, $5) +- LDFLAGS="$kde_save_LDFLAGS" +- LIBS="$kde_save_LIBS" +-]) +- +-AC_DEFUN([KDE_JAVA_PREFIX], +-[ +- dir=`dirname "$1"` +- base=`basename "$1"` +- list=`ls -1 $dir 2> /dev/null` +- for entry in $list; do +- if test -d $dir/$entry/bin; then +- case $entry in +- $base) +- javadirs="$javadirs $dir/$entry/bin" +- ;; +- esac +- elif test -d $dir/$entry/jre/bin; then +- case $entry in +- $base) +- javadirs="$javadirs $dir/$entry/jre/bin" +- ;; +- esac +- fi +- done +-]) +- +-dnl KDE_CHEC_JAVA_DIR(onlyjre) +-AC_DEFUN([KDE_CHECK_JAVA_DIR], +-[ +- +-AC_ARG_WITH(java, +-AC_HELP_STRING([--with-java=javadir],[use java installed in javadir, --without-java disables]), +-[ ac_java_dir=$withval +-], ac_java_dir="" +-) +- +-AC_MSG_CHECKING([for Java]) +- +-dnl at this point ac_java_dir is either a dir, 'no' to disable, or '' to say look in $PATH +-if test "x$ac_java_dir" = "xno"; then +- kde_java_bindir=no +- kde_java_includedir=no +- kde_java_libjvmdir=no +- kde_java_libgcjdir=no +- kde_java_libhpidir=no +-else +- if test "x$ac_java_dir" = "x"; then +- +- +- dnl No option set -> collect list of candidate paths +- if test -n "$JAVA_HOME"; then +- KDE_JAVA_PREFIX($JAVA_HOME) +- fi +- KDE_JAVA_PREFIX(/usr/j2se) +- KDE_JAVA_PREFIX(/usr/lib/j2se) +- KDE_JAVA_PREFIX(/usr/j*dk*) +- KDE_JAVA_PREFIX(/usr/lib/j*dk*) +- KDE_JAVA_PREFIX(/opt/j*sdk*) +- KDE_JAVA_PREFIX(/usr/lib/java*) +- KDE_JAVA_PREFIX(/usr/java*) +- KDE_JAVA_PREFIX(/usr/java/j*dk*) +- KDE_JAVA_PREFIX(/usr/java/j*re*) +- KDE_JAVA_PREFIX(/usr/lib/SunJava2*) +- KDE_JAVA_PREFIX(/usr/lib/SunJava*) +- KDE_JAVA_PREFIX(/usr/lib/IBMJava2*) +- KDE_JAVA_PREFIX(/usr/lib/IBMJava*) +- KDE_JAVA_PREFIX(/opt/java*) +- +- kde_cv_path="NONE" +- kde_save_IFS=$IFS +- IFS=':' +- for dir in $PATH; do +- if test -d "$dir"; then +- javadirs="$javadirs $dir" +- fi +- done +- IFS=$kde_save_IFS +- jredirs= +- +- dnl Now javadirs contains a list of paths that exist, all ending with bin/ +- for dir in $javadirs; do +- dnl Check for the java executable +- if test -x "$dir/java"; then +- sane_path=$(cd $dir; /bin/pwd) +- dnl And also check for a libjvm.so somewhere under there +- dnl Since we have to go to the parent dir, /usr/bin is excluded, /usr is too big. +- if test "$sane_path" != "/usr/bin"; then +- libjvmdir=`find $dir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1` +- if test ! -f $libjvmdir/libjvm.so; then continue; fi +- jredirs="$jredirs $dir" +- fi +- fi +- done +- +- dnl Now jredirs contains a reduced list, of paths where both java and ../**/libjvm.so was found +- JAVAC= +- JAVA= +- kde_java_bindir=no +- for dir in $jredirs; do +- JAVA="$dir/java" +- kde_java_bindir=$dir +- if test -x "$dir/javac"; then +- JAVAC="$dir/javac" +- break +- fi +- done +- +- if test -n "$JAVAC"; then +- dnl this substitution might not work - well, we test for jni.h below +- kde_java_includedir=`echo $JAVAC | sed -e 's,bin/javac$,include/,'` +- else +- kde_java_includedir=no +- fi +- else +- dnl config option set +- kde_java_bindir=$ac_java_dir/bin +- if test -x $ac_java_dir/bin/java && test ! -x $ac_java_dir/bin/javac; then +- kde_java_includedir=no +- else +- kde_java_includedir=$ac_java_dir/include +- fi +- fi +-fi +- +-dnl At this point kde_java_bindir and kde_java_includedir are either set or "no" +-if test "x$kde_java_bindir" != "xno"; then +- +- dnl Look for libjvm.so +- kde_java_libjvmdir=`find $kde_java_bindir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1` +- dnl Look for libgcj.so +- kde_java_libgcjdir=`find $kde_java_bindir/.. -name libgcj.so | sed 's,libgcj.so,,'|head -n 1` +- dnl Look for libhpi.so and avoid green threads +- kde_java_libhpidir=`find $kde_java_bindir/.. -name libhpi.so | grep -v green | sed 's,libhpi.so,,' | head -n 1` +- +- dnl Now check everything's fine under there +- dnl the include dir is our flag for having the JDK +- if test -d "$kde_java_includedir"; then +- if test ! -x "$kde_java_bindir/javac"; then +- AC_MSG_ERROR([javac not found under $kde_java_bindir - it seems you passed a wrong --with-java.]) +- fi +- if test ! -x "$kde_java_bindir/javah"; then +- AC_MSG_ERROR([javah not found under $kde_java_bindir. javac was found though! Use --with-java or --without-java.]) +- fi +- if test ! -x "$kde_java_bindir/jar"; then +- AC_MSG_ERROR([jar not found under $kde_java_bindir. javac was found though! Use --with-java or --without-java.]) +- fi +- if test ! -r "$kde_java_includedir/jni.h"; then +- AC_MSG_ERROR([jni.h not found under $kde_java_includedir. Use --with-java or --without-java.]) +- fi +- +- jni_includes="-I$kde_java_includedir" +- dnl Strange thing, jni.h requires jni_md.h which is under genunix here.. +- dnl and under linux here.. +- +- dnl not needed for gcj +- +- if test "x$kde_java_libgcjdir" = "x"; then +- test -d "$kde_java_includedir/linux" && jni_includes="$jni_includes -I$kde_java_includedir/linux" +- test -d "$kde_java_includedir/solaris" && jni_includes="$jni_includes -I$kde_java_includedir/solaris" +- test -d "$kde_java_includedir/genunix" && jni_includes="$jni_includes -I$kde_java_includedir/genunix" +- fi +- +- else +- JAVAC= +- jni_includes= +- fi +- +- if test "x$kde_java_libgcjdir" = "x"; then +- if test ! -r "$kde_java_libjvmdir/libjvm.so"; then +- AC_MSG_ERROR([libjvm.so not found under $kde_java_libjvmdir. Use --without-java.]) +- fi +- else +- if test ! -r "$kde_java_libgcjdir/libgcj.so"; then +- AC_MSG_ERROR([libgcj.so not found under $kde_java_libgcjdir. Use --without-java.]) +- fi +- fi +- +- if test ! -x "$kde_java_bindir/java"; then +- AC_MSG_ERROR([java not found under $kde_java_bindir. javac was found though! Use --with-java or --without-java.]) +- fi +- +- dnl not needed for gcj compile +- +- if test "x$kde_java_libgcjdir" = "x"; then +- if test ! -r "$kde_java_libhpidir/libhpi.so"; then +- AC_MSG_ERROR([libhpi.so not found under $kde_java_libhpidir. Use --without-java.]) +- fi +- fi +- +- if test -n "$jni_includes"; then +- dnl Check for JNI version +- AC_LANG_SAVE +- AC_LANG_CPLUSPLUS +- ac_cxxflags_safe="$CXXFLAGS" +- CXXFLAGS="$CXXFLAGS $all_includes $jni_includes" +- +- AC_TRY_COMPILE([ +- #include +- ], +- [ +- #ifndef JNI_VERSION_1_2 +- Syntax Error +- #endif +- ],[ kde_jni_works=yes ], +- [ kde_jni_works=no ]) +- +- if test $kde_jni_works = no; then +- AC_MSG_ERROR([Incorrect version of $kde_java_includedir/jni.h. +- You need to have Java Development Kit (JDK) version 1.2. +- +- Use --with-java to specify another location. +- Use --without-java to configure without java support. +- Or download a newer JDK and try again. +- See e.g. http://java.sun.com/products/jdk/1.2 ]) +- fi +- +- CXXFLAGS="$ac_cxxflags_safe" +- AC_LANG_RESTORE +- +- dnl All tests ok, inform and subst the variables +- +- JAVAC=$kde_java_bindir/javac +- JAVAH=$kde_java_bindir/javah +- JAR=$kde_java_bindir/jar +- AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is]) +- if test "x$kde_java_libgcjdir" = "x"; then +- JVMLIBS="-L$kde_java_libjvmdir -ljvm -L$kde_java_libhpidir -lhpi" +- else +- JVMLIBS="-L$kde_java_libgcjdir -lgcj" +- fi +- AC_MSG_RESULT([java JDK in $kde_java_bindir]) +- +- else +- AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is]) +- AC_MSG_RESULT([java JRE in $kde_java_bindir]) +- fi +-elif test -d "/Library/Java/Home"; then +- kde_java_bindir="/Library/Java/Home/bin" +- jni_includes="-I/Library/Java/Home/include" +- +- JAVAC=$kde_java_bindir/javac +- JAVAH=$kde_java_bindir/javah +- JAR=$kde_java_bindir/jar +- JVMLIBS="-Wl,-framework,JavaVM" +- +- AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is]) +- AC_MSG_RESULT([Apple Java Framework]) +-else +- AC_MSG_RESULT([none found]) +-fi +- +-AC_SUBST(JAVAC) +-AC_SUBST(JAVAH) +-AC_SUBST(JAR) +-AC_SUBST(JVMLIBS) +-AC_SUBST(jni_includes) +- +-# for backward compat +-kde_cv_java_includedir=$kde_java_includedir +-kde_cv_java_bindir=$kde_java_bindir +-]) +- +-dnl this is a redefinition of autoconf 2.5x's AC_FOREACH. +-dnl When the argument list becomes big, as in KDE for AC_OUTPUT in +-dnl big packages, m4_foreach is dog-slow. So use our own version of +-dnl it. (matz@kde.org) +-m4_define([mm_foreach], +-[m4_pushdef([$1])_mm_foreach($@)m4_popdef([$1])]) +-m4_define([mm_car], [[$1]]) +-m4_define([mm_car2], [[$@]]) +-m4_define([_mm_foreach], +-[m4_if(m4_quote($2), [], [], +- [m4_define([$1], mm_car($2))$3[]_mm_foreach([$1], +- mm_car2(m4_shift($2)), +- [$3])])]) +-m4_define([AC_FOREACH], +-[mm_foreach([$1], m4_split(m4_normalize([$2])), [$3])]) +- +-AC_DEFUN([KDE_NEED_FLEX], +-[ +-kde_libs_safe=$LIBS +-LIBS="$LIBS $USER_LDFLAGS" +-AM_PROG_LEX +-LIBS=$kde_libs_safe +-if test -z "$LEXLIB"; then +- AC_MSG_ERROR([You need to have flex installed.]) +-fi +-AC_SUBST(LEXLIB) +-]) +- +-AC_DEFUN([AC_PATH_QTOPIA], +-[ +- dnl TODO: use AC_CACHE_VAL +- +- if test -z "$1"; then +- qtopia_minver_maj=1 +- qtopia_minver_min=5 +- qtopia_minver_pat=0 +- else +- qtopia_minver_maj=`echo "$1" | sed -e "s/^\(.*\)\..*\..*$/\1/"` +- qtopia_minver_min=`echo "$1" | sed -e "s/^.*\.\(.*\)\..*$/\1/"` +- qtopia_minver_pat=`echo "$1" | sed -e "s/^.*\..*\.\(.*\)$/\1/"` +- fi +- +- qtopia_minver="$qtopia_minver_maj$qtopia_minver_min$qtopia_minver_pat" +- qtopia_minverstr="$qtopia_minver_maj.$qtopia_minver_min.$qtopia_minver_pat" +- +- AC_REQUIRE([AC_PATH_QT]) +- +- AC_MSG_CHECKING([for Qtopia]) +- +- LIB_QTOPIA="-lqpe" +- AC_SUBST(LIB_QTOPIA) +- +- kde_qtopia_dirs="$QPEDIR /opt/Qtopia" +- +- ac_qtopia_incdir=NO +- +- AC_ARG_WITH(qtopia-dir, +- AC_HELP_STRING([--with-qtopia-dir=DIR],[where the root of Qtopia is installed]), +- [ ac_qtopia_incdir="$withval"/include] ) +- +- qtopia_incdirs="" +- for dir in $kde_qtopia_dirs; do +- qtopia_incdirs="$qtopia_incdirs $dir/include" +- done +- +- if test ! "$ac_qtopia_incdir" = "NO"; then +- qtopia_incdirs="$ac_qtopia_incdir $qtopia_incdirs" +- fi +- +- qtopia_incdir="" +- AC_FIND_FILE(qpe/qpeapplication.h, $qtopia_incdirs, qtopia_incdir) +- ac_qtopia_incdir="$qtopia_incdir" +- +- if test -z "$qtopia_incdir"; then +- AC_MSG_ERROR([Cannot find Qtopia headers. Please check your installation.]) +- fi +- +- qtopia_ver_maj=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*QPE_VERSION "\(.*\)\..*\..*".*,\1,p'`; +- qtopia_ver_min=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*QPE_VERSION ".*\.\(.*\)\..*".*,\1,p'`; +- qtopia_ver_pat=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*QPE_VERSION ".*\..*\.\(.*\)".*,\1,p'`; +- +- qtopia_ver="$qtopia_ver_maj$qtopia_ver_min$qtopia_ver_pat" +- qtopia_verstr="$qtopia_ver_maj.$qtopia_ver_min.$qtopia_ver_pat" +- if test "$qtopia_ver" -lt "$qtopia_minver"; then +- AC_MSG_ERROR([found Qtopia version $qtopia_verstr but version $qtopia_minverstr +-is required.]) +- fi +- +- AC_LANG_SAVE +- AC_LANG_CPLUSPLUS +- +- ac_cxxflags_safe="$CXXFLAGS" +- ac_ldflags_safe="$LDFLAGS" +- ac_libs_safe="$LIBS" +- +- CXXFLAGS="$CXXFLAGS -I$qtopia_incdir $all_includes" +- LDFLAGS="$LDFLAGS $QT_LDFLAGS $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS" +- LIBS="$LIBS $LIB_QTOPIA $LIBQT" +- +- cat > conftest.$ac_ext < +-#include +- +-int main( int argc, char **argv ) +-{ +- QPEApplication app( argc, argv ); +- return 0; +-} +-EOF +- +- if AC_TRY_EVAL(ac_link) && test -s conftest; then +- rm -f conftest* +- else +- rm -f conftest* +- AC_MSG_ERROR([Cannot link small Qtopia Application. For more details look at +-the end of config.log]) +- fi +- +- CXXFLAGS="$ac_cxxflags_safe" +- LDFLAGS="$ac_ldflags_safe" +- LIBS="$ac_libs_safe" +- +- AC_LANG_RESTORE +- +- QTOPIA_INCLUDES="-I$qtopia_incdir" +- AC_SUBST(QTOPIA_INCLUDES) +- +- AC_MSG_RESULT([found version $qtopia_verstr with headers at $qtopia_incdir]) +-]) +- +- +-AC_DEFUN([KDE_INIT_DOXYGEN], +-[ +-AC_MSG_CHECKING([for Qt docs]) +-kde_qtdir= +-if test "${with_qt_dir+set}" = set; then +- kde_qtdir="$with_qt_dir" +-fi +- +-AC_FIND_FILE(qsql.html, [ $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 ], QTDOCDIR) +-AC_MSG_RESULT($QTDOCDIR) +- +-AC_SUBST(QTDOCDIR) +- +-KDE_FIND_PATH(dot, DOT, [], []) +-if test -n "$DOT"; then +- KDE_HAVE_DOT="YES" +-else +- KDE_HAVE_DOT="NO" +-fi +-AC_SUBST(KDE_HAVE_DOT) +-KDE_FIND_PATH(doxygen, DOXYGEN, [], []) +-AC_SUBST(DOXYGEN) +- +-DOXYGEN_PROJECT_NAME="$1" +-DOXYGEN_PROJECT_NUMBER="$2" +-AC_SUBST(DOXYGEN_PROJECT_NAME) +-AC_SUBST(DOXYGEN_PROJECT_NUMBER) +- +-KDE_HAS_DOXYGEN=no +-if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $QTDOCDIR/qsql.html; then +- KDE_HAS_DOXYGEN=yes +-fi +-AC_SUBST(KDE_HAS_DOXYGEN) +- +-]) +- +- +-AC_DEFUN([AC_FIND_BZIP2], +-[ +-AC_MSG_CHECKING([for bzDecompress in libbz2]) +-AC_CACHE_VAL(ac_cv_lib_bzip2, +-[ +-AC_LANG_SAVE +-AC_LANG_CPLUSPLUS +-kde_save_LIBS="$LIBS" +-LIBS="$all_libraries $USER_LDFLAGS -lbz2 $LIBSOCKET" +-kde_save_CXXFLAGS="$CXXFLAGS" +-CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES" +-AC_TRY_LINK(dnl +-[ +-#define BZ_NO_STDIO +-#include +-], +- [ bz_stream s; (void) bzDecompress(&s); ], +- eval "ac_cv_lib_bzip2='-lbz2'", +- eval "ac_cv_lib_bzip2=no") +-LIBS="$kde_save_LIBS" +-CXXFLAGS="$kde_save_CXXFLAGS" +-AC_LANG_RESTORE +-])dnl +-AC_MSG_RESULT($ac_cv_lib_bzip2) +- +-if test ! "$ac_cv_lib_bzip2" = no; then +- BZIP2DIR=bzip2 +- +- LIBBZ2="$ac_cv_lib_bzip2" +- AC_SUBST(LIBBZ2) +- +-else +- +- cxx_shared_flag= +- ld_shared_flag= +- KDE_CHECK_COMPILER_FLAG(shared, [ +- ld_shared_flag="-shared" +- ]) +- KDE_CHECK_COMPILER_FLAG(fPIC, [ +- cxx_shared_flag="-fPIC" +- ]) +- +- AC_MSG_CHECKING([for BZ2_bzDecompress in (shared) libbz2]) +- AC_CACHE_VAL(ac_cv_lib_bzip2_prefix, +- [ +- AC_LANG_SAVE +- AC_LANG_CPLUSPLUS +- kde_save_LIBS="$LIBS" +- LIBS="$all_libraries $USER_LDFLAGS $ld_shared_flag -lbz2 $LIBSOCKET" +- kde_save_CXXFLAGS="$CXXFLAGS" +- CXXFLAGS="$CFLAGS $cxx_shared_flag $all_includes $USER_INCLUDES" +- +- AC_TRY_LINK(dnl +- [ +- #define BZ_NO_STDIO +- #include +- ], +- [ bz_stream s; (void) BZ2_bzDecompress(&s); ], +- eval "ac_cv_lib_bzip2_prefix='-lbz2'", +- eval "ac_cv_lib_bzip2_prefix=no") +- LIBS="$kde_save_LIBS" +- CXXFLAGS="$kde_save_CXXFLAGS" +- AC_LANG_RESTORE +- ])dnl +- +- AC_MSG_RESULT($ac_cv_lib_bzip2_prefix) +- +- if test ! "$ac_cv_lib_bzip2_prefix" = no; then +- BZIP2DIR=bzip2 +- +- LIBBZ2="$ac_cv_lib_bzip2_prefix" +- AC_SUBST(LIBBZ2) +- +- AC_DEFINE(NEED_BZ2_PREFIX, 1, [Define if the libbz2 functions need the BZ2_ prefix]) +- dnl else, we just ignore this +- fi +- +-fi +-AM_CONDITIONAL(include_BZIP2, test -n "$BZIP2DIR") +-]) +- +-dnl ------------------------------------------------------------------------ +-dnl Try to find the SSL headers and libraries. +-dnl $(SSL_LDFLAGS) will be -Lsslliblocation (if needed) +-dnl and $(SSL_INCLUDES) will be -Isslhdrlocation (if needed) +-dnl ------------------------------------------------------------------------ +-dnl +-AC_DEFUN([KDE_CHECK_SSL], +-[ +-LIBSSL="-lssl -lcrypto" +-AC_REQUIRE([KDE_CHECK_LIB64]) +- +-ac_ssl_includes=NO ac_ssl_libraries=NO +-ssl_libraries="" +-ssl_includes="" +-AC_ARG_WITH(ssl-dir, +- AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]), +- [ ac_ssl_includes="$withval"/include +- ac_ssl_libraries="$withval"/lib$kdelibsuff +- ]) +- +-want_ssl=yes +-AC_ARG_WITH(ssl, +- AC_HELP_STRING([--without-ssl],[disable SSL checks]), +- [want_ssl=$withval]) +- +-if test $want_ssl = yes; then +- +-AC_MSG_CHECKING(for OpenSSL) +- +-AC_CACHE_VAL(ac_cv_have_ssl, +-[#try to guess OpenSSL locations +- +- ssl_incdirs="/usr/include /usr/local/include /usr/ssl/include /usr/local/ssl/include $prefix/include $kde_extra_includes" +- ssl_incdirs="$ac_ssl_includes $ssl_incdirs" +- AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir) +- ac_ssl_includes="$ssl_incdir" +- +- ssl_libdirs="/usr/lib$kdelibsuff /usr/local/lib$kdelibsuff /usr/ssl/lib$kdelibsuff /usr/local/ssl/lib$kdelibsuff $libdir $prefix/lib$kdelibsuff $exec_prefix/lib$kdelibsuff $kde_extra_libs" +- if test ! "$ac_ssl_libraries" = "NO"; then +- ssl_libdirs="$ac_ssl_libraries $ssl_libdirs" +- fi +- +- test=NONE +- ssl_libdir=NONE +- for dir in $ssl_libdirs; do +- try="ls -1 $dir/libssl*" +- if test=`eval $try 2> /dev/null`; then ssl_libdir=$dir; break; else echo "tried $dir" >&AC_FD_CC ; fi +- done +- +- ac_ssl_libraries="$ssl_libdir" +- +- ac_ldflags_safe="$LDFLAGS" +- ac_libs_safe="$LIBS" +- +- LDFLAGS="$LDFLAGS -L$ssl_libdir $all_libraries" +- LIBS="$LIBS $LIBSSL -lRSAglue -lrsaref" +- +- AC_TRY_LINK(,void RSAPrivateEncrypt(void);RSAPrivateEncrypt();, +- ac_ssl_rsaref="yes" +- , +- ac_ssl_rsaref="no" +- ) +- +- LDFLAGS="$ac_ldflags_safe" +- LIBS="$ac_libs_safe" +- +- if test "$ac_ssl_includes" = NO || test "$ac_ssl_libraries" = NO; then +- have_ssl=no +- else +- have_ssl=yes; +- fi +- +- ]) +- +- eval "$ac_cv_have_ssl" +- +- AC_MSG_RESULT([libraries $ac_ssl_libraries, headers $ac_ssl_includes]) +- +- AC_MSG_CHECKING([whether OpenSSL uses rsaref]) +- AC_MSG_RESULT($ac_ssl_rsaref) +- +- AC_MSG_CHECKING([for easter eggs]) +- AC_MSG_RESULT([none found]) +- +-else +- have_ssl=no +-fi +- +-if test "$have_ssl" = yes; then +- AC_MSG_CHECKING(for OpenSSL version) +- dnl Check for SSL version +- AC_CACHE_VAL(ac_cv_ssl_version, +- [ +- +- cat >conftest.$ac_ext < +-#include +- int main() { +- +-#ifndef OPENSSL_VERSION_NUMBER +- printf("ssl_version=\\"error\\"\n"); +-#else +- if (OPENSSL_VERSION_NUMBER < 0x00906000) +- printf("ssl_version=\\"old\\"\n"); +- else +- printf("ssl_version=\\"ok\\"\n"); +-#endif +- return (0); +- } +-EOF +- +- ac_save_CPPFLAGS=$CPPFLAGS +- if test "$ac_ssl_includes" != "/usr/include"; then +- CPPFLAGS="$CPPFLAGS -I$ac_ssl_includes" +- fi +- +- if AC_TRY_EVAL(ac_link); then +- +- if eval `./conftest 2>&5`; then +- if test $ssl_version = error; then +- AC_MSG_ERROR([$ssl_incdir/openssl/opensslv.h doesn't define OPENSSL_VERSION_NUMBER !]) +- else +- if test $ssl_version = old; then +- AC_MSG_WARN([OpenSSL version too old. Upgrade to 0.9.6 at least, see http://www.openssl.org. SSL support disabled.]) +- have_ssl=no +- fi +- fi +- ac_cv_ssl_version="ssl_version=$ssl_version" +- else +- AC_MSG_ERROR([Your system couldn't run a small SSL test program. +- Check config.log, and if you can't figure it out, send a mail to +- David Faure , attaching your config.log]) +- fi +- +- else +- AC_MSG_ERROR([Your system couldn't link a small SSL test program. +- Check config.log, and if you can't figure it out, send a mail to +- David Faure , attaching your config.log]) +- fi +- CPPFLAGS=$ac_save_CPPFLAGS +- +- ]) +- +- eval "$ac_cv_ssl_version" +- AC_MSG_RESULT($ssl_version) +-fi +- +-if test "$have_ssl" != yes; then +- LIBSSL=""; +-else +- AC_DEFINE(HAVE_SSL, 1, [If we are going to use OpenSSL]) +- ac_cv_have_ssl="have_ssl=yes \ +- ac_ssl_includes=$ac_ssl_includes ac_ssl_libraries=$ac_ssl_libraries ac_ssl_rsaref=$ac_ssl_rsaref" +- +- +- ssl_libraries="$ac_ssl_libraries" +- ssl_includes="$ac_ssl_includes" +- +- if test "$ac_ssl_rsaref" = yes; then +- LIBSSL="-lssl -lcrypto -lRSAglue -lrsaref" +- fi +- +- if test $ssl_version = "old"; then +- AC_DEFINE(HAVE_OLD_SSL_API, 1, [Define if you have OpenSSL < 0.9.6]) +- fi +-fi +- +-SSL_INCLUDES= +- +-if test "$ssl_includes" = "/usr/include"; then +- if test -f /usr/kerberos/include/krb5.h; then +- SSL_INCLUDES="-I/usr/kerberos/include" +- fi +-elif test "$ssl_includes" != "/usr/local/include" && test -n "$ssl_includes"; then +- SSL_INCLUDES="-I$ssl_includes" +-fi +- +-if test "$ssl_libraries" = "/usr/lib" || test "$ssl_libraries" = "/usr/local/lib" || test -z "$ssl_libraries" || test "$ssl_libraries" = "NONE"; then +- SSL_LDFLAGS="" +-else +- SSL_LDFLAGS="-L$ssl_libraries -R$ssl_libraries" +-fi +- +-AC_SUBST(SSL_INCLUDES) +-AC_SUBST(SSL_LDFLAGS) +-AC_SUBST(LIBSSL) +-]) +- +-AC_DEFUN([KDE_CHECK_STRLCPY], +-[ +- AC_REQUIRE([AC_CHECK_STRLCAT]) +- AC_REQUIRE([AC_CHECK_STRLCPY]) +- AC_CHECK_SIZEOF(size_t) +- AC_CHECK_SIZEOF(unsigned long) +- +- AC_MSG_CHECKING([sizeof size_t == sizeof unsigned long]) +- AC_TRY_COMPILE(,[ +- #if SIZEOF_SIZE_T != SIZEOF_UNSIGNED_LONG +- choke me +- #endif +- ],AC_MSG_RESULT([yes]),[ +- AC_MSG_RESULT(no) +- AC_MSG_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! +- ]) +- ]) +-]) +- +-AC_DEFUN([KDE_CHECK_BINUTILS], +-[ +- AC_MSG_CHECKING([if ld supports unversioned version maps]) +- +- kde_save_LDFLAGS="$LDFLAGS" +- LDFLAGS="$LDFLAGS -Wl,--version-script=conftest.map" +- echo "{ local: extern \"C++\" { foo }; };" > conftest.map +- AC_TRY_LINK([int foo;], +-[ +-#ifdef __INTEL_COMPILER +-icc apparently does not support libtools version-info and version-script +-at the same time. Dunno where the bug is, but until somebody figured out, +-better disable the optional version scripts. +-#endif +- +- foo = 42; +-], kde_supports_versionmaps=yes, kde_supports_versionmaps=no) +- LDFLAGS="$kde_save_LDFLAGS" +- rm -f conftest.map +- AM_CONDITIONAL(include_VERSION_SCRIPT, +- [test "$kde_supports_versionmaps" = "yes" && test "$kde_use_debug_code" = "no"]) +- +- AC_MSG_RESULT($kde_supports_versionmaps) +-]) +- +-AC_DEFUN([AM_PROG_OBJC],[ +-AC_CHECK_PROGS(OBJC, gcc, gcc) +-test -z "$OBJC" && AC_MSG_ERROR([no acceptable objective-c gcc found in \$PATH]) +-if test "x${OBJCFLAGS-unset}" = xunset; then +- OBJCFLAGS="-g -O2" +-fi +-AC_SUBST(OBJCFLAGS) +-_AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES(OBJC)]) +-]) +- +-AC_DEFUN([KDE_CHECK_PERL], +-[ +- KDE_FIND_PATH(perl, PERL, [$bindir $exec_prefix/bin $prefix/bin], [ +- AC_MSG_ERROR([No Perl found in your $PATH. +-We need perl to generate some code.]) +- ]) +- AC_SUBST(PERL) +-]) +- +-AC_DEFUN([KDE_CHECK_LARGEFILE], +-[ +-AC_SYS_LARGEFILE +-if test "$ac_cv_sys_file_offset_bits" != no; then +- CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits" +-fi +- +-if test "x$ac_cv_sys_large_files" != "xno"; then +- CPPFLAGS="$CPPFLAGS -D_LARGE_FILES=1" +-fi +- +-]) +- +-dnl A small extension to PKG_CHECK_MODULES (defined in pkg.m4.in) +-dnl which allows to search for libs that get installed into the KDE prefix. +-dnl +-dnl Syntax: KDE_PKG_CHECK_MODULES(KSTUFF, libkexif >= 0.2 glib = 1.3.4, action-if, action-not) +-dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page +-dnl also defines KSTUFF_PKG_ERRORS on error +-AC_DEFUN([KDE_PKG_CHECK_MODULES], [ +- +- PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" +- if test "$prefix" != "$kde_libs_prefix"; then +- PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" +- fi +- export PKG_CONFIG_PATH +- PKG_CHECK_MODULES([$1],[$2],[$3],[$4]) +-]) +- +- +-dnl Check for PIE support in the compiler and linker +-AC_DEFUN([KDE_CHECK_PIE_SUPPORT], +-[ +- AC_CACHE_CHECK([for PIE support], kde_cv_val_pie_support, +- [ +- AC_LANG_SAVE +- AC_LANG_CPLUSPLUS +- safe_CXXFLAGS=$CXXFLAGS +- safe_LDFLAGS=$LDFLAGS +- CXXFLAGS="$CXXFLAGS -fPIE" +- LDFLAGS="$LDFLAGS -pie" +- +- AC_TRY_LINK([int foo;], [], [kde_cv_val_pie_support=yes], [kde_cv_val_pie_support=no]) +- +- CXXFLAGS=$safe_CXXFLAGS +- LDFLAGS=$safe_LDFLAGS +- AC_LANG_RESTORE +- ]) +- +- AC_MSG_CHECKING(if enabling -pie/fPIE support) +- +- AC_ARG_ENABLE(pie, +- AC_HELP_STRING([--enable-pie],[platform supports PIE linking [default=detect]]), +- [kde_has_pie_support=$enableval], +- [kde_has_pie_support=detect]) +- +- if test "$kde_has_pie_support" = "detect"; then +- kde_has_pie_support=$kde_cv_val_pie_support +- fi +- +- AC_MSG_RESULT([$kde_has_pie_support]) +- +- KDE_USE_FPIE="" +- KDE_USE_PIE="" +- +- AC_SUBST([KDE_USE_FPIE]) +- AC_SUBST([KDE_USE_PIE]) +- +- if test "$kde_has_pie_support" = "yes"; then +- KDE_USE_FPIE="-fPIE" +- KDE_USE_PIE="-pie" +- fi +-]) +-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- +-## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 +-## Free Software Foundation, Inc. +-## Originally by Gordon Matzigkeit , 1996 +-## +-## 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 48 Debian 1.5.22-4 AC_PROG_LIBTOOL +- +- +-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) +-# ----------------------------------------------------------- +-# If this macro is not defined by Autoconf, define it here. +-m4_ifdef([AC_PROVIDE_IFELSE], +- [], +- [m4_define([AC_PROVIDE_IFELSE], +- [m4_ifdef([AC_PROVIDE_$1], +- [$2], [$3])])]) +- +- +-# AC_PROG_LIBTOOL +-# --------------- +-AC_DEFUN([AC_PROG_LIBTOOL], +-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl +-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX +-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. +- AC_PROVIDE_IFELSE([AC_PROG_CXX], +- [AC_LIBTOOL_CXX], +- [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX +- ])]) +-dnl And a similar setup for Fortran 77 support +- AC_PROVIDE_IFELSE([AC_PROG_F77], +- [AC_LIBTOOL_F77], +- [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 +-])]) +- +-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. +-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run +-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. +- AC_PROVIDE_IFELSE([AC_PROG_GCJ], +- [AC_LIBTOOL_GCJ], +- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], +- [AC_LIBTOOL_GCJ], +- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], +- [AC_LIBTOOL_GCJ], +- [ifdef([AC_PROG_GCJ], +- [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) +- ifdef([A][M_PROG_GCJ], +- [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) +- ifdef([LT_AC_PROG_GCJ], +- [define([LT_AC_PROG_GCJ], +- defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) +-])])# AC_PROG_LIBTOOL +- +- +-# _AC_PROG_LIBTOOL +-# ---------------- +-AC_DEFUN([_AC_PROG_LIBTOOL], +-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl +-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl +-AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl +-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl +- +-# This can be used to rebuild libtool when needed +-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" +- +-# Always use our own libtool. +-LIBTOOL='$(SHELL) $(top_builddir)/libtool' +-AC_SUBST(LIBTOOL)dnl +- +-# Prevent multiple expansion +-define([AC_PROG_LIBTOOL], []) +-])# _AC_PROG_LIBTOOL +- +- +-# AC_LIBTOOL_SETUP +-# ---------------- +-AC_DEFUN([AC_LIBTOOL_SETUP], +-[AC_PREREQ(2.50)dnl +-AC_REQUIRE([AC_ENABLE_SHARED])dnl +-AC_REQUIRE([AC_ENABLE_STATIC])dnl +-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl +-AC_REQUIRE([AC_CANONICAL_HOST])dnl +-AC_REQUIRE([AC_CANONICAL_BUILD])dnl +-AC_REQUIRE([AC_PROG_CC])dnl +-AC_REQUIRE([AC_PROG_LD])dnl +-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl +-AC_REQUIRE([AC_PROG_NM])dnl +- +-AC_REQUIRE([AC_PROG_LN_S])dnl +-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl +-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! +-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 +- +-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +-_LT_AC_PROG_ECHO_BACKSLASH +- +-case $host_os in +-aix3*) +- # AIX sometimes has problems with the GCC collect2 program. For some +- # reason, if we set the COLLECT_NAMES environment variable, the problems +- # vanish in a puff of smoke. +- if test "X${COLLECT_NAMES+set}" != Xset; then +- COLLECT_NAMES= +- export COLLECT_NAMES +- fi +- ;; +-esac +- +-# Sed substitution that helps us do robust quoting. It backslashifies +-# metacharacters that are still active within double-quoted strings. +-Xsed='sed -e 1s/^X//' +-[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] +- +-# Same as above, but do not quote variable references. +-[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] +- +-# Sed substitution to delay expansion of an escaped shell variable in a +-# double_quote_subst'ed string. +-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' +- +-# Sed substitution to avoid accidental globbing in evaled expressions +-no_glob_subst='s/\*/\\\*/g' +- +-# Constants: +-rm="rm -f" +- +-# Global variables: +-default_ofile=libtool +-can_build_shared=yes +- +-# All known linkers require a `.a' archive for static linking (except MSVC, +-# which needs '.lib'). +-libext=a +-ltmain="$ac_aux_dir/ltmain.sh" +-ofile="$default_ofile" +-with_gnu_ld="$lt_cv_prog_gnu_ld" +- +-AC_CHECK_TOOL(AR, ar, false) +-AC_CHECK_TOOL(RANLIB, ranlib, :) +-AC_CHECK_TOOL(STRIP, strip, :) +- +-old_CC="$CC" +-old_CFLAGS="$CFLAGS" +- +-# Set sane defaults for various variables +-test -z "$AR" && AR=ar +-test -z "$AR_FLAGS" && AR_FLAGS=cru +-test -z "$AS" && AS=as +-test -z "$CC" && CC=cc +-test -z "$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" +-test -z "$MAGIC_CMD" && MAGIC_CMD=file +-test -z "$NM" && NM=nm +-test -z "$SED" && SED=sed +-test -z "$OBJDUMP" && OBJDUMP=objdump +-test -z "$RANLIB" && RANLIB=: +-test -z "$STRIP" && STRIP=: +-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_postinstall_cmds='chmod 644 $oldlib' +-old_postuninstall_cmds= +- +-if test -n "$RANLIB"; then +- case $host_os in +- openbsd*) +- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" +- ;; +- *) +- 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*) +- if test "$file_magic_cmd" = '$MAGIC_CMD'; then +- AC_PATH_MAGIC +- fi +- ;; +-esac +- +-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) +- +-AC_ARG_ENABLE([libtool-lock], +- [AC_HELP_STRING([--disable-libtool-lock], +- [avoid locking (might break parallel builds)])]) +-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes +- +-AC_ARG_WITH([pic], +- [AC_HELP_STRING([--with-pic], +- [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], +- [pic_mode="$withval"], +- [pic_mode=default]) +-test -z "$pic_mode" && pic_mode=default +- +-# Use C for the default configuration in the libtool script +-tagname= +-AC_LIBTOOL_LANG_C_CONFIG +-_LT_AC_TAGCONFIG +-])# AC_LIBTOOL_SETUP +- +- +-# _LT_AC_SYS_COMPILER +-# ------------------- +-AC_DEFUN([_LT_AC_SYS_COMPILER], +-[AC_REQUIRE([AC_PROG_CC])dnl +- +-# If no C compiler was specified, use CC. +-LTCC=${LTCC-"$CC"} +- +-# If no C compiler flags were specified, use CFLAGS. +-LTCFLAGS=${LTCFLAGS-"$CFLAGS"} +- +-# Allow CC to be a program name with arguments. +-compiler=$CC +-])# _LT_AC_SYS_COMPILER +- +- +-# _LT_CC_BASENAME(CC) +-# ------------------- +-# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +-AC_DEFUN([_LT_CC_BASENAME], +-[for cc_temp in $1""; do +- case $cc_temp in +- compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; +- distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; +- \-*) ;; +- *) break;; +- esac +-done +-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +-]) +- +- +-# _LT_COMPILER_BOILERPLATE +-# ------------------------ +-# Check for compiler boilerplate output or warnings with +-# the simple compiler test code. +-AC_DEFUN([_LT_COMPILER_BOILERPLATE], +-[ac_outfile=conftest.$ac_objext +-printf "$lt_simple_compile_test_code" >conftest.$ac_ext +-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +-_lt_compiler_boilerplate=`cat conftest.err` +-$rm conftest* +-])# _LT_COMPILER_BOILERPLATE +- +- +-# _LT_LINKER_BOILERPLATE +-# ---------------------- +-# Check for linker boilerplate output or warnings with +-# the simple link test code. +-AC_DEFUN([_LT_LINKER_BOILERPLATE], +-[ac_outfile=conftest.$ac_objext +-printf "$lt_simple_link_test_code" >conftest.$ac_ext +-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +-_lt_linker_boilerplate=`cat conftest.err` +-$rm conftest* +-])# _LT_LINKER_BOILERPLATE +- +- +-# _LT_AC_SYS_LIBPATH_AIX +-# ---------------------- +-# Links a minimal program and checks the executable +-# for the system default hardcoded library path. In most cases, +-# this is /usr/lib:/lib, but when the MPI compilers are used +-# the location of the communication and MPI libs are included too. +-# 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; } +-}'` +-# 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="/usr/lib:/lib"; fi +-])# _LT_AC_SYS_LIBPATH_AIX +- +- +-# _LT_AC_SHELL_INIT(ARG) +-# ---------------------- +-AC_DEFUN([_LT_AC_SHELL_INIT], +-[ifdef([AC_DIVERSION_NOTICE], +- [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], +- [AC_DIVERT_PUSH(NOTICE)]) +-$1 +-AC_DIVERT_POP +-])# _LT_AC_SHELL_INIT +- +- +-# _LT_AC_PROG_ECHO_BACKSLASH +-# -------------------------- +-# Add some code to the start of the generated configure script which +-# will find an echo command which doesn't interpret backslashes. +-AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], +-[_LT_AC_SHELL_INIT([ +-# Check that we are running under the correct shell. +-SHELL=${CONFIG_SHELL-/bin/sh} +- +-case X$ECHO in +-X*--fallback-echo) +- # Remove one level of quotation (which was required for Make). +- ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` +- ;; +-esac +- +-echo=${ECHO-echo} +-if test "X[$]1" = X--no-reexec; then +- # Discard the --no-reexec flag, and continue. +- shift +-elif test "X[$]1" = X--fallback-echo; then +- # Avoid inline document here, it may be left over +- : +-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then +- # Yippee, $echo works! +- : +-else +- # Restart under the correct shell. +- exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} +-fi +- +-if test "X[$]1" = X--fallback-echo; then +- # used as fallback echo +- shift +- cat </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` && +- (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null +- then +- break +- fi +- done +-fi +- +-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && +- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- : +-else +- # The Solaris, AIX, and Digital Unix default echo programs unquote +- # backslashes. This makes it impossible to quote backslashes using +- # echo "$something" | sed 's/\\/\\\\/g' +- # +- # So, first we look for a working echo in the user's PATH. +- +- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +- for dir in $PATH /usr/ucb; do +- IFS="$lt_save_ifs" +- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && +- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && +- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- echo="$dir/echo" +- break +- fi +- done +- IFS="$lt_save_ifs" +- +- if test "X$echo" = Xecho; then +- # We didn't find a better echo, so look for alternatives. +- if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && +- echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- # This shell has a builtin print -r that does the trick. +- echo='print -r' +- elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && +- test "X$CONFIG_SHELL" != X/bin/ksh; then +- # If we have ksh, try running configure again with it. +- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} +- export ORIGINAL_CONFIG_SHELL +- CONFIG_SHELL=/bin/ksh +- export CONFIG_SHELL +- exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} +- else +- # Try using printf. +- echo='printf %s\n' +- if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && +- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- # Cool, printf works +- : +- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && +- test "X$echo_testing_string" = 'X\t' && +- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL +- export CONFIG_SHELL +- SHELL="$CONFIG_SHELL" +- export SHELL +- echo="$CONFIG_SHELL [$]0 --fallback-echo" +- elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && +- test "X$echo_testing_string" = 'X\t' && +- echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- echo="$CONFIG_SHELL [$]0 --fallback-echo" +- else +- # maybe with a smaller string... +- prev=: +- +- for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do +- if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null +- then +- break +- fi +- prev="$cmd" +- done +- +- if test "$prev" != 'sed 50q "[$]0"'; then +- echo_test_string=`eval $prev` +- export echo_test_string +- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} +- else +- # Oops. We lost completely, so just stick with echo. +- echo=echo +- fi +- fi +- fi +- fi +-fi +-fi +- +-# Copy echo and quote the copy suitably for passing to libtool from +-# the Makefile, instead of quoting the original, which is used later. +-ECHO=$echo +-if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then +- ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" +-fi +- +-AC_SUBST(ECHO) +-])])# _LT_AC_PROG_ECHO_BACKSLASH +- +- +-# _LT_AC_LOCK +-# ----------- +-AC_DEFUN([_LT_AC_LOCK], +-[AC_ARG_ENABLE([libtool-lock], +- [AC_HELP_STRING([--disable-libtool-lock], +- [avoid locking (might break parallel builds)])]) +-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes +- +-# Some flags need to be propagated to the compiler or linker for good +-# libtool support. +-case $host in +-ia64-*-hpux*) +- # 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.$ac_objext` in +- *ELF-32*) +- HPUX_IA64_MODE="32" +- ;; +- *ELF-64*) +- HPUX_IA64_MODE="64" +- ;; +- esac +- fi +- rm -rf conftest* +- ;; +-*-*-irix6*) +- # Find out which ABI we are using. +- echo '[#]line __oline__ "configure"' > conftest.$ac_ext +- if AC_TRY_EVAL(ac_compile); then +- if test "$lt_cv_prog_gnu_ld" = yes; then +- case `/usr/bin/file conftest.$ac_objext` in +- *32-bit*) +- LD="${LD-ld} -melf32bsmip" +- ;; +- *N32*) +- LD="${LD-ld} -melf32bmipn32" +- ;; +- *64-bit*) +- LD="${LD-ld} -melf64bmip" +- ;; +- esac +- else +- case `/usr/bin/file conftest.$ac_objext` in +- *32-bit*) +- LD="${LD-ld} -32" +- ;; +- *N32*) +- LD="${LD-ld} -n32" +- ;; +- *64-bit*) +- LD="${LD-ld} -64" +- ;; +- esac +- fi +- fi +- rm -rf conftest* +- ;; +- +-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 +- *32-bit*) +- case $host in +- x86_64-*linux*) +- LD="${LD-ld} -m elf_i386" +- ;; +- ppc64-*linux*|powerpc64-*linux*) +- LD="${LD-ld} -m elf32ppclinux" +- ;; +- s390x-*linux*) +- LD="${LD-ld} -m elf_s390" +- ;; +- sparc64-*linux*) +- LD="${LD-ld} -m elf32_sparc" +- ;; +- esac +- ;; +- *64-bit*) +- case $host in +- x86_64-*linux*) +- LD="${LD-ld} -m elf_x86_64" +- ;; +- ppc*-*linux*|powerpc*-*linux*) +- LD="${LD-ld} -m elf64ppc" +- ;; +- s390*-*linux*) +- LD="${LD-ld} -m elf64_s390" +- ;; +- sparc*-*linux*) +- LD="${LD-ld} -m elf64_sparc" +- ;; +- esac +- ;; +- esac +- fi +- rm -rf conftest* +- ;; +- +-*-*-sco3.2v5*) +- # On SCO OpenServer 5, we need -belf to get full-featured binaries. +- SAVE_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS -belf" +- AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, +- [AC_LANG_PUSH(C) +- AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) +- AC_LANG_POP]) +- if test x"$lt_cv_cc_needs_belf" != x"yes"; then +- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf +- CFLAGS="$SAVE_CFLAGS" +- fi +- ;; +-sparc*-*solaris*) +- # Find out which ABI we are using. +- echo 'int i;' > conftest.$ac_ext +- if AC_TRY_EVAL(ac_compile); then +- case `/usr/bin/file conftest.o` in +- *64-bit*) +- case $lt_cv_prog_gnu_ld in +- yes*) LD="${LD-ld} -m elf64_sparc" ;; +- *) LD="${LD-ld} -64" ;; +- esac +- ;; +- esac +- fi +- rm -rf conftest* +- ;; +- +-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], +-[*-*-cygwin* | *-*-mingw* | *-*-pw32*) +- AC_CHECK_TOOL(DLLTOOL, dlltool, false) +- AC_CHECK_TOOL(AS, as, false) +- AC_CHECK_TOOL(OBJDUMP, objdump, false) +- ;; +- ]) +-esac +- +-need_locks="$enable_libtool_lock" +- +-])# _LT_AC_LOCK +- +- +-# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, +-# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) +-# ---------------------------------------------------------------- +-# Check whether the given compiler option works +-AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], +-[AC_REQUIRE([LT_AC_PROG_SED]) +-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 +- 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. +- # Note that $ac_compile itself does not contain backslashes and begins +- # 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}\{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) +- (eval "$lt_compile" 2>conftest.err) +- ac_status=$? +- cat conftest.err >&AS_MESSAGE_LOG_FD +- 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 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 +- $rm conftest* +-]) +- +-if test x"[$]$2" = xyes; then +- ifelse([$5], , :, [$5]) +-else +- ifelse([$6], , :, [$6]) +-fi +-])# AC_LIBTOOL_COMPILER_OPTION +- +- +-# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, +-# [ACTION-SUCCESS], [ACTION-FAILURE]) +-# ------------------------------------------------------------ +-# Check whether the given compiler option works +-AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], +-[AC_CACHE_CHECK([$1], [$2], +- [$2=no +- save_LDFLAGS="$LDFLAGS" +- LDFLAGS="$LDFLAGS $3" +- printf "$lt_simple_link_test_code" > conftest.$ac_ext +- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then +- # The 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* +- LDFLAGS="$save_LDFLAGS" +-]) +- +-if test x"[$]$2" = xyes; then +- ifelse([$4], , :, [$4]) +-else +- ifelse([$5], , :, [$5]) +-fi +-])# AC_LIBTOOL_LINKER_OPTION +- +- +-# AC_LIBTOOL_SYS_MAX_CMD_LEN +-# -------------------------- +-AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], +-[# find the maximum length of command line arguments +-AC_MSG_CHECKING([the maximum length of command line arguments]) +-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl +- i=0 +- teststring="ABCD" +- +- case $build_os in +- msdosdjgpp*) +- # On DJGPP, this test can blow up pretty badly due to problems in libc +- # (any single argument exceeding 2000 bytes causes a buffer overrun +- # during glob expansion). Even if it were fixed, the result of this +- # check would be larger than it should be. +- lt_cv_sys_max_cmd_len=12288; # 12K is about right +- ;; +- +- gnu*) +- # Under GNU Hurd, this test is not required because there is +- # no limit to the length of command line arguments. +- # Libtool will interpret -1 as no limit whatsoever +- lt_cv_sys_max_cmd_len=-1; +- ;; +- +- cygwin* | mingw*) +- # On Win9x/ME, this test blows up -- it succeeds, but takes +- # about 5 minutes as the teststring grows exponentially. +- # Worse, since 9x/ME are not pre-emptively multitasking, +- # you end up with a "frozen" computer, even though with patience +- # the test eventually succeeds (with a max line length of 256k). +- # Instead, let's just punt: use the minimum linelength reported by +- # all of the supported platforms: 8192 (on NT/2K/XP). +- lt_cv_sys_max_cmd_len=8192; +- ;; +- +- amigaos*) +- # On AmigaOS with pdksh, this test takes hours, literally. +- # So we just punt and use a minimum line length of 8192. +- lt_cv_sys_max_cmd_len=8192; +- ;; +- +- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) +- # This has been around since 386BSD, at least. Likely further. +- if test -x /sbin/sysctl; then +- lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` +- elif test -x /usr/sbin/sysctl; then +- lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` +- else +- lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs +- fi +- # And add a safety zone +- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` +- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` +- ;; +- +- interix*) +- # We know the value 262144 and hardcode it with a safety zone (like BSD) +- lt_cv_sys_max_cmd_len=196608 +- ;; +- +- osf*) +- # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure +- # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not +- # nice to cause kernel panics so lets avoid the loop below. +- # First set a reasonable default. +- lt_cv_sys_max_cmd_len=16384 +- # +- if test -x /sbin/sysconfig; then +- case `/sbin/sysconfig -q proc exec_disable_arg_limit` in +- *1*) lt_cv_sys_max_cmd_len=-1 ;; +- esac +- fi +- ;; +- sco3.2v5*) +- lt_cv_sys_max_cmd_len=102400 +- ;; +- sysv5* | sco5v6* | sysv4.2uw2*) +- kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` +- if test -n "$kargmax"; then +- lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` +- else +- lt_cv_sys_max_cmd_len=32768 +- fi +- ;; +- *) +- # If test is not a shell built-in, we'll probably end up computing a +- # maximum length that is only half of the actual maximum length, but +- # we can't tell. +- 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` +- ;; +- esac +-]) +-if test -n $lt_cv_sys_max_cmd_len ; then +- AC_MSG_RESULT($lt_cv_sys_max_cmd_len) +-else +- AC_MSG_RESULT(none) +-fi +-])# AC_LIBTOOL_SYS_MAX_CMD_LEN +- +- +-# _LT_AC_CHECK_DLFCN +-# ------------------ +-AC_DEFUN([_LT_AC_CHECK_DLFCN], +-[AC_CHECK_HEADERS(dlfcn.h)dnl +-])# _LT_AC_CHECK_DLFCN +- +- +-# _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 : +- [$4] +-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); */ +- } +- else +- puts (dlerror ()); +- +- exit (status); +-}] +-EOF +- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then +- (./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_dlunknown|x*) $3 ;; +- esac +- else : +- # compilation failed +- $3 +- fi +-fi +-rm -fr conftest* +-])# _LT_AC_TRY_DLOPEN_SELF +- +- +-# AC_LIBTOOL_DLOPEN_SELF +-# ---------------------- +-AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], +-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl +-if test "x$enable_dlopen" != xyes; then +- enable_dlopen=unknown +- enable_dlopen_self=unknown +- enable_dlopen_self_static=unknown +-else +- lt_cv_dlopen=no +- lt_cv_dlopen_libs= +- +- case $host_os in +- beos*) +- lt_cv_dlopen="load_add_on" +- lt_cv_dlopen_libs= +- lt_cv_dlopen_self=yes +- ;; +- +- mingw* | pw32*) +- lt_cv_dlopen="LoadLibrary" +- lt_cv_dlopen_libs= +- ;; +- +- cygwin*) +- lt_cv_dlopen="dlopen" +- lt_cv_dlopen_libs= +- ;; +- +- darwin*) +- # if libdl is installed we need to link against it +- AC_CHECK_LIB([dl], [dlopen], +- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ +- lt_cv_dlopen="dyld" +- lt_cv_dlopen_libs= +- 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"], +- [AC_CHECK_FUNC([dlopen], +- [lt_cv_dlopen="dlopen"], +- [AC_CHECK_LIB([dl], [dlopen], +- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], +- [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"]) +- ]) +- ]) +- ]) +- ]) +- ]) +- ;; +- 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" +- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" +- +- save_LIBS="$LIBS" +- LIBS="$lt_cv_dlopen_libs $LIBS" +- +- AC_CACHE_CHECK([whether a program can dlopen itself], +- lt_cv_dlopen_self, [dnl +- _LT_AC_TRY_DLOPEN_SELF( +- lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, +- lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) +- ]) +- +- if test "x$lt_cv_dlopen_self" = xyes; then +- 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( +- lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, +- lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) +- ]) +- 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 +-])# AC_LIBTOOL_DLOPEN_SELF +- +- +-# AC_LIBTOOL_PROG_CC_C_O([TAGNAME]) +-# --------------------------------- +-# 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_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 +- $rm -r conftest 2>/dev/null +- mkdir conftest +- cd conftest +- mkdir out +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext +- +- lt_compiler_flag="-o out/conftest2.$ac_objext" +- # Insert the option either (1) after the last *FLAGS variable, or +- # (2) before a word containing "conftest.", or (3) at the end. +- # 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}\{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) +- (eval "$lt_compile" 2>out/conftest.err) +- ac_status=$? +- cat out/conftest.err >&AS_MESSAGE_LOG_FD +- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD +- 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 +- $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 . 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* +-]) +-])# AC_LIBTOOL_PROG_CC_C_O +- +- +-# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME]) +-# ----------------------------------------- +-# Check to see if we can do hard links to lock some files if needed +-AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], +-[AC_REQUIRE([_LT_AC_LOCK])dnl +- +-hard_links="nottested" +-if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then +- # do not overwrite the value of need_locks provided by the user +- AC_MSG_CHECKING([if we can lock with hard links]) +- hard_links=yes +- $rm conftest* +- ln conftest.a conftest.b 2>/dev/null && hard_links=no +- touch conftest.a +- ln conftest.a conftest.b 2>&5 || hard_links=no +- ln conftest.a conftest.b 2>/dev/null && hard_links=no +- AC_MSG_RESULT([$hard_links]) +- if test "$hard_links" = no; then +- AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) +- need_locks=warn +- fi +-else +- need_locks=no +-fi +-])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS +- +- +-# AC_LIBTOOL_OBJDIR +-# ----------------- +-AC_DEFUN([AC_LIBTOOL_OBJDIR], +-[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], +-[rm -f .libs 2>/dev/null +-mkdir .libs 2>/dev/null +-if test -d .libs; then +- lt_cv_objdir=.libs +-else +- # MS-DOS does not allow filenames that begin with a dot. +- lt_cv_objdir=_libs +-fi +-rmdir .libs 2>/dev/null]) +-objdir=$lt_cv_objdir +-])# AC_LIBTOOL_OBJDIR +- +- +-# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME]) +-# ---------------------------------------------- +-# Check hardcoding attributes. +-AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], +-[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 +- +- # We can hardcode non-existant directories. +- if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && +- # If the only mechanism to avoid hardcoding is shlibpath_var, we +- # have to relink, otherwise we might link with an installed library +- # when we should be linking with a yet-to-be-installed one +- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no && +- test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then +- # Linking always hardcodes the temporary library directory. +- _LT_AC_TAGVAR(hardcode_action, $1)=relink +- else +- # We can link without hardcoding, and we can hardcode nonexisting dirs. +- _LT_AC_TAGVAR(hardcode_action, $1)=immediate +- fi +-else +- # We cannot hardcode anything, or else we can only hardcode existing +- # directories. +- _LT_AC_TAGVAR(hardcode_action, $1)=unsupported +-fi +-AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)]) +- +-if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then +- # Fast installation is not supported +- enable_fast_install=no +-elif test "$shlibpath_overrides_runpath" = yes || +- test "$enable_shared" = no; then +- # Fast installation is not necessary +- enable_fast_install=needless +-fi +-])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH +- +- +-# AC_LIBTOOL_SYS_LIB_STRIP +-# ------------------------ +-AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP], +-[striplib= +-old_striplib= +-AC_MSG_CHECKING([whether stripping libraries is possible]) +-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" +- AC_MSG_RESULT([yes]) +-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" +- AC_MSG_RESULT([yes]) +- else +- AC_MSG_RESULT([no]) +-fi +- ;; +- *) +- AC_MSG_RESULT([no]) +- ;; +- esac +-fi +-])# AC_LIBTOOL_SYS_LIB_STRIP +- +- +-# AC_LIBTOOL_SYS_DYNAMIC_LINKER +-# ----------------------------- +-# PORTME Fill in your ld.so characteristics +-AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], +-[AC_MSG_CHECKING([dynamic linker characteristics]) +-library_names_spec= +-libname_spec='lib$name' +-soname_spec= +-shrext_cmds=".so" +-postinstall_cmds= +-postuninstall_cmds= +-finish_cmds= +-finish_eval= +-shlibpath_var= +-shlibpath_overrides_runpath=unknown +-version_type=none +-dynamic_linker="$host_os ld.so" +-sys_lib_dlsearch_path_spec="/lib /usr/lib" +-if test "$GCC" = yes; then +- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` +- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then +- # if the path contains ";" then we assume it to be the separator +- # otherwise default to the standard path separator (i.e. ":") - it is +- # assumed that no part of a normal pathname contains ";" but that should +- # okay in the real world where ";" in dirpaths is itself problematic. +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` +- else +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` +- fi +-else +- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +-fi +-need_lib_prefix=unknown +-hardcode_into_libs=no +- +-# when you set need_version to no, make sure it does not cause -set_version +-# flags to be left without arguments +-need_version=unknown +- +-case $host_os in +-aix3*) +- version_type=linux +- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' +- shlibpath_var=LIBPATH +- +- # AIX 3 has no versioning support, so we append a major version to the name. +- soname_spec='${libname}${release}${shared_ext}$major' +- ;; +- +-aix4* | aix5*) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- hardcode_into_libs=yes +- if test "$host_cpu" = ia64; then +- # AIX 5 supports IA64 +- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' +- shlibpath_var=LD_LIBRARY_PATH +- else +- # With GCC up to 2.95.x, collect2 would create an import file +- # for dependence libraries. The import file would start with +- # the line `#! .'. This would cause the generated library to +- # depend on `.', always an invalid library. This was fixed in +- # development snapshots of GCC prior to 3.0. +- case $host_os in +- aix4 | aix4.[[01]] | aix4.[[01]].*) +- if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' +- echo ' yes ' +- echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then +- : +- else +- can_build_shared=no +- fi +- ;; +- esac +- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct +- # soname into executable. Probably we can add versioning support to +- # collect2, so additional links can be useful in future. +- if test "$aix_use_runtimelinking" = yes; then +- # If using run time linking (on AIX 4.2 or later) use lib.so +- # instead of lib.a to let people know that these are not +- # typical AIX shared libraries. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- else +- # We preserve .a as extension for shared libraries through AIX4.2 +- # and later when we are not doing run time linking. +- library_names_spec='${libname}${release}.a $libname.a' +- soname_spec='${libname}${release}${shared_ext}$major' +- fi +- shlibpath_var=LIBPATH +- fi +- ;; +- +-amigaos*) +- library_names_spec='$libname.ixlibrary $libname.a' +- # Create ${libname}_ixlibrary.a entries in /sys/libs. +- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' +- ;; +- +-beos*) +- library_names_spec='${libname}${shared_ext}' +- dynamic_linker="$host_os ld.so" +- shlibpath_var=LIBRARY_PATH +- ;; +- +-bsdi[[45]]*) +- version_type=linux +- 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 $libdir' +- shlibpath_var=LD_LIBRARY_PATH +- sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" +- sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" +- # the default ld.so.conf also contains /usr/contrib/lib and +- # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow +- # libtool to hard-code these into programs +- ;; +- +-cygwin* | mingw* | pw32*) +- version_type=windows +- shrext_cmds=".dll" +- need_version=no +- need_lib_prefix=no +- +- case $GCC,$host_os in +- yes,cygwin* | yes,mingw* | yes,pw32*) +- library_names_spec='$libname.dll.a' +- # DLL is installed to $(libdir)/../bin by postinstall_cmds +- postinstall_cmds='base_file=`basename \${file}`~ +- 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~ +- chmod a+x \$dldir/$dlname' +- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ +- dlpath=$dir/\$dldll~ +- $rm \$dlpath' +- shlibpath_overrides_runpath=yes +- +- case $host_os in +- cygwin*) +- # Cygwin DLLs use 'cyg' prefix rather than 'lib' +- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' +- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" +- ;; +- mingw*) +- # MinGW DLLs use traditional 'lib' prefix +- soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' +- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` +- if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then +- # It is most probably a Windows format PATH printed by +- # mingw gcc, but we are running on Cygwin. Gcc prints its search +- # path with ; separators, and with drive letters. We can handle the +- # drive letters (cygwin fileutils understands them), so leave them, +- # especially as we might pass files found there to a mingw objdump, +- # which wouldn't understand a cygwinified path. Ahh. +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` +- else +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` +- fi +- ;; +- 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}' +- ;; +- esac +- ;; +- +- *) +- library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' +- ;; +- esac +- dynamic_linker='Win32 ld.exe' +- # FIXME: first we should search . and the directory the executable is in +- shlibpath_var=PATH +- ;; +- +-darwin* | rhapsody*) +- dynamic_linker="$host_os dyld" +- version_type=darwin +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' +- soname_spec='${libname}${release}${major}$shared_ext' +- shlibpath_overrides_runpath=yes +- shlibpath_var=DYLD_LIBRARY_PATH +- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' +- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. +- if test "$GCC" = yes; then +- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` +- else +- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' +- fi +- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' +- ;; +- +-dgux*) +- 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 +- ;; +- +-freebsd1*) +- dynamic_linker=no +- ;; +- +-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*) +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' +- need_version=no +- need_lib_prefix=no +- ;; +- freebsd-*) +- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' +- need_version=yes +- ;; +- esac +- shlibpath_var=LD_LIBRARY_PATH +- case $host_os in +- freebsd2*) +- shlibpath_overrides_runpath=yes +- ;; +- freebsd3.[[01]]* | freebsdelf3.[[01]]*) +- shlibpath_overrides_runpath=yes +- hardcode_into_libs=yes +- ;; +- freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ +- freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- ;; +- freebsd*) # from 4.6 on +- shlibpath_overrides_runpath=yes +- hardcode_into_libs=yes +- ;; +- esac +- ;; +- +-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 +- hardcode_into_libs=yes +- ;; +- +-hpux9* | hpux10* | hpux11*) +- # Give a soname corresponding to the major version so that dld.sl refuses to +- # link against other versions. +- version_type=sunos +- need_lib_prefix=no +- need_version=no +- case $host_cpu in +- ia64*) +- shrext_cmds='.so' +- hardcode_into_libs=yes +- dynamic_linker="$host_os dld.so" +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- if test "X$HPUX_IA64_MODE" = X32; then +- sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" +- else +- sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" +- fi +- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec +- ;; +- hppa*64*) +- shrext_cmds='.sl' +- hardcode_into_libs=yes +- dynamic_linker="$host_os dld.sl" +- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH +- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" +- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec +- ;; +- *) +- shrext_cmds='.sl' +- dynamic_linker="$host_os dld.sl" +- shlibpath_var=SHLIB_PATH +- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- ;; +- esac +- # HP-UX runs *really* slowly unless shared libraries are mode 555. +- postinstall_cmds='chmod 555 $lib' +- ;; +- +-interix3*) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- ;; +- +-irix5* | irix6* | nonstopux*) +- case $host_os in +- nonstopux*) version_type=nonstopux ;; +- *) +- if test "$lt_cv_prog_gnu_ld" = yes; then +- version_type=linux +- else +- version_type=irix +- fi ;; +- esac +- need_lib_prefix=no +- need_version=no +- soname_spec='${libname}${release}${shared_ext}$major' +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' +- case $host_os in +- irix5* | nonstopux*) +- libsuff= shlibsuff= +- ;; +- *) +- case $LD in # libtool.m4 will add one of these switches to LD +- *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") +- libsuff= shlibsuff= libmagic=32-bit;; +- *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") +- libsuff=32 shlibsuff=N32 libmagic=N32;; +- *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") +- libsuff=64 shlibsuff=64 libmagic=64-bit;; +- *) libsuff= shlibsuff= libmagic=never-match;; +- esac +- ;; +- esac +- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH +- shlibpath_overrides_runpath=no +- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" +- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" +- hardcode_into_libs=yes +- ;; +- +-# No shared lib support for Linux oldld, aout, or coff. +-linux*oldld* | linux*aout* | linux*coff*) +- dynamic_linker=no +- ;; +- +-# This must be Linux ELF. +-linux* | k*bsd*-gnu) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- # This implies no fast_install, which is unacceptable. +- # Some rework will be needed to allow for fast_install +- # before this can be enabled. +- hardcode_into_libs=yes +- +- # Append ld.so.conf contents to the search path +- if test -f /etc/ld.so.conf; then +- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" +- fi +- +- # We used to test for /lib/ld.so.1 and disable shared libraries on +- # powerpc, because MkLinux only supported shared libraries with the +- # GNU dynamic linker. Since this was broken with cross compilers, +- # most powerpc-linux boxes support dynamic linking these days and +- # people can always --disable-shared, the test was removed, and we +- # assume the GNU/Linux dynamic linker is in use. +- dynamic_linker='GNU/Linux ld.so' +- ;; +- +-netbsdelf*-gnu) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- dynamic_linker='NetBSD ld.elf_so' +- ;; +- +-netbsd*) +- version_type=sunos +- need_lib_prefix=no +- need_version=no +- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' +- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' +- dynamic_linker='NetBSD (a.out) ld.so' +- else +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- dynamic_linker='NetBSD ld.elf_so' +- fi +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes +- hardcode_into_libs=yes +- ;; +- +-newsos6) +- version_type=linux +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes +- ;; +- +-nto-qnx*) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes +- ;; +- +-openbsd*) +- version_type=sunos +- sys_lib_dlsearch_path_spec="/usr/lib" +- need_lib_prefix=no +- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. +- case $host_os in +- openbsd3.3 | openbsd3.3.*) need_version=yes ;; +- *) need_version=no ;; +- esac +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' +- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' +- shlibpath_var=LD_LIBRARY_PATH +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- case $host_os in +- openbsd2.[[89]] | openbsd2.[[89]].*) +- shlibpath_overrides_runpath=no +- ;; +- *) +- shlibpath_overrides_runpath=yes +- ;; +- esac +- else +- shlibpath_overrides_runpath=yes +- fi +- ;; +- +-os2*) +- libname_spec='$name' +- shrext_cmds=".dll" +- need_lib_prefix=no +- library_names_spec='$libname${shared_ext} $libname.a' +- dynamic_linker='OS/2 ld.exe' +- shlibpath_var=LIBPATH +- ;; +- +-osf3* | osf4* | osf5*) +- version_type=osf +- need_lib_prefix=no +- need_version=no +- soname_spec='${libname}${release}${shared_ext}$major' +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- shlibpath_var=LD_LIBRARY_PATH +- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" +- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" +- ;; +- +-solaris*) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes +- hardcode_into_libs=yes +- # ldd complains unless libraries are executable +- postinstall_cmds='chmod +x $lib' +- ;; +- +-sunos4*) +- version_type=sunos +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' +- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes +- if test "$with_gnu_ld" = yes; then +- need_lib_prefix=no +- fi +- need_version=yes +- ;; +- +-sysv4 | sysv4.3*) +- version_type=linux +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- case $host_vendor in +- sni) +- shlibpath_overrides_runpath=no +- need_lib_prefix=no +- export_dynamic_flag_spec='${wl}-Blargedynsym' +- runpath_var=LD_RUN_PATH +- ;; +- siemens) +- need_lib_prefix=no +- ;; +- motorola) +- need_lib_prefix=no +- need_version=no +- shlibpath_overrides_runpath=no +- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' +- ;; +- esac +- ;; +- +-sysv4*MP*) +- if test -d /usr/nec ;then +- version_type=linux +- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' +- soname_spec='$libname${shared_ext}.$major' +- shlibpath_var=LD_LIBRARY_PATH +- fi +- ;; +- +-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}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- ;; +- +-*) +- dynamic_linker=no +- ;; +-esac +-AC_MSG_RESULT([$dynamic_linker]) +-test "$dynamic_linker" = no && can_build_shared=no +- +-variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +-if test "$GCC" = yes; then +- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +-fi +-])# AC_LIBTOOL_SYS_DYNAMIC_LINKER +- +- +-# _LT_AC_TAGCONFIG +-# ---------------- +-AC_DEFUN([_LT_AC_TAGCONFIG], +-[AC_ARG_WITH([tags], +- [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], +- [include additional configurations @<:@automatic@:>@])], +- [tagnames="$withval"]) +- +-if test -f "$ltmain" && test -n "$tagnames"; then +- if test ! -f "${ofile}"; then +- AC_MSG_WARN([output file `$ofile' does not exist]) +- fi +- +- if test -z "$LTCC"; then +- eval "`$SHELL ${ofile} --config | grep '^LTCC='`" +- if test -z "$LTCC"; then +- AC_MSG_WARN([output file `$ofile' does not look like a libtool script]) +- else +- 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. +- available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` +- +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," +- for tagname in $tagnames; do +- IFS="$lt_save_ifs" +- # Check whether tagname contains only valid characters +- case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in +- "") ;; +- *) AC_MSG_ERROR([invalid tag name: $tagname]) +- ;; +- esac +- +- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null +- then +- AC_MSG_ERROR([tag name \"$tagname\" already exists]) +- fi +- +- # Update the list of available tags. +- if test -n "$tagname"; then +- echo appending configuration tag \"$tagname\" to $ofile +- +- case $tagname in +- 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_LIBTOOL_LANG_CXX_CONFIG +- else +- tagname="" +- fi +- ;; +- +- F77) +- if test -n "$F77" && test "X$F77" != "Xno"; then +- AC_LIBTOOL_LANG_F77_CONFIG +- else +- tagname="" +- fi +- ;; +- +- GCJ) +- if test -n "$GCJ" && test "X$GCJ" != "Xno"; then +- AC_LIBTOOL_LANG_GCJ_CONFIG +- else +- tagname="" +- fi +- ;; +- +- RC) +- AC_LIBTOOL_LANG_RC_CONFIG +- ;; +- +- *) +- AC_MSG_ERROR([Unsupported tag name: $tagname]) +- ;; +- esac +- +- # Append the new tag name to the list of available tags. +- if test -n "$tagname" ; then +- available_tags="$available_tags $tagname" +- fi +- fi +- done +- IFS="$lt_save_ifs" +- +- # Now substitute the updated list of available tags. +- if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then +- mv "${ofile}T" "$ofile" +- chmod +x "$ofile" +- else +- rm -f "${ofile}T" +- AC_MSG_ERROR([unable to update list of available tagged configurations.]) +- fi +-fi +-])# _LT_AC_TAGCONFIG +- +- +-# AC_LIBTOOL_DLOPEN +-# ----------------- +-# enable checks for dlopen support +-AC_DEFUN([AC_LIBTOOL_DLOPEN], +- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP]) +-])# AC_LIBTOOL_DLOPEN +- +- +-# AC_LIBTOOL_WIN32_DLL +-# -------------------- +-# declare package support for building win32 DLLs +-AC_DEFUN([AC_LIBTOOL_WIN32_DLL], +-[AC_BEFORE([$0], [AC_LIBTOOL_SETUP]) +-])# AC_LIBTOOL_WIN32_DLL +- +- +-# AC_ENABLE_SHARED([DEFAULT]) +-# --------------------------- +-# implement the --enable-shared flag +-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +-AC_DEFUN([AC_ENABLE_SHARED], +-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl +-AC_ARG_ENABLE([shared], +- [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@], +- [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])], +- [p=${PACKAGE-default} +- case $enableval in +- yes) enable_shared=yes ;; +- no) enable_shared=no ;; +- *) +- enable_shared=no +- # Look at the argument we got. We use all the common list separators. +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," +- for pkg in $enableval; do +- IFS="$lt_save_ifs" +- if test "X$pkg" = "X$p"; then +- enable_shared=yes +- fi +- done +- IFS="$lt_save_ifs" +- ;; +- esac], +- [enable_shared=]AC_ENABLE_SHARED_DEFAULT) +-])# AC_ENABLE_SHARED +- +- +-# AC_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) +-])# AC_DISABLE_SHARED +- +- +-# AC_ENABLE_STATIC([DEFAULT]) +-# --------------------------- +-# implement the --enable-static flag +-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +-AC_DEFUN([AC_ENABLE_STATIC], +-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl +-AC_ARG_ENABLE([static], +- [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@], +- [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])], +- [p=${PACKAGE-default} +- case $enableval in +- yes) enable_static=yes ;; +- no) enable_static=no ;; +- *) +- enable_static=no +- # Look at the argument we got. We use all the common list separators. +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," +- for pkg in $enableval; do +- IFS="$lt_save_ifs" +- if test "X$pkg" = "X$p"; then +- enable_static=yes +- fi +- done +- IFS="$lt_save_ifs" +- ;; +- esac], +- [enable_static=]AC_ENABLE_STATIC_DEFAULT) +-])# AC_ENABLE_STATIC +- +- +-# AC_DISABLE_STATIC +-# ----------------- +-# set the default static flag to --disable-static +-AC_DEFUN([AC_DISABLE_STATIC], +-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +-AC_ENABLE_STATIC(no) +-])# AC_DISABLE_STATIC +- +- +-# AC_ENABLE_FAST_INSTALL([DEFAULT]) +-# --------------------------------- +-# implement the --enable-fast-install flag +-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +-AC_DEFUN([AC_ENABLE_FAST_INSTALL], +-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl +-AC_ARG_ENABLE([fast-install], +- [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], +- [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], +- [p=${PACKAGE-default} +- case $enableval in +- yes) enable_fast_install=yes ;; +- no) enable_fast_install=no ;; +- *) +- enable_fast_install=no +- # Look at the argument we got. We use all the common list separators. +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," +- for pkg in $enableval; do +- IFS="$lt_save_ifs" +- if test "X$pkg" = "X$p"; then +- enable_fast_install=yes +- fi +- done +- IFS="$lt_save_ifs" +- ;; +- esac], +- [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT) +-])# AC_ENABLE_FAST_INSTALL +- +- +-# AC_DISABLE_FAST_INSTALL +-# ----------------------- +-# set the default to --disable-fast-install +-AC_DEFUN([AC_DISABLE_FAST_INSTALL], +-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +-AC_ENABLE_FAST_INSTALL(no) +-])# AC_DISABLE_FAST_INSTALL +- +- +-# AC_LIBTOOL_PICMODE([MODE]) +-# -------------------------- +-# implement the --with-pic flag +-# MODE is either `yes' or `no'. If omitted, it defaults to `both'. +-AC_DEFUN([AC_LIBTOOL_PICMODE], +-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +-pic_mode=ifelse($#,1,$1,default) +-])# AC_LIBTOOL_PICMODE +- +- +-# AC_PROG_EGREP +-# ------------- +-# This is predefined starting with Autoconf 2.54, so this conditional +-# definition can be removed once we require Autoconf 2.54 or later. +-m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP], +-[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep], +- [if echo a | (grep -E '(a|b)') >/dev/null 2>&1 +- then ac_cv_prog_egrep='grep -E' +- else ac_cv_prog_egrep='egrep' +- fi]) +- EGREP=$ac_cv_prog_egrep +- AC_SUBST([EGREP]) +-])]) +- +- +-# AC_PATH_TOOL_PREFIX +-# ------------------- +-# find a file program which can recognise shared library +-AC_DEFUN([AC_PATH_TOOL_PREFIX], +-[AC_REQUIRE([AC_PROG_EGREP])dnl +-AC_MSG_CHECKING([for $1]) +-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, +-[case $MAGIC_CMD in +-[[\\/*] | ?:[\\/]*]) +- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. +- ;; +-*) +- lt_save_MAGIC_CMD="$MAGIC_CMD" +- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +-dnl $ac_dummy forces splitting on constant user-supplied paths. +-dnl POSIX.2 word splitting is done only on the output of word expansions, +-dnl not every word. This closes a longstanding sh security hole. +- ac_dummy="ifelse([$2], , $PATH, [$2])" +- for ac_dir in $ac_dummy; do +- IFS="$lt_save_ifs" +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$1; then +- lt_cv_path_MAGIC_CMD="$ac_dir/$1" +- if test -n "$file_magic_test_file"; then +- case $deplibs_check_method in +- "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 +- : +- else +- cat <&2 +- +-*** Warning: the command libtool uses to detect shared libraries, +-*** $file_magic_cmd, produces output that libtool cannot recognize. +-*** The result is that libtool may fail to recognize shared libraries +-*** as such. This will affect the creation of libtool libraries that +-*** depend on shared libraries, but programs linked with such libtool +-*** libraries will work regardless of this problem. Nevertheless, you +-*** may want to report the problem to your system manager and/or to +-*** bug-libtool@gnu.org +- +-EOF +- fi ;; +- esac +- fi +- break +- fi +- done +- IFS="$lt_save_ifs" +- MAGIC_CMD="$lt_save_MAGIC_CMD" +- ;; +-esac]) +-MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +-if test -n "$MAGIC_CMD"; then +- AC_MSG_RESULT($MAGIC_CMD) +-else +- AC_MSG_RESULT(no) +-fi +-])# AC_PATH_TOOL_PREFIX +- +- +-# AC_PATH_MAGIC +-# ------------- +-# find a file program which can recognise 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 +- if test -n "$ac_tool_prefix"; then +- AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) +- else +- MAGIC_CMD=: +- fi +-fi +-])# AC_PATH_MAGIC +- +- +-# AC_PROG_LD +-# ---------- +-# find the pathname to the GNU or non-GNU linker +-AC_DEFUN([AC_PROG_LD], +-[AC_ARG_WITH([gnu-ld], +- [AC_HELP_STRING([--with-gnu-ld], +- [assume the C compiler uses GNU ld @<:@default=no@:>@])], +- [test "$withval" = no || with_gnu_ld=yes], +- [with_gnu_ld=no]) +-AC_REQUIRE([LT_AC_PROG_SED])dnl +-AC_REQUIRE([AC_PROG_CC])dnl +-AC_REQUIRE([AC_CANONICAL_HOST])dnl +-AC_REQUIRE([AC_CANONICAL_BUILD])dnl +-ac_prog=ld +-if test "$GCC" = yes; then +- # Check if gcc -print-prog-name=ld gives a path. +- AC_MSG_CHECKING([for ld used by $CC]) +- case $host in +- *-*-mingw*) +- # gcc leaves a trailing carriage return which upsets mingw +- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; +- *) +- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; +- esac +- case $ac_prog in +- # Accept absolute paths. +- [[\\/]]* | ?:[[\\/]]*) +- re_direlt='/[[^/]][[^/]]*/\.\./' +- # Canonicalize the pathname of ld +- ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` +- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do +- ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` +- done +- test -z "$LD" && LD="$ac_prog" +- ;; +- "") +- # If it fails, then pretend we aren't using GCC. +- ac_prog=ld +- ;; +- *) +- # If it is relative, then search for the first ld in PATH. +- with_gnu_ld=unknown +- ;; +- esac +-elif test "$with_gnu_ld" = yes; then +- AC_MSG_CHECKING([for GNU ld]) +-else +- AC_MSG_CHECKING([for non-GNU ld]) +-fi +-AC_CACHE_VAL(lt_cv_path_LD, +-[if test -z "$LD"; then +- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +- for ac_dir in $PATH; do +- IFS="$lt_save_ifs" +- test -z "$ac_dir" && ac_dir=. +- 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 variants of GNU ld only accept -v. +- # Break only if it was the GNU/non-GNU ld that we prefer. +- case `"$lt_cv_path_LD" -v 2>&1 &1 /dev/null; then +- case $host_cpu in +- i*86 ) +- # Not sure whether the presence of OpenBSD here was a mistake. +- # Let's accept both of them until this is cleared up. +- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|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.*` +- ;; +- esac +- else +- lt_cv_deplibs_check_method=pass_all +- fi +- ;; +- +-gnu*) +- lt_cv_deplibs_check_method=pass_all +- ;; +- +-hpux10.20* | hpux11*) +- lt_cv_file_magic_cmd=/usr/bin/file +- 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 +- ;; +- hppa*64*) +- [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] +- lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl +- ;; +- *) +- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' +- lt_cv_file_magic_test_file=/usr/lib/libc.sl +- ;; +- esac +- ;; +- +-interix3*) +- # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here +- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' +- ;; +- +-irix5* | irix6* | nonstopux*) +- case $LD in +- *-32|*"-32 ") libmagic=32-bit;; +- *-n32|*"-n32 ") libmagic=N32;; +- *-64|*"-64 ") libmagic=64-bit;; +- *) libmagic=never-match;; +- esac +- lt_cv_deplibs_check_method=pass_all +- ;; +- +-# This must be Linux ELF. +-linux* | k*bsd*-gnu) +- lt_cv_deplibs_check_method=pass_all +- ;; +- +-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 +- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' +- fi +- ;; +- +-newos6*) +- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' +- lt_cv_file_magic_cmd=/usr/bin/file +- lt_cv_file_magic_test_file=/usr/lib/libnls.so +- ;; +- +-nto-qnx*) +- lt_cv_deplibs_check_method=unknown +- ;; +- +-openbsd*) +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' +- else +- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' +- fi +- ;; +- +-osf3* | osf4* | osf5*) +- lt_cv_deplibs_check_method=pass_all +- ;; +- +-solaris*) +- lt_cv_deplibs_check_method=pass_all +- ;; +- +-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]]' +- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` +- ;; +- ncr) +- lt_cv_deplibs_check_method=pass_all +- ;; +- sequent) +- lt_cv_file_magic_cmd='/bin/file' +- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' +- ;; +- sni) +- lt_cv_file_magic_cmd='/bin/file' +- lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" +- lt_cv_file_magic_test_file=/lib/libc.so +- ;; +- siemens) +- lt_cv_deplibs_check_method=pass_all +- ;; +- pc) +- lt_cv_deplibs_check_method=pass_all +- ;; +- esac +- ;; +- +-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) +- lt_cv_deplibs_check_method=pass_all +- ;; +-esac +-]) +-file_magic_cmd=$lt_cv_file_magic_cmd +-deplibs_check_method=$lt_cv_deplibs_check_method +-test -z "$deplibs_check_method" && deplibs_check_method=unknown +-])# AC_DEPLIBS_CHECK_METHOD +- +- +-# AC_PROG_NM +-# ---------- +-# find the pathname to a BSD-compatible name lister +-AC_DEFUN([AC_PROG_NM], +-[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM, +-[if test -n "$NM"; then +- # Let the user override the test. +- lt_cv_path_NM="$NM" +-else +- 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 +- ;; +- *) +- 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 +- fi +- done +- IFS="$lt_save_ifs" +- done +- test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm +-fi]) +-NM="$lt_cv_path_NM" +-])# AC_PROG_NM +- +- +-# AC_CHECK_LIBM +-# ------------- +-# check for math library +-AC_DEFUN([AC_CHECK_LIBM], +-[AC_REQUIRE([AC_CANONICAL_HOST])dnl +-LIBM= +-case $host in +-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) +- # These system don't have libm, or don't need it +- ;; +-*-ncr-sysv4.3*) +- AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") +- AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") +- ;; +-*) +- AC_CHECK_LIB(m, cos, LIBM="-lm") +- ;; +-esac +-])# AC_CHECK_LIBM +- +- +-# AC_LIBLTDL_CONVENIENCE([DIRECTORY]) +-# ----------------------------------- +-# 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 +-# 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 +- no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; +- "") enable_ltdl_convenience=yes +- ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; +- esac +- LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la +- LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) +- # For backwards non-gettext consistent compatibility... +- INCLTDL="$LTDLINCL" +-])# AC_LIBLTDL_CONVENIENCE +- +- +-# AC_LIBLTDL_INSTALLABLE([DIRECTORY]) +-# ----------------------------------- +-# 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 +-# 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 +- AC_CHECK_LIB(ltdl, lt_dlinit, +- [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], +- [if test x"$enable_ltdl_install" = xno; then +- AC_MSG_WARN([libltdl not installed, but installation disabled]) +- else +- enable_ltdl_install=yes +- fi +- ]) +- if test x"$enable_ltdl_install" = x"yes"; then +- ac_configure_args="$ac_configure_args --enable-ltdl-install" +- LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la +- LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) +- else +- ac_configure_args="$ac_configure_args --enable-ltdl-install=no" +- LIBLTDL="-lltdl" +- LTDLINCL= +- fi +- # For backwards non-gettext consistent compatibility... +- INCLTDL="$LTDLINCL" +-])# AC_LIBLTDL_INSTALLABLE +- +- +-# AC_LIBTOOL_CXX +-# -------------- +-# enable support for C++ libraries +-AC_DEFUN([AC_LIBTOOL_CXX], +-[AC_REQUIRE([_LT_AC_LANG_CXX]) +-])# AC_LIBTOOL_CXX +- +- +-# _LT_AC_LANG_CXX +-# --------------- +-AC_DEFUN([_LT_AC_LANG_CXX], +-[AC_REQUIRE([AC_PROG_CXX]) +-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 +-# -------------- +-# enable support for Fortran 77 libraries +-AC_DEFUN([AC_LIBTOOL_F77], +-[AC_REQUIRE([_LT_AC_LANG_F77]) +-])# AC_LIBTOOL_F77 +- +- +-# _LT_AC_LANG_F77 +-# --------------- +-AC_DEFUN([_LT_AC_LANG_F77], +-[AC_REQUIRE([AC_PROG_F77]) +-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77]) +-])# _LT_AC_LANG_F77 +- +- +-# AC_LIBTOOL_GCJ +-# -------------- +-# enable support for GCJ libraries +-AC_DEFUN([AC_LIBTOOL_GCJ], +-[AC_REQUIRE([_LT_AC_LANG_GCJ]) +-])# AC_LIBTOOL_GCJ +- +- +-# _LT_AC_LANG_GCJ +-# --------------- +-AC_DEFUN([_LT_AC_LANG_GCJ], +-[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[], +- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[], +- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[], +- [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])], +- [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])], +- [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])]) +-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ]) +-])# _LT_AC_LANG_GCJ +- +- +-# AC_LIBTOOL_RC +-# ------------- +-# enable support for Windows resource files +-AC_DEFUN([AC_LIBTOOL_RC], +-[AC_REQUIRE([LT_AC_PROG_RC]) +-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC]) +-])# AC_LIBTOOL_RC +- +- +-# AC_LIBTOOL_LANG_C_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'. +-AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG]) +-AC_DEFUN([_LT_AC_LANG_C_CONFIG], +-[lt_save_CC="$CC" +-AC_LANG_PUSH(C) +- +-# Source file extension for C test sources. +-ac_ext=c +- +-# 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" +- +-# Code to be used in simple link tests +-lt_simple_link_test_code='int main(){return(0);}\n' +- +-_LT_AC_SYS_COMPILER +- +-# 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 +-## the running order or otherwise move them around unless you know exactly +-## what you are doing... +-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) +-AC_LIBTOOL_PROG_COMPILER_PIC($1) +-AC_LIBTOOL_PROG_CC_C_O($1) +-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) +-AC_LIBTOOL_PROG_LD_SHLIBS($1) +-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) +-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) +-AC_LIBTOOL_SYS_LIB_STRIP +-AC_LIBTOOL_DLOPEN_SELF +- +-# Report which library types will actually be built +-AC_MSG_CHECKING([if libtool supports shared libraries]) +-AC_MSG_RESULT([$can_build_shared]) +- +-AC_MSG_CHECKING([whether to build shared libraries]) +-test "$can_build_shared" = "no" && enable_shared=no +- +-# On AIX, shared libraries and static libraries use the same namespace, and +-# are all built from PIC. +-case $host_os in +-aix3*) +- test "$enable_shared" = yes && enable_static=no +- if test -n "$RANLIB"; then +- archive_cmds="$archive_cmds~\$RANLIB \$lib" +- postinstall_cmds='$RANLIB $lib' +- fi +- ;; +- +-aix4* | aix5*) +- 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]) +- +-AC_MSG_CHECKING([whether to build static libraries]) +-# Make sure either enable_shared or enable_static is yes. +-test "$enable_shared" = yes || enable_static=yes +-AC_MSG_RESULT([$enable_static]) +- +-AC_LIBTOOL_CONFIG($1) +- +-AC_LANG_POP +-CC="$lt_save_CC" +-])# AC_LIBTOOL_LANG_C_CONFIG +- +- +-# AC_LIBTOOL_LANG_CXX_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'. +-AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)]) +-AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], +-[AC_LANG_PUSH(C++) +-AC_REQUIRE([AC_PROG_CXX]) +-AC_REQUIRE([_LT_AC_PROG_CXXCPP]) +- +-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +-_LT_AC_TAGVAR(allow_undefined_flag, $1)= +-_LT_AC_TAGVAR(always_export_symbols, $1)=no +-_LT_AC_TAGVAR(archive_expsym_cmds, $1)= +-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= +-_LT_AC_TAGVAR(hardcode_direct, $1)=no +-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= +-_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)= +-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown +-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +-_LT_AC_TAGVAR(no_undefined_flag, $1)= +-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= +-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no +- +-# Dependencies to place before and after the object being linked: +-_LT_AC_TAGVAR(predep_objects, $1)= +-_LT_AC_TAGVAR(postdep_objects, $1)= +-_LT_AC_TAGVAR(predeps, $1)= +-_LT_AC_TAGVAR(postdeps, $1)= +-_LT_AC_TAGVAR(compiler_lib_search_path, $1)= +- +-# Source file extension for C++ test sources. +-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" +- +-# Code to be used in simple link tests +-lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n' +- +-# ltmain only uses $CC for tagged configurations so make sure $CC is set. +-_LT_AC_SYS_COMPILER +- +-# save warnings/boilerplate of simple test code +-_LT_COMPILER_BOILERPLATE +-_LT_LINKER_BOILERPLATE +- +-# Allow CC to be a program name with arguments. +-lt_save_CC=$CC +-lt_save_LD=$LD +-lt_save_GCC=$GCC +-GCC=$GXX +-lt_save_with_gnu_ld=$with_gnu_ld +-lt_save_path_LD=$lt_cv_path_LD +-if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then +- lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx +-else +- $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 +- $as_unset lt_cv_path_LD +-fi +-test -z "${LDCXX+set}" || LD=$LDCXX +-CC=${CXX-"c++"} +-compiler=$CC +-_LT_AC_TAGVAR(compiler, $1)=$CC +-_LT_CC_BASENAME([$compiler]) +- +-# We don't want -fno-exception wen compiling C++ code, so set the +-# no_builtin_flag separately +-if test "$GXX" = yes; then +- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' +-else +- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= +-fi +- +-if test "$GXX" = yes; then +- # Set up default GNU C++ configuration +- +- AC_PROG_LD +- +- # 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 $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' +- +- # If archive_cmds runs LD, not CC, wlarc should be empty +- # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to +- # investigate it a little bit more. (MM) +- wlarc='${wl}' +- +- # ancient GNU ld didn't support --whole-archive et. al. +- if eval "`$CC -print-prog-name=ld` --help 2>&1" | \ +- 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 +- else +- with_gnu_ld=no +- wlarc= +- +- # A generic and very simple default shared library creation +- # command for GNU C++ for the case where it uses the native +- # linker, instead of GNU ld. If possible, this setting should +- # overridden to take advantage of the native linker features on +- # the platform it is being used on. +- _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 +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' +- +-else +- GXX=no +- with_gnu_ld=no +- wlarc= +-fi +- +-# PORTME: fill in a description of your system's C++ link characteristics +-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) +-_LT_AC_TAGVAR(ld_shlibs, $1)=yes +-case $host_os in +- aix3*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- aix4* | aix5*) +- if test "$host_cpu" = ia64; then +- # On IA64, the linker does run time linking by default, so we don't +- # have to do anything special. +- aix_use_runtimelinking=no +- exp_sym_flag='-Bexport' +- no_entry_flag="" +- else +- aix_use_runtimelinking=no +- +- # Test if we are trying to use run time linking or normal +- # AIX style linking. If -brtl is somewhere in LDFLAGS, we +- # need to do runtime linking. +- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) +- for ld_flag in $LDFLAGS; do +- case $ld_flag in +- *-brtl*) +- aix_use_runtimelinking=yes +- break +- ;; +- esac +- done +- ;; +- esac +- +- exp_sym_flag='-bexport' +- no_entry_flag='-bnoentry' +- fi +- +- # When large executables or shared objects are built, AIX ld can +- # have problems creating the table of contents. If linking a library +- # or program results in "error TOC overflow" add -mminimal-toc to +- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not +- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. +- +- _LT_AC_TAGVAR(archive_cmds, $1)='' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- +- if test "$GXX" = yes; then +- case $host_os in aix4.[[012]]|aix4.[[012]].*) +- # We only want to do this on AIX 4.2 and lower, the check +- # below for broken collect2 doesn't work under 4.3+ +- collect2name=`${CC} -print-prog-name=collect2` +- if test -f "$collect2name" && \ +- strings "$collect2name" | grep resolve_lib_name >/dev/null +- then +- # We have reworked collect2 +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- else +- # We have old collect2 +- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported +- # It fails to find uninstalled libraries when the uninstalled +- # path is not listed in the libpath. Setting hardcode_minus_L +- # to unsupported forces relinking +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- _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 +- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release +- # chokes on -Wl,-G. The following line is correct: +- shared_flag='-G' +- else +- if test "$aix_use_runtimelinking" = yes; then +- shared_flag='${wl}-G' +- else +- shared_flag='${wl}-bM:SRE' +- fi +- fi +- fi +- +- # 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_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 $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 +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" +- # Warning - without using the other run time loading flags, +- # -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' +- # Exported symbols can be pulled into shared objects from archives +- _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 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 +- *) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- esac +- ;; +- +- cygwin* | mingw* | pw32*) +- # _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)=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 $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 +- cp $export_symbols $output_objdir/$soname.def; +- else +- echo EXPORTS > $output_objdir/$soname.def; +- cat $export_symbols >> $output_objdir/$soname.def; +- fi~ +- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +- else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; +- darwin* | rhapsody*) +- case $host_os in +- rhapsody* | darwin1.[[012]]) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' +- ;; +- *) # Darwin 1.3 on +- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +- else +- case ${MACOSX_DEPLOYMENT_TARGET} in +- 10.[[012]]) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +- ;; +- 10.*) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' +- ;; +- esac +- fi +- ;; +- esac +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- +- if test "$GXX" = yes ; then +- lt_int_apple_cc_single_mod=no +- output_verbose_link_cmd='echo' +- if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then +- lt_int_apple_cc_single_mod=yes +- fi +- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- else +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- fi +- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' +- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds +- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- else +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- fi +- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- else +- case $cc_basename in +- xlc*) +- output_verbose_link_cmd='echo' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' +- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' +- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- ;; +- *) +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- esac +- fi +- ;; +- +- dgux*) +- case $cc_basename in +- ec++*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- ghcx*) +- # Green Hills C++ Compiler +- # 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 +- ;; +- 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* | dragonfly*) +- # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF +- # conventions +- _LT_AC_TAGVAR(ld_shlibs, $1)=yes +- ;; +- gnu*) +- ;; +- hpux9*) +- _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' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, +- # but as the default +- # location of the library. +- +- case $cc_basename in +- 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 $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. +- # +- # 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 -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 $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 +- fi +- ;; +- esac +- ;; +- hpux10*|hpux11*) +- 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)=: +- +- case $host_cpu in +- hppa*64*|ia64*) +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' +- ;; +- *) +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +- ;; +- esac +- fi +- 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_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, +- # but as the default +- # location of the library. +- ;; +- esac +- +- case $cc_basename in +- CC*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- 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 $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- ;; +- esac +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_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 +- if test $with_gnu_ld = no; then +- 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 $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- ;; +- esac +- fi +- else +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; +- esac +- ;; +- interix3*) +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +- # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. +- # Instead, shared libraries are loaded at an image base (0x10000000 by +- # default) and relocated if they conflict, which is a slow very memory +- # consuming and fragmenting process. To avoid this, we pick a random, +- # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link +- # time. Moving up from 0x10000000 also allows more sbrk(2) space. +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' +- ;; +- irix5* | irix6*) +- case $cc_basename in +- CC*) +- # SGI C++ +- _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 +- # necessary to make sure instantiated templates are included +- # in the archive. +- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' +- ;; +- *) +- if test "$GXX" = yes; then +- if test "$with_gnu_ld" = no; then +- _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 $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 +- ;; +- esac +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- ;; +- linux* | k*bsd*-gnu) +- case $cc_basename in +- KCC*) +- # Kuck and Associates, Inc. (KAI) C++ Compiler +- +- # KCC will only create a shared library if the output file +- # ends with ".so" (or ".sl" for HP-UX), so rename the library +- # to its proper name (with version) after linking. +- _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. +- # +- # 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 $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' +- +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' +- +- # Archives containing C++ object files must be created using +- # "CC -Bstatic", where "CC" is the KAI C++ compiler. +- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' +- ;; +- 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(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' +- ;; +- pgCC*) +- # Portland Group C++ compiler +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' +- +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' +- ;; +- cxx*) +- # Compaq C++ +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $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' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- +- # 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 -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' +- ;; +- esac +- ;; +- lynxos*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- m88k*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- mvs*) +- case $cc_basename in +- cxx*) +- # 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 +- ;; +- 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= +- _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 +- fi +- # Workaround some broken pre-1.5 toolchains +- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' +- ;; +- openbsd2*) +- # C++ shared libraries are fairly broken +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- openbsd*) +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' +- fi +- output_verbose_link_cmd='echo' +- ;; +- osf3*) +- case $cc_basename in +- KCC*) +- # 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 $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)=: +- +- # Archives containing C++ object files must be created using +- # "CC -Bstatic", where "CC" is the KAI C++ compiler. +- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' +- +- ;; +- RCC*) +- # Rational C++ 2.4.1 +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- cxx*) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _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)=: +- +- # 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 -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' +- ;; +- *) +- 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} $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)=: +- +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' +- +- else +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; +- esac +- ;; +- osf4* | osf5*) +- case $cc_basename in +- KCC*) +- # Kuck and Associates, Inc. (KAI) C++ Compiler +- +- # KCC will only create a shared library if the output file +- # ends with ".so" (or ".sl" for HP-UX), so rename the library +- # to its proper name (with version) after linking. +- _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)=: +- +- # Archives containing C++ object files must be created using +- # the KAI C++ compiler. +- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' +- ;; +- RCC*) +- # Rational C++ 2.4.1 +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- cxx*) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' +- _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 $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' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- +- # 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 -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' +- ;; +- *) +- 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} $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)=: +- +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' +- +- else +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; +- esac +- ;; +- psos*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- sunos4*) +- case $cc_basename in +- CC*) +- # Sun C++ 4.x +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- lcc*) +- # Lucid +- # 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 +- ;; +- solaris*) +- case $cc_basename in +- 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} -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} ${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]].*) ;; +- *) +- # The C++ compiler is used as linker so we must use $wl +- # flag to pass the commands to the underlying system +- # linker. We must also pass each convience library through +- # to the system linker between allextract/defaultextract. +- # The C++ compiler will combine linker options so we +- # cannot just pass the convience library names through +- # without $wl. +- # Supported since Solaris 2.6 (maybe 2.5.1?) +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' +- ;; +- esac +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- +- 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' +- ;; +- gcx*) +- # Green Hills C++ Compiler +- _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' +- ;; +- *) +- # GNU C++ compiler with Solaris linker +- 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 $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 $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' +- +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" +- else +- # g++ 2.7 appears to require `-G' NOT `-shared' on this +- # platform. +- _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 $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' +- +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" +- fi +- +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' +- fi +- ;; +- esac +- ;; +- 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*) +- # NonStop-UX NCC 3.20 +- # 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 +- ;; +- vxworks*) +- # 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 +-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) +-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no +- +-_LT_AC_TAGVAR(GCC, $1)="$GXX" +-_LT_AC_TAGVAR(LD, $1)="$LD" +- +-## 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 +-## what you are doing... +-AC_LIBTOOL_POSTDEP_PREDEP($1) +-AC_LIBTOOL_PROG_COMPILER_PIC($1) +-AC_LIBTOOL_PROG_CC_C_O($1) +-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) +-AC_LIBTOOL_PROG_LD_SHLIBS($1) +-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) +-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) +- +-AC_LIBTOOL_CONFIG($1) +- +-AC_LANG_POP +-CC=$lt_save_CC +-LDCXX=$LD +-LD=$lt_save_LD +-GCC=$lt_save_GCC +-with_gnu_ldcxx=$with_gnu_ld +-with_gnu_ld=$lt_save_with_gnu_ld +-lt_cv_path_LDCXX=$lt_cv_path_LD +-lt_cv_path_LD=$lt_save_path_LD +-lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld +-lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld +-])# 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],[ +-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 +-dnl tag define a new lt_????_link_test_code variable, +-dnl but it's only used here... +-ifelse([$1],[],[cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext <> "$cfgfile" +-ifelse([$1], [], +-[#! $SHELL +- +-# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services. +-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) +-# NOTE: Changes made to this file will be lost: look at ltmain.sh. +-# +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 +-# Free Software Foundation, Inc. +-# +-# This file is part of GNU Libtool: +-# 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. +- +-# A sed program that does not truncate output. +-SED=$lt_SED +- +-# Sed that helps us avoid accidentally triggering echo(1) options like -n. +-Xsed="$SED -e 1s/^X//" +- +-# The HP-UX ksh and POSIX shell print the target directory to stdout +-# if CDPATH is set. +-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH +- +-# The names of the tagged configurations supported by this script. +-available_tags= +- +-# ### BEGIN LIBTOOL CONFIG], +-[# ### 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=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1) +- +-# Whether or not to disallow shared libs when runtime libs are static +-allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) +- +-# Whether or not to optimize for fast installation. +-fast_install=$enable_fast_install +- +-# 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 +- +-# The archiver. +-AR=$lt_AR +-AR_FLAGS=$lt_AR_FLAGS +- +-# A C compiler. +-LTCC=$lt_LTCC +- +-# LTCC compiler flags. +-LTCFLAGS=$lt_LTCFLAGS +- +-# A language-specific compiler. +-CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) +- +-# Is the compiler the GNU C compiler? +-with_gcc=$_LT_AC_TAGVAR(GCC, $1) +- +-# An ERE matcher. +-EGREP=$lt_EGREP +- +-# The linker used to build libraries. +-LD=$lt_[]_LT_AC_TAGVAR(LD, $1) +- +-# 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=$lt_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_AC_TAGVAR(lt_prog_compiler_wl, $1) +- +-# Object file suffix (normally "o"). +-objext="$ac_objext" +- +-# Old archive suffix (normally "a"). +-libext="$libext" +- +-# Shared library suffix (normally ".so"). +-shrext_cmds='$shrext_cmds' +- +-# Executable file suffix (normally ""). +-exeext="$exeext" +- +-# Additional compiler flags for building library objects. +-pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) +-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_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) +- +-# 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_AC_TAGVAR(lt_prog_compiler_static, $1) +- +-# Compiler flag to turn off builtin functions. +-no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) +- +-# Compiler flag to allow reflexive dlopens. +-export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1) +- +-# Compiler flag to generate shared objects directly from archives. +-whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1) +- +-# Compiler flag to generate thread-safe objects. +-thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1) +- +-# 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_[]_LT_AC_TAGVAR(old_archive_cmds, $1) +-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_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1) +- +-# Create a temporary old-style archive to link instead of a shared archive. +-old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) +- +-# Commands used to build and install a shared archive. +-archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1) +-archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1) +-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_[]_LT_AC_TAGVAR(module_cmds, $1) +-module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1) +- +-# 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_[]_LT_AC_TAGVAR(predep_objects, $1) +- +-# Dependencies to place after the objects being linked to create a +-# shared library. +-postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1) +- +-# Dependencies to place before the objects being linked to create a +-# shared library. +-predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1) +- +-# Dependencies to place after the objects being linked to create a +-# shared library. +-postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $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) +- +-# 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_[]_LT_AC_TAGVAR(allow_undefined_flag, $1) +- +-# Flag that forces no undefined symbols. +-no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1) +- +-# 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=$_LT_AC_TAGVAR(hardcode_action, $1) +- +-# Whether we should hardcode library paths into libraries. +-hardcode_into_libs=$hardcode_into_libs +- +-# Flag to hardcode \$libdir into a binary during linking. +-# This must work even if \$libdir does not exist. +-hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) +- +-# If ld is used when linking, flag to hardcode \$libdir into +-# a binary during linking. This must work even if \$libdir does +-# not exist. +-hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) +- +-# Whether we need a single -rpath flag with a separated argument. +-hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1) +- +-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the +-# resulting binary. +-hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1) +- +-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the +-# resulting binary. +-hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1) +- +-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into +-# the resulting binary. +-hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1) +- +-# Set to yes if building a shared library automatically hardcodes DIR into the library +-# and all subsequent libraries and executables linked against it. +-hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1) +- +-# Variables whose values should be saved in libtool wrapper scripts and +-# restored at relink time. +-variables_saved_for_relink="$variables_saved_for_relink" +- +-# Whether libtool must link a program against all its dependency libraries. +-link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1) +- +-# Compile-time system search path for libraries +-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec +- +-# Run-time system search path for libraries +-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)" +- +-# Set to yes if exported symbols are required. +-always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1) +- +-# The commands to list exported symbols. +-export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1) +- +-# The commands to extract the exported symbol list from a shared archive. +-extract_expsyms_cmds=$lt_extract_expsyms_cmds +- +-# Symbols that should not be listed in the preloaded symbols. +-exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1) +- +-# Symbols that must always be exported. +-include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1) +- +-ifelse([$1],[], +-[# ### END LIBTOOL CONFIG], +-[# ### END LIBTOOL TAG CONFIG: $tagname]) +- +-__EOF__ +- +-ifelse([$1],[], [ +- case $host_os in +- aix3*) +- cat <<\EOF >> "$cfgfile" +- +-# AIX sometimes has problems with the GCC collect2 program. For some +-# reason, if we set the COLLECT_NAMES environment variable, the problems +-# vanish in a puff of smoke. +-if test "X${COLLECT_NAMES+set}" != Xset; then +- COLLECT_NAMES= +- export COLLECT_NAMES +-fi +-EOF +- ;; +- esac +- +- # We use sed instead of cat because bash on DJGPP gets confused if +- # if finds mixed CR/LF and LF-only lines. Since sed operates in +- # text mode, it properly converts lines to CR/LF. This bash problem +- # is reportedly fixed, but why not run on old versions too? +- sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1) +- +- mv -f "$cfgfile" "$ofile" || \ +- (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") +- chmod +x "$ofile" +-]) +-else +- # If there is no Makefile yet, we rely on a make rule to execute +- # `config.status --recheck' to rerun these tests and create the +- # libtool script then. +- 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 +- +- +-# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME]) +-# ------------------------------------------- +-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], +-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +- +-_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= +- +-if test "$GCC" = yes; then +- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' +- +- AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], +- lt_cv_prog_compiler_rtti_exceptions, +- [-fno-rtti -fno-exceptions], [], +- [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) +-fi +-])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI +- +- +-# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE +-# --------------------------------- +-AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], +-[AC_REQUIRE([AC_CANONICAL_HOST]) +-AC_REQUIRE([AC_PROG_NM]) +-AC_REQUIRE([AC_OBJEXT]) +-# Check for command to grab the raw symbol name followed by C symbol from nm. +-AC_MSG_CHECKING([command to parse $NM output from $compiler object]) +-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], +-[ +-# These are sane defaults that work on at least a few old systems. +-# [They come from Ultrix. What could be older than Ultrix?!! ;)] +- +-# Character class describing NM global symbol codes. +-symcode='[[BCDEGRST]]' +- +-# Regexp to match symbols that can be accessed directly from C. +-sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' +- +-# Transform an extracted symbol line into a proper C declaration +-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" +- +-# Transform an extracted symbol line into symbol name and symbol address +-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'" +- +-# Define system-specific variables. +-case $host_os in +-aix*) +- symcode='[[BCDT]]' +- ;; +-cygwin* | mingw* | pw32*) +- symcode='[[ABCDGISTW]]' +- ;; +-hpux*) # Its linker distinguishes data from code symbols +- if test "$host_cpu" = ia64; then +- symcode='[[ABCDEGRST]]' +- fi +- 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*) +- symcode='[[BDRT]]' +- ;; +-sco3.2v5*) +- symcode='[[DT]]' +- ;; +-sysv4.2uw2*) +- symcode='[[DT]]' +- ;; +-sysv5* | sco5v6* | unixware* | OpenUNIX*) +- symcode='[[ABDT]]' +- ;; +-sysv4) +- symcode='[[DFNSTU]]' +- ;; +-esac +- +-# Handle CRLF in mingw tool chain +-opt_cr= +-case $build_os in +-mingw*) +- opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp +- ;; +-esac +- +-# If we're using GNU nm, then use its standard symbol codes. +-case `$NM -V 2>&1` in +-*GNU* | *'with BFD'*) +- 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'" +- +- # Check to see that the pipe works correctly. +- pipe_works=no +- +- rm -f conftest* +- cat > conftest.$ac_ext < $nlist) && test -s "$nlist"; then +- # Try sorting and uniquifying the output. +- if sort "$nlist" | uniq > "$nlist"T; then +- mv -f "$nlist"T "$nlist" +- else +- rm -f "$nlist"T +- fi +- +- # Make sure that we snagged all the symbols we need. +- if grep ' nm_test_var$' "$nlist" >/dev/null; then +- if grep ' nm_test_func$' "$nlist" >/dev/null; then +- cat < conftest.$ac_ext +-#ifdef __cplusplus +-extern "C" { +-#endif +- +-EOF +- # Now generate the symbol file. +- eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext' +- +- cat <> conftest.$ac_ext +-#if defined (__STDC__) && __STDC__ +-# define lt_ptr_t void * +-#else +-# define lt_ptr_t char * +-# define const +-#endif +- +-/* The mapping between symbol names and symbols. */ +-const struct { +- const char *name; +- lt_ptr_t address; +-} +-lt_preloaded_symbols[[]] = +-{ +-EOF +- $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext +- cat <<\EOF >> conftest.$ac_ext +- {0, (lt_ptr_t) 0} +-}; +- +-#ifdef __cplusplus +-} +-#endif +-EOF +- # Now try linking the two files. +- mv conftest.$ac_objext conftstm.$ac_objext +- lt_save_LIBS="$LIBS" +- lt_save_CFLAGS="$CFLAGS" +- LIBS="conftstm.$ac_objext" +- CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" +- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then +- pipe_works=yes +- fi +- LIBS="$lt_save_LIBS" +- CFLAGS="$lt_save_CFLAGS" +- else +- echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD +- fi +- else +- echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD +- fi +- else +- echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD +- fi +- else +- echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD +- cat conftest.$ac_ext >&5 +- fi +- rm -f conftest* conftst* +- +- # Do not use the global_symbol_pipe unless it works. +- if test "$pipe_works" = yes; then +- break +- else +- lt_cv_sys_global_symbol_pipe= +- fi +-done +-]) +-if test -z "$lt_cv_sys_global_symbol_pipe"; then +- lt_cv_sys_global_symbol_to_cdecl= +-fi +-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then +- AC_MSG_RESULT(failed) +-else +- AC_MSG_RESULT(ok) +-fi +-]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE +- +- +-# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME]) +-# --------------------------------------- +-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC], +-[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)= +-_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= +-_LT_AC_TAGVAR(lt_prog_compiler_static, $1)= +- +-AC_MSG_CHECKING([for $compiler option to produce PIC]) +- ifelse([$1],[CXX],[ +- # C++ specific cases for pic, static, wl, etc. +- if test "$GXX" = yes; then +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' +- +- case $host_os in +- aix*) +- # All AIX code is PIC. +- if test "$host_cpu" = ia64; then +- # AIX 5 now supports IA64 processor +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- fi +- ;; +- amigaos*) +- # FIXME: we need at least 68020 code to build shared libraries, but +- # adding the `-m68020' flag to GCC prevents building anything better, +- # like `-m68040'. +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' +- ;; +- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) +- # PIC is the default for these OSes. +- ;; +- mingw* | 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' +- ;; +- darwin* | rhapsody*) +- # PIC is the default on this platform +- # Common symbols not allowed in MH_DYLIB files +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' +- ;; +- *djgpp*) +- # DJGPP does not support shared libraries at all +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= +- ;; +- interix3*) +- # Interix 3.x gcc -fpic/-fPIC options generate broken code. +- # Instead, we relocate shared libraries at runtime. +- ;; +- sysv4*MP*) +- if test -d /usr/nec; then +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic +- fi +- ;; +- hpux*) +- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but +- # not for PA HP-UX. +- case $host_cpu in +- hppa*64*|ia64*) +- ;; +- *) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' +- ;; +- esac +- ;; +- *) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' +- ;; +- esac +- else +- case $host_os in +- aix4* | aix5*) +- # All AIX code is PIC. +- if test "$host_cpu" = ia64; then +- # AIX 5 now supports IA64 processor +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- else +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' +- fi +- ;; +- chorus*) +- case $cc_basename in +- 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++*) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- ;; +- ghcx*) +- # Green Hills C++ Compiler +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' +- ;; +- *) +- ;; +- esac +- ;; +- freebsd* | dragonfly*) +- # FreeBSD uses GNU C++ +- ;; +- hpux9* | hpux10* | hpux11*) +- case $cc_basename in +- CC*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _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*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' +- case $host_cpu in +- hppa*64*|ia64*) +- # +Z the default +- ;; +- *) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' +- ;; +- esac +- ;; +- *) +- ;; +- 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*) +- _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. +- ;; +- *) +- ;; +- esac +- ;; +- linux* | k*bsd*-gnu) +- case $cc_basename in +- KCC*) +- # KAI C++ Compiler +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' +- ;; +- 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' +- ;; +- pgCC*) +- # Portland Group C++ compiler. +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- ;; +- cxx*) +- # Compaq C++ +- # Make sure the PIC flag is empty. It appears that all Alpha +- # Linux and Compaq Tru64 Unix objects are PIC. +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' +- ;; +- *) +- ;; +- esac +- ;; +- lynxos*) +- ;; +- m88k*) +- ;; +- mvs*) +- case $cc_basename in +- cxx*) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' +- ;; +- *) +- ;; +- esac +- ;; +- netbsd* | netbsdelf*-gnu) +- ;; +- osf3* | osf4* | osf5*) +- case $cc_basename in +- KCC*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' +- ;; +- RCC*) +- # Rational C++ 2.4.1 +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' +- ;; +- 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 +- # Linux and Compaq Tru64 Unix objects are PIC. +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' +- ;; +- *) +- ;; +- esac +- ;; +- psos*) +- ;; +- solaris*) +- case $cc_basename in +- 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*) +- # Green Hills C++ Compiler +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' +- ;; +- *) +- ;; +- esac +- ;; +- sunos4*) +- case $cc_basename in +- CC*) +- # Sun C++ 4.x +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- ;; +- lcc*) +- # Lucid +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' +- ;; +- *) +- ;; +- esac +- ;; +- tandem*) +- case $cc_basename in +- NCC*) +- # NonStop-UX NCC 3.20 +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- ;; +- *) +- ;; +- esac +- ;; +- 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*) +- ;; +- *) +- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no +- ;; +- esac +- fi +-], +-[ +- if test "$GCC" = yes; then +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' +- +- case $host_os in +- aix*) +- # All AIX code is PIC. +- if test "$host_cpu" = ia64; then +- # AIX 5 now supports IA64 processor +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- fi +- ;; +- +- amigaos*) +- # FIXME: we need at least 68020 code to build shared libraries, but +- # adding the `-m68020' flag to GCC prevents building anything better, +- # like `-m68040'. +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' +- ;; +- +- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) +- # PIC is the default for these OSes. +- ;; +- +- mingw* | 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' +- ;; +- +- darwin* | rhapsody*) +- # PIC is the default on this platform +- # Common symbols not allowed in MH_DYLIB files +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' +- ;; +- +- interix3*) +- # Interix 3.x gcc -fpic/-fPIC options generate broken code. +- # Instead, we relocate shared libraries at runtime. +- ;; +- +- msdosdjgpp*) +- # Just because we use GCC doesn't mean we suddenly get shared libraries +- # on systems that don't support them. +- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no +- enable_shared=no +- ;; +- +- sysv4*MP*) +- if test -d /usr/nec; then +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic +- fi +- ;; +- +- hpux*) +- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but +- # not for PA HP-UX. +- case $host_cpu in +- hppa*64*|ia64*) +- # +Z the default +- ;; +- *) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' +- ;; +- esac +- ;; +- +- *) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' +- ;; +- esac +- else +- # PORTME Check for flag to pass linker flags through the system compiler. +- case $host_os in +- aix*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- if test "$host_cpu" = ia64; then +- # AIX 5 now supports IA64 processor +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- else +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' +- fi +- ;; +- darwin*) +- # PIC is the default on this platform +- # Common symbols not allowed in MH_DYLIB files +- case $cc_basename in +- xlc*) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- ;; +- esac +- ;; +- +- mingw* | pw32* | os2*) +- # This hack is so that the source file can tell whether it is being +- # built for inclusion in a dll (and should export symbols for example). +- _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 +- hppa*64*|ia64*) +- # +Z the default +- ;; +- *) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' +- ;; +- esac +- # Is there a better lt_prog_compiler_static that works with the bundled CC? +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' +- ;; +- +- irix5* | irix6* | nonstopux*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- # PIC (with -KPIC) is the default. +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' +- ;; +- +- newsos6) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- ;; +- +- 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' +- ;; +- esac +- ;; +- +- osf3* | osf4* | osf5*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- # All OSF/1 code is PIC. +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' +- ;; +- +- solaris*) +- _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*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- ;; +- +- 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' +- ;; +- +- sysv4*MP*) +- if test -d /usr/nec ;then +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- 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' +- ;; +- +- *) +- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no +- ;; +- esac +- fi +-]) +-AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)]) +- +-# +-# Check to make sure the PIC flag actually works. +-# +-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_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], +- [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in +- "" | " "*) ;; +- *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;; +- esac], +- [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= +- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) +-fi +-case $host_os in +- # For platforms which do not support PIC, -DPIC is meaningless: +- *djgpp*) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= +- ;; +- *) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])" +- ;; +-esac +- +-# +-# Check to make sure the static flag actually works. +-# +-wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" +-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], +- _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), +- $lt_tmp_static_flag, +- [], +- [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) +-]) +- +- +-# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME]) +-# ------------------------------------ +-# 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]) +-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*) +- # 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 +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' +- 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 +- ;; +- pw32*) +- _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 '\''/^[[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 +-],[ +- runpath_var= +- _LT_AC_TAGVAR(allow_undefined_flag, $1)= +- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no +- _LT_AC_TAGVAR(archive_cmds, $1)= +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)= +- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)= +- _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)= +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= +- _LT_AC_TAGVAR(thread_safe_flag_spec, $1)= +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +- _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(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* +- # included in the symbol list +- _LT_AC_TAGVAR(include_expsyms, $1)= +- # exclude_expsyms can be an extended regexp of symbols to exclude +- # it will be wrapped by ` (' and `)$', so one must not match beginning or +- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', +- # as well as any symbol that contains `d'. +- _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_" +- # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out +- # platforms (ab)use it in PIC code, but their linkers get confused if +- # the symbol is explicitly referenced. Since portable code cannot +- # rely on this symbol name, it's probably fine to never include it in +- # preloaded symbol tables. +- extract_expsyms_cmds= +- # 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 +- # When not using gcc, we currently assume that we are using +- # Microsoft Visual C++. +- if test "$GCC" != yes; then +- 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 +- ;; +- esac +- +- _LT_AC_TAGVAR(ld_shlibs, $1)=yes +- if test "$with_gnu_ld" = yes; then +- # 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*) +- # On AIX/PPC, the GNU linker is very broken +- if test "$host_cpu" != ia64; then +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- cat <&2 +- +-*** Warning: the GNU linker, at least up to release 2.9.1, is reported +-*** to be unable to reliably create shared libraries on AIX. +-*** Therefore, libtool is disabling shared libraries support. If you +-*** really care for shared libraries, you may want to modify your PATH +-*** so that a non-GNU linker is found, and then restart. +- +-EOF +- fi +- ;; +- +- amigaos*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- +- # Samuel A. Falvo II reports +- # that the semantics of dynamic libraries on AmigaOS, at least up +- # to version 4, is to share data among multiple programs linked +- # with the same dynamic library. Since this doesn't match the +- # behavior of shared libraries on other platforms, we can't use +- # them. +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- +- beos*) +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported +- # Joseph Beckenbach says some releases of gcc +- # support --undefined. This deserves some investigation. FIXME +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; +- +- cygwin* | mingw* | pw32*) +- # _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)=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 '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' +- +- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $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 +- cp $export_symbols $output_objdir/$soname.def; +- else +- echo EXPORTS > $output_objdir/$soname.def; +- cat $export_symbols >> $output_objdir/$soname.def; +- fi~ +- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +- else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; +- +- interix3*) +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +- # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. +- # Instead, shared libraries are loaded at an image base (0x10000000 by +- # default) and relocated if they conflict, which is a slow very memory +- # consuming and fragmenting process. To avoid this, we pick a random, +- # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link +- # time. Moving up from 0x10000000 also allows more sbrk(2) space. +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' +- ;; +- +- linux* | k*bsd*-gnu) +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- tmp_addflag= +- case $cc_basename,$host_cpu in +- pgcc*) # Portland Group C compiler +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' +- tmp_addflag=' $pic_flag' +- ;; +- pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' +- tmp_addflag=' $pic_flag -Mnomain' ;; +- ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 +- tmp_addflag=' -i_dynamic' ;; +- efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 +- tmp_addflag=' -i_dynamic -nofor_main' ;; +- ifc* | ifort*) # Intel Fortran compiler +- tmp_addflag=' -nofor_main' ;; +- esac +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- +- if test $supports_anon_versioning = yes; then +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~ +- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ +- $echo "local: *; };" >> $output_objdir/$libname.ver~ +- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' +- fi +- _LT_AC_TAGVAR(link_all_deplibs, $1)=no +- else +- _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 $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*) +- if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- cat <&2 +- +-*** Warning: The releases 2.8.* of the GNU linker cannot reliably +-*** create shared libraries on Solaris systems. Therefore, libtool +-*** is disabling shared libraries support. We urge you to upgrade GNU +-*** binutils to release 2.9.1 or newer. Another option is to modify +-*** your PATH or compiler configuration so that the native linker is +-*** used, and then restart. +- +-EOF +- elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- _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= +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; +- +- *) +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- _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)" = 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) +- case $host_os in +- aix3*) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported +- _LT_AC_TAGVAR(always_export_symbols, $1)=yes +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' +- # Note: this linker hardcodes the directories in LIBPATH if there +- # are no directories specified by -L. +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- 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*) +- if test "$host_cpu" = ia64; then +- # On IA64, the linker does run time linking by default, so we don't +- # have to do anything special. +- aix_use_runtimelinking=no +- exp_sym_flag='-Bexport' +- no_entry_flag="" +- else +- # 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 +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' +- else +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' +- fi +- aix_use_runtimelinking=no +- +- # Test if we are trying to use run time linking or normal +- # AIX style linking. If -brtl is somewhere in LDFLAGS, we +- # need to do runtime linking. +- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) +- for ld_flag in $LDFLAGS; do +- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then +- aix_use_runtimelinking=yes +- break +- fi +- done +- ;; +- esac +- +- exp_sym_flag='-bexport' +- no_entry_flag='-bnoentry' +- fi +- +- # When large executables or shared objects are built, AIX ld can +- # have problems creating the table of contents. If linking a library +- # or program results in "error TOC overflow" add -mminimal-toc to +- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not +- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. +- +- _LT_AC_TAGVAR(archive_cmds, $1)='' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- +- if test "$GCC" = yes; then +- case $host_os in aix4.[[012]]|aix4.[[012]].*) +- # We only want to do this on AIX 4.2 and lower, the check +- # below for broken collect2 doesn't work under 4.3+ +- collect2name=`${CC} -print-prog-name=collect2` +- if test -f "$collect2name" && \ +- strings "$collect2name" | grep resolve_lib_name >/dev/null +- then +- # We have reworked collect2 +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- else +- # We have old collect2 +- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported +- # It fails to find uninstalled libraries when the uninstalled +- # path is not listed in the libpath. Setting hardcode_minus_L +- # to unsupported forces relinking +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- _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 +- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release +- # chokes on -Wl,-G. The following line is correct: +- shared_flag='-G' +- else +- if test "$aix_use_runtimelinking" = yes; then +- shared_flag='${wl}-G' +- else +- shared_flag='${wl}-bM:SRE' +- fi +- fi +- fi +- +- # 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_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 $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 +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" +- # Warning - without using the other run time loading flags, +- # -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' +- # Exported symbols can be pulled into shared objects from archives +- _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 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 +- ;; +- +- amigaos*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- # see comment about different semantics on the GNU ld section +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- +- bsdi[[45]]*) +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic +- ;; +- +- cygwin* | mingw* | pw32*) +- # When not using gcc, we currently assume that we are using +- # Microsoft Visual C++. +- # hardcode_libdir_flag_spec is actually meaningless, as there is +- # no search path for DLLs. +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' +- _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_cmds=".dll" +- # FIXME: Setting linknames here is a bad hack. +- _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' +- _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' +- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes +- ;; +- +- darwin* | rhapsody*) +- case $host_os in +- rhapsody* | darwin1.[[012]]) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' +- ;; +- *) # Darwin 1.3 on +- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +- else +- case ${MACOSX_DEPLOYMENT_TARGET} in +- 10.[[012]]) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +- ;; +- 10.*) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' +- ;; +- esac +- fi +- ;; +- esac +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- if test "$GCC" = yes ; then +- output_verbose_link_cmd='echo' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' +- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- else +- case $cc_basename in +- xlc*) +- output_verbose_link_cmd='echo' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' +- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' +- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- ;; +- *) +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- esac +- fi +- ;; +- +- dgux*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; +- +- freebsd1*) +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- +- # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor +- # support. Future versions do this automatically, but an explicit c++rt0.o +- # does not break anything, and helps significantly (at the cost of a little +- # extra space). +- freebsd2.2*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' +- _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 +- ;; +- +- # Unfortunately, older versions of FreeBSD 2 do not have this feature. +- freebsd2*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; +- +- # FreeBSD 3 and greater uses gcc -shared to do shared libraries. +- 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 +- ;; +- +- 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 $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 +- _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 +- +- # 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(export_dynamic_flag_spec, $1)='${wl}-E' +- ;; +- +- hpux10*) +- if test "$GCC" = yes -a "$with_gnu_ld" = no; then +- _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 $libobjs $deplibs $compiler_flags' +- ;; +- esac +- else +- 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)='$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 +- _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_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; +- *) +- _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 +- ;; +- esac +- fi +- ;; +- +- irix5* | irix6* | nonstopux*) +- if test "$GCC" = yes; then +- _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' +- fi +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- ;; +- +- 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 +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF +- fi +- _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 +- ;; +- +- newsos6) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; +- +- 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 $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 +- ;; +- +- os2*) +- _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 $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} $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' +- fi +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- ;; +- +- 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} $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 ${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' +- fi +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- ;; +- +- solaris*) +- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' +- if test "$GCC" = yes; then +- 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 $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' +- fi +- _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]].*) ;; +- *) +- # The compiler driver will combine linker options so we +- # cannot just pass the convience library names through +- # without $wl, iff we do not link with $LD. +- # Luckily, gcc supports the same syntax we need for Sun Studio. +- # Supported since Solaris 2.6 (maybe 2.5.1?) +- case $wlarc in +- '') +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; +- *) +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; +- esac ;; +- esac +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- ;; +- +- sunos4*) +- 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 $libobjs $deplibs $compiler_flags' +- else +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' +- fi +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; +- +- sysv4) +- case $host_vendor in +- sni) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true??? +- ;; +- siemens) +- ## LD is ld it makes a PLAMLIB +- ## CC just makes a GrossModule. +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- ;; +- motorola) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie +- ;; +- esac +- runpath_var='LD_RUN_PATH' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; +- +- sysv4.3*) +- _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)='-Bexport' +- ;; +- +- sysv4*MP*) +- if test -d /usr/nec; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- runpath_var=LD_RUN_PATH +- hardcode_runpath_var=yes +- _LT_AC_TAGVAR(ld_shlibs, $1)=yes +- fi +- ;; +- +- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*) +- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- runpath_var='LD_RUN_PATH' +- +- if test "$GCC" = yes; then +- _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,$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 +- ;; +- +- 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*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; +- +- *) +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- esac +- fi +-]) +-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) +-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no +- +-# +-# Do we need to explicitly link libc? +-# +-case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in +-x|xyes) +- # Assume -lc should be added +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes +- +- if test "$enable_shared" = yes && test "$GCC" = yes; then +- case $_LT_AC_TAGVAR(archive_cmds, $1) in +- *'~'*) +- # FIXME: we may have to deal with multi-command sequences. +- ;; +- '$CC '*) +- # Test whether the compiler implicitly links with -lc since on some +- # systems, -lgcc has to come before -lc. If gcc already passes -lc +- # to ld, don't add -lc before -lgcc. +- AC_MSG_CHECKING([whether -lc should be explicitly linked in]) +- $rm conftest* +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext +- +- if AC_TRY_EVAL(ac_compile) 2>conftest.err; then +- soname=conftest +- lib=conftest +- libobjs=conftest.$ac_objext +- deplibs= +- wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) +- pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) +- compiler_flags=-v +- linker_flags=-v +- verstring= +- output_objdir=. +- libname=conftest +- lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)= +- if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) +- then +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- else +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes +- fi +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag +- else +- cat conftest.err 1>&5 +- fi +- $rm conftest* +- AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)]) +- ;; +- esac +- fi +- ;; +-esac +-])# AC_LIBTOOL_PROG_LD_SHLIBS +- +- +-# _LT_AC_FILE_LTDLL_C +-# ------------------- +-# Be careful that the start marker always follows a newline. +-AC_DEFUN([_LT_AC_FILE_LTDLL_C], [ +-# /* ltdll.c starts here */ +-# #define WIN32_LEAN_AND_MEAN +-# #include +-# #undef WIN32_LEAN_AND_MEAN +-# #include +-# +-# #ifndef __CYGWIN__ +-# # ifdef __CYGWIN32__ +-# # define __CYGWIN__ __CYGWIN32__ +-# # endif +-# #endif +-# +-# #ifdef __cplusplus +-# extern "C" { +-# #endif +-# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved); +-# #ifdef __cplusplus +-# } +-# #endif +-# +-# #ifdef __CYGWIN__ +-# #include +-# DECLARE_CYGWIN_DLL( DllMain ); +-# #endif +-# HINSTANCE __hDllInstance_base; +-# +-# BOOL APIENTRY +-# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved) +-# { +-# __hDllInstance_base = hInst; +-# return TRUE; +-# } +-# /* ltdll.c ends here */ +-])# _LT_AC_FILE_LTDLL_C +- +- +-# _LT_AC_TAGVAR(VARNAME, [TAGNAME]) +-# --------------------------------- +-AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])]) +- +- +-# old names +-AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL]) +-AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) +-AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) +-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) +-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) +-AC_DEFUN([AM_PROG_LD], [AC_PROG_LD]) +-AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) +- +-# This is just to silence aclocal about the macro not being used +-ifelse([AC_DISABLE_FAST_INSTALL]) +- +-AC_DEFUN([LT_AC_PROG_GCJ], +-[AC_CHECK_TOOL(GCJ, gcj, no) +- test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" +- AC_SUBST(GCJFLAGS) +-]) +- +-AC_DEFUN([LT_AC_PROG_RC], +-[AC_CHECK_TOOL(RC, windres, no) +-]) +- +-############################################################ +-# NOTE: This macro has been submitted for inclusion into # +-# GNU Autoconf as AC_PROG_SED. When it is available in # +-# a released version of Autoconf we should remove this # +-# macro and use it instead. # +-############################################################ +-# LT_AC_PROG_SED +-# -------------- +-# Check for a fully-functional sed program, that truncates +-# as few characters as possible. Prefer GNU sed if found. +-AC_DEFUN([LT_AC_PROG_SED], +-[AC_MSG_CHECKING([for a sed that does not truncate output]) +-AC_CACHE_VAL(lt_cv_path_SED, +-[# Loop through the user's path and test for sed and gsed. +-# Then use that list of sed's as ones to test for truncation. +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- 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 +- lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" +- fi +- done +- done +-done +-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 && continue +- cat /dev/null > conftest.in +- lt_ac_count=0 +- echo $ECHO_N "0123456789$ECHO_C" >conftest.in +- # Check for GNU sed and select it if it is found. +- if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then +- lt_cv_path_SED=$lt_ac_sed +- break +- fi +- while true; do +- cat conftest.in conftest.in >conftest.tmp +- mv conftest.tmp conftest.in +- cp conftest.in conftest.nl +- echo >>conftest.nl +- $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break +- cmp -s conftest.out conftest.nl || break +- # 10000 chars as input seems more than enough +- test $lt_ac_count -gt 10 && break +- lt_ac_count=`expr $lt_ac_count + 1` +- if test $lt_ac_count -gt $lt_ac_max; then +- lt_ac_max=$lt_ac_count +- lt_cv_path_SED=$lt_ac_sed +- fi +- done +-done +-]) +-SED=$lt_cv_path_SED +-AC_MSG_RESULT([$SED]) +-]) +- +-dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) +-dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page +-dnl also defines GSTUFF_PKG_ERRORS on error +-AC_DEFUN([PKG_CHECK_MODULES], [ +- succeeded=no +- +- if test -z "$PKG_CONFIG"; then +- AC_PATH_PROG(PKG_CONFIG, pkg-config, no) +- 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 +- AC_MSG_CHECKING(for $2) +- +- if $PKG_CONFIG --exists "$2" ; then +- AC_MSG_RESULT(yes) +- succeeded=yes +- +- AC_MSG_CHECKING($1_CFLAGS) +- $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` +- AC_MSG_RESULT($$1_CFLAGS) +- +- AC_MSG_CHECKING($1_LIBS) +- $1_LIBS=`$PKG_CONFIG --libs "$2"` +- AC_MSG_RESULT($$1_LIBS) +- else +- $1_CFLAGS="" +- $1_LIBS="" +- ## If we have a custom action on failure, don't print errors, but +- ## do set a variable so people can do so. +- $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` +- ifelse([$4], ,echo $$1_PKG_ERRORS,) +- fi +- +- AC_SUBST($1_CFLAGS) +- AC_SUBST($1_LIBS) +- 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 +- ifelse([$3], , :, [$3]) +- else +- ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) +- fi +-]) +- +- +diff --git a/aclocal.m4 b/aclocal.m4 +deleted file mode 100644 +index 0e90944..0000000 +--- a/aclocal.m4 ++++ b/dev/null +@@ -1,892 +0,0 @@ +-# generated automatically by aclocal 1.9.6 -*- Autoconf -*- +- +-# Copyright (C) 1996, 1997, 1998, 1999, 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. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +-# PARTICULAR PURPOSE. +- +-# Copyright (C) 2002, 2003, 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. +- +-# AM_AUTOMAKE_VERSION(VERSION) +-# ---------------------------- +-# Automake X.Y traces this macro to ensure aclocal.m4 has been +-# generated from the m4 files accompanying Automake X.Y. +-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) +- +-# AM_SET_CURRENT_AUTOMAKE_VERSION +-# ------------------------------- +-# Call AM_AUTOMAKE_VERSION so it can be traced. +-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. +-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +- [AM_AUTOMAKE_VERSION([1.9.6])]) +- +-# AM_AUX_DIR_EXPAND -*- Autoconf -*- +- +-# Copyright (C) 2001, 2003, 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. +- +-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +-# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to +-# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +-# +-# Of course, Automake must honor this variable whenever it calls a +-# tool from the auxiliary directory. The problem is that $srcdir (and +-# therefore $ac_aux_dir as well) can be either absolute or relative, +-# depending on how configure is run. This is pretty annoying, since +-# it makes $ac_aux_dir quite unusable in subdirectories: in the top +-# source directory, any form will work fine, but in subdirectories a +-# relative path needs to be adjusted first. +-# +-# $ac_aux_dir/missing +-# fails when called from a subdirectory if $ac_aux_dir is relative +-# $top_srcdir/$ac_aux_dir/missing +-# fails if $ac_aux_dir is absolute, +-# fails when called from a subdirectory in a VPATH build with +-# a relative $ac_aux_dir +-# +-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +-# are both prefixed by $srcdir. In an in-source build this is usually +-# harmless because $srcdir is `.', but things will broke when you +-# start a VPATH build or use an absolute $srcdir. +-# +-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +-# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +-# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +-# and then we would define $MISSING as +-# MISSING="\${SHELL} $am_aux_dir/missing" +-# This will work as long as MISSING is not called from configure, because +-# unfortunately $(top_srcdir) has no meaning in configure. +-# However there are other variables, like CC, which are often used in +-# configure, and could therefore not use this "fixed" $ac_aux_dir. +-# +-# Another solution, used here, is to always expand $ac_aux_dir to an +-# absolute PATH. The drawback is that using absolute paths prevent a +-# configured tree to be moved without reconfiguration. +- +-AC_DEFUN([AM_AUX_DIR_EXPAND], +-[dnl Rely on autoconf to set up CDPATH properly. +-AC_PREREQ([2.50])dnl +-# expand $ac_aux_dir to an absolute path +-am_aux_dir=`cd $ac_aux_dir && pwd` +-]) +- +-# AM_CONDITIONAL -*- Autoconf -*- +- +-# Copyright (C) 1997, 2000, 2001, 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 7 +- +-# AM_CONDITIONAL(NAME, SHELL-CONDITION) +-# ------------------------------------- +-# Define a conditional. +-AC_DEFUN([AM_CONDITIONAL], +-[AC_PREREQ(2.52)dnl +- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], +- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +-AC_SUBST([$1_TRUE]) +-AC_SUBST([$1_FALSE]) +-if $2; then +- $1_TRUE= +- $1_FALSE='#' +-else +- $1_TRUE='#' +- $1_FALSE= +-fi +-AC_CONFIG_COMMANDS_PRE( +-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then +- AC_MSG_ERROR([[conditional "$1" was never defined. +-Usually this means the macro was only invoked conditionally.]]) +-fi])]) +- +- +-# Copyright (C) 1999, 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 8 +- +-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +-# written in clear, in which case automake, when reading aclocal.m4, +-# will think it sees a *use*, and therefore will trigger all it's +-# C support machinery. Also note that it means that autoscan, seeing +-# CC etc. in the Makefile, will ask for an AC_PROG_CC use... +- +- +-# _AM_DEPENDENCIES(NAME) +-# ---------------------- +-# See how the compiler implements dependency checking. +-# NAME is "CC", "CXX", "GCJ", or "OBJC". +-# We try a few techniques and use that to set a single cache variable. +-# +-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +-# dependency, and given that the user is not expected to run this macro, +-# just rely on AC_PROG_CC. +-AC_DEFUN([_AM_DEPENDENCIES], +-[AC_REQUIRE([AM_SET_DEPDIR])dnl +-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +-AC_REQUIRE([AM_MAKE_INCLUDE])dnl +-AC_REQUIRE([AM_DEP_TRACK])dnl +- +-ifelse([$1], CC, [depcc="$CC" am_compiler_list=], +- [$1], CXX, [depcc="$CXX" am_compiler_list=], +- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], +- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], +- [depcc="$$1" am_compiler_list=]) +- +-AC_CACHE_CHECK([dependency style of $depcc], +- [am_cv_$1_dependencies_compiler_type], +-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then +- # We make a subdir and do the tests there. Otherwise we can end up +- # making bogus files that we don't know about and never remove. For +- # instance it was reported that on HP-UX the gcc test will end up +- # making a dummy file named `D' -- because `-MD' means `put the output +- # in D'. +- mkdir conftest.dir +- # Copy depcomp to subdir because otherwise we won't find it if we're +- # using a relative directory. +- cp "$am_depcomp" conftest.dir +- cd conftest.dir +- # We will build objects and dependencies in a subdirectory because +- # it helps to detect inapplicable dependency modes. For instance +- # both Tru64's cc and ICC support -MD to output dependencies as a +- # side effect of compilation, but ICC will put the dependencies in +- # the current directory while Tru64 will put them in the object +- # directory. +- mkdir sub +- +- am_cv_$1_dependencies_compiler_type=none +- if test "$am_compiler_list" = ""; then +- am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` +- fi +- for depmode in $am_compiler_list; do +- # Setup a source with many dependencies, because some compilers +- # like to wrap large dependency lists on column 80 (with \), and +- # we should not choose a depcomp mode which is confused by this. +- # +- # We need to recreate these files for each test, as the compiler may +- # overwrite some of them when testing with obscure command lines. +- # This happens at least with the AIX C compiler. +- : > sub/conftest.c +- for i in 1 2 3 4 5 6; do +- echo '#include "conftst'$i'.h"' >> sub/conftest.c +- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with +- # Solaris 8's {/usr,}/bin/sh. +- touch sub/conftst$i.h +- done +- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf +- +- case $depmode in +- nosideeffect) +- # after this tag, mechanisms are not by side-effect, so they'll +- # only be used when explicitly requested +- if test "x$enable_dependency_tracking" = xyes; then +- continue +- else +- break +- fi +- ;; +- none) break ;; +- esac +- # We check with `-c' and `-o' for the sake of the "dashmstdout" +- # mode. It turns out that the SunPro C++ compiler does not properly +- # handle `-M -o', and we need to detect this. +- if depmode=$depmode \ +- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ +- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ +- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ +- >/dev/null 2>conftest.err && +- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && +- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && +- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then +- # icc doesn't choke on unknown options, it will just issue warnings +- # or remarks (even with -Werror). So we grep stderr for any message +- # that says an option was ignored or not supported. +- # When given -MP, icc 7.0 and 7.1 complain thusly: +- # icc: Command line warning: ignoring option '-M'; no argument required +- # The diagnosis changed in icc 8.0: +- # icc: Command line remark: option '-MP' not supported +- if (grep 'ignoring option' conftest.err || +- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else +- am_cv_$1_dependencies_compiler_type=$depmode +- break +- fi +- fi +- done +- +- cd .. +- rm -rf conftest.dir +-else +- am_cv_$1_dependencies_compiler_type=none +-fi +-]) +-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +-AM_CONDITIONAL([am__fastdep$1], [ +- test "x$enable_dependency_tracking" != xno \ +- && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) +-]) +- +- +-# AM_SET_DEPDIR +-# ------------- +-# Choose a directory name for dependency files. +-# This macro is AC_REQUIREd in _AM_DEPENDENCIES +-AC_DEFUN([AM_SET_DEPDIR], +-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl +-]) +- +- +-# AM_DEP_TRACK +-# ------------ +-AC_DEFUN([AM_DEP_TRACK], +-[AC_ARG_ENABLE(dependency-tracking, +-[ --disable-dependency-tracking speeds up one-time build +- --enable-dependency-tracking do not reject slow dependency extractors]) +-if test "x$enable_dependency_tracking" != xno; then +- am_depcomp="$ac_aux_dir/depcomp" +- AMDEPBACKSLASH='\' +-fi +-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +-AC_SUBST([AMDEPBACKSLASH]) +-]) +- +-# Generate code to set up dependency tracking. -*- Autoconf -*- +- +-# Copyright (C) 1999, 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 3 +- +-# _AM_OUTPUT_DEPENDENCY_COMMANDS +-# ------------------------------ +-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +-[for mf in $CONFIG_FILES; do +- # Strip MF so we end up with the name of the file. +- mf=`echo "$mf" | sed -e 's/:.*$//'` +- # Check whether this is an Automake generated Makefile or not. +- # We used to match only the files named `Makefile.in', but +- # some people rename them; so instead we look at the file content. +- # Grep'ing the first line is not enough: some people post-process +- # each Makefile.in and add a new line on top of each file to say so. +- # So let's grep whole file. +- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then +- dirpart=`AS_DIRNAME("$mf")` +- else +- continue +- fi +- # Extract the definition of DEPDIR, am__include, and am__quote +- # from the Makefile without running `make'. +- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` +- test -z "$DEPDIR" && continue +- am__include=`sed -n 's/^am__include = //p' < "$mf"` +- test -z "am__include" && continue +- am__quote=`sed -n 's/^am__quote = //p' < "$mf"` +- # When using ansi2knr, U may be empty or an underscore; expand it +- U=`sed -n 's/^U = //p' < "$mf"` +- # Find all dependency output files, they are included files with +- # $(DEPDIR) in their names. We invoke sed twice because it is the +- # simplest approach to changing $(DEPDIR) to its actual value in the +- # expansion. +- for file in `sed -n " +- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ +- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do +- # Make sure the directory exists. +- test -f "$dirpart/$file" && continue +- fdir=`AS_DIRNAME(["$file"])` +- AS_MKDIR_P([$dirpart/$fdir]) +- # echo "creating $dirpart/$file" +- echo '# dummy' > "$dirpart/$file" +- done +-done +-])# _AM_OUTPUT_DEPENDENCY_COMMANDS +- +- +-# AM_OUTPUT_DEPENDENCY_COMMANDS +-# ----------------------------- +-# This macro should only be invoked once -- use via AC_REQUIRE. +-# +-# This code is only required when automatic dependency tracking +-# is enabled. FIXME. This creates each `.P' file that we will +-# need in order to bootstrap the dependency handling code. +-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +-[AC_CONFIG_COMMANDS([depfiles], +- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], +- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +-]) +- +-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 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 8 +- +-# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. +-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) +- +-# Do all the work for Automake. -*- Autoconf -*- +- +-# Copyright (C) 1996, 1997, 1998, 1999, 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 12 +- +-# 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. +- +-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +-# AM_INIT_AUTOMAKE([OPTIONS]) +-# ----------------------------------------------- +-# The call with PACKAGE and VERSION arguments is the old style +-# call (pre autoconf-2.50), which is being phased out. PACKAGE +-# and VERSION should now be passed to AC_INIT and removed from +-# the call to AM_INIT_AUTOMAKE. +-# We support both call styles for the transition. After +-# the next Automake release, Autoconf can make the AC_INIT +-# arguments mandatory, and then we can depend on a new Autoconf +-# release and drop the old call support. +-AC_DEFUN([AM_INIT_AUTOMAKE], +-[AC_PREREQ([2.58])dnl +-dnl Autoconf wants to disallow AM_ names. We explicitly allow +-dnl the ones we care about. +-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +-AC_REQUIRE([AC_PROG_INSTALL])dnl +-# test to see if srcdir already configured +-if test "`cd $srcdir && pwd`" != "`pwd`" && +- test -f $srcdir/config.status; then +- AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) +-fi +- +-# test whether we have cygpath +-if test -z "$CYGPATH_W"; then +- if (cygpath --version) >/dev/null 2>/dev/null; then +- CYGPATH_W='cygpath -w' +- else +- CYGPATH_W=echo +- fi +-fi +-AC_SUBST([CYGPATH_W]) +- +-# Define the identity of the package. +-dnl Distinguish between old-style and new-style calls. +-m4_ifval([$2], +-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +- AC_SUBST([PACKAGE], [$1])dnl +- AC_SUBST([VERSION], [$2])], +-[_AM_SET_OPTIONS([$1])dnl +- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl +- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl +- +-_AM_IF_OPTION([no-define],, +-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) +- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl +- +-# Some tools Automake needs. +-AC_REQUIRE([AM_SANITY_CHECK])dnl +-AC_REQUIRE([AC_ARG_PROGRAM])dnl +-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) +-AM_MISSING_PROG(AUTOCONF, autoconf) +-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) +-AM_MISSING_PROG(AUTOHEADER, autoheader) +-AM_MISSING_PROG(MAKEINFO, makeinfo) +-AM_PROG_INSTALL_SH +-AM_PROG_INSTALL_STRIP +-AC_REQUIRE([AM_PROG_MKDIR_P])dnl +-# We need awk for the "check" target. The system "awk" is bad on +-# some platforms. +-AC_REQUIRE([AC_PROG_AWK])dnl +-AC_REQUIRE([AC_PROG_MAKE_SET])dnl +-AC_REQUIRE([AM_SET_LEADING_DOT])dnl +-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], +- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], +- [_AM_PROG_TAR([v7])])]) +-_AM_IF_OPTION([no-dependencies],, +-[AC_PROVIDE_IFELSE([AC_PROG_CC], +- [_AM_DEPENDENCIES(CC)], +- [define([AC_PROG_CC], +- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl +-AC_PROVIDE_IFELSE([AC_PROG_CXX], +- [_AM_DEPENDENCIES(CXX)], +- [define([AC_PROG_CXX], +- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl +-]) +-]) +- +- +-# When config.status generates a header, we must update the stamp-h file. +-# This file resides in the same directory as the config header +-# that is generated. The stamp files are numbered to have different names. +- +-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +-# loop where config.status creates the headers, so we can generate +-# our stamp files there. +-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +-[# Compute $1's index in $config_headers. +-_am_stamp_count=1 +-for _am_header in $config_headers :; do +- case $_am_header in +- $1 | $1:* ) +- break ;; +- * ) +- _am_stamp_count=`expr $_am_stamp_count + 1` ;; +- esac +-done +-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) +- +-# Copyright (C) 2001, 2003, 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. +- +-# AM_PROG_INSTALL_SH +-# ------------------ +-# Define $install_sh. +-AC_DEFUN([AM_PROG_INSTALL_SH], +-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +-install_sh=${install_sh-"$am_aux_dir/install-sh"} +-AC_SUBST(install_sh)]) +- +-# Copyright (C) 2003, 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 2 +- +-# Check whether the underlying file-system supports filenames +-# with a leading dot. For instance MS-DOS doesn't. +-AC_DEFUN([AM_SET_LEADING_DOT], +-[rm -rf .tst 2>/dev/null +-mkdir .tst 2>/dev/null +-if test -d .tst; then +- am__leading_dot=. +-else +- am__leading_dot=_ +-fi +-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. +-# +-# 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 3 +- +-# AM_MAKE_INCLUDE() +-# ----------------- +-# Check to see how make treats includes. +-AC_DEFUN([AM_MAKE_INCLUDE], +-[am_make=${MAKE-make} +-cat > confinc << 'END' +-am__doit: +- @echo done +-.PHONY: am__doit +-END +-# If we don't find an include directive, just comment out the code. +-AC_MSG_CHECKING([for style of include used by $am_make]) +-am__include="#" +-am__quote= +-_am_result=none +-# First try GNU make style include. +-echo "include confinc" > confmf +-# We grep out `Entering directory' and `Leaving directory' +-# messages which can occur if `w' ends up in MAKEFLAGS. +-# In particular we don't look at `^make:' because GNU make might +-# be invoked under some other name (usually "gmake"), in which +-# case it prints its new name instead of `make'. +-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then +- am__include=include +- am__quote= +- _am_result=GNU +-fi +-# Now try BSD make style include. +-if test "$am__include" = "#"; then +- echo '.include "confinc"' > confmf +- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then +- am__include=.include +- am__quote="\"" +- _am_result=BSD +- fi +-fi +-AC_SUBST([am__include]) +-AC_SUBST([am__quote]) +-AC_MSG_RESULT([$_am_result]) +-rm -f confinc confmf +-]) +- +-# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- +- +-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 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 +- +-# AM_MISSING_PROG(NAME, PROGRAM) +-# ------------------------------ +-AC_DEFUN([AM_MISSING_PROG], +-[AC_REQUIRE([AM_MISSING_HAS_RUN]) +-$1=${$1-"${am_missing_run}$2"} +-AC_SUBST($1)]) +- +- +-# AM_MISSING_HAS_RUN +-# ------------------ +-# Define MISSING if not defined so far and test if it supports --run. +-# If it does, set am_missing_run to use it, otherwise, to nothing. +-AC_DEFUN([AM_MISSING_HAS_RUN], +-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" +-# Use eval to expand $SHELL +-if eval "$MISSING --run true"; then +- am_missing_run="$MISSING --run " +-else +- am_missing_run= +- AC_MSG_WARN([`missing' script is too old or missing]) +-fi +-]) +- +-# Copyright (C) 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. +- +-# AM_PROG_MKDIR_P +-# --------------- +-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. +-# +-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories +-# created by `make install' are always world readable, even if the +-# installer happens to have an overly restrictive umask (e.g. 077). +-# This was a mistake. There are at least two reasons why we must not +-# use `-m 0755': +-# - it causes special bits like SGID to be ignored, +-# - it may be too restrictive (some setups expect 775 directories). +-# +-# Do not use -m 0755 and let people choose whatever they expect by +-# setting umask. +-# +-# We cannot accept any implementation of `mkdir' that recognizes `-p'. +-# Some implementations (such as Solaris 8's) are not thread-safe: if a +-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' +-# concurrently, both version can detect that a/ is missing, but only +-# one can create it and the other will error out. Consequently we +-# restrict ourselves to GNU make (using the --version option ensures +-# this.) +-AC_DEFUN([AM_PROG_MKDIR_P], +-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then +- # We used to keeping the `.' as first argument, in order to +- # allow $(mkdir_p) to be used without argument. As in +- # $(mkdir_p) $(somedir) +- # where $(somedir) is conditionally defined. However this is wrong +- # for two reasons: +- # 1. if the package is installed by a user who cannot write `.' +- # make install will fail, +- # 2. the above comment should most certainly read +- # $(mkdir_p) $(DESTDIR)$(somedir) +- # so it does not work when $(somedir) is undefined and +- # $(DESTDIR) is not. +- # To support the latter case, we have to write +- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), +- # so the `.' trick is pointless. +- mkdir_p='mkdir -p --' +-else +- # On NextStep and OpenStep, the `mkdir' command does not +- # recognize any option. It will interpret all options as +- # directories to create, and then abort because `.' already +- # exists. +- for d in ./-p ./--version; +- do +- test -d $d && rmdir $d +- done +- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. +- if test -f "$ac_aux_dir/mkinstalldirs"; then +- mkdir_p='$(mkinstalldirs)' +- else +- mkdir_p='$(install_sh) -d' +- fi +-fi +-AC_SUBST([mkdir_p])]) +- +-# Helper functions for option handling. -*- Autoconf -*- +- +-# Copyright (C) 2001, 2002, 2003, 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 3 +- +-# _AM_MANGLE_OPTION(NAME) +-# ----------------------- +-AC_DEFUN([_AM_MANGLE_OPTION], +-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) +- +-# _AM_SET_OPTION(NAME) +-# ------------------------------ +-# Set option NAME. Presently that only means defining a flag for this option. +-AC_DEFUN([_AM_SET_OPTION], +-[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) +- +-# _AM_SET_OPTIONS(OPTIONS) +-# ---------------------------------- +-# OPTIONS is a space-separated list of Automake options. +-AC_DEFUN([_AM_SET_OPTIONS], +-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) +- +-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +-# ------------------------------------------- +-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +-AC_DEFUN([_AM_IF_OPTION], +-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) +- +-# Check to make sure that the build environment is sane. -*- Autoconf -*- +- +-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 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 +- +-# AM_SANITY_CHECK +-# --------------- +-AC_DEFUN([AM_SANITY_CHECK], +-[AC_MSG_CHECKING([whether build environment is sane]) +-# Just in case +-sleep 1 +-echo timestamp > conftest.file +-# Do `set' in a subshell so we don't clobber the current shell's +-# arguments. Must try -L first in case configure is actually a +-# symlink; some systems play weird games with the mod time of symlinks +-# (eg FreeBSD returns the mod time of the symlink's containing +-# directory). +-if ( +- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` +- if test "$[*]" = "X"; then +- # -L didn't work. +- set X `ls -t $srcdir/configure conftest.file` +- fi +- rm -f conftest.file +- if test "$[*]" != "X $srcdir/configure conftest.file" \ +- && test "$[*]" != "X conftest.file $srcdir/configure"; then +- +- # If neither matched, then we have a broken ls. This can happen +- # if, for instance, CONFIG_SHELL is bash and it inherits a +- # broken ls alias from the environment. This has actually +- # happened. Such a system could not be considered "sane". +- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken +-alias in your environment]) +- fi +- +- test "$[2]" = conftest.file +- ) +-then +- # Ok. +- : +-else +- AC_MSG_ERROR([newly created file is older than distributed files! +-Check your system clock]) +-fi +-AC_MSG_RESULT(yes)]) +- +-# Copyright (C) 2001, 2003, 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. +- +-# AM_PROG_INSTALL_STRIP +-# --------------------- +-# One issue with vendor `install' (even GNU) is that you can't +-# specify the program used to strip binaries. This is especially +-# annoying in cross-compiling environments, where the build's strip +-# is unlikely to handle the host's binaries. +-# Fortunately install-sh will honor a STRIPPROG variable, so we +-# always use install-sh in `make install-strip', and initialize +-# STRIPPROG with the value of the STRIP variable (set by the user). +-AC_DEFUN([AM_PROG_INSTALL_STRIP], +-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +-# Installed binaries are usually stripped using `strip' when the user +-# run `make install-strip'. However `strip' might not be the right +-# tool to use in cross-compilation environments, therefore Automake +-# will honor the `STRIP' environment variable to overrule this program. +-dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +-if test "$cross_compiling" != no; then +- AC_CHECK_TOOL([STRIP], [strip], :) +-fi +-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" +-AC_SUBST([INSTALL_STRIP_PROGRAM])]) +- +-# Check how to create a tarball. -*- Autoconf -*- +- +-# Copyright (C) 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 2 +- +-# _AM_PROG_TAR(FORMAT) +-# -------------------- +-# Check how to create a tarball in format FORMAT. +-# FORMAT should be one of `v7', `ustar', or `pax'. +-# +-# Substitute a variable $(am__tar) that is a command +-# writing to stdout a FORMAT-tarball containing the directory +-# $tardir. +-# tardir=directory && $(am__tar) > result.tar +-# +-# Substitute a variable $(am__untar) that extract such +-# a tarball read from stdin. +-# $(am__untar) < result.tar +-AC_DEFUN([_AM_PROG_TAR], +-[# Always define AMTAR for backward compatibility. +-AM_MISSING_PROG([AMTAR], [tar]) +-m4_if([$1], [v7], +- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], +- [m4_case([$1], [ustar],, [pax],, +- [m4_fatal([Unknown tar format])]) +-AC_MSG_CHECKING([how to create a $1 tar archive]) +-# Loop over all known methods to create a tar archive until one works. +-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' +-_am_tools=${am_cv_prog_tar_$1-$_am_tools} +-# Do not fold the above two line into one, because Tru64 sh and +-# Solaris sh will not grok spaces in the rhs of `-'. +-for _am_tool in $_am_tools +-do +- case $_am_tool in +- gnutar) +- for _am_tar in tar gnutar gtar; +- do +- AM_RUN_LOG([$_am_tar --version]) && break +- done +- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' +- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' +- am__untar="$_am_tar -xf -" +- ;; +- plaintar) +- # Must skip GNU tar: if it does not support --format= it doesn't create +- # ustar tarball either. +- (tar --version) >/dev/null 2>&1 && continue +- am__tar='tar chf - "$$tardir"' +- am__tar_='tar chf - "$tardir"' +- am__untar='tar xf -' +- ;; +- pax) +- am__tar='pax -L -x $1 -w "$$tardir"' +- am__tar_='pax -L -x $1 -w "$tardir"' +- am__untar='pax -r' +- ;; +- cpio) +- am__tar='find "$$tardir" -print | cpio -o -H $1 -L' +- am__tar_='find "$tardir" -print | cpio -o -H $1 -L' +- am__untar='cpio -i -H $1 -d' +- ;; +- none) +- am__tar=false +- am__tar_=false +- am__untar=false +- ;; +- esac +- +- # If the value was cached, stop now. We just wanted to have am__tar +- # and am__untar set. +- test -n "${am_cv_prog_tar_$1}" && break +- +- # tar/untar a dummy directory, and stop if the command works +- rm -rf conftest.dir +- mkdir conftest.dir +- echo GrepMe > conftest.dir/file +- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) +- rm -rf conftest.dir +- if test -s conftest.tar; then +- AM_RUN_LOG([$am__untar /dev/null 2>&1 && break +- fi +-done +-rm -rf conftest.dir +- +-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) +-AC_MSG_RESULT([$am_cv_prog_tar_$1])]) +-AC_SUBST([am__tar]) +-AC_SUBST([am__untar]) +-]) # _AM_PROG_TAR +- +-m4_include([acinclude.m4]) +diff --git a/config.h.in b/config.h.in +index 626a392..78d8bb0 100644 +--- a/config.h.in ++++ b/config.h.in +@@ -1,5 +1,8 @@ + /* config.h.in. Generated from configure.in by autoheader. */ + ++/* Define if building universal (internal helper macro) */ ++#undef AC_APPLE_UNIVERSAL_BUILD ++ + /* Define to 1 if you have the header file. */ + #undef HAVE_CARBON_CARBON_H + +@@ -68,9 +71,6 @@ + /* Defines if your system has the fontconfig and freetype libraries */ + #undef HAVE_KARBONTEXT + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_KSPELL2_BROKER_H +- + /* Defines if your system has the libart library */ + #undef HAVE_LIBART + +@@ -89,6 +89,9 @@ + /* Define if you have libtiff */ + #undef HAVE_LIBTIFF + ++/* Defines if your system has libpwd greater than or equal to v0.9.0 */ ++#undef HAVE_LIBWPD_090 ++ + /* Define if you have libz */ + #undef HAVE_LIBZ + +@@ -150,6 +153,9 @@ + /* Define to 1 if you have the `rewinddir' function. */ + #undef HAVE_REWINDDIR + ++/* Defines if your system has Ruby 1.9.x */ ++#undef HAVE_RUBY_1_9 ++ + /* Define if you have a STL implementation by SGI */ + #undef HAVE_SGI_STL + +@@ -200,6 +206,9 @@ + /* Define to 1 if you have the header file. */ + #undef HAVE_SYS_TYPES_H + ++/* Define to 1 if you have the header file. */ ++#undef HAVE_TDESPELL2_BROKER_H ++ + /* Define to 1 if you have the header file. */ + #undef HAVE_UNISTD_H + +@@ -227,6 +236,10 @@ + /* The correct header */ + #undef LCMS_HEADER + ++/* Define to the sub-directory in which libtool stores uninstalled libraries. ++ */ ++#undef LT_OBJDIR ++ + /* Name of package */ + #undef PACKAGE + +@@ -242,6 +255,9 @@ + /* Define to the one symbol short name of this package. */ + #undef PACKAGE_TARNAME + ++/* Define to the home page for this package. */ ++#undef PACKAGE_URL ++ + /* Define to the version of this package. */ + #undef PACKAGE_VERSION + +@@ -275,9 +291,17 @@ + /* Defined if compiling without arts */ + #undef WITHOUT_ARTS + +-/* Define to 1 if your processor stores words with the most significant byte +- first (like Motorola and SPARC, unlike Intel and VAX). */ +-#undef WORDS_BIGENDIAN ++/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most ++ significant byte first (like Motorola and SPARC, unlike Intel). */ ++#if defined AC_APPLE_UNIVERSAL_BUILD ++# if defined __BIG_ENDIAN__ ++# define WORDS_BIGENDIAN 1 ++# endif ++#else ++# ifndef WORDS_BIGENDIAN ++# undef WORDS_BIGENDIAN ++# endif ++#endif + + /* Defines the executable of xmllint */ + #undef XMLLINT +@@ -311,6 +335,11 @@ + #endif + + ++/* Enable large inode numbers on Mac OS X 10.5. */ ++#ifndef _DARWIN_USE_64_BIT_INODE ++# define _DARWIN_USE_64_BIT_INODE 1 ++#endif ++ + /* Number of bits in a file offset, on hosts where this is settable. */ + #undef _FILE_OFFSET_BITS + +@@ -379,6 +408,9 @@ + #endif + + ++/* define to 1 if -fvisibility is supported */ ++#undef __KDE_HAVE_GCC_VISIBILITY ++ + + #if defined(__SVR4) && !defined(__svr4__) + #define __svr4__ 1 +diff --git a/configure.files b/configure.files +index 635634e..e0bbb6e 100644 +--- a/configure.files ++++ b/configure.files +@@ -1,5 +1,9 @@ + ./admin/configure.in.min + configure.in.in ++./chalk/configure.in.bot ++./chalk/configure.in.in ++./chalk/plugins/configure.in.in ++./chalk/plugins/viewplugins/imagesize/configure.in.in + ./example/configure.in.in + ./filters/configure.in.mid + ./filters/chalk/configure.in.in +@@ -31,10 +35,6 @@ configure.in.in + ./kexi/plugins/macros/configure.in.in + ./kivio/configure.in.in + ./kpresenter/configure.in.in +-./chalk/configure.in.bot +-./chalk/configure.in.in +-./chalk/plugins/configure.in.in +-./chalk/plugins/viewplugins/imagesize/configure.in.in + ./kspread/plugins/calculator/configure.in.in + ./kword/mailmerge/configure.in.in + ./lib/configure.in.in +diff --git a/configure.in b/configure.in +deleted file mode 100644 +index 92ca35d..0000000 +--- a/configure.in ++++ b/dev/null +@@ -1,2701 +0,0 @@ +-dnl ======================================================= +-dnl FILE: ./admin/configure.in.min +-dnl ======================================================= +- +-dnl This file is part of the KDE libraries/packages +-dnl Copyright (C) 2001 Stephan Kulow (coolo@kde.org) +- +-dnl This file is free software; you can redistribute it and/or +-dnl modify it under the terms of the GNU Library General Public +-dnl License as published by the Free Software Foundation; either +-dnl version 2 of the License, or (at your option) any later version. +- +-dnl This library is distributed in the hope that it will be useful, +-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +-dnl Library General Public License for more details. +- +-dnl You should have received a copy of the GNU Library General Public License +-dnl along with this library; see the file COPYING.LIB. If not, write to +-dnl the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +-dnl Boston, MA 02110-1301, USA. +- +-# Original Author was Kalle@kde.org +-# I lifted it in some mater. (Stephan Kulow) +-# I used much code from Janos Farkas +- +-dnl Process this file with autoconf to produce a configure script. +- +-AC_INIT(acinclude.m4) dnl a source file from your sub dir +- +-dnl This is so we can use kde-common +-AC_CONFIG_AUX_DIR(admin) +- +-dnl This ksh/zsh feature conflicts with `cd blah ; pwd` +-unset CDPATH +- +-dnl Checking host/target/build systems, for make, install etc. +-AC_CANONICAL_SYSTEM +-dnl Perform program name transformation +-AC_ARG_PROGRAM +- +-dnl Automake doc recommends to do this only here. (Janos) +-AM_INIT_AUTOMAKE(koffice, "1.6.3") dnl searches for some needed programs +- +-AM_MAINTAINER_MODE +- +-KDE_SET_PREFIX +- +-dnl generate the config header +-AM_CONFIG_HEADER(config.h) dnl at the distribution this done +- +-dnl Checks for programs. +-AC_CHECK_COMPILERS +-AC_ENABLE_SHARED(yes) +-AC_ENABLE_STATIC(no) +-KDE_PROG_LIBTOOL +- +-dnl for NLS support. Call them in this order! +-dnl WITH_NLS is for the po files +-AM_KDE_WITH_NLS +- +-KDE_USE_QT(3.3) +-AC_PATH_KDE +-dnl ======================================================= +-dnl FILE: configure.in.in +-dnl ======================================================= +- +-#MIN_CONFIG(3.3) +- +-# Remember to synchronize the version number with the file koffice/lib/kofficecore/kofficeversion.h +-dnl PACKAGE set before +- +-CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS" +- +-AC_CHECK_HEADERS(unistd.h sys/param.h floatingpoint.h paths.h) +-AC_C_BIGENDIAN +-AC_CHECK_KDEMAXPATHLEN +- +-KDE_INIT_DOXYGEN([The KOffice API Reference], [Version $VERSION]) +- +-# Check for GraphicsMagick... +- +-have_graphicsmagick=no +-KDE_FIND_PATH(GraphicsMagick-config, GRAPHICS_MAGICK_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [ +- AC_MSG_WARN([Could not find GraphicsMagick anywhere, check http://www.graphicsmagick.org/ for GraphicsMagick >= 1.1.7.]) +-]) +- +-if test -n "$GRAPHICS_MAGICK_CONFIG"; then +- vers=`$GRAPHICS_MAGICK_CONFIG --version 2>/dev/null | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` +- if test -n "$vers" && test "$vers" -ge 1001007; then +- LIBGMAGICK_LIBS="`$GRAPHICS_MAGICK_CONFIG --libs`" +- LIBGMAGICK_LDFLAGS="`$GRAPHICS_MAGICK_CONFIG --ldflags`" +- LIBGMAGICK_RPATH= +- for args in $LIBGMAGICK_LIBS; do +- case $args in +- -L*) +- LIBGMAGICK_RPATH="$LIBMAGICK_RPATH $args" +- ;; +- esac +- done +- LIBGMAGICK_RPATH=`echo $LIBGMAGICK_RPATH | $SED -e "s/-L/-R/g"` +- LIBGMAGICK_CPPFLAGS="`$GRAPHICS_MAGICK_CONFIG --cppflags`" +- AC_DEFINE(HAVE_GMAGICK,1, [GraphicsMagick is available]) +- have_graphicsmagick=yes +- else +- AC_MSG_WARN([You need at least GraphicsMagick 1.1.7]) +- fi +- +-fi +- +-if test ! "$USE_RPATH" = "yes"; then +- LIBGMAGICK_RPATH= +-fi +- +-AC_SUBST(LIBGMAGICK_LIBS) +-AC_SUBST(LIBGMAGICK_LDFLAGS) +-AC_SUBST(LIBGMAGICK_CPPFLAGS) +-AC_SUBST(LIBGMAGICK_RPATH) +-AM_CONDITIONAL(include_graphicsmagick_filter, test "$have_graphicsmagick" = "yes" -a HAVE_GMAGICK) +- +-# End of GraphicsMagick check +- +-# Check for ImageMagick... +- +-have_imagemagick=no +-KDE_FIND_PATH(Magick-config, MAGICK_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [ +- AC_MSG_WARN([Could not find ImageMagick anywhere, check http://www.imagemagick.org/ for ImageMagick >= 5.5.2.]) +-]) +- +-if test -n "$MAGICK_CONFIG"; then +- vers=`$MAGICK_CONFIG --version 2>/dev/null | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` +- if test -n "$vers" && test "$vers" -ge 5005002 +- then +- if test "$vers" -ge 6000003 +- then +- AC_DEFINE(HAVE_MAGICK6, 1, [ImageMagick Version 6]) +- fi +- if test "$vers" -ge 6001000 +- then +- AC_DEFINE(HAVE_MAGICK61, 1, [ImageMagick Version 6.1]) +- fi +- LIBMAGICK_LIBS="`$MAGICK_CONFIG --libs`" +- LIBMAGICK_LDFLAGS="`$MAGICK_CONFIG --ldflags`" +- LIBMAGICK_RPATH= +- for args in $LIBMAGICK_LIBS; do +- case $args in +- -L*) +- LIBMAGICK_RPATH="$LIBMAGICK_RPATH $args" +- ;; +- esac +- done +- LIBMAGICK_RPATH=`echo $LIBMAGICK_RPATH | $SED -e "s/-L/-R/g"` +- LIBMAGICK_CPPFLAGS="`$MAGICK_CONFIG --cppflags`" +- AC_DEFINE(HAVE_MAGICK,1, [ImageMagick is available]) +- have_imagemagick=yes +- else +- AC_MSG_WARN([You need at least ImageMagick 5.5.2]) +- fi +-fi +- +-if test ! "$USE_RPATH" = "yes"; then +- LIBMAGICK_RPATH= +-fi +- +-AC_SUBST(LIBMAGICK_LIBS) +-AC_SUBST(LIBMAGICK_LDFLAGS) +-AC_SUBST(LIBMAGICK_CPPFLAGS) +-AC_SUBST(LIBMAGICK_RPATH) +-AM_CONDITIONAL(include_imagemagick_filter, test "$have_imagemagick" = "yes" -a HAVE_MAGICK61 -a ! "$have_graphicsmagick" = "yes" -a ! HAVE_GMAGICK) +- +-# End of ImageMagick check +- +-########################################################################## +-# This last check is copied from kdenonbeta/gsf/configure.in.in +-########################################################################## +-# KOFFICE_PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) +-# defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page +-# also defines GSTUFF_PKG_ERRORS on error +-# Note: This is specially tweaked for karbon's fontconfig check. Please fix +-# it before using it for other tests :-) +-AC_DEFUN([KOFFICE_PKG_CHECK_MODULES], [ +- succeeded=no +- +- if test -z "$PKG_CONFIG"; then +- AC_PATH_PROG(PKG_CONFIG, pkg-config, no) +- 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." +- echo "***" +- echo "*** Due to that we can't perform the check for fontconfig..." # added for karbon (Werner) +- else +- PKG_CONFIG_MIN_VERSION=0.9.0 +- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then +- AC_MSG_CHECKING(for $2) +- +- if $PKG_CONFIG --exists "$2" ; then +- AC_MSG_RESULT(yes) +- succeeded=yes +- +- AC_MSG_CHECKING($1_CFLAGS) +- $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` +- AC_MSG_RESULT($$1_CFLAGS) +- +- AC_MSG_CHECKING($1_LIBS) +- $1_LIBS=`$PKG_CONFIG --libs "$2"` +- AC_MSG_RESULT($$1_LIBS) +- else +- $1_CFLAGS="" +- $1_LIBS="" +- ## If we have a custom action on failure, don't print errors, but +- ## do set a variable so people can do so. +- $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` +- ifelse([$4], ,echo $$1_PKG_ERRORS,) +- fi +- +- AC_SUBST($1_CFLAGS) +- AC_SUBST($1_LIBS) +- 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 +- ifelse([$3], , :, [$3]) +-# else # removed for karbon (Werner) +-# ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) +- fi +-]) +- +-# --- Check for KDE 3.2 or 3.3 --- +- +-AC_MSG_CHECKING([for KDE version]) +- +-AC_LANG_SAVE +-AC_LANG_CPLUSPLUS +-kdeversion_save_CXXFLAGS="$CXXFLAGS" +-kdeversion_safe_LIBS="$LIBS" +-LIBS="$LIBS $X_EXTRA_LIBS" +-CXXFLAGS="$CXXFLAGS $all_includes" +- +-AC_COMPILE_IFELSE([ +-#include +-#if ! ( KDE_IS_VERSION( 3, 2, 90 ) ) +-#error KDE 3.2 +-#endif +-], +- need_trinity2_compat="no" +-, +- need_trinity2_compat="yes" +-) +- +-AC_COMPILE_IFELSE([ +-#include +-#if ! ( KDE_IS_VERSION( 3, 3, 90 ) ) +-#error KDE 3.3 +-#endif +-], +- need_trinity3_compat="no" +-, +- need_trinity3_compat="yes" +-) +- +-AC_COMPILE_IFELSE([ +-#include +-#if ! ( KDE_IS_VERSION( 3, 4, 90 ) ) +-#error KDE 3.4 +-#endif +-], +- need_trinity4_compat="no" +-, +- need_trinity4_compat="yes" +-) +- +-AC_COMPILE_IFELSE([ +-#include +-#if ! ( KDE_IS_VERSION( 3, 5, 2 ) ) +-#error KDE 3.5.x (x < 2) +-#endif +-], +- need_trinity51_compat="no" +-, +- need_trinity51_compat="yes" +-) +-CXXFLAGS="$kdeversion_save_CXXFLAGS" +-LIBS="$kdeversion_safe_LIBS" +-AC_LANG_RESTORE +- +-if test "$need_trinity2_compat" = "yes"; then +- AC_MSG_RESULT([KDE 3.2.x]) +-else +- if test "$need_trinity3_compat" = "yes"; then +- AC_MSG_RESULT([KDE 3.3.x]) +- else +- if test "$need_trinity4_compat" = "yes"; then +- AC_MSG_RESULT([KDE 3.4.x]) +- else +- if test "$need_trinity51_compat" = "yes"; then +- AC_MSG_RESULT([KDE 3.5.x (x < 2)]) +- else +- AC_MSG_RESULT([KDE 3.5.x (x >=2) or SVN trunk]) +- fi +- fi +- fi +-fi +- +-AM_CONDITIONAL(need_trinity2_compatibility, test "$need_trinity2_compat" = "yes") +-AM_CONDITIONAL(need_trinity3_compatibility, test "$need_trinity3_compat" = "yes") +-AM_CONDITIONAL(need_trinity4_compatibility, test "$need_trinity4_compat" = "yes") +-AM_CONDITIONAL(need_trinity51_compatibility, test "$need_trinity51_compat" = "yes") +- +-# Keep the old KDE 3.1 test, as long as it is still used +-AM_CONDITIONAL(need_trinity1_compatibility, test "supported" = "no") +- +-# --- End KDE 3.2 check --- +- +-# --- OpenEXR check --- +- +-KDE_FIND_PATH(pkg-config, PKGCONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [ +- AC_MSG_WARN([Could not find pkg-config]) +-]) +- +-AC_MSG_CHECKING([for OpenEXR]) +- +-if test -n "$PKGCONFIG"; then +- vers=`$PKGCONFIG OpenEXR --modversion 2>/dev/null` +- if test -n "$vers" +- then +- OPENEXR_LIBS="`$PKGCONFIG OpenEXR --libs`" +- OPENEXR_RPATH= +- for args in $OPENEXR_LIBS; do +- case $args in +- -L*) +- OPENEXR_RPATH="$OPENEXR_RPATH $args" +- ;; +- esac +- done +- OPENEXR_RPATH=`echo $OPENEXR_RPATH | $SED -e "s/-L/-R/g"` +- OPENEXR_CFLAGS="`$PKGCONFIG OpenEXR --cflags`" +- +- AC_DEFINE_UNQUOTED(HAVE_OPENEXR, 1, [Defines if your system has the OpenEXR library]) +- fi +-fi +- +-if test ! "$USE_RPATH" = "yes"; then +- OPENEXR_RPATH= +-fi +- +-if test -n "$OPENEXR_LIBS" +-then +- AC_MSG_RESULT([yes]) +-else +- AC_MSG_RESULT([not found]) +-fi +- +-AC_SUBST(OPENEXR_LIBS) +-AC_SUBST(OPENEXR_CFLAGS) +-AC_SUBST(OPENEXR_RPATH) +- +-AM_CONDITIONAL(have_openexr, test -n "$OPENEXR_LIBS") +- +-# --- End of OpenEXR check --- +-dnl ======================================================= +-dnl FILE: ./example/configure.in.in +-dnl ======================================================= +- +-dnl This is here so that example isn't compiled and intalled by default. +-dnl Do NOT put this file in your application, if you want it compiled ! +- +-DO_NOT_COMPILE="$DO_NOT_COMPILE example" +-dnl ======================================================= +-dnl FILE: ./filters/chalk/configure.in.in +-dnl ======================================================= +- +-# Check if the tiff lib is available +-AC_FIND_TIFF +-AM_CONDITIONAL(have_tiff, test -n "$LIBTIFF") +- +-AC_FIND_PNG +-AM_CONDITIONAL(have_png, test -n "$LIBPNG") +- +-AC_FIND_JPEG +-AM_CONDITIONAL(have_jpeg, test -n "$LIBJPEG") +- +-#--------------------------------------------------------- +-# libexif detection +-# taken from libkexif's configure.in.in +-#--------------------------------------------------------- +- +-LIBEXIF=no +- +-#PKG_CHECK_MODULES(LIBEXIF, libexif >= 0.5.7, , +-# [ AC_MSG_WARN([libexif >= 0.5.7 not found.]) +-# LIBEXIF=yes ]) +- +- +-#PKG_CHECK_MODULES(LIBEXIF06, libexif >= 0.6.9, +-# AC_DEFINE(HAVE_EXIF06,1,[check for libexif > 0.6]), +-# AC_MSG_WARN([Using old version of libexif.])) +- +-PKG_CHECK_MODULES(LIBEXIF, libexif >= 0.6.12 , , +- [ AC_MSG_WARN([libexif >= 0.6.12 not found.]) +- LIBEXIF=yes ]) +- +-AC_SUBST(LIBEXIF_LIBS) +-AC_SUBST(LIBEXIF_CFLAGS) +- +-#--------------------------------------------------------- +-# libexif detection +-#--------------------------------------------------------- +-AC_MSG_CHECKING([if C++ program with exif can be compiled]) +-AC_LANG_SAVE +-AC_LANG_CPLUSPLUS +-ac_save_CXXFLAGS="$CXXFLAGS" +-CXXFLAGS="$CXXFLAGS $LIBEXIF_CFLAGS" +-AC_CACHE_VAL(exif_build, +-[ +- AC_TRY_COMPILE([ +- extern "C" { +-#include +-#include +-} +- ],[ +- ExifLoader *l = exif_loader_new (); +- exif_loader_write_file (l,"kikoo"); +- return 0; +- ], exif_build=yes, +- exif_build=no) +-]) +-AC_MSG_RESULT($exif_build) +-if test "$exif_build" = "no"; then +- LIBEXIF="" +-fi +-CXXFLAGS="$ac_save_CXXFLAGS" +-AC_LANG_RESTORE +- +- +-AM_CONDITIONAL(have_exif, test -n "$LIBEXIF") +-AM_CONDITIONAL(include_jpeg_filter, test -n "$LIBJPEG" -a -n "$LIBEXIF") +-AM_CONDITIONAL(include_tiff_filter, test -n "$LIBTIFF" -a -n "$LIBEXIF") +-dnl ======================================================= +-dnl FILE: ./filters/chalk/pdf/configure.in.in +-dnl ======================================================= +- +-# Compile the pdf import filter only if Poppler is available +-PKG_CHECK_MODULES(POPPLER, poppler-tqt >= 0.5.1, have_poppler=yes, have_poppler=no) +- +-AM_CONDITIONAL(include_PDF, test "x$have_poppler" = xyes) +-dnl ======================================================= +-dnl FILE: ./filters/kword/msword/configure.in.in +-dnl ======================================================= +- +-AC_ARG_WITH(libwv2,AC_HELP_STRING([--with-libwv2=DIR],[use libwv2 in DIR]),[ +- if [ test "x$withval" != "xno" ]; then +- if [ test "x$withval" != "xyes" ]; then +- WV2_DIR=$withval +- fi +- search_for_wv2=yes +- else +- search_for_wv2=no +- fi +-],[ search_for_wv2=yes +-]) +- +-if [ test $search_for_wv2 != no ]; then +- if [ test -n "$WV2_DIR" ]; then +- KDE_FIND_PATH(wv2-config, WV2_CONFIG, [$WV2_DIR/bin], [ +- AC_MSG_WARN([Could not find libwv2, check http://www.sourceforge.net/projects/wvware/]) +- ]) +- else +- KDE_FIND_PATH(wv2-config, WV2_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [ +- AC_MSG_WARN([Could not find libwv2 anywhere, check http://www.sourceforge.net/projects/wvware/]) +- ]) +- fi +-fi +- +-if test -n "$WV2_CONFIG"; then +- vers=`$WV2_CONFIG --version 2>/dev/null | $SED -e 's/libwv2 //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` +- if test -n "$vers" && test "$vers" -ge 1009 +- then +- LIBWV2_LIBS="`$WV2_CONFIG --libs`" +- LIBWV2_RPATH= +- for args in $LIBWV2_LIBS; do +- case $args in +- -L*) +- LIBWV2_RPATH="$LIBWV2_RPATH $args" +- ;; +- esac +- done +- LIBWV2_RPATH=`echo $LIBWV2_RPATH | $SED -e "s/-L/-R/g"` +- LIBWV2_CFLAGS="`$WV2_CONFIG --cflags`" +- +- AC_DEFINE_UNQUOTED(HAVE_WV2, 1, [Defines if your system has the wv2 library]) +- else +- AC_MSG_WARN([You need at least version 0.1.9 of libwv2]) +- fi +-fi +- +- +-AC_SUBST(LIBWV2_LIBS) +-AC_SUBST(LIBWV2_CFLAGS) +-AC_SUBST(LIBWV2_RPATH) +-AM_CONDITIONAL(include_wv2_msword_filter, test -n "$LIBWV2_LIBS") +-dnl ======================================================= +-dnl FILE: ./filters/kword/pdf/xpdf/configure.in.in +-dnl ======================================================= +- +- +-AC_HEADER_DIRENT +-AC_HEADER_STDC +-AC_CHECK_FUNCS(rewinddir popen mkstemp) +- +-dnl ##### Check for fseeko/ftello or fseek64/ftell64 +-dnl The LARGEFILE and FSEEKO macros have to be called in C, not C++, mode. +-AC_SYS_LARGEFILE +-AC_FUNC_FSEEKO +-AC_CHECK_FUNCS(fseek64) +-AC_CHECK_FUNCS(ftell64) +- +-dnl ##### Check for libpaper (Debian). +-KDE_CHECK_HEADERS(paper.h) +-KDE_CHECK_LIB(paper, paperinit, [LIBPAPER="-lpaper"]) +-AC_SUBST(LIBPAPER) +-dnl ======================================================= +-dnl FILE: ./filters/kword/wordperfect/configure.in.in +-dnl ======================================================= +- +-KDE_FIND_PATH(pkg-config, PKGCONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [ +- AC_MSG_WARN([Could not find pkg-config]) +-]) +- +-if test -n "$PKGCONFIG"; then +- vers=`$PKGCONFIG libwpd-0.8 --modversion 2>/dev/null` +- if test -n "$vers" +- then +- LIBWPD_LIBS="`$PKGCONFIG libwpd-0.8 --libs`" +- LIBWPD_RPATH= +- for args in $LIBWPD_LIBS; do +- case $args in +- -L*) +- LIBWPD_RPATH="$LIBWPD_RPATH $args" +- ;; +- esac +- done +- LIBWPD_RPATH=`echo $LIBWPD_RPATH | $SED -e "s/-L/-R/g"` +- LIBWPD_CFLAGS="`$PKGCONFIG libwpd-0.8 --cflags`" +- +- AC_DEFINE_UNQUOTED(HAVE_WPD, 1, [Defines if your system has the libwpd library]) +- fi +-fi +- +- +-AC_SUBST(LIBWPD_LIBS) +-AC_SUBST(LIBWPD_CFLAGS) +-AC_SUBST(LIBWPD_RPATH) +- +-AM_CONDITIONAL(include_wpd_filter, test -n "$LIBWPD_LIBS") +- +-dnl ======================================================= +-dnl FILE: ./filters/xsltfilter/configure.in.in +-dnl ======================================================= +- +- +-KDE_FIND_PATH(xml2-config, XML_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [ +- AC_MSG_WARN([Could not find libxml2 anywhere, check ftp://xmlsoft.org/ for libxml >= 2.4.8. (we also keep a version of it in kdesupport for CVS users' convience)]) +- HELP_SUBDIR= +-]) +- +-if test -n "$XML_CONFIG"; then +- vers=`$XML_CONFIG --version 2>/dev/null | $SED -e 's/libxml //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` +- if test -n "$vers" && test "$vers" -ge 2004008 +- then +- LIBXML_LIBS="`$XML_CONFIG --libs`" +- LIBXML_RPATH= +- for args in $LIBXML_LIBS; do +- case $args in +- -L*) +- LIBXML_RPATH="$LIBXML_RPATH $args" +- ;; +- esac +- done +- LIBXML_RPATH=`echo $LIBXML_RPATH | $SED -e "s/-L/-R/g"` +- LIBXML_CFLAGS="`$XML_CONFIG --cflags`" +- +- KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [XMLLINT=""]) +- AC_DEFINE_UNQUOTED(XMLLINT, "$XMLLINT", [Defines the executable of xmllint]) +- else +- AC_MSG_WARN([You need at least libxml 2.4.8]) +- HELP_SUBDIR= +- fi +-fi +- +-KDE_FIND_PATH(xslt-config, XSLT_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [ +- AC_MSG_WARN([Could not find libxslt anywhere, check ftp://xmlsoft.org/ for libxslt >= 1.0.7. (we also keep a version of it in kdesupport for CVS users' convience)]) +- HELP_SUBDIR= +-]) +- +-if test -n "$XSLT_CONFIG"; then +- vers=`$XSLT_CONFIG --version 2>/dev/null | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` +- if test -n "$vers" && test "$vers" -ge 1000007; then +- LIBXSLT_LIBS="`$XSLT_CONFIG --libs`" +- LIBXSLT_RPATH= +- for args in $LIBXSLT_LIBS; do +- case $args in +- -L*) +- LIBXSLT_RPATH="$LIBXSLT_RPATH $args" +- ;; +- esac +- done +- LIBXSLT_RPATH=`echo $LIBXSLT_RPATH | $SED -e "s/-L/-R/g"` +- LIBXSLT_CFLAGS="`$XSLT_CONFIG --cflags`" +- +- else +- AC_MSG_WARN([You need at least libxslt 1.0.7]) +- HELP_SUBDIR= +- fi +-fi +- +-if test ! "$USE_RPATH" = "yes"; then +- LIBXSLT_RPATH= +- LIBXML_RPATH= +-fi +- +-AC_SUBST(LIBXSLT_LIBS) +-AC_SUBST(LIBXSLT_CFLAGS) +-AC_SUBST(LIBXSLT_RPATH) +- +-AC_SUBST(LIBXML_LIBS) +-AC_SUBST(LIBXML_CFLAGS) +-AC_SUBST(LIBXML_RPATH) +- +-AM_CONDITIONAL(include_XSLTFILTERS, test -n "$LIBXML_LIBS" -a -n "$LIBXSLT_LIBS") +-dnl ======================================================= +-dnl FILE: ./karbon/configure.in.in +-dnl ======================================================= +- +- +-KDE_FIND_PATH(freetype-config, FREETYPE_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [ +- AC_MSG_WARN([Could not find libfreetype anywhere, check http://www.freetype.org/]) +-]) +- +-if test -n "$FREETYPE_CONFIG"; then +- vers=`$FREETYPE_CONFIG --version 2>/dev/null | $SED -e 's/libfreetype //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` +- if test -n "$vers" && test "$vers" -ge 5000000 +- then +- LIBFREETYPE_LIBS="`$FREETYPE_CONFIG --libs`" +- LIBFREETYPE_RPATH= +- for args in $LIBFREETYPE_LIBS; do +- case $args in +- -L*) +- LIBFREETYPE_RPATH="$LIBFREETYPE_RPATH $args" +- ;; +- esac +- done +- LIBFREETYPE_RPATH=`echo $LIBFREETYPE_RPATH | $SED -e "s/-L/-R/g"` +- LIBFREETYPE_CFLAGS="`$FREETYPE_CONFIG --cflags`" +- else +- AC_MSG_WARN([You need at least libfreetype 5.0]) +- fi +-fi +- +-AC_SUBST(LIBFREETYPE_LIBS) +-AC_SUBST(LIBFREETYPE_CFLAGS) +-AC_SUBST(LIBFREETYPE_RPATH) +- +- +-KDE_FIND_PATH(libart2-config, LIBART_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [ +- AC_MSG_WARN([Could not find libart anywhere, check http://www.levien.com/libart/]) +-]) +- +-if test -n "$LIBART_CONFIG"; then +- vers=`$LIBART_CONFIG --version 2>/dev/null | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` +- if test -n "$vers" && test "$vers" -ge 2003008 +- then +- LIBART_LIBS="`$LIBART_CONFIG --libs`" +- LIBART_RPATH= +- for args in $LIBART_LIBS; do +- case $args in +- -L*) +- LIBART_RPATH="$LIBART_RPATH $args" +- ;; +- esac +- done +- LIBART_RPATH=`echo $LIBART_RPATH | $SED -e "s/-L/-R/g"` +- LIBART_CFLAGS="`$LIBART_CONFIG --cflags`" +- +- AC_DEFINE_UNQUOTED(HAVE_LIBART, 1, [Defines if your system has the libart library]) +- else +- AC_MSG_WARN([You need at least libart 2.3.8]) +- fi +-fi +- +-AC_SUBST(LIBART_LIBS) +-AC_SUBST(LIBART_CFLAGS) +-AC_SUBST(LIBART_RPATH) +- +- +-# Check for fontconfig +-KDE_FIND_PATH(fontconfig-config, FONTCONFIG_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [ +- KDE_FIND_PATH(pkg-config, PKGCONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [ +- AC_MSG_WARN([Could not find neither pkg-config nor fontconfig-config, check http://www.fontconfig.org/ ]) +- ]) +-]) +- +-if test -n "$PKGCONFIG"; then +- vers=`$PKGCONFIG fontconfig --modversion 2>/dev/null | $SED -e 's/libfontconfig //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` +- if test -n "$vers" && test "$vers" -ge 1000001 +- then +- LIBFONTCONFIG_LIBS="`$PKGCONFIG fontconfig --libs`" +- LIBFONTCONFIG_RPATH= +- for args in $LIBFONTCONFIG_LIBS; do +- case $args in +- -L*) +- LIBFONTCONFIG_RPATH="$LIBFONTCONFIG_RPATH $args" +- ;; +- esac +- done +- LIBFONTCONFIG_RPATH=`echo $LIBFONTCONFIG_RPATH | $SED -e "s/-L/-R/g"` +- LIBFONTCONFIG_CFLAGS="`$PKGCONFIG fontconfig --cflags`" +- +- AC_DEFINE_UNQUOTED(HAVE_FONTCONFIG, 1, [Defines if your system has the libfontconfig library]) +- fi +-fi +- +-if test -n "$FONTCONFIG_CONFIG"; then +- vers=`$FONTCONFIG_CONFIG --version 2>/dev/null | $SED -e 's/libfontconfig //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` +- if test -n "$vers" && test "$vers" -ge 1000001 +- then +- LIBFONTCONFIG_LIBS="`$FONTCONFIG_CONFIG --libs`" +- LIBFONTCONFIG_RPATH= +- for args in $LIBFONTCONFIG_LIBS; do +- case $args in +- -L*) +- LIBFONTCONFIG_RPATH="$LIBFONTCONFIG_RPATH $args" +- ;; +- esac +- done +- LIBFONTCONFIG_RPATH=`echo $LIBFONTCONFIG_RPATH | $SED -e "s/-L/-R/g"` +- LIBFONTCONFIG_CFLAGS="`$FONTCONFIG_CONFIG --cflags`" +- +- AC_DEFINE_UNQUOTED(HAVE_FONTCONFIG, 1, [Defines if your system has the libfontconfig library]) +- fi +-fi +- +-AC_SUBST(LIBFONTCONFIG_LIBS) +-AC_SUBST(LIBFONTCONFIG_CFLAGS) +-AC_SUBST(LIBFONTCONFIG_RPATH) +- +-if test -z "$LIBART_LIBS"; then +- DO_NOT_COMPILE="$DO_NOT_COMPILE karbon" +-fi +- +-if test -n "$LIBFREETYPE_LIBS" -a -n "$LIBFONTCONFIG_LIBS"; then +- AC_DEFINE_UNQUOTED(HAVE_KARBONTEXT, 1, [Defines if your system has the fontconfig and freetype libraries]) +-fi +-dnl ======================================================= +-dnl FILE: ./kexi/3rdparty/configure.in.in +-dnl ======================================================= +- +-dnl This is copied from gpsim-0.21.1/acinclude.m4, which was itself +-dnl copied from the NcFTP distribution. +-dnl Modified by David Faure for kexi's purposes. +-dnl +-dnl Original author Mike Gleason mgleason@NcFTP.com +-dnl +-dnl +-AC_DEFUN([kexi_LIB_READLINE], [ +-AC_MSG_CHECKING([for Readline library]) +- +-kexi_cv_lib_readline=no +-ac_save_LIBS="$LIBS" +-# Note: $LIBCURSES is permitted to be empty. +-for LIBREADLINE in "-lreadline" "-lreadline $LIBCURSES" "-lreadline -ltermcap" "-lreadline -lncurses" "-lreadline -lcurses" +-do +- LIBS="$ac_save_LIBS $LIBREADLINE" +- AC_TRY_RUN([ +- /* program */ +-#include +-#include +-#include +- +-main(int argc, char **argv) +-{ +- /* Note: don't actually call readline, since it may block; +- * We just want to see if it (dynamic) linked in okay. +- */ +- if (argc == 0) /* never true */ +- readline(0); +- exit(0); +-} +-],[ +- # action if true +- kexi_cv_lib_readline=yes +-],[ +- # action if false +- kexi_cv_lib_readline=no +-],[ +- # action if cross compiling +- kexi_cv_lib_readline=no +-]) +- +- if test "$kexi_cv_lib_readline" = yes ; then break ; fi +-done +-# restore LIBS +-LIBS="$ac_save_LIBS" +- +-if test "$kexi_cv_lib_readline" = no ; then +- LIBREADLINE="" +- AC_MSG_RESULT("not found - kexisql will not be compiled") +-else +- AC_MSG_RESULT($LIBREADLINE) +- AC_DEFINE(HAVE_READLINE, 1, [define if you have libreadline available]) +-fi +- +-AM_CONDITIONAL(have_readline, test "$kexi_cv_lib_readline" = "yes") +-AC_SUBST(LIBREADLINE) +-]) +- +-kexi_LIB_READLINE +-dnl ======================================================= +-dnl FILE: ./kexi/configure.in.in +-dnl ======================================================= +- +- +-#KEXI_VERSION= +-AC_SUBST(LIB_KEXI_KMDI, '-lkmdi') +-AC_SUBST(LIB_KEXI_KMDI_INCLUDES, '') +- +-dnl ======================================================= +-dnl FILE: ./kexi/kexidb/drivers/configure.in.in +-dnl ======================================================= +- +-dnl ======================================== +-dnl checks for MySQL +-dnl taken form KDEDB +-dnl ======================================== +- +-AC_ARG_ENABLE(mysql, +- AC_HELP_STRING([--enable-mysql],[build MySQL-plugin [default=yes]]), +- mysql_plugin=$enableval, mysql_plugin=yes) +- +-if test "x$mysql_plugin" = "xyes"; then +- compile_mysql_plugin="yes" +-else +- compile_mysql_plugin="no" +-fi +- +-AC_ARG_WITH(mysql_includes, +-AC_HELP_STRING([--with-mysql-includes=DIR],[use MySQL-includes installed in this directory]), +-[ +- ac_mysql_incdir=$withval +-], ac_mysql_incdir= +-) +- +-AC_ARG_WITH(mysql_libraries, +-AC_HELP_STRING([--with-mysql-libraries=DIR],[use MySQL-libs installed in this directory ]), +-[ +- ac_mysql_libdir=$withval +-], ac_mysql_libdir= +-) +- +-dnl ============================================== +-dnl check whether MySQL should be compiled +-dnl and where headers and libraries are installed +-dnl if present compile mysql-plugin +-dnl ============================================== +- +-AC_MSG_CHECKING([for MySQL]) +- +-if test "$compile_mysql_plugin" = "yes"; then +- if test -n "$ac_mysql_incdir" -o -n "$ac_mysql_libdir"; then +-dnl *** Configure arguments for includes or libs given *** +-dnl *** and MySQL not explicitly disabled. *** +-dnl *** Check that the paths given to configure are valid *** +- AC_MSG_CHECKING([for MySQL headers]) +- mysql_incdirs="$ac_mysql_incdir /usr/local/include /usr/include" +- AC_FIND_FILE(mysql/mysql.h, $mysql_incdirs, mysql_incdir) +- if test -r $mysql_incdir/mysql/mysql.h; then +- MYSQL_INC=$mysql_incdir +- AC_MSG_RESULT([$MYSQL_INC]) +- AC_SUBST(MYSQL_INC) +- else +- compile_mysql_plugin="no" +- AC_MSG_RESULT([not found]) +- fi +- +- AC_MSG_CHECKING([for MySQL libraries]) +- mysql_libdirs="$ac_mysql_libdir /usr/local/lib$kdelibsuff /usr/lib$kdelibsuff" +- AC_FIND_FILE(mysql/libmysqlclient.so, $mysql_libdirs, mysql_libdir) +- if test -r $mysql_libdir/mysql/libmysqlclient.so; then +- MYSQL_LIBS=$mysql_libdir +- AC_MSG_RESULT([$MYSQL_LIBS]) +- AC_SUBST(MYSQL_LIBS) +- else +- compile_mysql_plugin="no" +- AC_MSG_RESULT([not found]) +- fi +- else +-dnl *** No configure arguments for includes or libs given *** +-dnl *** and MySQL not explicitly disabled. *** +- KDE_FIND_PATH(mysql_config, MYSQL_CONFIG, +- [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /usr/bin ], [ +- AC_MSG_RESULT([not found]) +- ]) +- +- if test -n "$MYSQL_CONFIG"; then +- mysql_incdir=`$MYSQL_CONFIG --cflags| $SED -e "s,-I,,g" | cut -d " " -f 1` +- mysql_libdir=`$MYSQL_CONFIG --libs| $SED -e "s,',,g"` +- MYSQL_INC=$mysql_incdir +- MYSQL_LIBS=$mysql_libdir +- AC_SUBST(MYSQL_INC) +- AC_SUBST(MYSQL_LIBS) +- compile_mypsql_plugin="yes" +- AC_MSG_RESULT([headers $mysql_incdir, libraries $mysql_libdir]) +- else +- compile_mysql_plugin="no" +- fi +- fi +-else +-dnl *** MySQL plugin explicitly disabled. *** +-dnl *** Show that we are doing as requested. *** +- AC_MSG_NOTICE([Not attempting to configure MySQL as requested]) +-fi +- +-AM_CONDITIONAL(compile_mysql_plugin, test "$compile_mysql_plugin" = "yes") +- +-dnl ======================================== +-dnl Checks for PostgreSQL +-dnl ======================================== +- +-dnl ======================================== +-dnl libpq +-dnl Add configure-args +-dnl ======================================== +- +-dnl Assume we're building until something fails, unless explicitly disabled +-AC_ARG_ENABLE(pgsql, +-AC_HELP_STRING([--enable-pgsql],[build PostgreSQL-plugin [default=yes]]), +- pgsql_plugin=$enableval, pgsql_plugin=yes) +- +-if test "x$pgsql_plugin" = "xyes"; then +- compile_pgsql_plugin="yes" +-else +- compile_pgsql_plugin="no" +-fi +- +-AC_ARG_WITH(pgsql-includes, +-AC_HELP_STRING([--with-pgsql-includes=DIR],[use PostgreSQL(libpq)-includes installed in this directory ]), +-[ +- ac_pgsql_incdir=$withval +-], ac_pgsql_incdir= +-) +- +-AC_ARG_WITH(pgsql-libraries, +-AC_HELP_STRING([--with-pgsql-libraries=DIR],[use PostgreSQL(libpq)-libraries installed in this directory ]), +-[ +- ac_pgsql_libdir=$withval +-], ac_pgsql_libdir= +-) +- +- +-dnl ======================================== +-dnl header/library directories +-dnl ======================================== +- +-if test "$compile_pgsql_plugin" = "yes"; then +- if test -n "$ac_pgsql_incdir" -o -n "$ac_pgsql_libdir"; then +-dnl *** Configure arguments for includes or libs given *** +-dnl *** and PostgreSQL not explicitly disabled. *** +-dnl *** Check that the paths given to configure are valid *** +- AC_MSG_CHECKING([for PostgreSQL C API headers]) +- pgsql_incdirs="$ac_pgsql_incdir /usr/local/include /usr/include" +- AC_FIND_FILE(libpq-fe.h, $pgsql_incdirs, pgsql_incdir) +- if test -r $pgsql_incdir/libpq-fe.h; then +- PG_INCDIR=$pgsql_incdir +- AC_MSG_RESULT([$PG_INCDIR]) +- AC_SUBST(PG_INCDIR) +- else +- compile_pgsql_plugin="no" +- AC_MSG_RESULT([not found]) +- fi +- +- AC_MSG_CHECKING([for PostgreSQL C API libraries]) +- pgsql_libdirs="$ac_pgsql_libdir /usr/local/lib$kdelibsuff /usr/lib$kdelibsuff" +- AC_FIND_FILE(libpq.so, $pgsql_libdirs, pgsql_libdir) +- if test -r $pgsql_libdir/libpq.so; then +- PG_LIBDIR=$pgsql_libdir +- AC_MSG_RESULT([$PG_LIBDIR]) +- AC_SUBST(PG_LIBDIR) +- else +- compile_pgsql_plugin="no" +- AC_MSG_RESULT([not found]) +- fi +- else +-dnl *** No configure arguments for includes or libs given *** +-dnl *** and PostgreSQL not explicitly disabled. *** +- KDE_FIND_PATH(pg_config, PG_CONFIG, +- [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /usr/bin ], [ +- AC_MSG_RESULT([not found]) +- ]) +- +- if test -n "$PG_CONFIG"; then +- pgsql_incdir=`$PG_CONFIG --includedir` +- pgsql_libdir=`$PG_CONFIG --libdir` +- PG_INCDIR=$pgsql_incdir +- PG_LIBDIR=$pgsql_libdir +- AC_SUBST(PG_LIBDIR) +- compile_pgsql_plugin="yes" +- AC_MSG_RESULT([headers $pgsql_incdir, libraries $pgsql_libdir]) +- else +- compile_pgsql_plugin="no" +- fi +- fi +-else +-dnl *** PostgreSQL plugin explicitly disabled. *** +-dnl *** Show that we are doing as requested. *** +- AC_MSG_NOTICE([Not attempting to configure PostgreSQL as requested]) +-fi +- +-AM_CONDITIONAL(compile_pgsql_plugin, test "$compile_pgsql_plugin" = "yes") +- +- +-dnl ======================================== +-dnl libpqxx checks +-dnl ======================================== +- +-AC_ARG_WITH(pqxx-includes, +-AC_HELP_STRING([--with-pqxx-includes=DIR],[use PostgreSQL(libpqxx)-includes installed in this directory ]), +-[ +- ac_pqxx_incdir=$withval +-], ac_pqxx_incdir= +-) +- +-AC_ARG_WITH(pqxx-libraries, +-AC_HELP_STRING([--with-pqxx-libraries=DIR],[use PostgreSQL(libpqxx)-libraries installed in this directory ]), +-[ +- ac_pqxx_libdir=$withval +-], ac_pqxx_libdir= +-) +- +- +-dnl ======================================== +-dnl libpqxx headers +-dnl ======================================== +-if test "$compile_pgsql_plugin" = "yes"; then +- AC_MSG_CHECKING([for PostgreSQL C++ includes]) +- pqxx_incdirs="$ac_pqxx_incdir /usr/local/include /usr/include" +- AC_FIND_FILE(pqxx/pqxx, $pqxx_incdirs, pqxx_incdir) +- if test -r $pqxx_incdir/pqxx/pqxx; then +- PQXX_INCDIR=$pqxx_incdir +- AC_MSG_RESULT([$PQXX_INCDIR]) +- AC_SUBST(PQXX_INCDIR) +- else +- compile_pgsql_plugin="no" +- AC_MSG_RESULT([not found]) +- fi +-fi +- +-dnl ======================================== +-dnl libpqxx libraries +-dnl ======================================== +-if test "$compile_pgsql_plugin" = "yes"; then +- AC_MSG_CHECKING([for PostgreSQL C++ libraries]) +- pqxx_libdirs="$ac_pqxx_libdir /usr/local/lib$kdelibsuff /usr/lib$kdelibsuff" +- AC_FIND_FILE(libpqxx.so, $pqxx_libdirs, pqxx_libdir) +- if test -r $pqxx_libdir/libpqxx.so; then +- PQXX_LIBDIR=$pqxx_libdir +- AC_MSG_RESULT([$PQXX_LIBDIR]) +- AC_SUBST(PQXX_LIBDIR) +- else +- compile_pgsql_plugin="no" +- AC_MSG_RESULT([not found]) +- fi +-fi +- +-AM_CONDITIONAL(compile_pgsql_plugin, test "$compile_pgsql_plugin" = "yes") +-dnl ======================================================= +-dnl FILE: ./kexi/main/configure.in.in +-dnl ======================================================= +- +- +-dnl ====================================== +-dnl KNewStuff Configuration +-dnl ====================================== +-dnl +-dnl Copyright (C) 2004 Josef Spillner +-dnl This file is to be used within KDE's build system. +-dnl It defines $(LIB_KNEWSTUFF) if knewstuff has been found, +-dnl and a HAVE_KNEWSTUFF #define statement is added. +-dnl +- +-AC_MSG_CHECKING([for KDE library: knewstuff]) +- +-ac_knewstuff_includes=NO ac_knewstuff_libraries=NO +-knewstuff_libraries="" +-knewstuff_includes="" +- +-AC_CACHE_VAL(ac_cv_have_knewstuff, +-[ +-AC_FIND_FILE(knewstuff/downloaddialog.h, $kde_incdirs, knewstuff_incdir) +-ac_knewstuff_includes="$knewstuff_incdir" +- +-AC_FIND_FILE(libknewstuff.so, $kde_libdirs, knewstuff_libdir) +-ac_knewstuff_libraries="$knewstuff_libdir" +- +-if test "$ac_knewstuff_includes" = NO || test "$ac_knewstuff_libraries" = NO; then +- ac_cv_have_knewstuff="have_knewstuff=no" +- ac_knewstuff_notfound="" +-else +- have_knewstuff="yes" +-fi +-]) +- +-eval "$ac_cv_have_knewstuff" +- +-if test "$have_knewstuff" != yes; then +- AC_MSG_RESULT([$have_knewstuff]) +-else +- AC_MSG_RESULT([$have_knewstuff (libraries $ac_knewstuff_libraries, headers $ac_knewstuff_includes)]) +- +-dnl AC_DEFINE_UNQUOTED(HAVE_KNEWSTUFF, 1, [Add KNewStuff functionality.]) +- CXXFLAGS="$CXXFLAGS -DHAVE_KNEWSTUFF" +- +- LIB_KNEWSTUFF='-lknewstuff' +- AC_SUBST(LIB_KNEWSTUFF) +-fi +- +-AC_CHECK_FILE([kexi/3rdparty/kexifeedbackwizard/lib/kexifeedbackwizard.cpp], +- have_internal_feedback="yes" +-, +- have_internal_feedback="no" +-) +- +-AC_MSG_CHECKING([for KDE library: kfeedbackwizard]) +- +-ac_kfeedback_includes=NO ac_kfeedback_libraries=NO +-kfeedback_libraries="" +-kfeedback_includes="" +- +-AC_CACHE_VAL(ac_cv_have_kfeedback, +-[ +-AC_FIND_FILE(kfeedbackwizard.h, $kde_incdirs, kfeedback_incdir) +-ac_kfeedback_includes="$kfeedback_incdir" +- +-AC_FIND_FILE(libkfeedbackwizard.so, $kde_libdirs, kfeedback_libdir) +-ac_kfeedback_libraries="$kfeedback_libdir" +- +-if test "$ac_kfeedback_includes" = NO || test "$ac_kfeedback_libraries" = NO; then +- ac_cv_have_kfeedback="have_kfeedback=no" +- ac_kfeedback_notfound="" +-else +- have_kfeedback="yes" +-fi +-]) +- +-eval "$ac_cv_have_kfeedback" +- +-INC_KFEEDBACK='' +-LIB_KFEEDBACK='' +-if test "$have_kfeedback" != yes; then +- if test "$have_internal_feedback" = yes; then +- CXXFLAGS="$CXXFLAGS -DFEEDBACK_CLASS=KexiFeedbackWizard -DFEEDBACK_INCLUDE=\"\"" +- use_kexifb="yes" +- AC_MSG_RESULT([using internal]) +- INC_KFEEDBACK='-I../3rdparty/kexifeedbackwizard/lib' +- LIB_KFEEDBACK='../3rdparty/kexifeedbackwizard/lib/libkexifeedbackwizard.la' +- else +- use_kexifb="no" +- AC_MSG_RESULT([dont use]) +- fi +-else +- use_kexifb="no" +- AC_MSG_RESULT([$have_kfeedback (libraries $ac_kfeedback_libraries, headers $ac_kfeedback_includes)]) +- +-dnl AC_DEFINE_UNQUOTED(HAVE_KFEEDBACK, 1, [Add KNewStuff functionality.]) +- CXXFLAGS="$CXXFLAGS -DFEEDBACK_CLASS=KFeedbackWizard -DFEEDBACK_INCLUDE=\"\"" +- +- LIB_KFEEDBACK='-lkfeedbackwizard' +-fi +-AC_SUBST(LIB_KFEEDBACK) +-AC_SUBST(INC_KFEEDBACK) +-AM_CONDITIONAL(use_kexifeedback, test "$use_kexifb" = "yes") +-dnl ======================================================= +-dnl FILE: ./kexi/migration/configure.in.in +-dnl ======================================================= +- +-# KexiMDB isn't built as part of Kexi right now. +-#AC_ARG_ENABLE(keximdb, +-# AC_HELP_STRING([--enable-keximdb], +-# [build KexiMDB (MS Access) plugin [default=no]]), +-# compile_keximdb_plugin=$enableval, compile_keximdb_plugin=no) +-# +-#AM_CONDITIONAL(compile_keximdb_plugin, test "x$compile_keximdb_plugin" != "xno") +-dnl ======================================================= +-dnl FILE: ./kexi/plugins/configure.in.in +-dnl ======================================================= +- +-# disabled +-#AC_ARG_ENABLE(kexi-reports, +-# AC_HELP_STRING([--enable-kexi-reports], +-# [build Kexi reports plugin (EXPERIMENTAL) [default=no]]), +-# compile_kexi_reports_plugin=$enableval, compile_kexi_reports_plugin=no) +-#AM_CONDITIONAL(compile_kexi_reports_plugin, test "x$compile_kexi_reports_plugin" != "xno") +-# +-#if test "$compile_kexi_reports_plugin" == "yes"; then +-# AC_DEFINE(KEXI_REPORTS_SUPPORT, 1, [build Kexi reports plugin]) +-#fi +- +-AC_ARG_ENABLE(kexi-macros, +- AC_HELP_STRING([--enable-kexi-macros], +- [build Kexi macro plugin (EXPERIMENTAL) [default=yes]]), +- compile_kexi_macros_plugin=$enableval, compile_kexi_macros_plugin=no) +-AM_CONDITIONAL(compile_kexi_macros_plugin, test "x$compile_kexi_macros_plugin" == "xyes") +- +-if test "$compile_kexi_macros_plugin" == "yes"; then +- AC_DEFINE(KEXI_MACROS_SUPPORT, 1, [build Kexi macros plugin]) +-fi +-dnl ======================================================= +-dnl FILE: ./kexi/plugins/macros/configure.in.in +-dnl ======================================================= +- +-# Check for kunittest +-AC_MSG_CHECKING([for kunittest]) +- +-# First we check if the console unittester could be compiled +-have_kunittest_header="no" +-KDE_CHECK_HEADER(kunittest/tester.h, have_kunittest_header="yes", , ) +-AM_CONDITIONAL(include_kunittest, test "$have_kunittest_header" = "yes") +- +-# Second we check if the GUI-unittester could be compiled +-have_kunittestgui_header="no" +-KDE_CHECK_HEADER(kunittest/runnergui.h, have_kunittestgui_header="yes", , ) +-AM_CONDITIONAL(include_kunittestgui, test "$have_kunittestgui_header" = "yes") +- +-dnl ======================================================= +-dnl FILE: ./kivio/configure.in.in +-dnl ======================================================= +- +-dnl Do we have Python? +-KDE_CHECK_PYTHON +-dnl ======================================================= +-dnl FILE: ./kpresenter/configure.in.in +-dnl ======================================================= +- +-AC_HAVE_DPMS() +-dnl ======================================================= +-dnl FILE: ./chalk/configure.in.in +-dnl ======================================================= +- +-KDE_CHECK_LIB(Xi, XOpenDisplay, [ +- LIB_XINPUTEXT="-lXi" +- AC_DEFINE(HAVE_XINPUTEXT, 1, [Define if you have the X11 Input Extension]) +- ]) +-AC_SUBST(LIB_XINPUTEXT) +- +-# Check for lcms +-AC_MSG_CHECKING([for lcms >= 1.15]) +- +-have_lcms_header='no' +-KDE_CHECK_HEADER(lcms/lcms.h,have_lcms_header='yes',,) +-if test "$have_lcms_header" = 'yes' +-then +- AC_DEFINE(LCMS_HEADER, , [The correct header]) +- HAVELCMS="yes" +- LCMS_LIBS="-llcms" +- +- echo "#include " > conftest.$ac_ext +- echo "#if LCMS_VERSION < 115" >> conftest.$ac_ext +- echo "#error Need lcms >= 1.15" >> conftest.$ac_ext +- echo "#endif" >> conftest.$ac_ext +- echo "int main() {}" >> conftest.$ac_ext +- +-else +- # Alternative! Debian does it this way... +- KDE_CHECK_HEADER(lcms.h,have_lcms_header='yes',,) +- +- if test "$have_lcms_header" = 'yes' +- then +- AC_DEFINE(LCMS_HEADER, , [The correct header]) +- HAVELCMS="yes" +- LCMS_LIBS="-llcms" +- +- echo "#include " > conftest.$ac_ext +- echo "#if LCMS_VERSION < 115" >> conftest.$ac_ext +- echo "#error Need lcms >= 1.15" >> conftest.$ac_ext +- echo "#endif" >> conftest.$ac_ext +- echo "int main() {}" >> conftest.$ac_ext +- else +- KDE_CHECK_HEADER(lcms.h,have_lcms_header='yes',,) +- # and now debian also does it this way... can't they decide for one way of doing stuff ? +- +- AC_DEFINE(LCMS_HEADER, , [The correct header]) +- HAVELCMS="yes" +- LCMS_LIBS="-llcms" +- +- echo "#include " > conftest.$ac_ext +- echo "#if LCMS_VERSION < 115" >> conftest.$ac_ext +- echo "#error Need lcms >= 1.15" >> conftest.$ac_ext +- echo "#endif" >> conftest.$ac_ext +- echo "int main() {}" >> conftest.$ac_ext +- +- fi +-fi +- +-AC_SUBST(LCMS_LIBS) +- +-# IM 6.1.3 changed the number of arguments to GetMagickInfoList +- +-AC_MSG_CHECKING(if GetMagickInfoList has only 2 arguments) +-CPPFLAGS_TMP="$CPPFLAGS" # Save preprocessor flags +-CPPFLAGS="$LIBMAGICK_CPPFLAGS" +- +-AC_TRY_COMPILE( +- [#include +- #if HAVE_SYS_TYPES_H +- #include +- #endif +- #include "magick/api.h"], +- [const char *pattern; unsigned long ncolors; (void)GetMagickInfoList(pattern, &ncolors)], +- magick_info_list='yes', +- magick_info_list='no') +- +-CPPFLAGS="$CPPFLAGS_TMP" # Restore preprocessor flags +- +-if test "$magick_info_list" = 'yes'; then +- AC_MSG_RESULT(yes) +- AC_DEFINE([HAVE_OLD_GETMAGICKINFOLIST], 1, [GetMagickInfoList has different number of arguments with versions >= 6.1.3]) +-else +- AC_MSG_RESULT(no) +-fi +- +-# Check for kunittest +-AC_MSG_CHECKING([for kunittest]) +- +-have_kunittest_header="no" +-KDE_CHECK_HEADER(kunittest/tester.h, have_kunittest_header="yes", , ) +-AM_CONDITIONAL(include_kunittest_tests, test "$have_kunittest_header" = "yes") +- +-# --- OpenGL check --- +- +-AC_HAVE_GL( [], [] ) +- +-# --- End of OpenGL check --- +- +-# Check for powf. +- +-AC_CHECK_FUNC(powf, [have_powf="yes"], [AC_CHECK_LIB(m, powf, [have_powf="yes"], [have_powf="no"])]) +- +-if test "$have_powf" = 'yes'; then +- AC_DEFINE([HAVE_POWF], 1, [Define to 1 if your system has powf in ]) +-fi\ +-dnl ======================================================= +-dnl FILE: ./chalk/plugins/configure.in.in +-dnl ======================================================= +- +-KDE_CHECK_HEADER(kjsembed/jsproxy_imp.h, have_kjsembed=yes, have_kjsembed=no) +-AM_CONDITIONAL(use_kjsembed, test x$have_kjsembed = xyes) +-dnl ======================================================= +-dnl FILE: ./chalk/plugins/viewplugins/imagesize/configure.in.in +-dnl ======================================================= +- +-AC_CHECK_DECLS([round], [], [], [#include ]) +-dnl ======================================================= +-dnl FILE: ./kspread/plugins/calculator/configure.in.in +-dnl ======================================================= +- +-AC_CHECK_HEADERS(ieeefp.h) +- +-AC_CHECK_FUNCS(fabsl) +- +-AC_DEFUN([KDE_C_LONG_DOUBLE], +-[ +- AC_CACHE_CHECK(for long double, ac_cv_c_long_double, +- [ +- AC_TRY_RUN( +- [ +-#include +-#include +-#include +-#include +- +-int main() { +-/* The Stardent Vistra knows sizeof(long double), but does not support it. */ +-long double foo = 1.0; +-char buffer[10]; +-/* On Ultrix 4.3 cc, long double is 4 and double is 8. */ +-int result = (sizeof(long double) < sizeof(double)); +-/* the following is needed for a broken printf in glibc2 */ +-if (!result) { +- foo = foo * 3; +- sprintf(buffer,"%0.0Lf",foo); +- result = strcmp(buffer, "3"); +-/* and now something mean ;-) */ +- foo = powl(fabsl(foo), 1); +-} +-exit(result); } +- ], +- ac_cv_c_long_double=yes, ac_cv_c_long_double=no, +- ac_cv_c_long_double=no +- ) +- ]) +- if test $ac_cv_c_long_double = yes; then +- AC_DEFINE(HAVE_LONG_DOUBLE, 1, [Define if you have support for long double in printf]) +- fi +-]) +-KDE_C_LONG_DOUBLE +- +-AC_LANG_C +-KDE_CHECK_LIB(m, isinf, [ +- AC_DEFINE_UNQUOTED(HAVE_FUNC_ISINF, 1, [Define if you have isinf]) +-]) +-dnl ======================================================= +-dnl FILE: ./kword/mailmerge/configure.in.in +-dnl ======================================================= +- +-dnl only compile the sql plugin if qt was compiled with sql support +- +- +-AC_MSG_CHECKING([for SQL support in QT]) +- +-LIBS_SAVE_KWSL="$LIBS" +-CXXFLAGS_SAVE_KWSL="$CXXFLAGS" +-CFLAGS_SAVE_KWSL="$CFLAGS" +- +-AC_LANG_SAVE +-AC_LANG_CPLUSPLUS +- +-LIBS="$all_libraries -lqimgio -lpng -lz $LIBJPEG $LIBQT" +-CXXFLAGS="$CXXFLAGS -I$qt_includes $all_includes" +- +-AC_TRY_COMPILE([ +-#include +-], +-[ +-#ifdef QT_NO_SQL +-#error "No QT-SQL support" +-#endif +-], +-ac_trycompile_kwsl_qtsql=yes, +-ac_trycompile_kwsl_qtsql=no) +- +-CXXFLAGS="$CXXFLAGS_SAVE_KWSL" +-LIBS="$LIBS_SAVE_KWSL" +-AC_LANG_RESTORE +- +-if eval "test \"`echo $ac_trycompile_kwsl_qtsql`\" = yes"; then +- SQLDIR=sql +- AC_SUBST(SQLDIR) +- AC_MSG_RESULT([QT supports SQL - compile qtsqlmailmerge]) +-else +- SQLDIR= +- AC_SUBST(SQLDIR) +- AC_MSG_RESULT([QT supports SQL -- qtsqlmailmerge will not be built]) +-fi +- +-AM_CONDITIONAL(include_sql, test -n "$SQLDIR") +-dnl ======================================================= +-dnl FILE: ./lib/configure.in.in +-dnl ======================================================= +- +-AC_SUBST(KWMF_INCLUDES, '-I$(top_srcdir)/lib/kwmf -I$(top_builddir)/lib/kwmf') +-AC_SUBST(KSTORE_INCLUDES, '-I$(top_srcdir)/lib/store -I$(top_builddir)/lib/store') +-AC_SUBST(KOTEXT_INCLUDES, '-I$(top_srcdir)/lib/kotext -I$(top_builddir)/lib/kotext') +-AC_SUBST(KOPAINTER_INCLUDES, '-I$(top_srcdir)/lib/kopainter -I$(top_builddir)/lib/kopainter') +-AC_SUBST(KOPALETTE_INCLUDES, '-I$(top_srcdir)/lib/kopalette -I$(top_builddir)/lib/kopalette') +-AC_SUBST(KOFFICECORE_INCLUDES, '-I$(top_srcdir)/lib/kofficecore -I$(top_builddir)/lib/kofficecore') +-AC_SUBST(KOFFICEUI_INCLUDES, '-I$(top_srcdir)/lib/kofficeui -I$(top_builddir)/lib/kofficeui') +-AC_SUBST(KFORMULA_INCLUDES, '-I$(top_srcdir)/lib/kformula -I$(top_builddir)/lib/kformula') +-dnl those are included with e.g. +-AC_SUBST(KOPROPERTY_INCLUDES, '-I$(top_srcdir)/lib -I$(top_builddir)/lib') +-AC_SUBST(KROSS_INCLUDES, '-I$(top_srcdir)/lib/kross -I$(top_builddir)/lib/kross') +-AC_SUBST(LIB_KOFFICEUI, '$(top_builddir)/lib/kofficeui/libkofficeui.la') +-AC_SUBST(LIB_KOFFICECORE, '$(top_builddir)/lib/kofficecore/libkofficecore.la') +-AC_SUBST(LIB_KSTORE, '$(top_builddir)/lib/store/libkstore.la') +-AC_SUBST(LIB_KOTEXT, '$(top_builddir)/lib/kotext/libkotext.la') +-AC_SUBST(LIB_KOPAINTER, '$(top_builddir)/lib/kopainter/libkopainter.la') +-AC_SUBST(LIB_KOPALETTE, '$(top_builddir)/lib/kopalette/libkopalette.la') +-AC_SUBST(LIB_KWMF, '$(top_builddir)/lib/kwmf/libkwmf.la') +-AC_SUBST(LIB_KOWMF, '$(top_builddir)/lib/kwmf/libkowmf.la') +-AC_SUBST(LIB_KFORMULA, '$(top_builddir)/lib/kformula/libkformulalib.la') +-AC_SUBST(LIB_KOPROPERTY, '$(top_builddir)/lib/koproperty/libkoproperty.la') +-AC_SUBST(LIB_KROSS_API, '$(top_builddir)/lib/kross/api/libkrossapi.la') +-AC_SUBST(LIB_KROSS_MAIN, '$(top_builddir)/lib/kross/main/libkrossmain.la') +- +-AC_SUBST(interfacedir, '$(top_srcdir)/lib/interfaces') +-AC_SUBST(KOFFICE_LIBS, '$(LIB_KOFFICEUI) $(LIB_KOFFICECORE) $(LIB_KSTORE)') +-AC_SUBST(KOFFICE_INCLUDES, '$(KOFFICEUI_INCLUDES) $(KOFFICECORE_INCLUDES) $(KSTORE_INCLUDES) $(KWMF_INCLUDES) $(KOPALETTE_INCLUDES)') +- +-AC_DEFINE_UNQUOTED(PREFIX,"$prefix",[Define the PREFIX where to install this package]) +- +-dnl ======================================================= +-dnl FILE: ./lib/kotext/configure.in.in +-dnl ======================================================= +- +- AC_LANG_SAVE +- AC_LANG_C +- dnl Check for aspell library +- KDE_CHECK_HEADERS([kspell2/broker.h]) +- if test "x$ac_cv_header_kspell2_broker_h" = "xyes"; then +- dnl the header and the lib exist -> ok +- dnl this is for config.h +- AC_DEFINE(HAVE_LIBKSPELL2, 1, [If we are going to use libkspell2 for spell-checking]) +- LIBKSPELL2="-lkspell2" +- AC_MSG_RESULT([found in $ac_kspell2_includes]) +- else +- LIBKSPELL2="" +- AC_MSG_RESULT([not found -- spell-checking will be disabled]) +- fi +- AC_SUBST(LIBKSPELL2) +- AC_LANG_RESTORE +-dnl ======================================================= +-dnl FILE: ./lib/kross/configure.in.in +-dnl ======================================================= +- +-AC_ARG_ENABLE(scripting, +- AC_HELP_STRING([--enable-scripting], +- [build scripting library (Kross) [default=yes]]), +- compile_kross=$enableval, compile_kross=yes) +-AM_CONDITIONAL(compile_kross, test "x$compile_kross" = "xyes") +- +-############################### +-# Check if Python is installed. +- +-if test "x$compile_kross" = "xyes" ; then +- #KDE_CHECK_PYTHON(2.3) +- KDE_CHECK_PYTHON +-fi +- +-# Compile the Kross python plugin only if both, $LIBPYTHON and +-# $PYTHONINC, are defined. +-AM_CONDITIONAL(compile_kross_python, +- test -n "$LIBPYTHON" && test -n "$PYTHONINC") +- +-############################### +-# Check for Ruby +- +-if test "x$compile_kross" = "xyes" ; then +- AC_CHECK_PROGS([RUBY], [ruby ruby1.8 ruby18 ruby1.9 ruby19], ruby) +- +- if test -n "$RUBY"; then +- AC_MSG_CHECKING(for Ruby dirs) +- # Note: pkgconfig file exists only for ruby >= 1.9.3 +- if test -n "$PKGCONFIG"; then +- RUBY_VERSION=`$PKGCONFIG ruby --modversion 2>/dev/null` +- if test -n "$RUBY_VERSION"; then +- RUBY_CFLAGS=`$PKGCONFIG ruby --cflags` +- fi +- if test -z "$RUBY_VERSION"; then +- RUBY_VERSION=`$PKGCONFIG ruby-1.9 --modversion 2>/dev/null` +- if test -n "$RUBY_VERSION"; then +- RUBY_CFLAGS=`$PKGCONFIG ruby-1.9 --cflags` +- fi +- fi +- if test -z "$RUBY_VERSION"; then +- # pkgconfig file does not exist but might be 1.9.1: RUBY_VERSION defined in ruby/version.h +- if test -n "$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"rubyhdrdir"@:>@)'"; then +- # rubyhdrdir parameter works only in >=1.9.1; this is 1.9.1 +- RUBY_MAJOR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"['MAJOR']"@:>@)'` +- RUBY_MINOR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"['MINOR']"@:>@)'` +- RUBY_TEENY=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"['TEENY']"@:>@)'` +- if test "$RUBY_MAJOR" == "1" && test "$RUBY_MINOR" == "9"; then +- RUBY_VERSION="$RUBY_MAJOR.$RUBY_MINOR.$RUBY_TEENY" +- RUBY_CFLAGS="-I`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"rubyhdrdir"@:>@)'`" +- RUBY_CFLAGS="$RUBY_CFLAGS/`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"arch"@:>@)'` $RUBY_CFLAGS" +- if test -n "`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'`"; then +- RUBY_ENABLESHARED=yes +- fi +- fi +- fi +- fi +- if test -n "$RUBY_VERSION"; then +- RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"archdir"@:>@)'` +- RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"sitearchdir"@:>@)'` +- RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"sitelibdir"@:>@)'` +- RUBY_RUBYLIBDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"rubylibdir"@:>@)'` +- RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"libdir"@:>@)'` +- RUBY_INCLUDEDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"rubyhdrdir"@:>@)'` +- RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'` +- AC_DEFINE_UNQUOTED(HAVE_RUBY_1_9, 1, [Defines if your system has Ruby 1.9.x]) +- fi +- fi +- if test -z "$RUBY_VERSION"; then +- RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'` +- RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'` +- RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'` +- RUBY_RUBYLIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubylibdir"@:>@)'` +- RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"libdir"@:>@)'` +- RUBY_INCLUDEDIR=$RUBY_ARCHDIR +- RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'` +- fi +- AC_MSG_RESULT([ +- archdir $RUBY_ARCHDIR, +- sitearchdir $RUBY_SITEARCHDIR, +- sitedir $RUBY_SITEDIR, +- rubylibdir $RUBY_RUBYLIBDIR, +- libdir $RUBY_LIBDIR, +- includedir $RUBY_INCLUDEDIR, +- librubyarg $RUBY_LIBRUBYARG, +- cflags $RUBY_CFLAGS]) +- AC_SUBST(RUBY_ARCHDIR) +- AC_SUBST(RUBY_SITEARCHDIR) +- AC_SUBST(RUBY_RUBYLIBDIR) +- AC_SUBST(RUBY_INCLUDEDIR) +- AC_SUBST(RUBY_LIBRUBYARG) +- AC_SUBST(RUBY_SITEDIR) +- AC_SUBST(RUBY_CFLAGS) +- +- AC_MSG_CHECKING(for Ruby header) +- +- if test ! -r $RUBY_INCLUDEDIR/ruby.h; then +- # if $RUBY_INCLUDEDIR is not valid try to use $RUBY_ARCHDIR +- RUBY_INCLUDEDIR=$RUBY_ARCHDIR +- fi +- +- if test ! -r $RUBY_INCLUDEDIR/ruby.h; then +- RUBY_LIBDIR="" +- AC_MSG_RESULT([not found]) +- else +- AC_MSG_RESULT([found]) # header +- +- AC_MSG_CHECKING(Ruby shared library) +- if test "x$RUBY_ENABLESHARED" != "xyes" ; then +- AC_MSG_RESULT([shared library not found]) +- RUBY_LIBDIR="" +- else +- if test -z "$RUBY_LIBRUBYARG" ; then +- AC_MSG_RESULT([link argument not found]) +- RUBY_LIBDIR="" +- else +- AC_MSG_RESULT([found]) # shared library link arg +- +- AC_MSG_CHECKING([if C++ program with ruby can be compiled]) +- AC_LANG_SAVE +- AC_LANG_CPLUSPLUS +- ac_save_CXXFLAGS="$CXXFLAGS" +- CXXFLAGS="$CXXFLAGS -I$RUBY_INCLUDEDIR" +- AC_CACHE_VAL(ruby_build, +- [ +- AC_TRY_COMPILE([ +- #include +- #include +- ],[ +- +-#if(RUBY_VERSION_MAJOR==1 && RUBY_VERSION_MINOR == 8 && RUBY_VERSION_TEENY <= 1) +-#error "need at least ruby 1.8.2\n" +-#endif +- +- ruby_init(); +- return 0; +- ], ruby_build=yes, +- ruby_build=no) +- ]) +- AC_MSG_RESULT($ruby_build) +- if test "$ruby_build" = "no"; then +- RUBY_LIBDIR="" +- fi +- CXXFLAGS="$ac_save_CXXFLAGS" +- AC_LANG_RESTORE +- fi # have ruby shared lib argument +- fi # have shared lib +- fi # have ruby header +- fi # have ruby +-fi # compiling kross +- +-AM_CONDITIONAL(compile_kross_ruby, test -n "$RUBY_LIBDIR") +-KDE_CREATE_SUBDIRSLIST +-AM_CONDITIONAL(lib_SUBDIR_included, test "x$lib_SUBDIR_included" = xyes) +-AM_CONDITIONAL(interfaces_SUBDIR_included, test "x$interfaces_SUBDIR_included" = xyes) +-AM_CONDITIONAL(autocorrect_SUBDIR_included, test "x$autocorrect_SUBDIR_included" = xyes) +-AM_CONDITIONAL(doc_SUBDIR_included, test "x$doc_SUBDIR_included" = xyes) +-AM_CONDITIONAL(example_SUBDIR_included, test "x$example_SUBDIR_included" = xyes) +-AM_CONDITIONAL(karbon_SUBDIR_included, test "x$karbon_SUBDIR_included" = xyes) +-AM_CONDITIONAL(kchart_SUBDIR_included, test "x$kchart_SUBDIR_included" = xyes) +-AM_CONDITIONAL(kdgantt_SUBDIR_included, test "x$kdgantt_SUBDIR_included" = xyes) +-AM_CONDITIONAL(kformula_SUBDIR_included, test "x$kformula_SUBDIR_included" = xyes) +-AM_CONDITIONAL(kivio_SUBDIR_included, test "x$kivio_SUBDIR_included" = xyes) +-AM_CONDITIONAL(koshell_SUBDIR_included, test "x$koshell_SUBDIR_included" = xyes) +-AM_CONDITIONAL(kounavail_SUBDIR_included, test "x$kounavail_SUBDIR_included" = xyes) +-AM_CONDITIONAL(kpresenter_SUBDIR_included, test "x$kpresenter_SUBDIR_included" = xyes) +-AM_CONDITIONAL(chalk_SUBDIR_included, test "x$chalk_SUBDIR_included" = xyes) +-AM_CONDITIONAL(kspread_SUBDIR_included, test "x$kspread_SUBDIR_included" = xyes) +-AM_CONDITIONAL(kugar_SUBDIR_included, test "x$kugar_SUBDIR_included" = xyes) +-AM_CONDITIONAL(mimetypes_SUBDIR_included, test "x$mimetypes_SUBDIR_included" = xyes) +-AM_CONDITIONAL(pics_SUBDIR_included, test "x$pics_SUBDIR_included" = xyes) +-AM_CONDITIONAL(plugins_SUBDIR_included, test "x$plugins_SUBDIR_included" = xyes) +-AM_CONDITIONAL(servicetypes_SUBDIR_included, test "x$servicetypes_SUBDIR_included" = xyes) +-AM_CONDITIONAL(templates_SUBDIR_included, test "x$templates_SUBDIR_included" = xyes) +-AM_CONDITIONAL(tools_SUBDIR_included, test "x$tools_SUBDIR_included" = xyes) +-AM_CONDITIONAL(kword_SUBDIR_included, test "x$kword_SUBDIR_included" = xyes) +-AM_CONDITIONAL(kplato_SUBDIR_included, test "x$kplato_SUBDIR_included" = xyes) +-AM_CONDITIONAL(kexi_SUBDIR_included, test "x$kexi_SUBDIR_included" = xyes) +-AM_CONDITIONAL(filters_SUBDIR_included, test "x$filters_SUBDIR_included" = xyes) +-AC_CONFIG_FILES([ Makefile ]) +-AC_CONFIG_FILES([ autocorrect/Makefile ]) +-AC_CONFIG_FILES([ doc/Makefile ]) +-AC_CONFIG_FILES([ doc/karbon/Makefile ]) +-AC_CONFIG_FILES([ doc/kchart/Makefile ]) +-AC_CONFIG_FILES([ doc/kexi/Makefile ]) +-AC_CONFIG_FILES([ doc/kformula/Makefile ]) +-AC_CONFIG_FILES([ doc/kivio/Makefile ]) +-AC_CONFIG_FILES([ doc/koffice/Makefile ]) +-AC_CONFIG_FILES([ doc/koshell/Makefile ]) +-AC_CONFIG_FILES([ doc/kplato/Makefile ]) +-AC_CONFIG_FILES([ doc/kpresenter/Makefile ]) +-AC_CONFIG_FILES([ doc/chalk/Makefile ]) +-AC_CONFIG_FILES([ doc/kspread/Makefile ]) +-AC_CONFIG_FILES([ doc/kugar/Makefile ]) +-AC_CONFIG_FILES([ doc/kword/Makefile ]) +-AC_CONFIG_FILES([ doc/thesaurus/Makefile ]) +-AC_CONFIG_FILES([ example/Makefile ]) +-AC_CONFIG_FILES([ filters/Makefile ]) +-AC_CONFIG_FILES([ filters/generic_wrapper/Makefile ]) +-AC_CONFIG_FILES([ filters/karbon/Makefile ]) +-AC_CONFIG_FILES([ filters/karbon/ai/Makefile ]) +-AC_CONFIG_FILES([ filters/karbon/applixgraphics/Makefile ]) +-AC_CONFIG_FILES([ filters/karbon/eps/Makefile ]) +-AC_CONFIG_FILES([ filters/karbon/kontour/Makefile ]) +-AC_CONFIG_FILES([ filters/karbon/msod/Makefile ]) +-AC_CONFIG_FILES([ filters/karbon/oodraw/Makefile ]) +-AC_CONFIG_FILES([ filters/karbon/png/Makefile ]) +-AC_CONFIG_FILES([ filters/karbon/svg/Makefile ]) +-AC_CONFIG_FILES([ filters/karbon/wmf/Makefile ]) +-AC_CONFIG_FILES([ filters/karbon/xaml/Makefile ]) +-AC_CONFIG_FILES([ filters/karbon/xcf/Makefile ]) +-AC_CONFIG_FILES([ filters/kchart/Makefile ]) +-AC_CONFIG_FILES([ filters/kchart/bmp/Makefile ]) +-AC_CONFIG_FILES([ filters/kchart/jpeg/Makefile ]) +-AC_CONFIG_FILES([ filters/kchart/libimageexport/Makefile ]) +-AC_CONFIG_FILES([ filters/kchart/mng/Makefile ]) +-AC_CONFIG_FILES([ filters/kchart/png/Makefile ]) +-AC_CONFIG_FILES([ filters/kchart/svg/Makefile ]) +-AC_CONFIG_FILES([ filters/kchart/xbm/Makefile ]) +-AC_CONFIG_FILES([ filters/kchart/xpm/Makefile ]) +-AC_CONFIG_FILES([ filters/kformula/Makefile ]) +-AC_CONFIG_FILES([ filters/kformula/latex/Makefile ]) +-AC_CONFIG_FILES([ filters/kformula/mathml/Makefile ]) +-AC_CONFIG_FILES([ filters/kformula/png/Makefile ]) +-AC_CONFIG_FILES([ filters/kformula/svg/Makefile ]) +-AC_CONFIG_FILES([ filters/kivio/Makefile ]) +-AC_CONFIG_FILES([ filters/kivio/imageexport/Makefile ]) +-AC_CONFIG_FILES([ filters/kpresenter/Makefile ]) +-AC_CONFIG_FILES([ filters/kpresenter/bmp/Makefile ]) +-AC_CONFIG_FILES([ filters/kpresenter/jpeg/Makefile ]) +-AC_CONFIG_FILES([ filters/kpresenter/kword/Makefile ]) +-AC_CONFIG_FILES([ filters/kpresenter/libimageexport/Makefile ]) +-AC_CONFIG_FILES([ filters/kpresenter/magicpoint/Makefile ]) +-AC_CONFIG_FILES([ filters/kpresenter/mng/Makefile ]) +-AC_CONFIG_FILES([ filters/kpresenter/ooimpress/Makefile ]) +-AC_CONFIG_FILES([ filters/kpresenter/png/Makefile ]) +-AC_CONFIG_FILES([ filters/kpresenter/powerpoint/Makefile ]) +-AC_CONFIG_FILES([ filters/kpresenter/powerpoint/import/Makefile ]) +-AC_CONFIG_FILES([ filters/kpresenter/powerpoint/libppt/Makefile ]) +-AC_CONFIG_FILES([ filters/kpresenter/svg/Makefile ]) +-AC_CONFIG_FILES([ filters/kpresenter/xbm/Makefile ]) +-AC_CONFIG_FILES([ filters/kpresenter/xpm/Makefile ]) +-AC_CONFIG_FILES([ filters/chalk/Makefile ]) +-AC_CONFIG_FILES([ filters/chalk/gmagick/Makefile ]) +-AC_CONFIG_FILES([ filters/chalk/jpeg/Makefile ]) +-AC_CONFIG_FILES([ filters/chalk/libkisexif/Makefile ]) +-AC_CONFIG_FILES([ filters/chalk/magick/Makefile ]) +-AC_CONFIG_FILES([ filters/chalk/openexr/Makefile ]) +-AC_CONFIG_FILES([ filters/chalk/pdf/Makefile ]) +-AC_CONFIG_FILES([ filters/chalk/png/Makefile ]) +-AC_CONFIG_FILES([ filters/chalk/raw/Makefile ]) +-AC_CONFIG_FILES([ filters/chalk/tiff/Makefile ]) +-AC_CONFIG_FILES([ filters/chalk/xcf/Makefile ]) +-AC_CONFIG_FILES([ filters/kspread/Makefile ]) +-AC_CONFIG_FILES([ filters/kspread/applixspread/Makefile ]) +-AC_CONFIG_FILES([ filters/kspread/csv/Makefile ]) +-AC_CONFIG_FILES([ filters/kspread/dbase/Makefile ]) +-AC_CONFIG_FILES([ filters/kspread/excel/Makefile ]) +-AC_CONFIG_FILES([ filters/kspread/excel/import/Makefile ]) +-AC_CONFIG_FILES([ filters/kspread/excel/sidewinder/Makefile ]) +-AC_CONFIG_FILES([ filters/kspread/gnumeric/Makefile ]) +-AC_CONFIG_FILES([ filters/kspread/html/Makefile ]) +-AC_CONFIG_FILES([ filters/kspread/kexi/Makefile ]) +-AC_CONFIG_FILES([ filters/kspread/latex/Makefile ]) +-AC_CONFIG_FILES([ filters/kspread/latex/export/Makefile ]) +-AC_CONFIG_FILES([ filters/kspread/libkspreadexport/Makefile ]) +-AC_CONFIG_FILES([ filters/kspread/opencalc/Makefile ]) +-AC_CONFIG_FILES([ filters/kspread/qpro/Makefile ]) +-AC_CONFIG_FILES([ filters/kspread/qpro/libqpro/Makefile ]) +-AC_CONFIG_FILES([ filters/kspread/qpro/libqpro/qpro/Makefile ]) +-AC_CONFIG_FILES([ filters/kspread/qpro/libqpro/src/Makefile ]) +-AC_CONFIG_FILES([ filters/kugar/Makefile ]) +-AC_CONFIG_FILES([ filters/kugar/kugarnop/Makefile ]) +-AC_CONFIG_FILES([ filters/kword/Makefile ]) +-AC_CONFIG_FILES([ filters/kword/abiword/Makefile ]) +-AC_CONFIG_FILES([ filters/kword/amipro/Makefile ]) +-AC_CONFIG_FILES([ filters/kword/applixword/Makefile ]) +-AC_CONFIG_FILES([ filters/kword/ascii/Makefile ]) +-AC_CONFIG_FILES([ filters/kword/docbook/Makefile ]) +-AC_CONFIG_FILES([ filters/kword/hancomword/Makefile ]) +-AC_CONFIG_FILES([ filters/kword/html/Makefile ]) +-AC_CONFIG_FILES([ filters/kword/html/export/Makefile ]) +-AC_CONFIG_FILES([ filters/kword/html/import/Makefile ]) +-AC_CONFIG_FILES([ filters/kword/kword1.3/Makefile ]) +-AC_CONFIG_FILES([ filters/kword/kword1.3/import/Makefile ]) +-AC_CONFIG_FILES([ filters/kword/latex/Makefile ]) +-AC_CONFIG_FILES([ filters/kword/latex/export/Makefile ]) +-AC_CONFIG_FILES([ filters/kword/latex/import/Makefile ]) +-AC_CONFIG_FILES([ filters/kword/latex/import/generator/Makefile ]) +-AC_CONFIG_FILES([ filters/kword/latex/import/parser/Makefile ]) +-AC_CONFIG_FILES([ filters/kword/libexport/Makefile ]) +-AC_CONFIG_FILES([ filters/kword/msword/Makefile ]) +-AC_CONFIG_FILES([ filters/kword/mswrite/Makefile ]) +-AC_CONFIG_FILES([ filters/kword/oowriter/Makefile ]) +-AC_CONFIG_FILES([ filters/kword/palmdoc/Makefile ]) +-AC_CONFIG_FILES([ filters/kword/pdf/Makefile ]) +-AC_CONFIG_FILES([ filters/kword/pdf/xpdf/Makefile ]) +-AC_CONFIG_FILES([ filters/kword/pdf/xpdf/goo/Makefile ]) +-AC_CONFIG_FILES([ filters/kword/pdf/xpdf/xpdf/Makefile ]) +-AC_CONFIG_FILES([ filters/kword/rtf/Makefile ]) +-AC_CONFIG_FILES([ filters/kword/rtf/export/Makefile ]) +-AC_CONFIG_FILES([ filters/kword/rtf/import/Makefile ]) +-AC_CONFIG_FILES([ filters/kword/starwriter/Makefile ]) +-AC_CONFIG_FILES([ filters/kword/wml/Makefile ]) +-AC_CONFIG_FILES([ filters/kword/wordperfect/Makefile ]) +-AC_CONFIG_FILES([ filters/kword/wordperfect/export/Makefile ]) +-AC_CONFIG_FILES([ filters/kword/wordperfect/import/Makefile ]) +-AC_CONFIG_FILES([ filters/libdialogfilter/Makefile ]) +-AC_CONFIG_FILES([ filters/liboofilter/Makefile ]) +-AC_CONFIG_FILES([ filters/olefilters/Makefile ]) +-AC_CONFIG_FILES([ filters/olefilters/lib/Makefile ]) +-AC_CONFIG_FILES([ filters/olefilters/powerpoint97/Makefile ]) +-AC_CONFIG_FILES([ filters/xsltfilter/Makefile ]) +-AC_CONFIG_FILES([ filters/xsltfilter/export/Makefile ]) +-AC_CONFIG_FILES([ filters/xsltfilter/export/xsl/Makefile ]) +-AC_CONFIG_FILES([ filters/xsltfilter/export/xsl/kword/Makefile ]) +-AC_CONFIG_FILES([ filters/xsltfilter/export/xsl/kword/xslfo/Makefile ]) +-AC_CONFIG_FILES([ filters/xsltfilter/import/Makefile ]) +-AC_CONFIG_FILES([ interfaces/Makefile ]) +-AC_CONFIG_FILES([ karbon/Makefile ]) +-AC_CONFIG_FILES([ karbon/commands/Makefile ]) +-AC_CONFIG_FILES([ karbon/core/Makefile ]) +-AC_CONFIG_FILES([ karbon/data/Makefile ]) +-AC_CONFIG_FILES([ karbon/dialogs/Makefile ]) +-AC_CONFIG_FILES([ karbon/dockers/Makefile ]) +-AC_CONFIG_FILES([ karbon/pics/Makefile ]) +-AC_CONFIG_FILES([ karbon/plugins/Makefile ]) +-AC_CONFIG_FILES([ karbon/plugins/flattenpath/Makefile ]) +-AC_CONFIG_FILES([ karbon/plugins/imagetool/Makefile ]) +-AC_CONFIG_FILES([ karbon/plugins/insertknots/Makefile ]) +-AC_CONFIG_FILES([ karbon/plugins/roundcorners/Makefile ]) +-AC_CONFIG_FILES([ karbon/plugins/shadoweffect/Makefile ]) +-AC_CONFIG_FILES([ karbon/plugins/whirlpinch/Makefile ]) +-AC_CONFIG_FILES([ karbon/plugins/zoomtool/Makefile ]) +-AC_CONFIG_FILES([ karbon/render/Makefile ]) +-AC_CONFIG_FILES([ karbon/render/xrgbrender/Makefile ]) +-AC_CONFIG_FILES([ karbon/shapes/Makefile ]) +-AC_CONFIG_FILES([ karbon/templates/Makefile ]) +-AC_CONFIG_FILES([ karbon/templates/basic/Makefile ]) +-AC_CONFIG_FILES([ karbon/tools/Makefile ]) +-AC_CONFIG_FILES([ karbon/visitors/Makefile ]) +-AC_CONFIG_FILES([ karbon/widgets/Makefile ]) +-AC_CONFIG_FILES([ kchart/Makefile ]) +-AC_CONFIG_FILES([ kchart/kdchart/Makefile ]) +-AC_CONFIG_FILES([ kchart/pics/Makefile ]) +-AC_CONFIG_FILES([ kchart/templates/Makefile ]) +-AC_CONFIG_FILES([ kchart/toolbar/Makefile ]) +-AC_CONFIG_FILES([ kchart/toolbar/crystalsvg/Makefile ]) +-AC_CONFIG_FILES([ kchart/toolbar/locolor/Makefile ]) +-AC_CONFIG_FILES([ kdgantt/Makefile ]) +-AC_CONFIG_FILES([ kexi/Makefile ]) +-AC_CONFIG_FILES([ kexi/3rdparty/Makefile ]) +-AC_CONFIG_FILES([ kexi/3rdparty/kexisql/Makefile ]) +-AC_CONFIG_FILES([ kexi/3rdparty/kexisql/src/Makefile ]) +-AC_CONFIG_FILES([ kexi/3rdparty/kexisql/tool/Makefile ]) +-AC_CONFIG_FILES([ kexi/3rdparty/kexisql3/Makefile ]) +-AC_CONFIG_FILES([ kexi/3rdparty/kexisql3/src/Makefile ]) +-AC_CONFIG_FILES([ kexi/3rdparty/kolibs/Makefile ]) +-AC_CONFIG_FILES([ kexi/3rdparty/uuid/Makefile ]) +-AC_CONFIG_FILES([ kexi/core/Makefile ]) +-AC_CONFIG_FILES([ kexi/data/Makefile ]) +-AC_CONFIG_FILES([ kexi/data/trinity4compat/Makefile ]) +-AC_CONFIG_FILES([ kexi/examples/Makefile ]) +-AC_CONFIG_FILES([ kexi/formeditor/Makefile ]) +-AC_CONFIG_FILES([ kexi/formeditor/factories/Makefile ]) +-AC_CONFIG_FILES([ kexi/formeditor/kdevelop_plugin/Makefile ]) +-AC_CONFIG_FILES([ kexi/formeditor/scripting/Makefile ]) +-AC_CONFIG_FILES([ kexi/formeditor/test/Makefile ]) +-AC_CONFIG_FILES([ kexi/kexidb/Makefile ]) +-AC_CONFIG_FILES([ kexi/kexidb/drivers/Makefile ]) +-AC_CONFIG_FILES([ kexi/kexidb/drivers/mySQL/Makefile ]) +-AC_CONFIG_FILES([ kexi/kexidb/drivers/odbc/Makefile ]) +-AC_CONFIG_FILES([ kexi/kexidb/drivers/pqxx/Makefile ]) +-AC_CONFIG_FILES([ kexi/kexidb/drivers/sqlite/Makefile ]) +-AC_CONFIG_FILES([ kexi/kexidb/drivers/sqlite2/Makefile ]) +-AC_CONFIG_FILES([ kexi/kexidb/parser/Makefile ]) +-AC_CONFIG_FILES([ kexi/kexiutils/Makefile ]) +-AC_CONFIG_FILES([ kexi/main/Makefile ]) +-AC_CONFIG_FILES([ kexi/main/printing/Makefile ]) +-AC_CONFIG_FILES([ kexi/main/startup/Makefile ]) +-AC_CONFIG_FILES([ kexi/migration/Makefile ]) +-AC_CONFIG_FILES([ kexi/migration/mysql/Makefile ]) +-AC_CONFIG_FILES([ kexi/migration/pqxx/Makefile ]) +-AC_CONFIG_FILES([ kexi/migration/txt/Makefile ]) +-AC_CONFIG_FILES([ kexi/pics/Makefile ]) +-AC_CONFIG_FILES([ kexi/plugins/Makefile ]) +-AC_CONFIG_FILES([ kexi/plugins/forms/Makefile ]) +-AC_CONFIG_FILES([ kexi/plugins/forms/widgets/Makefile ]) +-AC_CONFIG_FILES([ kexi/plugins/importexport/Makefile ]) +-AC_CONFIG_FILES([ kexi/plugins/importexport/csv/Makefile ]) +-AC_CONFIG_FILES([ kexi/plugins/macros/Makefile ]) +-AC_CONFIG_FILES([ kexi/plugins/macros/kexiactions/Makefile ]) +-AC_CONFIG_FILES([ kexi/plugins/macros/kexipart/Makefile ]) +-AC_CONFIG_FILES([ kexi/plugins/macros/lib/Makefile ]) +-AC_CONFIG_FILES([ kexi/plugins/macros/tests/Makefile ]) +-AC_CONFIG_FILES([ kexi/plugins/migration/Makefile ]) +-AC_CONFIG_FILES([ kexi/plugins/queries/Makefile ]) +-AC_CONFIG_FILES([ kexi/plugins/relations/Makefile ]) +-AC_CONFIG_FILES([ kexi/plugins/reports/Makefile ]) +-AC_CONFIG_FILES([ kexi/plugins/scripting/Makefile ]) +-AC_CONFIG_FILES([ kexi/plugins/scripting/kexiapp/Makefile ]) +-AC_CONFIG_FILES([ kexi/plugins/scripting/kexidb/Makefile ]) +-AC_CONFIG_FILES([ kexi/plugins/scripting/kexiscripting/Makefile ]) +-AC_CONFIG_FILES([ kexi/plugins/scripting/scripts/Makefile ]) +-AC_CONFIG_FILES([ kexi/plugins/scripting/scripts/copycenter/Makefile ]) +-AC_CONFIG_FILES([ kexi/plugins/scripting/scripts/exportxhtml/Makefile ]) +-AC_CONFIG_FILES([ kexi/plugins/scripting/scripts/importxhtml/Makefile ]) +-AC_CONFIG_FILES([ kexi/plugins/scripting/scripts/projectdocumentor/Makefile ]) +-AC_CONFIG_FILES([ kexi/plugins/scripting/scripts/python/Makefile ]) +-AC_CONFIG_FILES([ kexi/plugins/scripting/scripts/python/kexiapp/Makefile ]) +-AC_CONFIG_FILES([ kexi/plugins/tables/Makefile ]) +-AC_CONFIG_FILES([ kexi/tests/Makefile ]) +-AC_CONFIG_FILES([ kexi/tests/altertable/Makefile ]) +-AC_CONFIG_FILES([ kexi/tests/newapi/Makefile ]) +-AC_CONFIG_FILES([ kexi/tests/parser/Makefile ]) +-AC_CONFIG_FILES([ kexi/tests/startup/Makefile ]) +-AC_CONFIG_FILES([ kexi/tests/tableview/Makefile ]) +-AC_CONFIG_FILES([ kexi/tests/widgets/Makefile ]) +-AC_CONFIG_FILES([ kexi/tools/Makefile ]) +-AC_CONFIG_FILES([ kexi/tools/add_column/Makefile ]) +-AC_CONFIG_FILES([ kexi/tools/delete_column/Makefile ]) +-AC_CONFIG_FILES([ kexi/widget/Makefile ]) +-AC_CONFIG_FILES([ kexi/widget/relations/Makefile ]) +-AC_CONFIG_FILES([ kexi/widget/tableview/Makefile ]) +-AC_CONFIG_FILES([ kexi/widget/utils/Makefile ]) +-AC_CONFIG_FILES([ kformula/Makefile ]) +-AC_CONFIG_FILES([ kformula/pics/Makefile ]) +-AC_CONFIG_FILES([ kivio/Makefile ]) +-AC_CONFIG_FILES([ kivio/kiviopart/Makefile ]) +-AC_CONFIG_FILES([ kivio/kiviopart/config/Makefile ]) +-AC_CONFIG_FILES([ kivio/kiviopart/kiviosdk/Makefile ]) +-AC_CONFIG_FILES([ kivio/kiviopart/pics/Makefile ]) +-AC_CONFIG_FILES([ kivio/kiviopart/stencils/Makefile ]) +-AC_CONFIG_FILES([ kivio/kiviopart/stencils/Dia/Makefile ]) +-AC_CONFIG_FILES([ kivio/kiviopart/stencils/Dia/Assorted/Makefile ]) +-AC_CONFIG_FILES([ kivio/kiviopart/stencils/Dia/Circuit/Makefile ]) +-AC_CONFIG_FILES([ kivio/kiviopart/stencils/Dia/Cisco/Makefile ]) +-AC_CONFIG_FILES([ kivio/kiviopart/stencils/Dia/Civil/Makefile ]) +-AC_CONFIG_FILES([ kivio/kiviopart/stencils/Dia/Contact/Makefile ]) +-AC_CONFIG_FILES([ kivio/kiviopart/stencils/Dia/Electric/Makefile ]) +-AC_CONFIG_FILES([ kivio/kiviopart/stencils/Dia/Jigsaw/Makefile ]) +-AC_CONFIG_FILES([ kivio/kiviopart/stencils/Dia/MSE/Makefile ]) +-AC_CONFIG_FILES([ kivio/kiviopart/stencils/Dia/Network/Makefile ]) +-AC_CONFIG_FILES([ kivio/kiviopart/stencils/Dia/Pneumatic/Makefile ]) +-AC_CONFIG_FILES([ kivio/kiviopart/stencils/Dia/SDL/Makefile ]) +-AC_CONFIG_FILES([ kivio/kiviopart/stencils/Dia/Sybase/Makefile ]) +-AC_CONFIG_FILES([ kivio/kiviopart/stencils/Flowcharting/Makefile ]) +-AC_CONFIG_FILES([ kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Makefile ]) +-AC_CONFIG_FILES([ kivio/kiviopart/stencils/Flowcharting/Extended/Makefile ]) +-AC_CONFIG_FILES([ kivio/kiviopart/stencils/Flowcharting/Logic/Makefile ]) +-AC_CONFIG_FILES([ kivio/kiviopart/stencils/Geographic/Makefile ]) +-AC_CONFIG_FILES([ kivio/kiviopart/stencils/Geographic/Flags/Makefile ]) +-AC_CONFIG_FILES([ kivio/kiviopart/stencils/Geographic/Maps/Makefile ]) +-AC_CONFIG_FILES([ kivio/kiviopart/stencils/Hardware/Makefile ]) +-AC_CONFIG_FILES([ kivio/kiviopart/stencils/Hardware/Computer/Makefile ]) +-AC_CONFIG_FILES([ kivio/kiviopart/stencils/Hardware/Miscellaneous/Makefile ]) +-AC_CONFIG_FILES([ kivio/kiviopart/stencils/Miscellaneous/Makefile ]) +-AC_CONFIG_FILES([ kivio/kiviopart/stencils/Miscellaneous/Arrows/Makefile ]) +-AC_CONFIG_FILES([ kivio/kiviopart/stencils/Miscellaneous/Buildings/Makefile ]) +-AC_CONFIG_FILES([ kivio/kiviopart/stencils/Miscellaneous/ER/Makefile ]) +-AC_CONFIG_FILES([ kivio/kiviopart/stencils/Miscellaneous/NassiShneiderman/Makefile ]) +-AC_CONFIG_FILES([ kivio/kiviopart/stencils/Miscellaneous/People/Makefile ]) +-AC_CONFIG_FILES([ kivio/kiviopart/stencils/Miscellaneous/Transport/Makefile ]) +-AC_CONFIG_FILES([ kivio/kiviopart/stencils/UML/Makefile ]) +-AC_CONFIG_FILES([ kivio/kiviopart/stencils/UML/ActivityDiagrams/Makefile ]) +-AC_CONFIG_FILES([ kivio/kiviopart/stencils/UML/ClassDiagrams/Makefile ]) +-AC_CONFIG_FILES([ kivio/kiviopart/tiles/Makefile ]) +-AC_CONFIG_FILES([ kivio/kiviopart/tools/Makefile ]) +-AC_CONFIG_FILES([ kivio/kiviopart/ui/Makefile ]) +-AC_CONFIG_FILES([ kivio/plugins/Makefile ]) +-AC_CONFIG_FILES([ kivio/plugins/kivioconnectortool/Makefile ]) +-AC_CONFIG_FILES([ kivio/plugins/kivioconnectortool/straight_connector/Makefile ]) +-AC_CONFIG_FILES([ kivio/plugins/kivioselecttool/Makefile ]) +-AC_CONFIG_FILES([ kivio/plugins/kivioselecttool/select_pics/Makefile ]) +-AC_CONFIG_FILES([ kivio/plugins/kiviosmlconnector/Makefile ]) +-AC_CONFIG_FILES([ kivio/plugins/kiviosmlconnector/sml_connector/Makefile ]) +-AC_CONFIG_FILES([ kivio/plugins/kiviotargettool/Makefile ]) +-AC_CONFIG_FILES([ kivio/plugins/kiviotexttool/Makefile ]) +-AC_CONFIG_FILES([ kivio/plugins/kiviozoomtool/Makefile ]) +-AC_CONFIG_FILES([ kivio/plugins/kiviozoomtool/zoom_pics/Makefile ]) +-AC_CONFIG_FILES([ kivio/templates/Makefile ]) +-AC_CONFIG_FILES([ kivio/templates/basic/Makefile ]) +-AC_CONFIG_FILES([ koshell/Makefile ]) +-AC_CONFIG_FILES([ kounavail/Makefile ]) +-AC_CONFIG_FILES([ kplato/Makefile ]) +-AC_CONFIG_FILES([ kplato/pics/Makefile ]) +-AC_CONFIG_FILES([ kplato/reports/Makefile ]) +-AC_CONFIG_FILES([ kplato/templates/Makefile ]) +-AC_CONFIG_FILES([ kplato/templates/Simple/Makefile ]) +-AC_CONFIG_FILES([ kplato/tests/Makefile ]) +-AC_CONFIG_FILES([ kplato/toolbar/Makefile ]) +-AC_CONFIG_FILES([ kpresenter/Makefile ]) +-AC_CONFIG_FILES([ kpresenter/autoformEdit/Makefile ]) +-AC_CONFIG_FILES([ kpresenter/autoforms/Makefile ]) +-AC_CONFIG_FILES([ kpresenter/autoforms/Arrows/Makefile ]) +-AC_CONFIG_FILES([ kpresenter/autoforms/Connections/Makefile ]) +-AC_CONFIG_FILES([ kpresenter/dtd/Makefile ]) +-AC_CONFIG_FILES([ kpresenter/pics/Makefile ]) +-AC_CONFIG_FILES([ kpresenter/pics/rotate/Makefile ]) +-AC_CONFIG_FILES([ kpresenter/slideshow/Makefile ]) +-AC_CONFIG_FILES([ kpresenter/templates/Makefile ]) +-AC_CONFIG_FILES([ kpresenter/templates/A4/Makefile ]) +-AC_CONFIG_FILES([ kpresenter/templates/Screen/Makefile ]) +-AC_CONFIG_FILES([ kpresenter/templates/Screenpresentations/Makefile ]) +-AC_CONFIG_FILES([ kpresenter/templates/common_icon/Makefile ]) +-AC_CONFIG_FILES([ kpresenter/templates/legal/Makefile ]) +-AC_CONFIG_FILES([ kpresenter/templates/letter/Makefile ]) +-AC_CONFIG_FILES([ kpresenter/toolbar/Makefile ]) +-AC_CONFIG_FILES([ chalk/Makefile ]) +-AC_CONFIG_FILES([ chalk/colorspaces/Makefile ]) +-AC_CONFIG_FILES([ chalk/colorspaces/cmyk_u16/Makefile ]) +-AC_CONFIG_FILES([ chalk/colorspaces/cmyk_u8/Makefile ]) +-AC_CONFIG_FILES([ chalk/colorspaces/cmyk_u8/templates/Makefile ]) +-AC_CONFIG_FILES([ chalk/colorspaces/gray_u16/Makefile ]) +-AC_CONFIG_FILES([ chalk/colorspaces/gray_u8/Makefile ]) +-AC_CONFIG_FILES([ chalk/colorspaces/gray_u8/templates/Makefile ]) +-AC_CONFIG_FILES([ chalk/colorspaces/gray_u8/tests/Makefile ]) +-AC_CONFIG_FILES([ chalk/colorspaces/lms_f32/Makefile ]) +-AC_CONFIG_FILES([ chalk/colorspaces/rgb_f16half/Makefile ]) +-AC_CONFIG_FILES([ chalk/colorspaces/rgb_f16half/tests/Makefile ]) +-AC_CONFIG_FILES([ chalk/colorspaces/rgb_f32/Makefile ]) +-AC_CONFIG_FILES([ chalk/colorspaces/rgb_f32/tests/Makefile ]) +-AC_CONFIG_FILES([ chalk/colorspaces/rgb_u16/Makefile ]) +-AC_CONFIG_FILES([ chalk/colorspaces/rgb_u16/tests/Makefile ]) +-AC_CONFIG_FILES([ chalk/colorspaces/rgb_u8/Makefile ]) +-AC_CONFIG_FILES([ chalk/colorspaces/rgb_u8/templates/Makefile ]) +-AC_CONFIG_FILES([ chalk/colorspaces/rgb_u8/tests/Makefile ]) +-AC_CONFIG_FILES([ chalk/colorspaces/wet/Makefile ]) +-AC_CONFIG_FILES([ chalk/colorspaces/wetsticky/Makefile ]) +-AC_CONFIG_FILES([ chalk/colorspaces/wetsticky/brushop/Makefile ]) +-AC_CONFIG_FILES([ chalk/colorspaces/ycbcr_u16/Makefile ]) +-AC_CONFIG_FILES([ chalk/colorspaces/ycbcr_u8/Makefile ]) +-AC_CONFIG_FILES([ chalk/core/Makefile ]) +-AC_CONFIG_FILES([ chalk/core/tests/Makefile ]) +-AC_CONFIG_FILES([ chalk/core/tiles/Makefile ]) +-AC_CONFIG_FILES([ chalk/core/tiles/tests/Makefile ]) +-AC_CONFIG_FILES([ chalk/data/Makefile ]) +-AC_CONFIG_FILES([ chalk/data/brushes/Makefile ]) +-AC_CONFIG_FILES([ chalk/data/gradients/Makefile ]) +-AC_CONFIG_FILES([ chalk/data/images/Makefile ]) +-AC_CONFIG_FILES([ chalk/data/palettes/Makefile ]) +-AC_CONFIG_FILES([ chalk/data/patterns/Makefile ]) +-AC_CONFIG_FILES([ chalk/data/profiles/Makefile ]) +-AC_CONFIG_FILES([ chalk/dtd/Makefile ]) +-AC_CONFIG_FILES([ chalk/chalkcolor/Makefile ]) +-AC_CONFIG_FILES([ chalk/chalkcolor/colorspaces/Makefile ]) +-AC_CONFIG_FILES([ chalk/chalkcolor/tests/Makefile ]) +-AC_CONFIG_FILES([ chalk/pics/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/filters/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/filters/blur/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/filters/bumpmap/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/filters/cimg/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/filters/colorify/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/filters/colors/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/filters/colorsfilters/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/filters/convolutionfilters/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/filters/cubismfilter/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/filters/embossfilter/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/filters/example/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/filters/fastcolortransfer/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/filters/imageenhancement/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/filters/lenscorrectionfilter/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/filters/levelfilter/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/filters/noisefilter/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/filters/oilpaintfilter/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/filters/pixelizefilter/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/filters/raindropsfilter/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/filters/randompickfilter/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/filters/roundcorners/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/filters/smalltilesfilter/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/filters/sobelfilter/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/filters/threadtest/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/filters/unsharp/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/filters/wavefilter/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/paintops/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/paintops/defaultpaintops/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/tools/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/tools/defaulttools/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/tools/selectiontools/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/tools/tool_crop/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/tools/tool_curves/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/tools/tool_filter/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/tools/tool_perspectivegrid/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/tools/tool_perspectivetransform/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/tools/tool_polygon/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/tools/tool_polyline/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/tools/tool_selectsimilar/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/tools/tool_star/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/tools/tool_transform/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/viewplugins/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/viewplugins/colorrange/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/viewplugins/colorspaceconversion/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/viewplugins/dropshadow/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/viewplugins/filtersgallery/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/viewplugins/histogram/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/viewplugins/histogram_docker/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/viewplugins/history_docker/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/viewplugins/imagesize/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/viewplugins/modify_selection/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/viewplugins/performancetest/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/viewplugins/rotateimage/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/viewplugins/screenshot/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/viewplugins/scripting/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/viewplugins/scripting/chalkcore/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/viewplugins/scripting/chalkscripting/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/viewplugins/scripting/samples/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/viewplugins/scripting/samples/python/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/viewplugins/scripting/samples/ruby/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/viewplugins/selectopaque/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/viewplugins/separate_channels/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/viewplugins/shearimage/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/viewplugins/substrate/Makefile ]) +-AC_CONFIG_FILES([ chalk/plugins/viewplugins/variations/Makefile ]) +-AC_CONFIG_FILES([ chalk/sdk/Makefile ]) +-AC_CONFIG_FILES([ chalk/ui/Makefile ]) +-AC_CONFIG_FILES([ kspread/Makefile ]) +-AC_CONFIG_FILES([ kspread/dialogs/Makefile ]) +-AC_CONFIG_FILES([ kspread/dtd/Makefile ]) +-AC_CONFIG_FILES([ kspread/extensions/Makefile ]) +-AC_CONFIG_FILES([ kspread/pics/Makefile ]) +-AC_CONFIG_FILES([ kspread/plugins/Makefile ]) +-AC_CONFIG_FILES([ kspread/plugins/calculator/Makefile ]) +-AC_CONFIG_FILES([ kspread/plugins/calculator/pics/Makefile ]) +-AC_CONFIG_FILES([ kspread/plugins/insertcalendar/Makefile ]) +-AC_CONFIG_FILES([ kspread/plugins/scripting/Makefile ]) +-AC_CONFIG_FILES([ kspread/plugins/scripting/kspreadcore/Makefile ]) +-AC_CONFIG_FILES([ kspread/plugins/scripting/scripts/Makefile ]) +-AC_CONFIG_FILES([ kspread/plugins/scripting/scripts/exporthtml/Makefile ]) +-AC_CONFIG_FILES([ kspread/plugins/scripting/scripts/scripteditor/Makefile ]) +-AC_CONFIG_FILES([ kspread/sheetstyles/Makefile ]) +-AC_CONFIG_FILES([ kspread/templates/Makefile ]) +-AC_CONFIG_FILES([ kspread/templates/Business/Makefile ]) +-AC_CONFIG_FILES([ kspread/templates/General/Makefile ]) +-AC_CONFIG_FILES([ kspread/templates/HomeFamily/Makefile ]) +-AC_CONFIG_FILES([ kspread/tests/Makefile ]) +-AC_CONFIG_FILES([ kspread/toolbar/Makefile ]) +-AC_CONFIG_FILES([ kspread/toolbar/crystalsvg/Makefile ]) +-AC_CONFIG_FILES([ kugar/Makefile ]) +-AC_CONFIG_FILES([ kugar/kudesigner/Makefile ]) +-AC_CONFIG_FILES([ kugar/kudesigner/pics/Makefile ]) +-AC_CONFIG_FILES([ kugar/kudesigner/templates/Makefile ]) +-AC_CONFIG_FILES([ kugar/kudesigner/templates/General/Makefile ]) +-AC_CONFIG_FILES([ kugar/kudesigner/toolbar/Makefile ]) +-AC_CONFIG_FILES([ kugar/kudesigner_lib/Makefile ]) +-AC_CONFIG_FILES([ kugar/lib/Makefile ]) +-AC_CONFIG_FILES([ kugar/part/Makefile ]) +-AC_CONFIG_FILES([ kugar/samples/Makefile ]) +-AC_CONFIG_FILES([ kword/Makefile ]) +-AC_CONFIG_FILES([ kword/data/Makefile ]) +-AC_CONFIG_FILES([ kword/dtd/Makefile ]) +-AC_CONFIG_FILES([ kword/expression/Makefile ]) +-AC_CONFIG_FILES([ kword/horizontalline/Makefile ]) +-AC_CONFIG_FILES([ kword/mailmerge/Makefile ]) +-AC_CONFIG_FILES([ kword/mailmerge/kabc/Makefile ]) +-AC_CONFIG_FILES([ kword/mailmerge/kspread/Makefile ]) +-AC_CONFIG_FILES([ kword/mailmerge/sql/Makefile ]) +-AC_CONFIG_FILES([ kword/pics/Makefile ]) +-AC_CONFIG_FILES([ kword/templates/Makefile ]) +-AC_CONFIG_FILES([ kword/templates/CardsAndLabels/Makefile ]) +-AC_CONFIG_FILES([ kword/templates/Envelopes/Makefile ]) +-AC_CONFIG_FILES([ kword/templates/Wordprocessing/Makefile ]) +-AC_CONFIG_FILES([ kword/tests/Makefile ]) +-AC_CONFIG_FILES([ kword/toolbar/Makefile ]) +-AC_CONFIG_FILES([ lib/Makefile ]) +-AC_CONFIG_FILES([ lib/kformula/Makefile ]) +-AC_CONFIG_FILES([ lib/kformula/config/Makefile ]) +-AC_CONFIG_FILES([ lib/kformula/dtd/Makefile ]) +-AC_CONFIG_FILES([ lib/kformula/fonts/Makefile ]) +-AC_CONFIG_FILES([ lib/kformula/pics/Makefile ]) +-AC_CONFIG_FILES([ lib/kformula/pics/crystalsvg/Makefile ]) +-AC_CONFIG_FILES([ lib/kofficecore/Makefile ]) +-AC_CONFIG_FILES([ lib/kofficecore/tests/Makefile ]) +-AC_CONFIG_FILES([ lib/kofficeui/Makefile ]) +-AC_CONFIG_FILES([ lib/kofficeui/pics/Makefile ]) +-AC_CONFIG_FILES([ lib/kofficeui/tests/Makefile ]) +-AC_CONFIG_FILES([ lib/kopainter/Makefile ]) +-AC_CONFIG_FILES([ lib/kopalette/Makefile ]) +-AC_CONFIG_FILES([ lib/koproperty/Makefile ]) +-AC_CONFIG_FILES([ lib/koproperty/editors/Makefile ]) +-AC_CONFIG_FILES([ lib/koproperty/test/Makefile ]) +-AC_CONFIG_FILES([ lib/kotext/Makefile ]) +-AC_CONFIG_FILES([ lib/kotext/kohyphen/Makefile ]) +-AC_CONFIG_FILES([ lib/kotext/kohyphen/hyphdicts/Makefile ]) +-AC_CONFIG_FILES([ lib/kotext/tests/Makefile ]) +-AC_CONFIG_FILES([ lib/kross/Makefile ]) +-AC_CONFIG_FILES([ lib/kross/api/Makefile ]) +-AC_CONFIG_FILES([ lib/kross/main/Makefile ]) +-AC_CONFIG_FILES([ lib/kross/python/Makefile ]) +-AC_CONFIG_FILES([ lib/kross/python/cxx/Makefile ]) +-AC_CONFIG_FILES([ lib/kross/python/scripts/Makefile ]) +-AC_CONFIG_FILES([ lib/kross/python/scripts/RestrictedPython/Makefile ]) +-AC_CONFIG_FILES([ lib/kross/ruby/Makefile ]) +-AC_CONFIG_FILES([ lib/kross/runner/Makefile ]) +-AC_CONFIG_FILES([ lib/kross/test/Makefile ]) +-AC_CONFIG_FILES([ lib/kwmf/Makefile ]) +-AC_CONFIG_FILES([ lib/store/Makefile ]) +-AC_CONFIG_FILES([ lib/store/tests/Makefile ]) +-AC_CONFIG_FILES([ mimetypes/Makefile ]) +-AC_CONFIG_FILES([ mimetypes/trinity3/Makefile ]) +-AC_CONFIG_FILES([ mimetypes/trinity51/Makefile ]) +-AC_CONFIG_FILES([ pics/Makefile ]) +-AC_CONFIG_FILES([ pics/crystalsvg/Makefile ]) +-AC_CONFIG_FILES([ plugins/Makefile ]) +-AC_CONFIG_FILES([ plugins/scan/Makefile ]) +-AC_CONFIG_FILES([ servicetypes/Makefile ]) +-AC_CONFIG_FILES([ templates/Makefile ]) +-AC_CONFIG_FILES([ tools/Makefile ]) +-AC_CONFIG_FILES([ tools/converter/Makefile ]) +-AC_CONFIG_FILES([ tools/kfile-plugins/Makefile ]) +-AC_CONFIG_FILES([ tools/kfile-plugins/abiword/Makefile ]) +-AC_CONFIG_FILES([ tools/kfile-plugins/gnumeric/Makefile ]) +-AC_CONFIG_FILES([ tools/kfile-plugins/koffice/Makefile ]) +-AC_CONFIG_FILES([ tools/kfile-plugins/ooo/Makefile ]) +-AC_CONFIG_FILES([ tools/kthesaurus/Makefile ]) +-AC_CONFIG_FILES([ tools/quickprint/Makefile ]) +-AC_CONFIG_FILES([ tools/spell/Makefile ]) +-AC_CONFIG_FILES([ tools/thesaurus/Makefile ]) +-AC_CONFIG_FILES([ tools/thumbnail/Makefile ]) +-AC_MSG_CHECKING([for filters to be compiled]) +- +-if test -s $srcdir/inst-apps ; then +- SUBDIRLIST=`cat $srcdir/inst-apps` +-else +- SUBDIRLIST=`cat $srcdir/subdirs` +-fi +- +-# fallback (KDE_CREATE_SUBDIRLIST has this fallback, so I have put it here too.) +-if test -z "$SUBDIRLIST" ; then +- SUBDIRLIST=`ls -1 $srcdir` +-fi +- +-# first check which main apllication we could compile +-for args in $SUBDIRLIST ; do +- case $args in +- kword) COMPILE_FILTER_KWORD="$args " ;; +- kspread) COMPILE_FILTER_KSPREAD="$args " ;; +- kchart) COMPILE_FILTER_KCHART="$args " ;; +- karbon) COMPILE_FILTER_KARBON="$args " ;; +- kpresenter) COMPILE_FILTER_KPRESENTER="$args " ;; +- kformula) COMPILE_FILTER_KFORMULA="$args " ;; +- kugar) COMPILE_FILTER_KUGAR="$args " ;; +- chalk) COMPILE_FILTER_KRITA="$args " ;; +- kivio) COMPILE_FILTER_KIVIO="$args " ;; +- kexi) COMPILE_FILTER_KEXI="$args " ;; +- esac +-done +- +-# now remove the applications the user has asked not to compile +-for args in $DO_NOT_COMPILE ; do +- case $args in +- kword) COMPILE_FILTER_KWORD= ;; +- kspread) COMPILE_FILTER_KSPREAD= ;; +- kchart) COMPILE_FILTER_KCHART= ;; +- karbon) COMPILE_FILTER_KARBON= ;; +- kpresenter) COMPILE_FILTER_KPRESENTER= ;; +- kformula) COMPILE_FILTER_KFORMULA= ;; +- kugar) COMPILE_FILTER_KUGAR= ;; +- chalk) COMPILE_FILTER_KRITA= ;; +- kivio) COMPILE_FILTER_KIVIO= ;; +- kexi) COMPILE_FILTER_KEXI= ;; +- esac +-done +- +-USERFEEDBACKCOMPILE="$COMPILE_FILTER_KWORD$COMPILE_FILTER_KSPREAD$COMPILE_FILTER_KCHART$COMPILE_FILTER_KARBON$COMPILE_FILTER_KPRESENTER$COMPILE_FILTER_KFORMULA$COMPILE_FILTER_KUGAR" +-AC_MSG_RESULT([$USERFEEDBACKCOMPILE]) +- +-AM_CONDITIONAL(compile_filter_KWORD, test -n "$COMPILE_FILTER_KWORD") +-AM_CONDITIONAL(compile_filter_KSPREAD, test -n "$COMPILE_FILTER_KSPREAD") +-AM_CONDITIONAL(compile_filter_KCHART, test -n "$COMPILE_FILTER_KCHART") +-AM_CONDITIONAL(compile_filter_KARBON, test -n "$COMPILE_FILTER_KARBON") +-AM_CONDITIONAL(compile_filter_KPRESENTER, test -n "$COMPILE_FILTER_KPRESENTER") +-AM_CONDITIONAL(compile_filter_KFORMULA, test -n "$COMPILE_FILTER_KFORMULA") +-AM_CONDITIONAL(compile_filter_KUGAR, test -n "$COMPILE_FILTER_KUGAR") +-AM_CONDITIONAL(compile_filter_KRITA, test -n "$COMPILE_FILTER_KRITA") +-AM_CONDITIONAL(compile_filter_KIVIO, test -n "$COMPILE_FILTER_KIVIO") +-AM_CONDITIONAL(compile_filter_KEXI, test -n "$COMPILE_FILTER_KEXI") +-if test -s $srcdir/inst-apps ; then +- SUBDIRLIST=`cat $srcdir/inst-apps` +-else +- SUBDIRLIST=`cat $srcdir/subdirs` +-fi +- +-# fallback (KDE_CREATE_SUBDIRLIST has this fallback, so I have put it here too.) +-if test -z "$SUBDIRLIST" ; then +- SUBDIRLIST=`ls -1 $srcdir` +-fi +- +-# first check which main apllication we could compile +-for args in $SUBDIRLIST ; do +- case $args in +- kugar) COMPILE_PLUGIN_KUGAR="$args " ;; +- esac +-done +- +-# now remove the applications the user has asked not to compile +-for args in $DO_NOT_COMPILE ; do +- case $args in +- kugar) COMPILE_PLUGIN_KUGAR= ;; +- esac +-done +- +-AM_CONDITIONAL(compile_plugin_KUGAR, test -n "$COMPILE_PLUGIN_KUGAR") +-if test -s $srcdir/inst-apps ; then +- SUBDIRLIST=`cat $srcdir/inst-apps` +-else +- SUBDIRLIST=`cat $srcdir/subdirs` +-fi +- +-# fallback (KDE_CREATE_SUBDIRLIST has this fallback, so I have put it here too.) +-if test -z "$SUBDIRLIST" ; then +- SUBDIRLIST=`ls -1 $srcdir` +-fi +- +-AC_MSG_CHECKING([whether only Kexi is being built]) +-KEXI_ONLY=yes +-for args in $SUBDIRLIST ; do +- case $args in +- lib) ;; +- kexi) ;; +- *) if test -d $srcdir/$args ; then +- KEXI_ONLY=no +- fi +- ;; +- esac +-done +-AC_MSG_RESULT([$KEXI_ONLY]) +-AM_CONDITIONAL(compile_kexionly, test "$KEXI_ONLY" = "yes" ) +- +-AC_MSG_CHECKING([whether kopainter should be compiled]) +- +-# first check which main application we could compile +-for args in $SUBDIRLIST ; do +- case $args in +- chalk) COMPILE_LIB_FOR_KRITA="$args " ;; +- karbon) COMPILE_LIB_FOR_KARBON="$args " ;; +- kivio) COMPILE_LIB_FOR_KIVIO="$args " ;; +- esac +-done +- +-# now remove the applications the user has asked not to compile +-COMPILE_LIB_FOR_KPRESENTER="#" +-for args in $DO_NOT_COMPILE ; do +- case $args in +- chalk) COMPILE_LIB_FOR_KRITA= ;; +- karbon) COMPILE_LIB_FOR_KARBON= ;; +- kivio) COMPILE_LIB_FOR_KIVIO= ;; +- kpresenter) COMPILE_LIB_FOR_KPRESENTER= ;; +- esac +-done +- +-if test -n "$COMPILE_LIB_FOR_KRITA$COMPILE_LIB_FOR_KARBON$COMPILE_LIB_FOR_KIVIO$COMPILE_LIB_FOR_KPRESENTER" ; then +- USERFEEDBACKCOMPILELIB="yes" +-else +- USERFEEDBACKCOMPILELIB="no" +-fi +- +-AC_MSG_RESULT([$USERFEEDBACKCOMPILELIB]) +- +-AM_CONDITIONAL(compile_lib_KOPAINTER, test "$USERFEEDBACKCOMPILELIB" = "yes" ) +- +-AC_OUTPUT +-if test -z "$LIBGMAGICK_LIBS" -a -z "$LIBMAGICK_LIBS"; then +- echo "" +- echo "You're missing GraphicsMagick (>=1.1.7). chalk's GraphicsMagick import/export" +- echo "filter will not be compiled. You can download GraphicsMagick from" +- echo "http://www.graphicsmagick.org/. The GraphicsMagick filter allows chalk to" +- echo "read and write XCF, PSD, GIF, BMP, and many other image formats." +- echo "" +- echo "If you have problems compiling GraphicsMagick, please try configuring it using" +- echo "the --without-magick-plus-plus flag, the C++ API isn't needed for chalk." +- echo "" +- all_tests=bad +- AC_DEFINE([include_imagemagick_filter],"",[don't use magick filter]) +-fi +- +-if test -z "$LIBGMAGICK_LIBS" -a ! -z "$LIBMAGICK_LIBS"; then +- +- echo "" +- echo "You're missing GraphicsMagick (>=1.1.7). chalk's GraphicsMagick import/export" +- echo "filter will not be compiled. But ImageMagick was found, which mean that chalk" +- echo "will be able to read and write XCF, PSD, GIF, BMP, and many other image formats." +- echo "But the ImageMagick filter is deprecated and we strongly advise you to install" +- echo "GraphicsMagick either from your distribution or from http://www.graphicsmagick.org/" +-fi +-if test -z "$LIBJPEG" -o -z "$LIBEXIF"; then +- echo "" +- echo "You're missing libjpeg or libexif 0.6.12 or later (binaries and/or headers)." +- echo "chalk won't be able to import/export jpeg" +- echo "" +- all_tests=bad +-fi +-# ImageMagick is deprecated, we don't care anymore if it's not here +-# +-#if test -z "$LIBMAGICK_LIBS"; then +-# echo "" +-# echo "You're missing ImageMagick (>=6.1.0). chalk's ImageMagick import/export" +-# echo "filter will not be compiled. You can download ImageMagick from" +-# echo "http://www.imagemagick.org/. The ImageMagick filter allows chalk to" +-# echo "read and write XCF, PSD, GIF, BMP, and many other image formats." +-# echo "" +-# echo "If you have problems compiling ImageMagick, please try configuring it using" +-# echo "the --without-magick-plus-plus flag, the C++ API isn't needed for chalk." +-# echo "" +-# all_tests=bad +-#fi +- +-if test -z "$OPENEXR_LIBS"; then +- echo "" +- echo "You're missing the OpenEXR library. Chalk's OpenEXR import/export filter will " +- echo "not be compiled. You can download OpenEXR from http://www.openexr.com or " +- echo "install it from an appropriate binary package." +- echo "" +- all_tests=bad +-fi +- +-if test -z "$POPPLER_LIBS"; then +- echo "" +- echo "You're missing libpoppler 0.5.1 or later (binaries and/or headers)." +- echo "chalk won't be able to import pdf" +- echo "note that the tqt-binding of libpoppler is required" +- echo "" +-fi +-if test -z "$LIBPNG"; then +- echo "" +- echo "You're missing libpng (binaries and/or headers), chalk won't be able" +- echo "to import/export png" +- echo "" +- all_tests=bad +-fi +- +-if test -z "$LIBTIFF"; then +- echo "" +- echo "You're missing libtiff (binaries and/or headers), chalk won't be able" +- echo "to import/export tiff" +- echo "" +- all_tests=bad +-fi +-if test -z "$LIBWV2_LIBS"; then +- echo "" +- echo "You're missing libwv2 0.1.9 or newer. KWord's MS Word filter will not be" +- echo "compiled. You can download wv2 using anonymous CVS from the Sourceforge" +- echo "repository (http://sourceforge.net/cvs/?group_id=10501) or get a" +- echo "tarball at http://sourceforge.net/projects/wvware/" +-# echo "The MS Word filter won't be compiled due to experimental changes." +- echo "" +- all_tests=bad +-fi +-if test -z "$LIBWPD_LIBS"; then +- echo "" +- echo "You're missing libwpd 0.8 or newer. KWord's WordPerfect import filter will " +- echo "not be compiled. You can download libwpd from http://libwpd.sf.net or " +- echo "install it from appropriate binary package." +- echo "" +- all_tests=bad +-fi +-if test -z "$LIBXML_LIBS"; then +- echo "" +- echo "You're missing libxml2 (at least version 2.4.8)." +- echo "The XSLT filters will not be compiled." +- echo "Please download libxml2 from http://xmlsoft.org ." +- echo "" +- all_tests=bad +-fi +- +-if test -z "$LIBXSLT_LIBS"; then +- echo "" +- echo "You're missing libxslt (at least version 1.0.7)." +- echo "The XSLT filters will not be compiled." +-# TODO: URL is not exacly right anymore +- echo "Please download libxml2 from http://xmlsoft.org ." +- echo "" +- all_tests=bad +-fi +- +-if test -z "$LIBART_LIBS"; then +- echo "" +- echo "You're missing libart 2.3.8. karbon will not be compiled." +- echo "You can download libart from" +- echo "http://svg.kde.org/download.html" +- echo "" +- all_tests=bad +-else +- if test -z "$LIBFONTCONFIG_LIBS"; then +- echo "" +- echo "You're missing fontconfig 1.0.1 or newer. karbon will not have text support." +- echo "You can download fontconfig from http://fontconfig.org/" +- echo "" +- all_tests=bad +- fi +- +- if test -z "$LIBFREETYPE_LIBS"; then +- echo "" +- echo "You're missing libfreetype 5.0 or newer. karbon will not have text support." +- echo "You can download libfreetype from http://www.freetype.org/" +- echo "" +- all_tests=bad +- fi +-fi +-if test -z "$MYSQL_INC" -o -z "$MYSQL_LIBS"; then +- +- echo "----------------------------------------------------------------------" +- +- echo " + The MySQL development files were not found." +- cat <=2) +- +-EOS +- fi +- +-# SUMMARY messages +- cat <&1 >/dev/null +- if test $? -ne 0; then +- echo "" +- echo "Warning: you chose to install this package in $given_prefix," +- echo "but KDE was found in $kde_libs_prefix." +- echo "For this to work, you will need to tell KDE about the new prefix, by ensuring" +- echo "that KDEDIRS contains it, e.g. export KDEDIRS=$given_prefix:$kde_libs_prefix" +- echo "Then restart KDE." +- echo "" +- fi +- fi +-fi +- +-if test x$GXX = "xyes" -a x$kde_have_gcc_visibility = "xyes" -a x$kde_cv_val_qt_gcc_visibility_patched = "xno"; then +- echo "" +- echo "Your GCC supports symbol visibility, but the patch for Qt supporting visibility" +- echo "was not included. Therefore, GCC symbol visibility support remains disabled." +- echo "" +- echo "For better performance, consider including the Qt visibility supporting patch" +- echo "located at:" +- echo "" +- echo "http://bugs.kde.org/show_bug.cgi?id=109386" +- echo "" +- echo "and recompile all of Qt and KDE. Note, this is entirely optional and" +- echo "everything will continue to work just fine without it." +- echo "" +-fi +- +-if test "$all_tests" = "bad"; then +- if test ! "$cache_file" = "/dev/null"; then +- echo "" +- echo "Please remove the file $cache_file after changing your setup" +- echo "so that configure will find the changes next time." +- echo "" +- fi +-else +- echo "" +- echo "Good - your configure finished. Start make now" +- echo "" +-fi +diff --git a/filters/kword/wordperfect/configure.in.in b/filters/kword/wordperfect/configure.in.in +index a491966..d3b8353 100644 +--- a/filters/kword/wordperfect/configure.in.in ++++ b/filters/kword/wordperfect/configure.in.in +@@ -41,8 +41,6 @@ if test -z "$LIBWPD_LIBS"; then + + AC_DEFINE_UNQUOTED(HAVE_WPD, 1, [Defines if your system has the libwpd library]) + AC_DEFINE_UNQUOTED(HAVE_LIBWPD_090, 1, [Defines if your system has libpwd greater than or equal to v0.9.0]) +- +- AC_MSG_ERROR([[libwpd >= 0.9.0 is not yet supported!]]) + fi + fi + fi +diff --git a/filters/kword/wordperfect/import/WordPerfectCollector.hxx b/filters/kword/wordperfect/import/WordPerfectCollector.hxx +index d593224..fa3ec72 100644 +--- a/filters/kword/wordperfect/import/WordPerfectCollector.hxx ++++ b/filters/kword/wordperfect/import/WordPerfectCollector.hxx +@@ -77,13 +77,72 @@ struct ltstr + } + }; + ++#ifdef HAVE_LIBWPD_090 ++class WordPerfectCollector : public WPXDocumentInterface ++#else // HAVE_LIBWPD_090 + class WordPerfectCollector : public WPXHLListenerImpl ++#endif HAVE_LIBWPD_090 + { + public: + WordPerfectCollector(WPXInputStream *pInput, DocumentHandler *pHandler); + virtual ~WordPerfectCollector(); + bool filter(); + ++#ifdef HAVE_LIBWPD_090 ++ virtual void setDocumentMetaData(const WPXPropertyList &propList) {}; ++ virtual void startDocument(); ++ virtual void endDocument(); ++ virtual void definePageStyle(const WPXPropertyList &propList) {}; ++ virtual void openPageSpan(const WPXPropertyList &propList) {}; ++ virtual void closePageSpan() {}; ++ virtual void openHeader(const WPXPropertyList &propList) {}; ++ virtual void closeHeader() {}; ++ virtual void openFooter(const WPXPropertyList &propList) {}; ++ virtual void closeFooter() {}; ++ virtual void defineParagraphStyle(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops) {}; ++ virtual void openParagraph(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops); ++ virtual void closeParagraph(); ++ virtual void defineCharacterStyle(const WPXPropertyList &propList) {}; ++ virtual void openSpan(const WPXPropertyList &propList); ++ virtual void closeSpan(); ++ virtual void defineSectionStyle(const WPXPropertyList &propList, const WPXPropertyListVector &columns) {}; ++ virtual void openSection(const WPXPropertyList &propList, const WPXPropertyListVector &columns) {}; ++ virtual void closeSection() {}; ++ virtual void insertTab(); ++ virtual void insertSpace() {}; ++ virtual void insertText(const WPXString &text); ++ virtual void insertLineBreak(); ++ virtual void insertField(const WPXString &type, const WPXPropertyList &propList) {}; ++ virtual void defineOrderedListLevel(const WPXPropertyList &propList) {}; ++ virtual void defineUnorderedListLevel(const WPXPropertyList &propList) {}; ++ virtual void openOrderedListLevel(const WPXPropertyList &propList) {}; ++ virtual void openUnorderedListLevel(const WPXPropertyList &propList) {}; ++ virtual void closeOrderedListLevel() {}; ++ virtual void closeUnorderedListLevel() {}; ++ virtual void openListElement(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops) {}; ++ virtual void closeListElement() {}; ++ virtual void openFootnote(const WPXPropertyList &propList) {}; ++ virtual void closeFootnote() {}; ++ virtual void openEndnote(const WPXPropertyList &propList) {}; ++ virtual void closeEndnote() {}; ++ virtual void openComment(const WPXPropertyList &propList) {}; ++ virtual void closeComment() {}; ++ virtual void openTextBox(const WPXPropertyList &propList) {}; ++ virtual void closeTextBox() {}; ++ virtual void openTable(const WPXPropertyList &propList, const WPXPropertyListVector &columns) {}; ++ virtual void openTableRow(const WPXPropertyList &propList) {}; ++ virtual void closeTableRow() {}; ++ virtual void openTableCell(const WPXPropertyList &propList) {}; ++ virtual void closeTableCell() {}; ++ virtual void insertCoveredTableCell(const WPXPropertyList &propList) {}; ++ virtual void closeTable() {}; ++ virtual void openFrame(const WPXPropertyList &propList) {}; ++ virtual void closeFrame() {}; ++ virtual void insertBinaryObject(const WPXPropertyList &propList, const WPXBinaryData &data) {}; ++ virtual void insertEquation(const WPXPropertyList &propList, const WPXString &data) {}; ++ ++#else // HAVE_LIBWPD_090 ++ + virtual void setDocumentMetaData(const WPXPropertyList &propList) {} + virtual void startDocument() {} + virtual void endDocument() {} +@@ -132,6 +191,8 @@ public: + virtual void insertCoveredTableCell(const WPXPropertyList &propList); + virtual void closeTable(); + ++#endif // HAVE_LIBWPD_090 ++ + protected: + void _resetDocumentState(); + bool _parseSourceDocument(WPXInputStream &input); +diff --git a/filters/kword/wordperfect/import/wpimport.cc b/filters/kword/wordperfect/import/wpimport.cc +index 09fc4d5..5ff786c 100644 +--- a/filters/kword/wordperfect/import/wpimport.cc ++++ b/filters/kword/wordperfect/import/wpimport.cc +@@ -44,6 +44,104 @@ K_EXPORT_COMPONENT_FACTORY( libwpimport, WPImportFactory( "kofficefilters" ) ) + #include "DocumentHandler.hxx" + #include "WordPerfectCollector.hxx" + ++#ifdef HAVE_LIBWPD_090 ++class WPXMemoryInputStream : public WPXInputStream ++{ ++public: ++ WPXMemoryInputStream(unsigned char *data, unsigned long size); ++ virtual ~WPXMemoryInputStream(); ++ ++ virtual bool isOLEStream() { ++ return false; ++ } ++ virtual WPXInputStream * getDocumentOLEStream(const char *name) { ++ return NULL; ++ } ++ ++ const virtual unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead); ++ virtual int seek(long offset, WPX_SEEK_TYPE seekType); ++ virtual long tell(); ++ virtual bool atEOS(); ++ ++private: ++ long m_offset; ++ size_t m_size; ++ unsigned char *m_data; ++}; ++ ++WPXMemoryInputStream::WPXMemoryInputStream(unsigned char *data, unsigned long size) : ++ WPXInputStream(), ++ m_offset(0), ++ m_size(size), ++ m_data(data) ++{ ++} ++ ++WPXMemoryInputStream::~WPXMemoryInputStream() ++{ ++} ++ ++const unsigned char * WPXMemoryInputStream::read(unsigned long numBytes, unsigned long &numBytesRead) ++{ ++ numBytesRead = 0; ++ ++ if (numBytes == 0) ++ return 0; ++ ++ int numBytesToRead; ++ ++ if ((m_offset+numBytes) < m_size) ++ numBytesToRead = numBytes; ++ else ++ numBytesToRead = m_size - m_offset; ++ ++ numBytesRead = numBytesToRead; // about as paranoid as we can be.. ++ ++ if (numBytesToRead == 0) ++ return 0; ++ ++ long oldOffset = m_offset; ++ m_offset += numBytesToRead; ++ ++ return &m_data[oldOffset]; ++} ++ ++int WPXMemoryInputStream::seek(long offset, WPX_SEEK_TYPE seekType) ++{ ++ if (seekType == WPX_SEEK_CUR) ++ m_offset += offset; ++ else if (seekType == WPX_SEEK_SET) ++ m_offset = offset; ++ ++ if (m_offset < 0) ++ { ++ m_offset = 0; ++ return 1; ++ } ++ if ((long)m_offset > (long)m_size) ++ { ++ m_offset = m_size; ++ return 1; ++ } ++ ++ return 0; ++} ++ ++long WPXMemoryInputStream::tell() ++{ ++ return m_offset; ++} ++ ++bool WPXMemoryInputStream::atEOS() ++{ ++ if ((long)m_offset == (long)m_size) ++ return true; ++ ++ return false; ++} ++ ++#else // HAVE_LIBWPD_090 ++ + class WPXMemoryInputStream : public WPXInputStream + { + public: +@@ -138,6 +236,8 @@ bool WPXMemoryInputStream::atEOS() + return false; + } + ++#endif // HAVE_LIBWPD_090 ++ + class KWordHandler : public DocumentHandler + { + public: +@@ -250,7 +350,11 @@ KoFilter::ConversionStatus WPImport::convert( const TQCString& from, const TQCSt + // instream now owns buf, no need to delete buf later + WPXMemoryInputStream instream = WPXMemoryInputStream( buf, fsize ); + ++#ifdef HAVE_LIBWPD_090 ++ WPDConfidence confidence = WPDocument::isFileFormatSupported(&instream); ++#else // HAVE_LIBWPD_090 + WPDConfidence confidence = WPDocument::isFileFormatSupported(&instream, false); ++#endif // HAVE_LIBWPD_090 + if( confidence == WPD_CONFIDENCE_NONE ) + { + fprintf(stderr, "ERROR: We have no confidence that you are giving us a valid WordPerfect document.\n"); +diff --git a/subdirs b/subdirs +index 5e82c6f..9ba54a3 100644 +--- a/subdirs ++++ b/subdirs +@@ -1,6 +1,7 @@ + lib + interfaces + autocorrect ++chalk + doc + example + karbon +@@ -11,7 +12,6 @@ kivio + koshell + kounavail + kpresenter +-chalk + kspread + kugar + mimetypes +-- +cgit v0.9.0.2-52-g1de3 diff --git a/redhat/applications/koffice/koffice-3.5.13.2-fix_wpd_09_support_2.patch b/redhat/applications/koffice/koffice-3.5.13.2-fix_wpd_09_support_2.patch new file mode 100644 index 000000000..a024f98b4 --- /dev/null +++ b/redhat/applications/koffice/koffice-3.5.13.2-fix_wpd_09_support_2.patch @@ -0,0 +1,88 @@ +--- trinity-koffice-3.5.13.2/filters/kword/wordperfect/import/WordPerfectCollector.hxx.wpd2 2013-04-08 12:28:49.159409461 +0200 ++++ trinity-koffice-3.5.13.2/filters/kword/wordperfect/import/WordPerfectCollector.hxx 2013-04-08 12:29:01.170158682 +0200 +@@ -81,7 +81,7 @@ + class WordPerfectCollector : public WPXDocumentInterface + #else // HAVE_LIBWPD_090 + class WordPerfectCollector : public WPXHLListenerImpl +-#endif HAVE_LIBWPD_090 ++#endif // HAVE_LIBWPD_090 + { + public: + WordPerfectCollector(WPXInputStream *pInput, DocumentHandler *pHandler); +@@ -93,12 +93,12 @@ + virtual void startDocument(); + virtual void endDocument(); + virtual void definePageStyle(const WPXPropertyList &propList) {}; +- virtual void openPageSpan(const WPXPropertyList &propList) {}; +- virtual void closePageSpan() {}; +- virtual void openHeader(const WPXPropertyList &propList) {}; +- virtual void closeHeader() {}; +- virtual void openFooter(const WPXPropertyList &propList) {}; +- virtual void closeFooter() {}; ++ virtual void openPageSpan(const WPXPropertyList &propList); ++ virtual void closePageSpan(); ++ virtual void openHeader(const WPXPropertyList &propList); ++ virtual void closeHeader(); ++ virtual void openFooter(const WPXPropertyList &propList); ++ virtual void closeFooter(); + virtual void defineParagraphStyle(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops) {}; + virtual void openParagraph(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops); + virtual void closeParagraph(); +@@ -106,36 +106,36 @@ + virtual void openSpan(const WPXPropertyList &propList); + virtual void closeSpan(); + virtual void defineSectionStyle(const WPXPropertyList &propList, const WPXPropertyListVector &columns) {}; +- virtual void openSection(const WPXPropertyList &propList, const WPXPropertyListVector &columns) {}; +- virtual void closeSection() {}; ++ virtual void openSection(const WPXPropertyList &propList, const WPXPropertyListVector &columns); ++ virtual void closeSection(); + virtual void insertTab(); + virtual void insertSpace() {}; + virtual void insertText(const WPXString &text); + virtual void insertLineBreak(); + virtual void insertField(const WPXString &type, const WPXPropertyList &propList) {}; +- virtual void defineOrderedListLevel(const WPXPropertyList &propList) {}; +- virtual void defineUnorderedListLevel(const WPXPropertyList &propList) {}; +- virtual void openOrderedListLevel(const WPXPropertyList &propList) {}; +- virtual void openUnorderedListLevel(const WPXPropertyList &propList) {}; +- virtual void closeOrderedListLevel() {}; +- virtual void closeUnorderedListLevel() {}; +- virtual void openListElement(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops) {}; +- virtual void closeListElement() {}; +- virtual void openFootnote(const WPXPropertyList &propList) {}; +- virtual void closeFootnote() {}; +- virtual void openEndnote(const WPXPropertyList &propList) {}; +- virtual void closeEndnote() {}; ++ virtual void defineOrderedListLevel(const WPXPropertyList &propList); ++ virtual void defineUnorderedListLevel(const WPXPropertyList &propList); ++ virtual void openOrderedListLevel(const WPXPropertyList &propList); ++ virtual void openUnorderedListLevel(const WPXPropertyList &propList); ++ virtual void closeOrderedListLevel(); ++ virtual void closeUnorderedListLevel(); ++ virtual void openListElement(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops); ++ virtual void closeListElement(); ++ virtual void openFootnote(const WPXPropertyList &propList); ++ virtual void closeFootnote(); ++ virtual void openEndnote(const WPXPropertyList &propList); ++ virtual void closeEndnote(); + virtual void openComment(const WPXPropertyList &propList) {}; + virtual void closeComment() {}; + virtual void openTextBox(const WPXPropertyList &propList) {}; + virtual void closeTextBox() {}; +- virtual void openTable(const WPXPropertyList &propList, const WPXPropertyListVector &columns) {}; +- virtual void openTableRow(const WPXPropertyList &propList) {}; +- virtual void closeTableRow() {}; +- virtual void openTableCell(const WPXPropertyList &propList) {}; +- virtual void closeTableCell() {}; +- virtual void insertCoveredTableCell(const WPXPropertyList &propList) {}; +- virtual void closeTable() {}; ++ virtual void openTable(const WPXPropertyList &propList, const WPXPropertyListVector &columns); ++ virtual void openTableRow(const WPXPropertyList &propList); ++ virtual void closeTableRow(); ++ virtual void openTableCell(const WPXPropertyList &propList); ++ virtual void closeTableCell(); ++ virtual void insertCoveredTableCell(const WPXPropertyList &propList); ++ virtual void closeTable(); + virtual void openFrame(const WPXPropertyList &propList) {}; + virtual void closeFrame() {}; + virtual void insertBinaryObject(const WPXPropertyList &propList, const WPXBinaryData &data) {}; diff --git a/redhat/applications/kvirc/kvirc-3.5.13.2-fix_ftbfs.patch b/redhat/applications/kvirc/kvirc-3.5.13.2-fix_ftbfs.patch new file mode 100644 index 000000000..737ccaad6 --- /dev/null +++ b/redhat/applications/kvirc/kvirc-3.5.13.2-fix_ftbfs.patch @@ -0,0 +1,11 @@ +--- trinity-kvirc-3.5.13.2/configure.in.ORI 2013-06-04 00:16:19.407990544 +0200 ++++ trinity-kvirc-3.5.13.2/configure.in 2013-06-04 00:16:26.428844196 +0200 +@@ -20,7 +20,7 @@ + AM_MAINTAINER_MODE + + AC_PREFIX_DEFAULT(/usr/local) +-AM_CONFIG_HEADER(src/config.h) ++AC_CONFIG_HEADER(src/config.h) + + #------------------------------------------------------------------ + # HERE starts your real configure script diff --git a/redhat/dependencies/arts/arts-3.5.13.2-debug.patch b/redhat/dependencies/arts/arts-3.5.13.2-debug.patch new file mode 100644 index 000000000..1925292ab --- /dev/null +++ b/redhat/dependencies/arts/arts-3.5.13.2-debug.patch @@ -0,0 +1,12 @@ +--- trinity-arts-3.5.13.2~pre15+85a8c7ad/flow/audioionull.cc.ORI 2013-05-26 13:35:39.081803512 +0200 ++++ trinity-arts-3.5.13.2~pre15+85a8c7ad/flow/audioionull.cc 2013-05-26 13:36:02.342333674 +0200 +@@ -133,6 +133,9 @@ + if((_direction & directionWrite) && getParam(canWrite) >= _fragmentSize) + todo |= AudioSubSystem::ioWrite; + ++ fprintf(stderr, "AudioIO: can write %d, fragment size %d, todo %d\n", ++ getParam(canWrite), _fragmentSize, todo); ++ + if(!todo) + return; + diff --git a/redhat/dependencies/arts/arts-3.5.13.2-fix_esd_buffer.patch b/redhat/dependencies/arts/arts-3.5.13.2-fix_esd_buffer.patch new file mode 100644 index 000000000..c60be93f0 --- /dev/null +++ b/redhat/dependencies/arts/arts-3.5.13.2-fix_esd_buffer.patch @@ -0,0 +1,20 @@ +diff -Nuar trinity-arts-3.5.13.2.ORI/flow/audioioesd.cc trinity-arts-3.5.13.2.P/flow/audioioesd.cc +--- trinity-arts-3.5.13.2.ORI/flow/audioioesd.cc 2013-04-08 19:05:22.665624664 +0200 ++++ trinity-arts-3.5.13.2.P/flow/audioioesd.cc 2013-04-08 23:58:07.905872271 +0200 +@@ -204,14 +204,10 @@ + return write_fd; + + case canRead: +- return ESD_BUF_SIZE; ++ return param(fragmentSize); + + case canWrite: +- return ESD_BUF_SIZE; +- +- // ESD handles are actually socket descriptors, and I know not +- // of any portable way to peek at the socket's send or receive +- // buffers. ++ return param(fragmentSize); + + default: + return param(p); diff --git a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.2-fix_extra_module_dir.patch b/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.2-fix_extra_module_dir.patch new file mode 100644 index 000000000..ba57986f0 --- /dev/null +++ b/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.2-fix_extra_module_dir.patch @@ -0,0 +1,41 @@ +--- pykdeextensions-3.5.13.1/src/kdedistutils.py.extramodule 2012-09-08 17:33:05.000000000 +0000 ++++ pykdeextensions-3.5.13.1/src/kdedistutils.py 2012-10-02 19:19:40.185384207 +0000 +@@ -712,6 +712,8 @@ + + # Build the 'stub' code. + cppcode = self.cpptemplate % {"moduledir": self.data_dir, ++ "extramodule": os.getenv("EXTRA_MODULE_DIR"), ++ "pyqt_dir": self.pyqt_dir, + "modulename": modulename, + "factoryfunction": factoryfunction, + "python_version": python_version} +@@ -854,6 +856,8 @@ + #include + + #define MODULE_DIR "%(moduledir)s" ++#define EXTRA_MODULE_DIR "%(extramodule)s" ++#define PYQT_DIR "%(pyqt_dir)s" + #define MODULE_NAME "%(modulename)s" + #define FACTORY "%(factoryfunction)s" + #define CPP_FACTORY %(factoryfunction)s +--- pykdeextensions-3.5.13.1/src/kdedistutils.py.ORI 2013-04-07 17:54:28.531813437 +0200 ++++ pykdeextensions-3.5.13.1/src/kdedistutils.py 2013-04-07 17:56:15.510529614 +0200 +@@ -903,6 +906,18 @@ + if(!pyize->appendToSysPath (path.latin1 ())) { + return report_error ("***Failed to set sys.path\n"); + } ++ ++ // Add the extra path to the python script to the interpreter search path. ++ QString extrapath = QString(EXTRA_MODULE_DIR); ++ if(!pyize->appendToSysPath (extrapath.latin1 ())) { ++ return report_error ("***Failed to set extra sys.path\n"); ++ } ++ ++ // Add the PYQT path to the python script to the interpreter search path. ++ QString pyqt_dir = QString(PYQT_DIR); ++ if(!pyize->appendToSysPath (pyqt_dir.latin1 ())) { ++ return report_error ("***Failed to set PYQT sys.path\n"); ++ } + + // Load the Python script. + PyObject *pyModule = pyize->importModule ((char *)script.latin1 ()); diff --git a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.2-fix_include_dir.patch b/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.2-fix_include_dir.patch new file mode 100644 index 000000000..2d6863f65 --- /dev/null +++ b/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.2-fix_include_dir.patch @@ -0,0 +1,11 @@ +--- pykdeextensions/src/kdedistutils.py.ORI 2012-08-27 22:10:18.873738368 +0200 ++++ pykdeextensions/src/kdedistutils.py 2012-08-27 22:10:50.234094262 +0200 +@@ -539,7 +539,7 @@ + canidatepaths.append(os.path.join(kdedir,"include")) + canidatepaths.append(os.path.join(install.prefix,"include")) + canidatepaths.append('/opt/trinity/include') +- canidatepaths.append('/opt/kde/include') ++ canidatepaths.append('/opt/trinity/include/tde') + self.kde_inc_dir = FindFileInPaths('kapplication.h',canidatepaths) + if self.kde_inc_dir is None: + raise SystemExit, "Failed to find the KDE header file directory." diff --git a/redhat/libraries/python-trinity/python-trinity-3.5.13.2-fix_tde_includedir.patch b/redhat/libraries/python-trinity/python-trinity-3.5.13.2-fix_tde_includedir.patch new file mode 100644 index 000000000..5921695e8 --- /dev/null +++ b/redhat/libraries/python-trinity/python-trinity-3.5.13.2-fix_tde_includedir.patch @@ -0,0 +1,11 @@ +--- trinity-python-trinity-3.5.13.2/configure.py.ORI 2013-01-20 14:28:38.844683333 +0100 ++++ trinity-python-trinity-3.5.13.2/configure.py 2013-01-20 14:29:05.179062079 +0100 +@@ -410,7 +410,7 @@ + + if not opt_kdeincdir: + incSearchPaths = [os.path.join (opt_kdebasedir, "include")] +- incSearchPaths.append (os.path.join (opt_kdebasedir, "include", "kde")) # Red Hat ++ incSearchPaths.append (os.path.join (opt_kdebasedir, "include", "tde")) # Red Hat + opt_kdeincdir = search ("kapplication.h", incSearchPaths) + + def check_kde_installation(): diff --git a/redhat/tde-i18n/tde-3.5.13.2-admin.patch b/redhat/tde-i18n/tde-3.5.13.2-admin.patch new file mode 100644 index 000000000..4b27f5a90 --- /dev/null +++ b/redhat/tde-i18n/tde-3.5.13.2-admin.patch @@ -0,0 +1,44 @@ +Index: b/admin/cvs.sh +=================================================================== +--- a/admin/cvs.sh 2013-05-22 17:34:41.870203477 +0200 ++++ b/admin/cvs.sh 2013-05-22 17:35:08.553206290 +0200 +@@ -68,7 +68,7 @@ + echo "*** KDE requires automake $required_automake_version" + exit 1 + ;; +- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11* | automake*1.12*) ++ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11* | automake*1.12* | automake*1.13* ) + echo "*** $AUTOMAKE_STRING found." + UNSERMAKE=no + ;; +@@ -128,7 +128,7 @@ + echo "*** Creating configure" + call_and_fix_autoconf + +-if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then ++if egrep "^A[MC]_CONFIG_HEADER" configure.in >/dev/null 2>&1; then + echo "*** Creating config.h template" + $AUTOHEADER || exit 1 + touch config.h.in +@@ -184,7 +184,7 @@ + fi + fi + $ACLOCAL $ACLOCALFLAGS +-if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then ++if egrep "^A[MC]_CONFIG_HEADER" configure.in >/dev/null 2>&1; then + echo "*** Creating config.h template" + $AUTOHEADER || exit 1 + touch config.h.in +Index: b/admin/configure.in.min +=================================================================== +--- a/admin/configure.in.min 2013-05-22 17:34:41.878202494 +0200 ++++ b/admin/configure.in.min 2013-05-22 17:34:43.385704000 +0200 +@@ -41,7 +41,7 @@ + KDE_SET_PREFIX + + dnl generate the config header +-AM_CONFIG_HEADER(config.h) dnl at the distribution this done ++AC_CONFIG_HEADER(config.h) dnl at the distribution this done + + dnl Checks for programs. + AC_PROG_CC diff --git a/redhat/tde-i18n/trinity-tde-i18n-fr-3.5.13.2-updates.patch b/redhat/tde-i18n/trinity-tde-i18n-fr-3.5.13.2-updates.patch new file mode 100644 index 000000000..5f0844433 --- /dev/null +++ b/redhat/tde-i18n/trinity-tde-i18n-fr-3.5.13.2-updates.patch @@ -0,0 +1,578 @@ +--- tde-i18n-fr/messages/kdelibs/kdelibs.po.ORI 2013-05-11 13:46:34.210204854 +0200 ++++ tde-i18n-fr/messages/kdelibs/kdelibs.po 2013-05-11 13:47:23.882174000 +0200 +@@ -5659,8 +5659,36 @@ + msgstr "À &propos" + + #: kdeui/kaboutkde.cpp:84 +-msgid "&Report Bugs or Wishes" +-msgstr "Rapport de bogues et &souhaits" ++msgid "&Report Bugs/Request Enhancements" ++msgstr "Rapport de bogues / &Améliorations" ++ ++msgid "&Report Bug/Request Enhancement..." ++msgstr "&Rapport de bogue/Amélioration..." ++ ++msgid "" ++"Reporting bugs and requesting enhancements are maintained using the Bugzilla reporting system.\n" ++"You'll need a login account and password to use the reporting system.\n" ++"To control spam and rogue elements the login requires a valid email address.\n" ++"Consider using any large email service if you want to avoid using your private email address.\n" ++"\n" ++"Selecting the button below opens your web browser to http://bugs.trinitydesktop.org,\n" ++"where you will find the report form.\n" ++"The information displayed above will be transferred to the reporting system.\n" ++"Session cookies must be enabled to use the reporting system.\n" ++"\n" ++"Thank you for helping!" ++msgstr "" ++"Les rapports de bogues et demandes d'améliorations sont traités par le système Bugzilla.\n" ++"Vous devez posséder un identifiant et un mot de passe pour utiliser le système de rapport.\n" ++"Pour éviter le spam et les rapports indésirables, vous devez avoir une adresse email valide.\n" ++"Vous pouvez créer une adresse email spécifique si vous ne voulez pas utiliser votre adresse email privée.\n" ++"\n" ++"Cliquez sur le bouton ci-dessous pour ouvrir votre navigateur à l'adresse http://bugs.trinitydesktop.org,\n" ++"où vous trouverez le formulaire de rapport.\n" ++"Les informations affichés ci-dessus seront transférées au système de rapport.\n" ++"Les cookies de session doivent être activés pour utiliser le système de rapport.\n" ++"\n" ++"Merci pour votre aide!" + + #: kdeui/kaboutkde.cpp:85 + msgid "&Join the Trinity Team" +--- tde-i18n-fr/messages/kdebase/krandr.po.ORI 2013-05-11 13:51:27.100137014 +0200 ++++ tde-i18n-fr/messages/kdebase/krandr.po 2013-05-11 13:57:36.051526232 +0200 +@@ -331,3 +331,24 @@ + #: configdialog.cpp:49 + msgid "Global &Shortcuts" + msgstr "Raccourcis Globaux" ++ ++msgid "Start KRandRTray automatically when you log in?" ++msgstr "Démarrer KRandRTray automatiquement à l'ouverture de session ?" ++ ++msgid "Start Automatically" ++msgstr "Démarrer automatiquement" ++ ++msgid "Do Not Start" ++msgstr "Ne pas démarrer" ++ ++msgid "Output Port" ++msgstr "Sortie Vidéo" ++ ++msgid "Next available output" ++msgstr "Sortie Vidéo suivante" ++ ++#, c-format ++msgid "%1 (Active)" ++msgstr "%1 (Active)" ++ ++ +--- /dev/null 2013-05-11 10:08:04.442569174 +0200 ++++ tde-i18n-fr/messages/kdebase/kcmdisplayconfig.po 2013-05-11 14:23:12.893229163 +0200 +@@ -0,0 +1,123 @@ ++msgid "The global display configuration is a system wide setting, and requires administrator access
To alter the system's global display configuration, click on the \"Administrator Mode\" button below." ++msgstr "La configuration d'affichage globale est un réglage système, et nécessite les droits administrateur.
Pour modifier la configuration système globale, cliquer sur le bouton \"Mode superutilisateur\"." ++ ++msgid "Color Profiles" ++msgstr "Profils de couleurs" ++ ++msgid "

Monitor & Display Configuration

This module allows you to configure monitors attached to your computer via TDE." ++msgstr "

Configuration de l'affichage

Ce module permet de configurer les moniteurs attachés à votre ordinateur via TDE." ++ ++msgid "Global Settings" ++msgstr "Paramètres globaux" ++ ++msgid "Global" ++msgstr "Général" ++ ++msgid "&Enable global display control" ++msgstr "&Activer le contrôle de l'affichage" ++ ++msgid "Resolution and Layout" ++msgstr "Résolution et disposition" ++ ++msgid "Monitors" ++msgstr "Moniteurs" ++ ++msgid "Drag the monitor icons to match the physical arrangement of your monitors." ++msgstr "Déplacez les icônes pour qu'elles correspondent à la disposition de vos moniteurs." ++ ++msgid "Display:" ++msgstr "Sortie Vidéo:" ++ ++msgid "&Screen resolution" ++msgstr "&Résolution de l'écran:" ++ ++msgid "Less" ++msgstr "Moins" ++ ++msgid "More" ++msgstr "Plus" ++ ++msgid "unset" ++msgstr "Non définie" ++ ++msgid "&Refresh rate" ++msgstr "&Taux de rafraichissement" ++ ++msgid "Screen Transformations" ++msgstr "Transformation de l'écran" ++ ++msgid "&Mirror screen horizontally" ++msgstr "Miroir &horizonal" ++ ++msgid "Mirror screen &vertically" ++msgstr "Miroir &vertical" ++ ++msgid "&Use this device as the primary monitor." ++msgstr "Utiliser en tant que moniteur &primaire." ++ ++msgid "&Extend my Trinity desktop onto this monitor." ++msgstr "&Etendre mon bureau Trinity sur ce moniteur." ++ ++msgid "&Rescan Displays" ++msgstr "&Redétecter les écrans" ++ ++msgid "Load &Existing Profile" ++msgstr "Charger un profil &existant." ++ ++msgid "&Test Settings" ++msgstr "&Tester les réglages" ++ ++msgid "&Identify" ++msgstr "&Identifier" ++ ++msgid "Brightness and Gamma" ++msgstr "Luminosité et Gamma" ++ ++msgid "Visual Calibration Aid" ++msgstr "Aide visuelle à la calibration" ++ ++msgid "Target gamma:" ++msgstr "Gamma cible:" ++ ++msgid "Hardware Gamma Control" ++msgstr "Contrôle du Gamma matériel" ++ ++msgid "All" ++msgstr "Tous" ++ ++msgid "Red" ++msgstr "Rouge" ++ ++msgid "Green" ++msgstr "Vert" ++ ++msgid "Blue" ++msgstr "Bleu" ++ ++msgid "Adjust the gamma sliders to make the squares above fade into their backgrounds as much as possible." ++msgstr "Ajustez les niveaux de gamma jusqu'à ce que les carrés disparaissent dans le fond autant que possible." ++ ++msgid "Tip: Most computer software expects a gamma of 2.2.\\nAdditionally, any ICC settings for the selected screen will override the gamma controls available on this tab." ++msgstr "Astuce: La plupart des logiciels attendent un gamma de 2.2.
De plus, les réglages ICC spécifiques pour l'écran sélectionné, s'ils existent, seront prioritaires sur ceux-ci." ++ ++msgid "Power Management" ++msgstr "Gestion de l'Energie" ++ ++msgid "Energy Star (DPMS)" ++msgstr "Energy Star (DPMS)" ++ ++msgid "&Enable DPMS power save modes" ++msgstr "&Activer les modes d'économie d'énergie DPMS" ++ ++msgid "Enable &standby after" ++msgstr "Interrompre l'écran après" ++ ++msgid "Enable &suspend after" ++msgstr "Activer la mise en veille après" ++ ++msgid "Enable &power down after" ++msgstr "Activer l'arrêt après" ++ ++msgid "minutes." ++msgstr "minutes." ++ +--- tde-i18n-fr/messages/kdebase/kicker.po.ORI 2013-05-11 20:59:51.416285023 +0200 ++++ tde-i18n-fr/messages/kdebase/kicker.po 2013-05-11 21:01:03.139885540 +0200 +@@ -889,6 +889,24 @@ + msgid "My Documents" + msgstr "Mes Documents" + ++msgid "My Images" ++msgstr "Mes Images" ++ ++msgid "My Music" ++msgstr "Ma Musique" ++ ++msgid "My Videos" ++msgstr "Mes Vidéos" ++ ++msgid "My Downloads" ++msgstr "Mes Téléchargements" ++ ++msgid "Switch to Kickoff Menu Style" ++msgstr "Utiliser le menu Kickoff" ++ ++msgid "Switch to Trinity Classic Menu Style" ++msgstr "Utiliser le menu Classique" ++ + msgid "Network Folders" + msgstr "Dossiers Réseau" + +--- tde-i18n-fr/messages/kdebase/kcmsmserver.po.ORI 2013-05-11 21:07:13.314644518 +0200 ++++ tde-i18n-fr/messages/kdebase/kcmsmserver.po 2013-05-11 21:12:44.468153019 +0200 +@@ -63,6 +63,12 @@ + "Cochez cette option si vous désirez que le gestionnaire de session affiche une " + "demande de confirmation avant d'arrêter la session." + ++msgid "Show fancy &logout fadeaway" ++msgstr "Afficher un fondu gris lors de la déconnexion" ++ ++msgid "Show logout stat&us dialog" ++msgstr "Afficher la fenêtre d'état de déconnexion" ++ + #. i18n: file smserverconfigdlg.ui line 62 + #: rc.cpp:15 + #, no-c-format +@@ -177,3 +180,16 @@ + "Vous pouvez saisir ici une liste (séparée par des virgules) des applications " + "qui ne doivent pas être enregistrées, et qui ne seront par conséquent pas " + "relancées lorsque la session sera restaurée. Par exemple, « xterm,xconsole »." ++ ++msgid "The new window manager will be used when TDE is started the next time." ++msgstr "Le nouveau gestionnaire de fenêtres sera utilisé au prochain démarrage de TDE." ++ ++msgid "Window manager change" ++msgstr "Modification du gestionnaire de fenêtres" ++ ++msgid "KWin (KDE default)" ++msgstr "TWin (par défaut)" ++ ++msgid "Window Manager" ++msgstr "Gestionnaire de fenêtres" ++ +--- tde-i18n-fr/messages/kdebase/kcmkdnssd.po.ORI 2013-05-11 21:14:32.762027927 +0200 ++++ tde-i18n-fr/messages/kdebase/kcmkdnssd.po 2013-05-11 21:15:59.767319820 +0200 +@@ -184,3 +184,7 @@ + + #~ msgid "Alt+I" + #~ msgstr "Alt+I" ++ ++msgid "Enable &Zeroconf network browsing" ++msgstr "Activer le parcours du réseau avec Zeroconf" ++ +--- tde-i18n-fr/messages/kdebase/kcmenergy.po.ORI 2013-05-11 21:18:10.672748597 +0200 ++++ tde-i18n-fr/messages/kdebase/kcmenergy.po 2013-05-11 21:19:44.590902968 +0200 +@@ -102,3 +102,10 @@ + "Choisissez la période d'inactivité après laquelle l'affichage doit être éteint. " + "Ceci est le plus haut niveau d'économie d'énergie qui puisse être utilisé " + "lorsque l'écran est physiquement allumé." ++ ++msgid "&Enable specific display power management" ++msgstr "&Activer la gestion spécifique de l'énergie" ++ ++msgid "Configure KPowersave..." ++msgstr "Configurer KPowersave..." ++ +--- tde-i18n-fr/messages/kdebase/kio_media.po.ORI 2013-05-11 21:43:21.810972521 +0200 ++++ tde-i18n-fr/messages/kdebase/kio_media.po 2013-05-11 21:43:43.080556048 +0200 +@@ -564,3 +564,7 @@ + #: propsdlgplugin/propsdlgshareplugin.cpp:67 + msgid "&Mounting" + msgstr "&Montage" ++ ++msgid "Decrypt" ++msgstr "Décrypter" ++ +--- tde-i18n-fr/messages/kdebase/kcmmedia.po.ORI 2013-05-11 21:52:54.856736846 +0200 ++++ tde-i18n-fr/messages/kdebase/kcmmedia.po 2013-05-11 21:53:11.780404569 +0200 +@@ -216,3 +216,10 @@ + #, no-c-format + msgid "Command:" + msgstr "Commande :" ++ ++msgid "Mount options" ++msgstr "Options de montage par défaut" ++ ++msgid "Here you can specify default mount options for your storage media. Please note that some options are not supported for certain filesystems and/or medium. You will be able to redefine all these options on per-volume basis later, using Properties dialog of the corresponding volume.
\nSome of the options are tristate. Leave them \"undefined\" to let KDE choose the best value depending on your media." ++msgstr "Vous pouvez spécifier ici les options de montage par défaut pour les périphériques amovibles. Veuillez noter que certaines options ne sont pas supportées avec certains systèmes de fichiers ou médias. Vous pourrez redéfinir individuellement toutes ces options pour chaque média ultérieurement, en utilisant la boite de dialogue Propriétés sur ce média.
\nCertaines options ont 3 états. Laissez-les grisées pour laisser TDE choisir la meilleure valeur pour vous." ++ +--- tde-i18n-fr/messages/kdebase/kcmkonq.po.ORI 2013-05-11 22:03:57.845711507 +0200 ++++ tde-i18n-fr/messages/kdebase/kcmkonq.po 2013-05-11 22:07:46.429213872 +0200 +@@ -64,6 +64,17 @@ + "seule fenêtre. Quand cette option n'est pas cochée, tous les transferts " + "apparaissent dans des fenêtres séparées." + ++msgid "Show archived &files as folders" ++msgstr "Afficher les fichiers &archives comme des dossiers" ++ ++msgid "" ++"Checking this option will list archived" ++" files as folders when using tree view." ++ ++msgstr "" ++"Si vous cochez cette option, tous les fichiers archives (ZIP, TAR ...)" ++" seront affichés comme des dossiers dans l'explorateur de fichiers." ++ + #: behaviour.cpp:85 + msgid "Show file &tips" + msgstr "Af&ficher les info-bulles des fichiers" +--- tde-i18n-fr/messages/kdebase/kcmkicker.po.ORI 2013-05-11 23:14:47.566479096 +0200 ++++ tde-i18n-fr/messages/kdebase/kcmkicker.po 2013-05-11 23:29:07.733152080 +0200 +@@ -1032,12 +1032,22 @@ + "y configurer l'aspect et le comportement des poignées d'applets, la teinture de " + "la transparence et d'autres choses." + ++ ++msgid "Start menu style:" ++msgstr "Style de menu démarrer:" ++ ++msgid "Trinity Classic" ++msgstr "Classique" ++ + #. i18n: file menutab.ui line 27 + #: rc.cpp:369 + #, no-c-format + msgid "K Menu" + msgstr "Menu K" + ++msgid "Open menu on mouse hover" ++msgstr "Ouvrir le menu au survol de la souris" ++ + #. i18n: file menutab.ui line 49 + #: rc.cpp:372 + #, no-c-format +@@ -1122,6 +1126,15 @@ + msgid "Show side ima&ge" + msgstr "Afficher le &bandeau latéral" + ++msgid "Display text in K Menu button" ++msgstr "Afficher du texte sur le bouton K Menu" ++ ++msgid "Text:" ++msgstr "Texte:" ++ ++msgid "K Menu button icon:" ++msgstr "Icone du bouton K Menu:" ++ + #. i18n: file menutab.ui line 126 + #: rc.cpp:405 + #, no-c-format +@@ -1281,6 +1300,42 @@ + "Lorsque cette option est sélectionnée, la zone du menu « sous la main » " + "contiendra les applications les plus utilisées." + ++msgid "Show T&ooltip" ++msgstr "Afficher les info-bulles" ++ ++msgid "When this option is selected, a tooltip appears when hovering the mouse pointer over Application Launcher Menu items. Enabling this option also requires that tooltips are enabled in the Panels->Appearance configuration dialog." ++msgstr "Cette option affiche une info-bulle lorsque la souris survole les applications dans le menu de démarrage. Cette option nécessite que les bulles d'aide soient activées dans la rubrique Tableau de bords->Apparence" ++ ++msgid "Recent Documents Menu" ++msgstr "Menus des documents récents" ++ ++msgid "K Menu Search" ++msgstr "Menus de recherche" ++ ++msgid "Show search field in K Menu" ++msgstr "Afficher le champ de recherche dans le menu K" ++ ++msgid "Blur the background when transparency is enabled" ++msgstr "Flouter le fond d'écran lorsque la transparence est activée" ++ ++msgid "When checked, the displayed semi-transparent background image will be blurred to reduce eyestrain" ++msgstr "Si vous cochez cette case, le fond d'écran semi-transparent sera flouté pour réduire la fatigue visuelle" ++ ++msgid "Show resize handle on panels" ++msgstr "Afficher les poignées de redimensionnement" ++ ++msgid "Enabling this option will show a resize handle on the resizable end of each panel." ++msgstr "Activer cette option affichera une poignée de redimensionnement à chaque extremité de chaque panneau." ++ ++msgid "Use deep buttons" ++msgstr "Utiliser des textures profonds" ++ ++msgid "Enabling this option will yield more highly textured panels." ++msgstr "Activer cette option affichera des panneaux davantage texturés." ++ ++msgid "Enable icon activation effects" ++msgstr "Activer les effets d'activation des icones" ++ + #. i18n: file positiontab.ui line 17 + #: rc.cpp:464 + #, no-c-format +--- tde-i18n-fr/messages/kdebase/ksmserver.po.ORI 2013-05-12 22:22:06.947460769 +0200 ++++ tde-i18n-fr/messages/kdebase/ksmserver.po 2013-05-12 22:26:35.822041371 +0200 +@@ -103,3 +103,39 @@ + msgid "Saving your settings..." + msgstr "Enregistrement de vos paramètres ..." + ++msgid "Would you like to turn off your computer?" ++msgstr "Souhaitez-vous éteindre votre ordinateur ?" ++ ++msgid "" ++"This computer will turn off automatically\n" ++"after %1 seconds." ++msgstr "" ++"Cet ordinateur s'éteindra automatiquement\n" ++"dans %1 secondes." ++ ++msgid "Would you like to reboot your computer?" ++msgstr "Souhaitez-vous redémarrer votre ordinateur ?" ++ ++msgid "Would you like to reboot to \"%1\"?" ++msgstr "Voulez-vous redémarrer \"%1\" ?" ++ ++msgid "" ++"This computer will reboot automatically\n" ++"after %1 seconds." ++msgstr "" ++"Cet ordinateur redémarrera automatiquement\n" ++"après %1 secondes." ++ ++msgid "Would you like to end your current session?" ++msgstr "Souhaitez-vous fermer votre session ?" ++ ++msgid "" ++"This session will end\n" ++"after %1 seconds automatically." ++msgstr "" ++"Cette session sera fermée automatiquement\n" ++"après %1 secondes." ++ ++msgid "Confirm" ++msgstr "Confirmer" ++ +--- tde-i18n-fr/messages/kdebase/kcmkonqhtml.po.ORI 2013-05-12 22:40:57.371286882 +0200 ++++ tde-i18n-fr/messages/kdebase/kcmkonqhtml.po 2013-05-12 22:45:34.458496871 +0200 +@@ -1546,3 +1546,21 @@ + #, no-c-format + msgid "Use a&rtsdsp to pipe plugin sound through aRts" + msgstr "Utiliser « a&rtsdsp » pour rediriger le son du module vers aRts" ++ ++msgid "Sm&ooth scrolling" ++msgstr "Déflilement fluide" ++ ++msgid "Enabled" ++msgstr "Activé" ++ ++msgid "Disabled" ++msgstr "Désactivé" ++ ++msgid "" ++"Determines whether Konqueror should use smooth steps to scroll HTML pages, or whole steps:
" ++"
  • Always: Always use smooth steps when scrolling.
    • " ++"
  • Never: Never use smooth scrolling, scroll with whole steps instead.
    • " ++msgstr "" ++"Détermine si Konqueror doit utiliser un défilement fluide des pages HTML, ou un défilement par étapes:
    " ++"
    • Toujours: Toujours utiliser le défilement fluide.
      • " ++"
    • Jamais: Ne jamais utiliser le défilement fluide, défiler pas par pas.
      • " +--- tde-i18n-fr/messages/kdebase/kcmkwm.po.ORI 2013-05-12 22:53:03.442689656 +0200 ++++ tde-i18n-fr/messages/kdebase/kcmkwm.po 2013-05-12 23:06:59.007771110 +0200 +@@ -1185,3 +1185,22 @@ + msgstr "" + "La gestion de la transparence est récente et peut causer des problèmes, " + "
      incluant des plantages (du moteur de transparence ou même de X).      " ++ ++msgid "Enable the Trinity window composition manager" ++msgstr "Activer le gestionnaire de composition de fenêtres de Trinity" ++ ++msgid "Use shadows (standard effects should be disabled in the Styles module if this is checked)" ++msgstr "Utiliser les ombres (l'effet standard d'ombre doit être désactivé dans le menu Styles)" ++ ++msgid "Base shadow size:" ++msgstr "Taille de base de l'ombre:" ++ ++msgid "Active window shadow size multiplier:" ++msgstr "Multiplier la taille de l'ombre de la fenêtre active:" ++ ++msgid "Dock shadow size multiplier:" ++msgstr "Multiplier la taille de l'ombre du dock:" ++ ++msgid "Fade-in menus (requires menu fade effect to be disabled in the Styles module)" ++msgstr "Apparition progressive des menus (nécessite que l'apparition progressive soit désactivée dans le menu Styles)" ++ +--- tde-i18n-fr/messages/kdebase/kcmscreensaver.po.ORI 2013-05-14 23:49:35.272995867 +0200 ++++ tde-i18n-fr/messages/kdebase/kcmscreensaver.po 2013-05-15 00:00:03.074900231 +0200 +@@ -338,3 +338,33 @@ + #: scrnsave.cpp:470 + msgid "Loading..." + msgstr "Chargement..." ++ ++msgid "&Delay saver start after lock" ++msgstr "Retarder l'économiseur d'écran" ++ ++msgid "When manually locking the screen, wait to start the screen saver until the configured start delay has elapsed." ++msgstr "Lors du verrouillage manuel de l'écran, attendre le délai indiqué pour démarrer l'économiseur d'écran." ++ ++msgid "&Use Secure Attention Key" ++msgstr "Utiliser les touches de sécurité" ++ ++msgid "Require Secure Attention Key prior to displaying the unlock dialog." ++msgstr "Exiger l'appui sur CTRL+ALT+SUPPR avant de demander le mot de passe." ++ ++msgid "Use &legacy lock windows" ++msgstr "Utiliser l'ancienne fenêtre de verrouillage" ++ ++msgid "Use old-style unmanaged X11 lock windows." ++msgstr "Utiliser l'ancienne fenêtre X11 de verrouillage, non gérée par Trinity." ++ ++msgid "&Hide active windows from saver" ++msgstr "&Masquer les fenêtres actives" ++ ++msgid "Hide all active windows from the screen saver and use the desktop background as the screen saver input." ++msgstr "Masquer toutes les fenêtres actives et afficher le fond d'écran lorsque l'économiseur d'écran est déclenché." ++ ++msgid "&Vibrate unlock dialog box on failure" ++msgstr "&Vibrer en cas d'échec de déverrouillage" ++ ++msgid "Makes the unlock dialog box vibrate when entering an incorrect password." ++msgstr "Faire vibrer la fenêtre de déverrouillage lorsqu'un mauvais mot de passe est saisi." +--- tde-i18n-fr/messages/kdebase/kdmconfig.po.ORI 2013-05-15 00:01:50.557981168 +0200 ++++ tde-i18n-fr/messages/kdebase/kdmconfig.po 2013-05-15 00:03:54.685758336 +0200 +@@ -895,3 +895,24 @@ + "_: EMAIL OF TRANSLATORS\n" + "Your emails" + msgstr "cousin@kde.org,caulier.gilles@free.fr,kde@macolu.org" ++ ++msgid "Secure Attention Key" ++msgstr "Touches de sécurité" ++ ++msgid "Enable Secure Attention Key" ++msgstr "Activer les touches de sécurité" ++ ++msgid "Secure Attention Key support is not available on your system. Please check for the presence of evdev and uinput." ++msgstr "Le support des touches de sécurité n'est pas disponible sur votre système. Veuillez vérifier la présence de evdev et uinput." ++ ++msgid "Here you can enable or disable the Secure Attention Key [SAK] anti-spoofing measure." ++msgstr "Vous pouvez activer ou désactiver les touches de sécurité, mesure anti-usurpation." ++ ++msgid "Restart X-Server with session exit" ++msgstr "Redémarrer le serveur X après la fermeture de la session." ++ ++msgid "Whether the login manager should restart the local X-Server after a session exit instead of resetting. Use this when the X-Server leaks memory, crashes the system on reset attempts, or otherwise exhibits display issues." ++msgstr "Spécifie si le gestionnaire de connexion doit redémarrer le serveur X local après une fermeture de session au lieu de le réinitialiser. Utilisez cette option si le serveur X a des problèmes de stabilité, d'affichage, ou des fuite mémoire." ++ ++msgid "Allow &Root Login" ++msgstr "Autoriser la connexion en tant qu'utilisateur &Root" +--- tde-i18n-fr/messages/kdebase/kcmbackground.po.ORI 2013-05-15 20:43:56.647074858 +0200 ++++ tde-i18n-fr/messages/kdebase/kcmbackground.po 2013-05-15 20:46:02.044250812 +0200 +@@ -920,3 +920,9 @@ + #, no-c-format + msgid "Move &Up" + msgstr "Mon&ter" ++ ++msgid "Cross-fading background" ++msgstr "Affichage progressif du fond d'écran" ++ ++msgid "Enables a smooth fading effect when changing background image." ++msgstr "Activer un effet de fondu lors du changement de fond d'écran." +--- tde-i18n-fr/messages/kdebase/kminipagerapplet.po.ORI 2013-05-17 21:28:37.998756359 +0200 ++++ tde-i18n-fr/messages/kdebase/kminipagerapplet.po 2013-05-17 21:29:50.398145568 +0200 +@@ -193,3 +193,6 @@ + #, no-c-format + msgid "Show window icons in previews?" + msgstr "Afficher les icônes des fenêtres dans les aperçus ?" ++ ++msgid "&Cycle on Wheel" ++msgstr "&Changer de bureau à la molette" diff --git a/redhat/tdebase/kdebase-3.5.13.2-add_ck_shutdown.patch b/redhat/tdebase/kdebase-3.5.13.2-add_ck_shutdown.patch new file mode 100644 index 000000000..b862f00ca --- /dev/null +++ b/redhat/tdebase/kdebase-3.5.13.2-add_ck_shutdown.patch @@ -0,0 +1,15 @@ +--- trinity-tdebase-3.5.13.2/kdmlib/dmctl.cpp.ORI 2013-02-15 22:22:05.217381830 +0100 ++++ trinity-tdebase-3.5.13.2/kdmlib/dmctl.cpp 2013-02-15 22:52:06.635823349 +0100 +@@ -180,7 +180,12 @@ + if (DMType == GDM) + return exec( "QUERY_LOGOUT_ACTION\n", re ) && re.find("HALT") >= 0; + ++#ifdef WITH_CONSOLE_KIT ++ // Use consolekit to check if we can shutdown the computer ++ return exec( "dbus-send --system --print-reply --dest=org.freedesktop.ConsoleKit /org/freedesktop/ConsoleKit/Manager org.freedesktop.ConsoleKit.Manager.CanStop\n", re ) && re.find("boolean true") >= 0; ++#else + return exec( "caps\n", re ) && re.find( "\tshutdown" ) >= 0; ++#endif + } + + void diff --git a/redhat/tdebase/kdebase-3.5.13.2-add_disable_composite_option.patch b/redhat/tdebase/kdebase-3.5.13.2-add_disable_composite_option.patch new file mode 100644 index 000000000..4dc2e72f1 --- /dev/null +++ b/redhat/tdebase/kdebase-3.5.13.2-add_disable_composite_option.patch @@ -0,0 +1,81 @@ +--- kdebase/kdesktop/bgmanager.cc.ORI 2012-09-06 17:20:49.564915154 -0400 ++++ kdebase/kdesktop/bgmanager.cc 2012-09-06 17:21:01.969682348 -0400 +@@ -1013,13 +1013,13 @@ + slotChangeDesktop(0); + } + +-#ifdef COMPOSITE + void KBackgroundManager::slotCmBackgroundChanged( bool ) + { ++#ifdef COMPOSITE + m_tPixmap->fill(TQColor(0, 0x0)); + m_Hash = 0; + slotChangeDesktop(0); +-} + #endif ++} + + #include "bgmanager.moc" +--- kdebase/kdesktop/main.cc.ORI 2012-09-07 20:33:09.716283507 +0200 ++++ kdebase/kdesktop/main.cc 2012-09-07 20:33:31.683842727 +0200 +@@ -43,7 +43,7 @@ + #include + #include + +-#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300 ++#if defined(WITH_COMPOSITE) && defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300 + #define COMPOSITE + #endif + +--- kdebase/kdesktop/bgmanager.h.ORI 2012-09-07 20:36:28.196299160 +0200 ++++ kdebase/kdesktop/bgmanager.h 2012-09-07 20:36:52.420812591 +0200 +@@ -15,7 +15,7 @@ + + #include + +-#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300 ++#if defined(WITH_COMPOSITE) && defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300 + #define COMPOSITE + #endif + +--- kdebase/kdesktop/kdesktopapp.h.ORI 2012-09-07 20:37:14.677365503 +0200 ++++ kdebase/kdesktop/kdesktopapp.h 2012-09-07 20:37:25.194154223 +0200 +@@ -23,7 +23,7 @@ + #include + #include + +-#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300 ++#if defined(WITH_COMPOSITE) && defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300 + #define COMPOSITE + #endif + +--- kdebase/konsole/konsole/main.cpp.ORI 2012-09-07 20:37:37.749901966 +0200 ++++ kdebase/konsole/konsole/main.cpp 2012-09-07 20:37:46.683722469 +0200 +@@ -46,7 +46,7 @@ + + #include "konsole.h" + +-#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300 ++#if defined(WITH_COMPOSITE) && defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300 + #define COMPOSITE + #endif + +--- trinity-tdebase-3.5.13.2/CMakeLists.txt.composite 2013-06-16 21:49:33.742313671 +0200 ++++ trinity-tdebase-3.5.13.2/CMakeLists.txt 2013-06-16 21:49:40.485177448 +0200 +@@ -82,6 +82,7 @@ + option( WITH_I8K "Enable Dell laptop support (ksysguard)" ${WITH_ALL_OPTIONS} ) + option( WITH_HAL "Enable HAL support" ${WITH_ALL_OPTIONS} ) + option( WITH_KDESKTOP_LOCK_BACKTRACE "Enable backtrace in kdesktop_lock exception handler" ${WITH_ALL_OPTIONS} ) ++option( WITH_COMPOSITE "Enable COMPOSITE support" OFF ) + + + ##### user requested modules #################### +--- trinity-tdebase-3.5.13.2/config.h.cmake.composite 2013-06-16 21:50:04.626689570 +0200 ++++ trinity-tdebase-3.5.13.2/config.h.cmake 2013-06-16 21:50:13.094518380 +0200 +@@ -188,3 +188,6 @@ + // Kickoff menu + #cmakedefine KICKOFF_DIST_CONFIG_SHORTCUT1 "@KICKOFF_DIST_CONFIG_SHORTCUT1@" + #cmakedefine KICKOFF_DIST_CONFIG_SHORTCUT2 "@KICKOFF_DIST_CONFIG_SHORTCUT2@" ++ ++// kdesktop, konsole ++#cmakedefine WITH_COMPOSITE "@WITH_COMPOSITE@" diff --git a/redhat/tdebase/kdebase-3.5.13.2-build_without_dbustqt.patch b/redhat/tdebase/kdebase-3.5.13.2-build_without_dbustqt.patch new file mode 100644 index 000000000..bb4b42b0e --- /dev/null +++ b/redhat/tdebase/kdebase-3.5.13.2-build_without_dbustqt.patch @@ -0,0 +1,139 @@ +--- kdebase/kdm/backend/CMakeLists.txt.ORI 2012-09-06 22:11:08.422091268 +0200 ++++ kdebase/kdm/backend/CMakeLists.txt 2012-09-06 22:11:21.280843938 +0200 +@@ -14,11 +14,11 @@ + include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_BINARY_DIR} +- ${DBUS_TQT_INCLUDE_DIRS} ++ ${DBUS_INCLUDE_DIRS} + ) + + link_directories( +- ${DBUS_TQT_LIBRARY_DIRS} ++ ${DBUS_LIBRARY_DIRS} + ) + + ##### kdm (executable) ########################## +@@ -43,6 +43,6 @@ + process.c protodpy.c reset.c resource.c rpcauth.c + server.c session.c sessreg.c socket.c streams.c + util.c xdmauth.c xdmcp.c +- LINK X11 ${XAU_LIBRARIES} ${DBUS_TQT_LIBRARIES} ${CRYPT_LIBRARY} ${PAM_LIBRARY} ${XDMCP_LIBRARIES} ++ LINK X11 ${XAU_LIBRARIES} ${DBUS_LIBRARIES} ${CRYPT_LIBRARY} ${PAM_LIBRARY} ${XDMCP_LIBRARIES} + DESTINATION ${BIN_INSTALL_DIR} + ) +--- kdebase/ksmserver/CMakeLists.txt.ORI 2012-09-06 17:22:59.990317001 -0400 ++++ kdebase/ksmserver/CMakeLists.txt 2012-09-06 17:23:16.340989494 -0400 +@@ -19,13 +19,13 @@ + ${CMAKE_SOURCE_DIR}/kdmlib + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +- ${DBUS_TQT_INCLUDE_DIRS} ++ ${DBUS_INCLUDE_DIRS} + ${HAL_INCLUDE_DIRS} + ) + + link_directories( + ${TQT_LIBRARY_DIRS} +- ${DBUS_TQT_LIBRARY_DIRS} ++ ${DBUS_LIBRARY_DIRS} + ) + + +@@ -43,5 +43,5 @@ + main.cpp server.cpp shutdowndlg.cpp startupdlg.cpp + legacy.cpp startup.cpp shutdown.cpp client.cpp + KSMServerInterface.skel server.skel timed.ui +- LINK dmctl-static kdeui-shared krsync-shared ${HAL_LIBRARIES} ${DBUS_TQT_LIBRARIES} ++ LINK dmctl-static kdeui-shared krsync-shared ${HAL_LIBRARIES} ${DBUS_LIBRARIES} + ) +--- kdebase/kioslave/media/mediamanager/CMakeLists.txt.ORI 2012-09-07 23:57:56.858227336 +0200 ++++ kdebase/kioslave/media/mediamanager/CMakeLists.txt 2012-09-07 23:58:54.948097583 +0200 +@@ -20,12 +20,12 @@ + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${HAL_INCLUDE_DIRS} +- ${DBUS_TQT_INCLUDE_DIRS} ++ ${DBUS_INCLUDE_DIRS} + ) + + link_directories( + ${TQT_LIBRARY_DIRS} +- ${DBUS_TQT_LIBRARY_DIRS} ++ ${DBUS_LIBRARY_DIRS} + ) + + +@@ -48,7 +48,7 @@ + + tde_add_kpart( ${target} AUTOMOC + SOURCES ${${target}_SRCS} +- LINK mediacommon-static kdeinit_kded-shared ${HAL_LIBRARIES} -lhal-storage ${DBUS_TQT_LIBRARIES} ++ LINK mediacommon-static kdeinit_kded-shared ${HAL_LIBRARIES} -lhal-storage ${DBUS_LIBRARIES} -ldbus-qt-1 + DESTINATION ${PLUGIN_INSTALL_DIR} + ) + else( ) +--- trinity-tdebase-3.5.13.2/ConfigureChecks.cmake.ORI 2013-01-23 23:11:55.903373346 +0100 ++++ trinity-tdebase-3.5.13.2/ConfigureChecks.cmake 2013-01-23 23:12:23.168860363 +0100 +@@ -256,21 +256,3 @@ + endif( ) + + +-# dbus-tqt (kdm, ksmserver, kioslaves(media)) +-if( BUILD_KDM OR BUILD_KSMSERVER OR (BUILD_KIOSLAVES AND WITH_HAL) ) +- # check for dbus-tqt +- pkg_check_modules( DBUS_TQT REQUIRED dbus-tqt ) +- tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES ) +- set( CMAKE_REQUIRED_INCLUDES ${DBUS_TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS} ${QT_INCLUDE_DIRS}) +- set( CMAKE_REQUIRED_LIBRARIES ${DBUS_TQT_LDFLAGS} ${TQT_LDFLAGS} ${QT_LDFLAGS} ) +- check_cxx_source_compiles(" +- #include +- #include +- int main(int, char**) { return 0; } " +- HAVE_DBUS_QT3_07 ) +- tde_restore( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES ) +- if( NOT HAVE_DBUS_QT3_07 ) +- tde_message_fatal( "dbus-tqt is required, but was not found on your system" ) +- endif( ) +- +-endif( ) +--- trinity-tdebase-3.5.13.2/kicker/kicker/ui/CMakeLists.txt.ORI 2013-06-16 22:01:14.879046232 +0200 ++++ trinity-tdebase-3.5.13.2/kicker/kicker/ui/CMakeLists.txt 2013-06-16 22:01:32.316688895 +0200 +@@ -20,7 +20,7 @@ + ${CMAKE_SOURCE_DIR}/kicker/kicker/buttons + ${CMAKE_SOURCE_DIR}/kdmlib + ${CMAKE_SOURCE_DIR}/libkonq +- ${DBUS_TQT_INCLUDE_DIRS} ++ ${DBUS_INCLUDE_DIRS} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ) +@@ -56,5 +56,5 @@ + tde_add_library( ${target} STATIC_PIC AUTOMOC + SOURCES ${${target}_SRCS} + DEPENDENCIES kicker_core-static kickermain-static +- LINK dmctl-static kickoffsearch_interfaces-shared ${DBUS_TQT_LIBRARIES} ${HAL_LIBRARIES} ++ LINK dmctl-static kickoffsearch_interfaces-shared ${DBUS_LIBRARIES} ${HAL_LIBRARIES} + ) +--- trinity-tdebase-3.5.13.2/kicker/kicker/core/CMakeLists.txt.ORI 2013-06-16 22:05:07.891261997 +0200 ++++ trinity-tdebase-3.5.13.2/kicker/kicker/core/CMakeLists.txt 2013-06-16 22:05:17.673060725 +0200 +@@ -17,7 +17,7 @@ + ${CMAKE_SOURCE_DIR}/kicker/libkicker + ${CMAKE_SOURCE_DIR}/kicker/kicker/ui + ${CMAKE_SOURCE_DIR}/kicker/kicker/buttons +- ${DBUS_TQT_INCLUDE_DIRS} ++ ${DBUS_INCLUDE_DIRS} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ) +--- trinity-tdebase-3.5.13.2/kicker/kicker/buttons/CMakeLists.txt.ORI 2013-06-16 22:09:44.143564983 +0200 ++++ trinity-tdebase-3.5.13.2/kicker/kicker/buttons/CMakeLists.txt 2013-06-16 22:09:48.450475959 +0200 +@@ -17,7 +17,7 @@ + ${CMAKE_SOURCE_DIR}/kicker/kicker/core + ${CMAKE_SOURCE_DIR}/kicker/kicker/ui + ${CMAKE_SOURCE_DIR}/libkonq +- ${DBUS_TQT_INCLUDE_DIRS} ++ ${DBUS_INCLUDE_DIRS} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ) diff --git a/redhat/tdebase/kdebase-3.5.13.2-set_kdm_minuid.patch b/redhat/tdebase/kdebase-3.5.13.2-set_kdm_minuid.patch new file mode 100644 index 000000000..ca412df01 --- /dev/null +++ b/redhat/tdebase/kdebase-3.5.13.2-set_kdm_minuid.patch @@ -0,0 +1,39 @@ +--- trinity-tdebase-3.5.13.2/config.h.cmake.ORI 2013-02-11 13:57:40.955386048 +0100 ++++ trinity-tdebase-3.5.13.2/config.h.cmake 2013-02-11 14:02:42.484413874 +0100 +@@ -159,6 +159,9 @@ + + #cmakedefine XDMCP 1 + ++#define TDM_DEFMINUID "@TDM_DEFMINUID@" ++#define TDM_DEFMAXUID "@TDM_DEFMAXUID@" ++ + + // ksmserver + #cmakedefine DBUS_SYSTEM_BUS "@DBUS_SYSTEM_BUS@" +--- trinity-tdebase-3.5.13.2/kdm/kfrontend/genkdmconf.c.ORI 2013-02-11 14:03:11.290843286 +0100 ++++ trinity-tdebase-3.5.13.2/kdm/kfrontend/genkdmconf.c 2013-02-11 14:05:21.309267838 +0100 +@@ -2761,6 +2761,10 @@ + } + } + } ++#ifdef TDM_MINDEFUID ++ defminuid = TDM_MINDEFUID; ++ defmaxuid = TDM_MAXDEFUID; ++#else // TDM_MINDEFUID + #ifdef __linux__ + if (!stat( "/etc/debian_version", &st )) { /* debian */ + defminuid = "1000"; +@@ -2778,10 +2782,11 @@ + defminuid = "500"; + defmaxuid = "65000"; + } +-#else ++#else // __linux__ + defminuid = "1000"; + defmaxuid = "65000"; +-#endif ++#endif // __linux__ ++#endif // TDM_MINDEFUID + for (i = 0; i < CONF_MAX_PRIO; i++) + for (cs = config; cs; cs = cs->next) + for (ce = cs->ents; ce; ce = ce->next) diff --git a/redhat/tdebase/tdebase-3.5.13.2-bookmark_global_copy.patch b/redhat/tdebase/tdebase-3.5.13.2-bookmark_global_copy.patch new file mode 100644 index 000000000..b9b0ec5fa --- /dev/null +++ b/redhat/tdebase/tdebase-3.5.13.2-bookmark_global_copy.patch @@ -0,0 +1,27 @@ +--- ./libkonq/konqbookmarkmanager.h.ori 2013-05-08 23:26:03.558587419 +0200 ++++ ./libkonq/konqbookmarkmanager.h 2013-05-08 23:29:25.317517880 +0200 +@@ -3,6 +3,8 @@ + + #include + #include ++#include ++#include + #include + + class LIBKONQ_EXPORT KonqBookmarkManager +@@ -11,7 +13,14 @@ + static KBookmarkManager * self() { + if ( !s_bookmarkManager ) + { +- TQString bookmarksFile = locateLocal("data", TQString::fromLatin1("konqueror/bookmarks.xml")); ++ TQString globalBookmarkFile = locate( "data", TQString::fromLatin1( "konqueror/bookmarks.xml" ) ); ++ TQString bookmarksFile = locateLocal( "data", TQString::fromLatin1("konqueror/bookmarks.xml" ), true); ++ if ( globalBookmarkFile != TQString::null && bookmarksFile == TQString::null ) { ++ KIO::file_copy( ++ KURL::fromPathOrURL( globalBookmarkFile ), ++ KURL::fromPathOrURL( bookmarksFile ), -1, false, false ++ ); ++ } + s_bookmarkManager = KBookmarkManager::managerForFile( bookmarksFile ); + } + return s_bookmarkManager; diff --git a/redhat/tdebase/tdebase-3.5.13.2-displayconfig_translation.patch b/redhat/tdebase/tdebase-3.5.13.2-displayconfig_translation.patch new file mode 100644 index 000000000..d2af92c3f --- /dev/null +++ b/redhat/tdebase/tdebase-3.5.13.2-displayconfig_translation.patch @@ -0,0 +1,37 @@ +--- trinity-tdebase-3.5.13.2~pre100+073a32f9/kcontrol/displayconfig/displayconfig.desktop.ORI 2013-05-11 14:53:30.914170537 +0200 ++++ trinity-tdebase-3.5.13.2~pre100+073a32f9/kcontrol/displayconfig/displayconfig.desktop 2013-05-11 14:53:59.495582944 +0200 +@@ -2,6 +2,7 @@ + Categories=Qt;KDE;X-KDE-settings-system; + Comment=Configure display + Comment[en_US]=Configure display ++Comment[fr]=Configuration de l'affichage + DocPath=kcontrol/displayconfig.html + Exec=kcmshell displayconfig + GenericName= +@@ -11,6 +12,7 @@ + MimeType= + Name=Monitor & Display + Name[en_US]=Monitor & Display ++Name[fr]=Moniteurs & Affichage + NoDisplay=false + Path= + StartupNotify=true +--- trinity-tdebase-3.5.13.2~pre100+073a32f9/kcontrol/iccconfig/iccconfig.desktop.ORI 2013-05-11 21:21:04.241337141 +0200 ++++ trinity-tdebase-3.5.13.2~pre100+073a32f9/kcontrol/iccconfig/iccconfig.desktop 2013-05-11 21:21:44.782537929 +0200 +@@ -12,6 +12,7 @@ + Categories=Qt;KDE;X-KDE-settings-hardware; + Comment=Configure display ICC profile + Comment[en_US]=Configure display ICC profile ++Comment[fr]=Configurer les profils de couleurs ICC + DocPath=kcontrol/iccconfig.html + GenericName= + GenericName[en_US]= +@@ -19,5 +20,6 @@ + MimeType= + Name=ICC Color Profile + Name[en_US]=ICC Color Profile ++Name[fr]=Profils de couleurs ICC + +-NoDisplay=false +\ Pas de fin de ligne à la fin du fichier ++NoDisplay=false diff --git a/redhat/tdebase/tdebase-3.5.13.2-fix_media_safelyremove.patch b/redhat/tdebase/tdebase-3.5.13.2-fix_media_safelyremove.patch new file mode 100644 index 000000000..c3ca254c8 --- /dev/null +++ b/redhat/tdebase/tdebase-3.5.13.2-fix_media_safelyremove.patch @@ -0,0 +1,10 @@ +diff -Naur kdebase-3.5.10/kioslave/media/services/media_safelyremove.desktop kdebase-3.5.10.yeni/kioslave/media/services/media_safelyremove.desktop +--- kdebase-3.5.10/kioslave/media/services/media_safelyremove.desktop 2008-08-19 21:16:59.000000000 +0300 ++++ kdebase-3.5.10.yeni/kioslave/media/services/media_safelyremove.desktop 2009-12-22 00:51:57.122282682 +0200 +@@ -71,5 +71,5 @@ + Name[wa]=Ositer e såvrité + Name[zh_CN]=安全删除 + Name[zh_TW]=安全的移除 +-Exec=kio_media_mounthelper -s %u ++Exec=kio_media_mounthelper -u %u + diff --git a/redhat/tdebase/tdebase-3.5.13.2-kbackground_xml_selector.patch b/redhat/tdebase/tdebase-3.5.13.2-kbackground_xml_selector.patch new file mode 100644 index 000000000..94016932e --- /dev/null +++ b/redhat/tdebase/tdebase-3.5.13.2-kbackground_xml_selector.patch @@ -0,0 +1,701 @@ +--- ./kcontrol/background/bgadvanced.cpp.ORI 2013-05-09 14:42:39.036269356 +0200 ++++ ./kcontrol/background/bgadvanced.cpp 2013-05-09 14:43:12.485581123 +0200 +@@ -44,6 +44,7 @@ + #include "bgadvanced.h" + #include "bgadvanced_ui.h" + ++#include "KCrossBGRender.h" + #include + + /**** BGAdvancedDialog ****/ +@@ -63,7 +64,7 @@ + } + + +-BGAdvancedDialog::BGAdvancedDialog(KBackgroundRenderer *_r, ++BGAdvancedDialog::BGAdvancedDialog(KCrossBGRender *_r, + TQWidget *parent, + bool m_multidesktop) + : KDialogBase(parent, "BGAdvancedDialog", +--- ./kcontrol/background/bgdialog.cpp.ORI 2013-05-09 14:46:43.556237673 +0200 ++++ ./kcontrol/background/bgdialog.cpp 2013-05-09 14:47:33.054218951 +0200 +@@ -63,6 +63,7 @@ + #include "bgwallpaper.h" + #include "bgadvanced.h" + #include "bgdialog.h" ++#include "KCrossBGRender.h" + + #define NR_PREDEF_PATTERNS 6 + +@@ -194,19 +195,19 @@ + int eDesk = i>0 ? i-1 : 0; + + // Setup the merged-screen renderer +- KBackgroundRenderer * r = new KBackgroundRenderer(eDesk, 0, false, _config); ++ KCrossBGRender * r = new KCrossBGRender(eDesk, 0, false, _config); + m_renderer[i].insert( 0, r ); + connect( r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)) ); + + // Setup the common-screen renderer +- r = new KBackgroundRenderer(eDesk, 0, true, _config); ++ r = new KCrossBGRender(eDesk, 0, true, _config); + m_renderer[i].insert( 1, r ); + connect( r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)) ); + + // Setup the remaining renderers for each screen + for (unsigned j=0; j < m_numScreens; ++j ) + { +- r = new KBackgroundRenderer(eDesk, j, true, _config); ++ r = new KCrossBGRender(eDesk, j, true, _config); + m_renderer[i].insert( j+2, r ); + connect( r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)) ); + } +@@ -221,14 +222,14 @@ + } + + // set up the common desktop renderer +- KBackgroundRenderer * r = new KBackgroundRenderer(0, 0, false, _config); ++ KCrossBGRender * r = new KCrossBGRender(0, 0, false, _config); + m_renderer[0].insert(0, r); + connect(r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int))); + + // set up all the other desktop renderers + for (unsigned i = 0; i < m_numDesks; ++i) + { +- r = new KBackgroundRenderer(i, 0, false, _config); ++ r = new KCrossBGRender(i, 0, false, _config); + m_renderer[i+1].insert(0, r); + connect(r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int))); + } +@@ -266,7 +267,7 @@ + delete m_pGlobals; + } + +-KBackgroundRenderer * BGDialog::eRenderer() ++KCrossBGRender * BGDialog::eRenderer() + { + return m_renderer[m_eDesk][m_eScreen]; + } +@@ -681,7 +682,7 @@ + + void BGDialog::updateUI() + { +- KBackgroundRenderer *r = eRenderer(); ++ KCrossBGRender *r = eRenderer(); + m_comboDesktop->setCurrentItem(m_eDesk); + m_comboScreen->setCurrentItem(m_eScreen); + +@@ -819,7 +820,7 @@ + if (!m_previewUpdates) + return; + +- KBackgroundRenderer * r = m_renderer[m_eDesk][(m_eScreen>1) ? (screen_done+2) : m_eScreen]; ++ KCrossBGRender * r = m_renderer[m_eDesk][(m_eScreen>1) ? (screen_done+2) : m_eScreen]; + + if (r->image().isNull()) + return; +@@ -858,7 +859,7 @@ + + void BGDialog::slotWallpaperTypeChanged(int i) + { +- KBackgroundRenderer *r = eRenderer(); ++ KCrossBGRender *r = eRenderer(); + r->stop(); + + // No picture +@@ -984,7 +985,7 @@ + + void BGDialog::slotWallpaperPos(int mode) + { +- KBackgroundRenderer *r = eRenderer(); ++ KCrossBGRender *r = eRenderer(); + + mode++; + m_wallpaperPos = mode; +@@ -1002,7 +1003,7 @@ + + void BGDialog::slotSetupMulti() + { +- KBackgroundRenderer *r = eRenderer(); ++ KCrossBGRender *r = eRenderer(); + + BGMultiWallpaperDialog dlg(r, topLevelWidget()); + if (dlg.exec() == TQDialog::Accepted) { +@@ -1018,7 +1019,7 @@ + + void BGDialog::slotPrimaryColor(const TQColor &color) + { +- KBackgroundRenderer *r = eRenderer(); ++ KCrossBGRender *r = eRenderer(); + + if (color == r->colorA()) + return; +@@ -1033,7 +1034,7 @@ + + void BGDialog::slotSecondaryColor(const TQColor &color) + { +- KBackgroundRenderer *r = eRenderer(); ++ KCrossBGRender *r = eRenderer(); + + if (color == r->colorB()) + return; +@@ -1048,7 +1049,7 @@ + + void BGDialog::slotPattern(int pattern) + { +- KBackgroundRenderer *r = eRenderer(); ++ KCrossBGRender *r = eRenderer(); + r->stop(); + bool bSecondaryEnabled = true; + if (pattern < NR_PREDEF_PATTERNS) +@@ -1085,7 +1086,7 @@ + // Copy stuff + for (unsigned desk = 0; desk < m_numDesks+1; ++desk ) + { +- KBackgroundRenderer *master = m_renderer[desk][1]; ++ KCrossBGRender *master = m_renderer[desk][1]; + for (unsigned screen = 0; screen < m_numScreens; ++screen) + { + m_renderer[desk][screen+2]->copyConfig(master); +@@ -1140,7 +1141,7 @@ + // Copy stuff + for (unsigned screen = 0; screen < m_renderer[0].size(); ++screen ) + { +- KBackgroundRenderer *master = m_renderer[0][screen]; ++ KCrossBGRender *master = m_renderer[0][screen]; + for (unsigned desk = 0; desk < m_numDesks; ++desk ) + { + m_renderer[desk+1][screen]->copyConfig(master); +@@ -1179,7 +1180,7 @@ + + void BGDialog::slotAdvanced() + { +- KBackgroundRenderer *r = eRenderer(); ++ KCrossBGRender *r = eRenderer(); + + m_previewUpdates = false; + BGAdvancedDialog dlg(r, topLevelWidget(), m_multidesktop); +@@ -1301,7 +1302,7 @@ + { + for (unsigned j = 0; j < m_renderer[i].size(); ++j ) + { +- KBackgroundRenderer * r = m_renderer[i][j]; ++ KCrossBGRender * r = m_renderer[i][j]; + if( r->isActive()) + r->stop(); + r->desktopResized(); +--- ./kcontrol/background/bgadvanced.h.ori 2013-05-09 14:49:18.551047531 +0200 ++++ ./kcontrol/background/bgadvanced.h 2013-05-09 14:49:23.509945456 +0200 +@@ -33,14 +33,14 @@ + class TQSpinBox; + + class BGAdvancedBase; +-class KBackgroundRenderer; ++class KCrossBGRender; + class KBackgroundProgram; + + class BGAdvancedDialog : public KDialogBase + { + Q_OBJECT + public: +- BGAdvancedDialog(KBackgroundRenderer *_r, TQWidget *parent, bool m_multidesktop); ++ BGAdvancedDialog(KCrossBGRender *_r, TQWidget *parent, bool m_multidesktop); + + void setCacheSize(int s); + int cacheSize(); +@@ -79,7 +79,7 @@ + void slotEnableProgram(bool b); + + private: +- KBackgroundRenderer *r; ++ KCrossBGRender *r; + + BGAdvancedBase *dlg; + +--- ./kcontrol/background/bgdialog.h.ORI 2013-05-09 14:49:59.223210319 +0200 ++++ ./kcontrol/background/bgdialog.h 2013-05-09 14:50:40.215366483 +0200 +@@ -28,6 +28,7 @@ + #include "bgrender.h" + #include "bgsettings.h" + #include "bgdefaults.h" ++#include "KCrossBGRender.h" + + class BGMonitorArrangement; + class KStandardDirs; +@@ -53,7 +54,7 @@ + protected: + void initUI(); + void updateUI(); +- KBackgroundRenderer * eRenderer(); ++ KCrossBGRender * eRenderer(); + + void setWallpaper(const TQString &); + +@@ -95,7 +96,7 @@ + int m_screen; + int m_eDesk; + int m_eScreen; +- TQValueVector< TQPtrVector > m_renderer; // m_renderer[desk][screen] ++ TQValueVector< TQPtrVector > m_renderer; // m_renderer[desk][screen] + TQMap m_wallpaper; + TQStringList m_patterns; + int m_slideShowRandom; // Remembers last Slide Show setting +--- ./kcontrol/background/bgwallpaper.h.ORI 2013-05-09 14:51:55.150823830 +0200 ++++ ./kcontrol/background/bgwallpaper.h 2013-05-09 14:52:37.513949453 +0200 +@@ -27,6 +27,7 @@ + #include + + #include ++#include + + class BGMultiWallpaperBase; + class KBackgroundSettings; +@@ -55,12 +56,16 @@ + void slotMoveDown(); + void slotOk(); + void slotItemSelected( TQListBoxItem * ); ++ void slotCheckScheduled(bool); ++ void slotChangedXML(const TQString&); ++ + private: + void setEnabledMoveButtons(); + + KBackgroundSettings *m_pSettings; + + BGMultiWallpaperBase *dlg; ++ TQString lastXml; + }; + + #endif +--- ./kcontrol/background/bgwallpaper.cpp.ORI 2013-05-09 14:53:01.461452198 +0200 ++++ ./kcontrol/background/bgwallpaper.cpp 2013-05-09 14:57:27.712924157 +0200 +@@ -26,12 +26,14 @@ + #include + #include + #include ++#include + + #include + #include + #include + #include + #include ++#include + + #include "bgsettings.h" + #include "bgwallpaper.h" +@@ -119,10 +121,41 @@ + connect(dlg->m_buttonMoveUp, TQT_SIGNAL(clicked()), TQT_SLOT(slotMoveUp())); + connect(dlg->m_buttonMoveDown, TQT_SIGNAL(clicked()), TQT_SLOT(slotMoveDown())); + connect(dlg->m_listImages, TQT_SIGNAL(clicked ( TQListBoxItem * )), TQT_SLOT(slotItemSelected( TQListBoxItem *))); ++ connect(dlg->chkScheduled, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotCheckScheduled(bool))); ++ connect(dlg->kurlXmlFile, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChangedXML(const TQString &))); ++ + dlg->m_buttonRemove->setEnabled( false ); + dlg->m_buttonMoveUp->setEnabled( false ); + dlg->m_buttonMoveDown->setEnabled( false ); + ++ // XML Stuffs ++ dlg->kurlXmlFile->setFilter("*.xml"); ++ if (m_pSettings->wallpaperList()[0].endsWith("xml",false)) { ++ dlg->kurlXmlFile->setURL(m_pSettings->wallpaperList()[0]); ++ dlg->chkScheduled->setChecked(true); ++ dlg->m_listImages->removeItem(0); ++ lastXml = m_pSettings->wallpaperList()[0]; ++ } else { ++ dlg->kurlXmlFile->setURL("/usr/share/mdk/backgrounds/Mandriva.xml"); ++ dlg->chkScheduled->setChecked(false); ++ slotCheckScheduled(false); ++ } ++} ++ ++void BGMultiWallpaperDialog::slotCheckScheduled(bool state) ++{ ++ if ( state == true ) { ++ dlg->grpNormalShow->setEnabled(false); ++ dlg->kurlXmlFile->setEnabled(true); ++ } else { ++ dlg->grpNormalShow->setEnabled(true); ++ dlg->kurlXmlFile->setEnabled(false); ++ } ++} ++ ++void BGMultiWallpaperDialog::slotChangedXML(const TQString & file) ++{ ++ lastXml = file; + } + + void BGMultiWallpaperDialog::slotItemSelected( TQListBoxItem * ) +@@ -222,15 +255,38 @@ + + void BGMultiWallpaperDialog::slotOk() + { ++ bool useXml = false; ++ // Looking to XML ++ if (dlg->chkScheduled->isChecked() && lastXml.endsWith("xml",false)) { ++ useXml = true; ++ kdDebug() << "Adding XML" << lastXml; ++ dlg->m_listImages->insertItem(lastXml,0); ++ } ++ ++ kdDebug() << dlg->m_listImages << endl; ++ + TQStringList lst; +- for (unsigned i=0; i < dlg->m_listImages->count(); i++) ++ for (unsigned i=0; i < dlg->m_listImages->count(); i++) { +- lst.append(dlg->m_listImages->text(i)); ++ lst.append(dlg->m_listImages->text(i)); ++ } + m_pSettings->setWallpaperList(lst); + m_pSettings->setWallpaperChangeInterval(dlg->m_spinInterval->value()); +- if (dlg->m_cbRandom->isChecked()) ++ if (dlg->m_cbRandom->isChecked()) { + m_pSettings->setMultiWallpaperMode(KBackgroundSettings::Random); +- else ++ } else { + m_pSettings->setMultiWallpaperMode(KBackgroundSettings::InOrder); ++ } ++ ++ if(useXml) { ++ m_pSettings->changeWallpaper(); ++ m_pSettings->setWallpaper(lastXml); ++ m_pSettings->changeWallpaper(); ++ } else { ++ m_pSettings->changeWallpaper(); ++ m_pSettings->setWallpaper(lst[0]); ++ m_pSettings->changeWallpaper(); ++ } ++ + accept(); + } + +--- kdebase-3.5.9/kcontrol/background/bgwallpaper_ui.ui.kbg_trans 2008-03-17 11:06:49.000000000 -0300 ++++ kdebase-3.5.9/kcontrol/background/bgwallpaper_ui.ui 2008-03-17 11:07:13.000000000 -0300 +@@ -1,4 +1,4 @@ +- ++ + BGMultiWallpaperBase + + +@@ -8,155 +8,209 @@ + + 0 + 0 +- 410 +- 196 ++ 499 ++ 526 + + +- ++ ++ BGMultiWallPaperBase ++ ++ + + unnamed + + + 0 + +- +- +- textLabel2 +- +- +- Show the following pictures: +- +- +- +- +- m_cbRandom +- +- +- &Show pictures in random order +- +- +- ++ + +- layout3 ++ layout8 + + + + unnamed + +- ++ + +- textLabel1 ++ chkScheduled + + +- Change &picture after: +- +- +- m_spinInterval ++ Scheduled Slide Show + + +- ++ + +- m_spinInterval ++ kurlXmlFile + + +- +- +- spacer4 +- +- +- Horizontal +- +- +- Expanding +- +- +- +- 20 +- 20 +- +- +- + + +- ++ + +- layout4 ++ grpNormalShow + +- ++ ++ ++ ++ + + unnamed + +- ++ + +- m_listImages +- +- +- +- 3 +- 3 +- 0 +- 0 +- +- +- +- +- 300 +- 100 +- ++ layout3 + ++ ++ ++ unnamed ++ ++ ++ ++ textLabel1_2 ++ ++ ++ Change &picture after: ++ ++ ++ m_spinInterval ++ ++ ++ ++ ++ m_spinInterval ++ ++ ++ ++ ++ spacer4 ++ ++ ++ Horizontal ++ ++ ++ Expanding ++ ++ ++ ++ 20 ++ 20 ++ ++ ++ ++ + +- ++ + +- m_buttonAdd ++ m_cbRandom + + +- &Add... +- +- +- +- +- spacer5 +- +- +- Vertical +- +- +- Expanding ++ &Show pictures in random order + +- +- +- 20 +- 20 +- +- +- +- +- +- m_buttonRemove +- +- +- &Remove ++ ++ Alt+S + + +- ++ + +- m_buttonMoveDown ++ textLabel2 + + +- Move &Down ++ Show the following pictures: + + +- ++ + +- m_buttonMoveUp +- +- +- Move &Up ++ layout4 + ++ ++ ++ unnamed ++ ++ ++ ++ m_listImages ++ ++ ++ ++ 3 ++ 3 ++ 0 ++ 0 ++ ++ ++ ++ ++ 300 ++ 100 ++ ++ ++ ++ ++ ++ m_buttonAdd ++ ++ ++ &Add... ++ ++ ++ Alt+A ++ ++ ++ ++ ++ spacer5 ++ ++ ++ Vertical ++ ++ ++ Expanding ++ ++ ++ ++ 20 ++ 20 ++ ++ ++ ++ ++ ++ m_buttonRemove ++ ++ ++ &Remove ++ ++ ++ Alt+R ++ ++ ++ ++ ++ m_buttonMoveDown ++ ++ ++ Move &Down ++ ++ ++ Alt+D ++ ++ ++ ++ ++ m_buttonMoveUp ++ ++ ++ Move &Up ++ ++ ++ Alt+U ++ ++ ++ + +- ++ + +- ++ + + + bgwallpaper.h +@@ -164,4 +218,9 @@ + + + ++ ++ kurlrequester.h ++ klineedit.h ++ kpushbutton.h ++ + diff --git a/redhat/tdebase/tdebase-3.5.13.2-kcontrol_menu_entry.patch b/redhat/tdebase/tdebase-3.5.13.2-kcontrol_menu_entry.patch new file mode 100644 index 000000000..cdef8e5a7 --- /dev/null +++ b/redhat/tdebase/tdebase-3.5.13.2-kcontrol_menu_entry.patch @@ -0,0 +1,20 @@ +--- ./kcontrol/kcontrol/KControl.desktop~ 2013-01-09 02:12:13.000000000 +0100 ++++ ./kcontrol/kcontrol/KControl.desktop 2013-05-08 17:55:54.250733219 +0200 +@@ -5,7 +5,7 @@ + DocPath=kcontrol/index.html + X-KDE-StartupNotify=true + +-Name=Control Center ++Name=Trinity Control Center + Name[af]=Beheer Sentrum + Name[ar]=مركز التحكم + Name[az]=İdarə Mərkəzi +@@ -28,7 +28,7 @@ + Name[eu]=Kontrol gunea + Name[fa]=مرکز کنترل + Name[fi]=Ohjauskeskus +-Name[fr]=Centre de configuration de KDE ++Name[fr]=Centre de configuration de Trinity + Name[fy]=Konfiguraasjesintrum + Name[ga]=Lárionad Rialaithe + Name[gl]=Centro de Control diff --git a/redhat/tdebase/tdebase-3.5.13.2-kdesktop_crossfade.patch b/redhat/tdebase/tdebase-3.5.13.2-kdesktop_crossfade.patch new file mode 100644 index 000000000..3b4e86819 --- /dev/null +++ b/redhat/tdebase/tdebase-3.5.13.2-kdesktop_crossfade.patch @@ -0,0 +1,1002 @@ +diff -p -up kdebase-3.5.9/kcontrol/background/crossfade.h.crossfade-efect kdebase-3.5.9/kcontrol/background/crossfade.h +--- kdebase-3.5.9/kcontrol/background/crossfade.h.crossfade-efect 2008-03-11 09:17:29.000000000 -0300 ++++ kdebase-3.5.9/kcontrol/background/crossfade.h 2008-03-11 09:17:29.000000000 -0300 +@@ -0,0 +1,56 @@ ++/* vi: ts=8 sts=4 sw=4 ++ * kate: space-indent on; tab-width 8; indent-width 4; indent-mode cstyle; ++ * ++ * This file is part of the KDE project, module kdesktop. ++ * Copyright (C) 1999,2000 Geert Jansen ++ * ++ * You can Freely distribute this program under the GNU General Public ++ * License. See the file "COPYING" for the exact licensing terms. ++ */ ++ ++#ifndef __crossfade_h_Included__ ++#define __crossfade_h_Included__ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++ ++ ++inline TQPixmap crossFade(const TQPixmap &pix1, const TQPixmap &pix2, double r_alpha, ++ bool sync = false){ ++ ++ TQPixmap pix = TQPixmap(1,1,8); ++ int mw,mh; ++ mw = pix1.width(); ++ mh = pix1.height(); ++ ++ int alpha = 0xffff * (1-r_alpha); ++ ++ XRenderColor clr = { 0, 0, 0, alpha }; ++ XRenderPictureAttributes pa; ++ pa.repeat = True; ++ Picture pic = XRenderCreatePicture(pix.x11Display(), pix.handle(), ++ XRenderFindStandardFormat (pix.x11Display(), PictStandardA8), ++ CPRepeat, &pa); ++ XRenderFillRectangle(pix.x11Display(), PictOpSrc, pic, ++ &clr, 0, 0, 1, 1); ++ TQPixmap dst(pix1); ++ dst.detach(); ++ XRenderComposite(pix.x11Display(), PictOpOver, pix2.x11RenderHandle(), ++ pic, dst.x11RenderHandle(),0,0, 0,0, 0,0, mw,mh); ++ ++ if (sync) { ++ XSync(pix.x11Display(), false); ++ } ++ XRenderFreePicture(pix.x11Display(), pic); ++ return dst; ++} ++ ++#endif // __crossfade_h_Included__ +--- ./kcontrol/background/CMakeLists.txt.ORI 2013-05-08 18:36:33.605165935 +0200 ++++ ./kcontrol/background/CMakeLists.txt 2013-05-08 18:37:55.448537081 +0200 +@@ -28,7 +28,7 @@ + ##### bgnd (static) ############################# + + tde_add_library( bgnd STATIC_PIC AUTOMOC +- SOURCES bgrender.cpp bgsettings.cpp ++ SOURCES bgrender.cpp bgsettings.cpp KCrossBGRender.cc + LINK ${LIBART_LIBRARIES} + ) + +--- ./kcontrol/background/bgrender.cpp.ORI 2013-05-08 18:39:20.212849124 +0200 ++++ ./kcontrol/background/bgrender.cpp 2013-05-08 18:44:04.200187009 +0200 +@@ -10,6 +10,8 @@ + + #include + ++#include "KCrossBGRender.h" ++ + #include + #include + #include +@@ -1061,7 +1063,7 @@ + } + + +-KBackgroundRenderer * KVirtualBGRenderer::renderer(unsigned screen) ++KCrossBGRender * KVirtualBGRenderer::renderer(unsigned screen) + { + return m_renderer[screen]; + } +@@ -1220,7 +1222,8 @@ + for (unsigned i=0; isetSize(renderSize(i)); + connect( r, TQT_SIGNAL(imageDone(int,int)), this, TQT_SLOT(screenDone(int,int)) ); +@@ -1250,7 +1253,8 @@ + Q_UNUSED(_desk); + Q_UNUSED(_screen); + +- const KBackgroundRenderer * sender = dynamic_cast(this->sender()); ++ //const KBackgroundRenderer * sender = dynamic_cast(this->sender()); ++ const KCrossBGRender * sender = dynamic_cast(this->sender()); + int screen = m_renderer.find(sender); + if (screen == -1) + //?? +--- kdebase-3.5.9/kcontrol/background/KCrossBGRender.h.crossfade-efect 2008-03-11 09:17:29.000000000 -0300 ++++ kdebase-3.5.9/kcontrol/background/KCrossBGRender.h 2008-03-11 10:50:24.000000000 -0300 +@@ -0,0 +1,76 @@ ++/* ++ * Copyright (C) 2008 Danilo Cesar Lemes de Paula ++ * Copyright (C) 2008 Gustavo Boiko ++ * Mandriva Conectiva ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Library General Public ++ * License version 2 as published by the Free Software Foundation. ++ * ++ * This library 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 ++ * Library General Public License for more details. ++ * ++ * You should have received a copy of the GNU Library General Public License ++ * along with this library; see the file COPYING.LIB. If not, write to ++ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, ++ * Boston, MA 02111-1307, USA. ++*/ ++ ++#ifndef __KCrossBGRender_h_Included__ ++#define __KCrossBGRender_h_Included__ ++ ++ ++#include ++#include ++#include ++#include ++ ++#include "bgrender.h" ++ ++class TQDomElement; ++ ++typedef struct crossEvent{ ++ bool transition; ++ TQString pix1; ++ TQString pix2; ++ TQTime stime; //start time ++ TQTime etime; //end time ++} KBGCrossEvent; ++ ++ ++class KCrossBGRender: public KBackgroundRenderer{ ++ ++TQ_OBJECT ++ ++public: ++ KCrossBGRender(int desk, int screen, bool drawBackgroundPerScreen, KConfig *config=0); ++ ~KCrossBGRender(); ++ ++ bool needWallpaperChange(); ++ void changeWallpaper(bool init=false); ++ TQPixmap pixmap(); ++ bool usingCrossXml(){return useCrossEfect;}; ++ ++ ++private: ++ TQPixmap pix; ++ int secs; ++ TQString xmlFileName; ++ bool useCrossEfect; ++ ++ int actualPhase; ++ ++ void createStartTime(TQDomElement e); ++ void createTransition(TQDomElement e); ++ void createStatic(TQDomElement e); ++ bool setCurrentEvent(bool init = false); ++ void initCrossFade(TQString xml); ++ void fixEnabled(); ++ TQPixmap getCurrentPixmap(); ++ KBGCrossEvent current; ++ TQValueList timeList; ++}; ++ ++#endif // __KCrossBGRender_h_Included__ +--- ./kcontrol/background/bgrender.h.ORI 2013-05-08 18:46:41.122053931 +0200 ++++ ./kcontrol/background/bgrender.h 2013-05-08 18:49:07.510128486 +0200 +@@ -28,6 +28,7 @@ + class KTempFile; + class KShellProcess; + class KStandardDirs; ++class KCrossBGRender; + + /** + * This class renders a desktop background to a TQImage. The operation is +@@ -127,7 +128,7 @@ + KVirtualBGRenderer(int desk, KConfig *config=0l); + ~KVirtualBGRenderer(); + +- KBackgroundRenderer * renderer(unsigned screen); ++ KCrossBGRender * renderer(unsigned screen); + unsigned numRenderers() const { return m_numRenderers; } + + TQPixmap pixmap(); +@@ -173,7 +174,8 @@ + TQSize m_size; + + TQMemArray m_bFinished; +- TQPtrVector m_renderer; ++ //TQPtrVector m_renderer; ++ TQPtrVector m_renderer; + TQPixmap *m_pPixmap; + }; + +diff -p -up kdebase-3.5.9/kcontrol/background/KCrossBGRender.cc.crossfade-efect kdebase-3.5.9/kcontrol/background/KCrossBGRender.cc +--- kdebase-3.5.9/kcontrol/background/KCrossBGRender.cc.crossfade-efect 2008-03-11 09:17:29.000000000 -0300 ++++ kdebase-3.5.9/kcontrol/background/KCrossBGRender.cc 2008-03-11 10:54:41.000000000 -0300 +@@ -0,0 +1,362 @@ ++/* ++ * Copyright (C) 2008 Danilo Cesar Lemes de Paula ++ * Copyright (C) 2008 Gustavo Boiko ++ * Mandriva Conectiva ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Library General Public ++ * License version 2 as published by the Free Software Foundation. ++ * ++ * This library 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 ++ * Library General Public License for more details. ++ * ++ * You should have received a copy of the GNU Library General Public License ++ * along with this library; see the file COPYING.LIB. If not, write to ++ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, ++ * Boston, MA 02111-1307, USA. ++ */ ++ ++#include ++#include ++ ++#include ++ ++#include "KCrossBGRender.h" ++//#include "crossfade.h" ++#include ++#include ++ ++ ++KCrossBGRender::KCrossBGRender(int desk, int screen, bool drawBackgroundPerScreen, KConfig *config): KBackgroundRenderer(desk,screen,drawBackgroundPerScreen,config) ++{ ++ useCrossEfect = false; ++ if ( wallpaperList()[0].endsWith("xml",false) ) { ++ initCrossFade(wallpaperList()[0]); ++ } ++} ++ ++ ++void KCrossBGRender::initCrossFade(TQString xmlFile) ++{ ++ useCrossEfect = true; ++ if (xmlFile.isEmpty()){ ++ useCrossEfect = false; ++ return; ++ } ++ secs = 0; ++ timeList.empty(); ++ ++ // read the XMLfile ++ TQDomDocument xmldoc = TQDomDocument(xmlFile); ++ TQFile file( xmlFile ); ++ if ( !file.open( IO_ReadOnly ) ) { ++ useCrossEfect = false; ++ return; ++ } ++ if ( !xmldoc.setContent( &file ) ) { ++ useCrossEfect = false; ++ file.close(); ++ return; ++ } ++ file.close(); ++ ++ TQDomElement docElem = xmldoc.documentElement(); ++ TQDomNode n = docElem.firstChild(); ++ while( !n.isNull() ) { ++ TQDomElement e = n.toElement(); // try to convert the node to an element. ++ if( !e.isNull() ) { ++ if (e.tagName() == "starttime") { ++ createStartTime(e); ++ } else if (e.tagName() == "transition") { ++ createTransition(e); ++ } else if (e.tagName() == "static") { ++ createStatic(e); ++ } ++ } ++ n = n.nextSibling(); ++ } ++ ++ // Setting "now" state ++ setCurrentEvent(true); ++ pix = getCurrentPixmap(); ++ ++ useCrossEfect = true; ++} ++ ++ ++KCrossBGRender::~KCrossBGRender(){ ++} ++ ++TQPixmap KCrossBGRender::pixmap() { ++ fixEnabled(); ++ if (!useCrossEfect){ ++ TQPixmap p = KBackgroundRenderer::pixmap(); ++ kdDebug() << "Inherited " << p.size() << endl; ++ if (p.width() == 0 && p.height() == 0){ ++ p.convertFromImage(image()); ++ } ++ return p; ++ } ++ ++ return pix; ++} ++ ++bool KCrossBGRender::needWallpaperChange(){ ++ if (!useCrossEfect) { ++ return KBackgroundRenderer::needWallpaperChange(); ++ } ++ ++ bool forceChange = setCurrentEvent(); // If we change the current state ++ if (forceChange){ // do not matter what hapens ++ actualPhase = 0; // we need to change background ++ return true; ++ } ++ ++ // Return false if it's not a transition ++ if (!current.transition) { ++ return false; ++ } ++ ++ double timeLeft, timeTotal; ++ TQTime now = TQTime::currentTime(); ++ ++ timeLeft = now.secsTo(current.etime); ++ if (timeLeft < 0) { ++ timeLeft += 86400; // before midnight ++ } ++ timeTotal = current.stime.secsTo(current.etime); ++ if (timeTotal < 0) { ++ timeTotal += 86400; ++ } ++ ++ double passed = timeTotal - timeLeft; ++ double timeCell = timeTotal/60; //Time cell size ++ ++ //kdDebug() << "\ntimeleft:" << timeLeft << " timeTotal:" << timeTotal ++ // << "\npassed:" << passed << " timeCell:" << timeCell ++ // << "\nactualPhase: " << actualPhase << endl; ++ ++ int aux = passed/timeCell; ++ if(actualPhase != aux){ ++ //kdDebug() << "needWallpaperChange() => returned true" << endl; ++ actualPhase = passed/timeCell; ++ return true; ++ } ++ ++ //kdDebug() << "needWallpaperChange() => returned false" << endl; ++ return false; ++} ++ ++/* ++ * This method change the enabledEffect flag to TRUE of FALSE, according ++ * with multiWallpaperMode and FileName (it needs to be a XML) ++ */ ++void KCrossBGRender::fixEnabled(){ ++ ++ ++ TQString w = wallpaperList()[0]; ++ useCrossEfect = false; ++ if(multiWallpaperMode() == Random || multiWallpaperMode() == InOrder){ ++ ++ if ( w != xmlFileName ){ ++ // New XML File ++ xmlFileName = w; ++ if (w.endsWith("xml",false)){ ++ initCrossFade(wallpaperList()[0]); ++ //useCrossEfect = true; ++ }else{ ++ // Not, it's not a xml file ++ useCrossEfect = false; ++ } ++ }else if (w.endsWith("xml",false)){ ++ //xmlFile doesn't change ++ //but it's there ++ useCrossEfect = true; ++ }else{ ++ // it's not a XML file ++ useCrossEfect = false; ++ } ++ } ++} ++ ++void KCrossBGRender::changeWallpaper(bool init){ ++ ++ ++ ++ fixEnabled(); ++ ++ if (!useCrossEfect){ ++ KBackgroundRenderer::changeWallpaper(init); ++ return; ++ } ++ ++ pix = getCurrentPixmap(); ++ ++ ++} ++ ++ ++bool KCrossBGRender::setCurrentEvent(bool init){ ++ TQTime now = TQTime::currentTime(); ++ ++ ++ //Verify if is need to change ++ if (!(init || now <= current.stime || now >= current.etime )) { ++ return false; ++ } ++ ++ TQValueList::iterator it; ++ for ( it = timeList.begin(); it != timeList.end(); ++it ){ ++ ++ // Look for time ++ if ( ((*it).stime <= now && now <= (*it).etime) || //normal situation ++ ((*it).etime <= (*it).stime && (now >= (*it).stime || ++ now <= (*it).etime) ) ) ++ { ++ current = *it; ++ actualPhase = 0; ++ ++ //kdDebug() << "Cur: " << current.stime << "< now <" << current.etime << endl; ++ return true; ++ } ++ } ++} ++ ++TQPixmap KCrossBGRender::getCurrentPixmap() ++{ ++ float alpha; ++ TQPixmap ret; ++ TQImage tmp; ++ TQImage p1; ++ if (!tmp.load(current.pix1)) ++ return TQPixmap(); ++ ++ // scale the pixmap to fit in the screen ++ //p1 = TQPixmap(QApplication::desktop()->screenGeometry().size()); ++ //TQPainter p(&p1); ++ //p.drawPixmap(p1.rect(), tmp); ++ // ++ p1 = tmp.smoothScale(TQApplication::desktop()->screenGeometry().size()); ++ ++ if (current.transition){ ++ TQTime now = TQTime::currentTime(); ++ double timeLeft,timeTotal; ++ ++ TQImage p2; ++ ++ if (!tmp.load(current.pix2) ) ++ return NULL; ++ ++ p2 = tmp.smoothScale(TQApplication::desktop()->screenGeometry().size()); ++ //TQPainter p(&p2); ++ //p.drawPixmap(p2.rect(), tmp); ++ ++ timeLeft = now.secsTo(current.etime); ++ if (timeLeft < 0) ++ timeLeft += 86400; ++ timeTotal = current.stime.secsTo(current.etime); ++ if (timeTotal < 0) ++ timeTotal += 86400; ++ ++ alpha = (timeTotal - timeLeft)/timeTotal; ++ ++ //ret = crossFade(p2,p1,alpha); ++ tmp = KImageEffect::blend(p2,p1,alpha); ++ ret.convertFromImage(tmp); ++ return ret; ++ }else{ ++ ret.convertFromImage(p1); ++ return ret; ++ } ++ ++ ++} ++ ++void KCrossBGRender::createStartTime(TQDomElement docElem) ++{ ++ int hour; ++ int minutes; ++ ++ TQDomNode n = docElem.firstChild(); ++ while( !n.isNull() ) { ++ TQDomElement e = n.toElement(); ++ if( !e.isNull() ) { ++ if (e.tagName() == "hour"){ ++ hour = e.text().toInt(); ++ }else if ( e.tagName() == "minute" ){ ++ minutes = e.text().toInt(); ++ } ++ ++ } ++ ++ n = n.nextSibling(); ++ } ++ secs = hour*60*60 + minutes*60; ++} ++void KCrossBGRender::createTransition(TQDomElement docElem) ++{ ++ int duration; ++ TQString from; ++ TQString to; ++ ++ TQDomNode n = docElem.firstChild(); ++ while( !n.isNull() ) { ++ TQDomElement e = n.toElement(); ++ if( !e.isNull() ) { ++ if (e.tagName() == "duration"){ ++ duration = e.text().toFloat(); ++ }else if ( e.tagName() == "from" ){ ++ from = e.text(); ++ } ++ else if ( e.tagName() == "to" ){ ++ to = e.text(); ++ } ++ ++ } ++ n = n.nextSibling(); ++ } ++ TQTime startTime(0,0,0); ++ startTime = startTime.addSecs(secs); ++ TQTime endTime(0,0,0); ++ endTime = endTime.addSecs(secs+duration); ++ ++ secs += duration; ++ ++ KBGCrossEvent l = {true, from, to, startTime,endTime}; ++ ++ timeList.append(l); ++ ++} ++void KCrossBGRender::createStatic(TQDomElement docElem) ++{ ++ int duration; ++ TQString file; ++ ++ TQDomNode n = docElem.firstChild(); ++ while( !n.isNull() ) { ++ TQDomElement e = n.toElement(); ++ if( !e.isNull() ) { ++ if (e.tagName() == "duration"){ ++ duration = e.text().toFloat(); ++ }else if ( e.tagName() == "file" ){ ++ file = e.text(); ++ } ++ ++ } ++ n = n.nextSibling(); ++ } ++ ++ TQTime startTime(0,0,0); ++ startTime = startTime.addSecs(secs); ++ TQTime endTime(0,0,0); ++ endTime = endTime.addSecs(secs+duration); ++ ++ secs += duration; ++ ++ KBGCrossEvent l = {false, file, NULL, startTime,endTime}; ++ timeList.append(l); ++} ++ ++#include "KCrossBGRender.moc" +--- ./kdm/kfrontend/krootimage.h.ORI 2013-05-08 18:54:48.631599139 +0200 ++++ ./kdm/kfrontend/krootimage.h 2013-05-08 18:55:02.365339708 +0200 +@@ -27,6 +27,7 @@ + #include + + #include ++#include + + + class MyApplication : public KApplication +--- ./kdesktop/bgmanager.cc.ORI 2013-05-08 18:56:29.915684768 +0200 ++++ ./kdesktop/bgmanager.cc 2013-05-08 19:12:04.451954803 +0200 +@@ -16,10 +16,16 @@ + #include "bgsettings.h" + #include "kdesktopapp.h" + ++//FIXME ++#include "KCrossBGRender.h" ++#include "crossfade.h" ++ + #include + + #include + #include ++#include ++#include + + #include + #include +@@ -34,6 +40,8 @@ + #include + #include + #include ++#include ++#include + + #ifndef None + #define None 0L +@@ -47,7 +55,8 @@ + + #include "pixmapserver.h" + +-template class TQPtrVector; ++//template class TQPtrVector; ++template class TQPtrVector; + template class TQPtrVector; + template class TQMemArray; + +@@ -108,6 +117,12 @@ + connect(m_pTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout())); + m_pTimer->start( 60000 ); + ++ /*CrossFade's config*/ ++ m_crossTimer = new TQTimer(this); ++ connect(m_crossTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotCrossFadeTimeout())); ++ /*Ends here*/ ++ ++ + connect(m_pKwinmodule, TQT_SIGNAL(currentDesktopChanged(int)), + TQT_SLOT(slotChangeDesktop(int))); + connect(m_pKwinmodule, TQT_SIGNAL(numberOfDesktopsChanged(int)), +@@ -577,6 +592,36 @@ + + + /* ++ * This slot is called when the Timeout is executed ++ */ ++void KBackgroundManager::slotCrossFadeTimeout() ++{ ++ KVirtualBGRenderer *r = m_Renderer[fadeDesk]; ++ if (crossInit) { ++ mBenchmark.start(); ++ } ++ ++ if (mAlpha <= 0.0 || mBenchmark.elapsed() > 300 ) { ++ bool do_cleanup = true; ++ mAlpha = 1; ++ m_crossTimer->stop(); ++ KPixmap pixm(mNextScreen); ++ setPixmap(&pixm, r->hash(), fadeDesk); ++ return; ++ } ++ // Reset Timer ++ mBenchmark.start(); ++ ++ TQPixmap dst = crossFade(*mOldScreen, mNextScreen, mAlpha, crossInit); ++ KPixmap pixm(dst); ++ setPixmap(&pixm, r->hash(), fadeDesk); ++ ++ mAlpha -=0.03; ++ crossInit = false; ++} ++ ++ ++/* + * This slot is called when a renderer is done. + */ + void KBackgroundManager::slotImageDone(int desk) +@@ -592,6 +637,10 @@ + KPixmap *pm = new KPixmap(); + KVirtualBGRenderer *r = m_Renderer[desk]; + bool do_cleanup = true; ++ fadeDesk = desk; ++ mAlpha = 1.0; ++ int width,height; ++ + + *pm = r->pixmap(); + // If current: paint it +@@ -603,7 +652,41 @@ + //setPixmap(viewport_background, r->hash(), desk); + //delete viewport_background; + +- setPixmap(pm, r->hash(), desk); ++ //START ++ if (m_Renderer[effectiveDesktop()]->renderer(0)->crossFadeBg() && !m_Renderer[effectiveDesktop()]->renderer(0)->usingCrossXml()){ ++ int mode = m_Renderer[effectiveDesktop()]->renderer(0)->wallpaperMode(); ++ width = TQApplication::desktop()->screenGeometry().width(); //m_pDesktop->width(); ++ height = TQApplication::desktop()->screenGeometry().height();// m_pDesktop->height(); ++ ++ if (mode == KBackgroundSettings::NoWallpaper || mode == KBackgroundSettings::Tiled || mode == KBackgroundSettings::CenterTiled ){ ++ mNextScreen = TQPixmap(width,height); ++ TQPainter p (&mNextScreen); ++ p.drawTiledPixmap(0,0,width,height,*pm); ++ } else { ++ mNextScreen = TQPixmap(*pm); ++ } ++ ++ if (m_pDesktop){ ++ mOldScreen = const_cast( m_pDesktop->backgroundPixmap() ); ++ }else{ ++ mOldScreen = const_cast( ++ TQApplication::desktop()->screen()->backgroundPixmap() ); ++ } ++ ++ //TODO Find a way to discover if CrossFade effect needs to run ++ if (mOldScreen){ ++ crossInit = true; ++ m_crossTimer->start(70); ++ } else{ ++ setPixmap(pm, r->hash(), desk); ++ } ++ }else{ ++ setPixmap(pm, r->hash(), desk); ++ } ++ //ENDS HERE */ ++ ++ //setPixmap(pm, r->hash(), desk); ++ + if (!m_bBgInitDone) + { + m_bBgInitDone = true; +@@ -801,7 +884,8 @@ + TQString KBackgroundManager::currentWallpaper(int desk) + { + //TODO Is the behaviour of this function appropriate for multiple screens? +- KBackgroundRenderer *r = m_Renderer[validateDesk(desk)]->renderer(0); ++ //KBackgroundRenderer *r = m_Renderer[validateDesk(desk)]->renderer(0); ++ KCrossBGRender *r = m_Renderer[validateDesk(desk)]->renderer(0); + + return r->currentWallpaper(); + } +@@ -818,7 +902,7 @@ + // DCOP exported + void KBackgroundManager::setExport(int _export) + { +- kdDebug() << "KBackgroundManager enabling exports.\n"; ++// kdDebug() << "KBackgroundManager enabling exports.\n"; + applyExport(_export); + slotChangeDesktop(0); + } +@@ -843,7 +927,7 @@ + //TODO Is the behaviour of this function appropriate for multiple screens? + for (unsigned i=0; i < m_Renderer[effectiveDesktop()]->numRenderers(); ++i) + { +- KBackgroundRenderer *r = m_Renderer[effectiveDesktop()]->renderer(i); ++ KCrossBGRender *r = m_Renderer[effectiveDesktop()]->renderer(i); + r->stop(); + r->setWallpaperMode(mode); + r->setMultiWallpaperMode(KBackgroundSettings::NoMulti); +@@ -856,7 +940,7 @@ + void KBackgroundManager::setWallpaper(TQString wallpaper) + { + //TODO Is the behaviour of this function appropriate for multiple screens? +- KBackgroundRenderer *r = m_Renderer[effectiveDesktop()]->renderer(0); ++ KCrossBGRender *r = m_Renderer[effectiveDesktop()]->renderer(0); + int mode = r->wallpaperMode(); + if (mode == KBackgroundSettings::NoWallpaper) + mode = KBackgroundSettings::Tiled; +@@ -869,7 +953,7 @@ + TQStringList KBackgroundManager::wallpaperFiles(int desk) + { + //TODO Is the behaviour of this function appropriate for multiple screens? +- KBackgroundRenderer *r = m_Renderer[validateDesk(desk)]->renderer(0); ++ KCrossBGRender *r = m_Renderer[validateDesk(desk)]->renderer(0); + + return r->wallpaperFiles(); + } +@@ -880,7 +964,7 @@ + TQStringList KBackgroundManager::wallpaperList(int desk) + { + //TODO Is the behaviour of this function appropriate for multiple screens? +- KBackgroundRenderer *r = m_Renderer[validateDesk(desk)]->renderer(0);; ++ KCrossBGRender *r = m_Renderer[validateDesk(desk)]->renderer(0);; + + return r->wallpaperList(); + } +@@ -907,7 +991,7 @@ + //TODO Is the behaviour of this function appropriate for multiple screens? + for (unsigned i=0; i < m_Renderer[sdesk]->numRenderers(); ++i) + { +- KBackgroundRenderer *r = m_Renderer[sdesk]->renderer(i); ++ KCrossBGRender *r = m_Renderer[sdesk]->renderer(i); + + setCommon(false); // Force each desktop to have it's own wallpaper + +@@ -974,7 +1058,7 @@ + //TODO Is the behaviour of this function appropriate for multiple screens? + for (unsigned i=0; i < m_Renderer[effectiveDesktop()]->numRenderers(); ++i) + { +- KBackgroundRenderer *r = m_Renderer[effectiveDesktop()]->renderer(i); ++ KCrossBGRender *r = m_Renderer[effectiveDesktop()]->renderer(i); + r->stop(); + + if (isColorA) +--- ./kdesktop/bgmanager.h.ORI 2013-05-08 19:13:25.120426716 +0200 ++++ ./kdesktop/bgmanager.h 2013-05-08 19:15:12.071398460 +0200 +@@ -13,6 +13,7 @@ + #include + #include + ++#include + #include + + #if defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300 +@@ -89,6 +90,7 @@ + void desktopResized(); + void clearRoot(); + void saveImages(); ++ void slotCrossFadeTimeout(); + void slotCmBackgroundChanged(bool); + + private: +@@ -131,6 +133,15 @@ + KPixmapServer *m_pPixmapServer; + + unsigned long m_xrootpmap; ++ ++ /*CrossFade vars*/ ++ TQTimer * m_crossTimer; ++ double mAlpha; ++ TQPixmap mNextScreen; ++ TQPixmap * mOldScreen; ++ int fadeDesk; ++ TQTime mBenchmark; ++ bool crossInit; + }; + + #endif // __BGManager_h_Included__ +--- trinity-tdebase-3.5.13.2~pre102+43d29f86/kcontrol/background/bgdialog_ui.ui.ORI 2013-05-15 12:13:14.000000000 +0000 ++++ trinity-tdebase-3.5.13.2~pre102+43d29f86/kcontrol/background/bgdialog_ui.ui 2013-05-15 12:20:25.000000000 +0000 +@@ -376,6 +376,17 @@ + </ul></qt> + + ++ ++ ++ m_cbCrossFadeBg ++ ++ ++ Cross-fading background ++ ++ ++ Enables a smooth fading effect when changing background image. ++ ++ + + + m_comboBlend +--- trinity-tdebase-3.5.13.2~pre102+43d29f86/kcontrol/background/bgdefaults.h.ORI 2013-05-15 13:42:20.933760867 +0000 ++++ trinity-tdebase-3.5.13.2~pre102+43d29f86/kcontrol/background/bgdefaults.h 2013-05-15 13:42:38.305365721 +0000 +@@ -34,5 +34,6 @@ + #define _defBlendMode KBackgroundSettings::NoBlending + #define _defBlendBalance 100 + #define _defReverseBlending false ++#define _defCrossFadeBg false + + #endif // __BGDefaults_h_Included__ +--- trinity-tdebase-3.5.13.2~pre102+43d29f86/kcontrol/background/bgsettings.h.ORI 2013-05-15 13:37:34.228282617 +0000 ++++ trinity-tdebase-3.5.13.2~pre102+43d29f86/kcontrol/background/bgsettings.h 2013-05-15 13:39:31.884606381 +0000 +@@ -198,6 +198,9 @@ + void setReverseBlending(bool value); + bool reverseBlending() const { return m_ReverseBlending; } + ++ void setCrossFadeBg(bool value); ++ bool crossFadeBg() const { return m_CrossFadeBg; } ++ + void setBlendBalance(int value); + int blendBalance() const { return m_BlendBalance; } + +@@ -273,6 +276,7 @@ + int m_BlendMode, defBlendMode; + int m_BlendBalance, defBlendBalance; + bool m_ReverseBlending, defReverseBlending; ++ bool m_CrossFadeBg, defCrossFadeBg; + int m_MinOptimizationDepth; + bool m_bShm; + bool m_bDrawBackgroundPerScreen; +--- trinity-tdebase-3.5.13.2~pre102+43d29f86/kcontrol/background/bgsettings.cpp.ORI 2013-05-15 13:39:59.408980208 +0000 ++++ trinity-tdebase-3.5.13.2~pre102+43d29f86/kcontrol/background/bgsettings.cpp 2013-05-15 13:46:15.197432823 +0000 +@@ -437,6 +437,7 @@ + defBlendMode = _defBlendMode; + defBlendBalance = _defBlendBalance; + defReverseBlending = _defReverseBlending; ++ defCrossFadeBg = _defCrossFadeBg; + + m_MinOptimizationDepth = _defMinOptimizationDepth; + m_bShm = _defShm; +@@ -537,6 +538,7 @@ + m_BlendMode = settings->m_BlendMode; + m_BlendBalance = settings->m_BlendBalance; + m_ReverseBlending = settings->m_ReverseBlending; ++ m_CrossFadeBg = settings->m_CrossFadeBg; + m_MinOptimizationDepth = settings->m_MinOptimizationDepth; + m_bShm = settings->m_bShm; + m_MultiMode = settings->m_MultiMode; +@@ -633,6 +635,15 @@ + } + + ++void KBackgroundSettings::setCrossFadeBg(bool value) ++{ ++ if (m_CrossFadeBg == value) ++ return; ++ dirty = hashdirty = true; ++ m_CrossFadeBg = value; ++} ++ ++ + void KBackgroundSettings::setWallpaper(TQString wallpaper) + { + dirty = hashdirty = true; +@@ -774,6 +785,8 @@ + + m_ReverseBlending = m_pConfig->readBoolEntry( "ReverseBlending", defReverseBlending); + ++ m_CrossFadeBg = m_pConfig->readBoolEntry( "CrossFadeBg", defCrossFadeBg); ++ + // Multiple wallpaper config + m_WallpaperList = m_pConfig->readPathListEntry("WallpaperList"); + +@@ -834,6 +847,7 @@ + m_pConfig->writeEntry("BlendMode", m_BlMRevMap[m_BlendMode]); + m_pConfig->writeEntry("BlendBalance", m_BlendBalance); + m_pConfig->writeEntry("ReverseBlending", m_ReverseBlending); ++ m_pConfig->writeEntry("CrossFadeBg", m_CrossFadeBg); + m_pConfig->writeEntry("MinOptimizationDepth", m_MinOptimizationDepth); + m_pConfig->writeEntry("UseSHM", m_bShm); + +--- trinity-tdebase-3.5.13.2~pre102+43d29f86/kcontrol/background/bgdialog.h.ORI 2013-05-15 13:56:09.397921090 +0000 ++++ trinity-tdebase-3.5.13.2~pre102+43d29f86/kcontrol/background/bgdialog.h 2013-05-15 13:56:17.377739605 +0000 +@@ -80,6 +80,7 @@ + void slotBlendReverse(bool b); + void desktopResized(); + void setBlendingEnabled(bool); ++ void slotCrossFadeBg(bool); + + protected: + void getEScreen(); +--- trinity-tdebase-3.5.13.2~pre102+43d29f86/kcontrol/background/bgdialog.cpp.ORI 2013-05-15 13:53:49.809095324 +0000 ++++ trinity-tdebase-3.5.13.2~pre102+43d29f86/kcontrol/background/bgdialog.cpp 2013-05-15 13:53:54.636985486 +0000 +@@ -174,6 +174,10 @@ + connect(m_cbBlendReverse, TQT_SIGNAL(toggled(bool)), + TQT_SLOT(slotBlendReverse(bool))); + ++ // Crossfading background ++ connect(m_cbCrossFadeBg, TQT_SIGNAL(toggled(bool)), ++ TQT_SLOT(slotCrossFadeBg(bool))); ++ + // advanced options + connect(m_buttonAdvanced, TQT_SIGNAL(clicked()), + TQT_SLOT(slotAdvanced())); +@@ -304,6 +308,7 @@ + m_cbBlendReverse->setEnabled( false ); + m_buttonAdvanced->setEnabled( false ); + m_buttonGetNew->setEnabled( false ); ++ m_cbCrossFadeBg->setEnabled( false ); + } + + void BGDialog::load( bool useDefaults ) +@@ -781,6 +786,8 @@ + m_cbBlendReverse->setChecked(r->reverseBlending()); + m_sliderBlend->setValue( r->blendBalance() / 10 ); + ++ m_cbCrossFadeBg->setChecked(r->crossFadeBg()); ++ + m_comboBlend->blockSignals(false); + m_sliderBlend->blockSignals(false); + +@@ -1295,6 +1302,17 @@ + eRenderer()->start(true); + } + ++void BGDialog::slotCrossFadeBg(bool b) ++{ ++ if (b == eRenderer()->crossFadeBg()) ++ return; ++ emit changed(true); ++ ++ eRenderer()->stop(); ++ eRenderer()->setCrossFadeBg(b); ++ eRenderer()->start(true); ++} ++ + void BGDialog::desktopResized() + { + for (unsigned i = 0; i < m_renderer.size(); ++i) diff --git a/redhat/tdebase/tdebase-3.5.13.2-kdesu-noignorebutton.patch b/redhat/tdebase/tdebase-3.5.13.2-kdesu-noignorebutton.patch new file mode 100644 index 000000000..41b081edc --- /dev/null +++ b/redhat/tdebase/tdebase-3.5.13.2-kdesu-noignorebutton.patch @@ -0,0 +1,26 @@ +--- trinity-tdebase-3.5.13.2~pre102+43d29f86/kdesu/kdesu/sudlg.cpp.kdesu_no_ignore 2013-05-16 22:59:53.633425236 +0200 ++++ trinity-tdebase-3.5.13.2~pre102+43d29f86/kdesu/kdesu/sudlg.cpp 2013-05-16 23:00:04.685200151 +0200 +@@ -15,7 +15,7 @@ + #include "sudlg.h" + + KDEsuDialog::KDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep,const TQString& icon, bool withIgnoreButton, int timeout) +- : KPasswordDialog(Password, enableKeep, (withIgnoreButton ? User1:NoDefault), icon) ++ : KPasswordDialog(Password, enableKeep, 0, icon) + { + KConfig* config = KGlobal::config(); + config->setGroup("super-user-command"); +@@ -34,12 +34,10 @@ + } else { + if (m_User == "root") { + prompt = i18n("The action you requested needs root privileges. " +- "Please enter root's password below or click " +- "Ignore to continue with your current privileges."); ++ "Please enter root's password below."); + } else { + prompt = i18n("The action you requested needs additional privileges. " +- "Please enter the password for \"%1\" below or click " +- "Ignore to continue with your current privileges.").arg(static_cast(m_User)); ++ "Please enter the password for \"%1\" below.").arg(static_cast(m_User)); + } + } + setPrompt(prompt); diff --git a/redhat/tdebase/tdebase-3.5.13.2-kdm_theme_selector.patch b/redhat/tdebase/tdebase-3.5.13.2-kdm_theme_selector.patch new file mode 100644 index 000000000..39f6f49a3 --- /dev/null +++ b/redhat/tdebase/tdebase-3.5.13.2-kdm_theme_selector.patch @@ -0,0 +1,229 @@ +--- trinity-tdebase-3.5.13.2~pre86+807a5445/kcontrol/kdm/kdm-appear.h.kdm_theme_selector 2013-01-09 02:12:13.000000000 +0100 ++++ trinity-tdebase-3.5.13.2~pre86+807a5445/kcontrol/kdm/kdm-appear.h 2013-05-09 12:58:14.535347383 +0200 +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -57,6 +58,7 @@ + + void loadColorSchemes(KBackedComboBox *combo); + void loadGuiStyles(KBackedComboBox *combo); ++ void loadThemes(KBackedComboBox *combo); + void loadLanguageList(KLanguageButton *combo); + + bool eventFilter(TQObject *, TQEvent *); +@@ -72,6 +74,7 @@ + private slots: + void slotAreaRadioClicked(int id); + void slotLogoButtonClicked(); ++ void slotUsethemeChanged(bool state); + void changed(); + + private: +@@ -85,14 +88,19 @@ + TQRadioButton *logoRadio; + TQLineEdit *xLineEdit; + TQLineEdit *yLineEdit; ++ TQCheckBox * themecheck; + KBackedComboBox *compositorcombo; + KBackedComboBox *guicombo; ++ KBackedComboBox *themecombo; + KBackedComboBox *colcombo; + KBackedComboBox *echocombo; ++ TQLabel * themeimagelabel; + KLanguageButton *langcombo; + TQCheckBox *sakbox; + TQLabel *sakwarning; + ++ //TQHBoxLayout * themehlay; ++ TQGroupBox *themegroup; + }; + + #endif +--- trinity-tdebase-3.5.13.2~pre86+807a5445/kcontrol/kdm/kdm-appear.cpp.kdm_theme_selector 2013-01-09 02:12:13.000000000 +0100 ++++ trinity-tdebase-3.5.13.2~pre86+807a5445/kcontrol/kdm/kdm-appear.cpp 2013-05-09 13:00:34.428413714 +0200 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -35,6 +36,7 @@ + #include + #include + ++#include + #include + #include + #include +@@ -62,10 +64,43 @@ + + TQVBoxLayout *vbox = new TQVBoxLayout(this, KDialog::marginHint(), + KDialog::spacingHint(), "vbox"); +- TQGroupBox *group = new TQGroupBox(i18n("Appearance"), this); ++ ++ // ThemeBox Starts here ++ ++ themecheck = new TQCheckBox( i18n("Use Theme"), this ); ++ vbox->addWidget(themecheck); ++ connect(themecheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); ++ connect(themecheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotUsethemeChanged(bool))); ++ ++ themegroup = new TQGroupBox(0, Vertical, i18n("Theme"), this); ++ vbox->addWidget(themegroup); ++ ++ TQGridLayout * grid = new TQGridLayout( themegroup->layout(), 4, 3, KDialog::spacingHint() ); ++ ++ grid->setColStretch(1, 1); ++ grid->setColStretch(2, 1); ++ ++ themecombo = new KBackedComboBox(themegroup); ++ loadThemes(themecombo); ++ ++ TQLabel * label1 = new TQLabel(themecombo, i18n("KDM Theme:"),themegroup); ++ grid->addWidget(label1,1,0); ++ grid->addWidget(themecombo,1,1); ++ connect(themecombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); ++ connect(themecombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotThemeChanged(int))); ++ ++ themeimagelabel = new TQLabel(themecombo,"",themegroup); ++ ++ grid->addMultiCellWidget(themeimagelabel,1,3,2,2,TQt::AlignRight); ++ ++ vbox->addStretch(1); ++ // ENDS HERE ++ ++ TQGroupBox * group = new TQGroupBox(i18n("Appearance"), this); ++ + vbox->addWidget(group); + +- TQGridLayout *grid = new TQGridLayout( group, 5, 2, KDialog::marginHint(), ++ grid = new TQGridLayout( group, 5, 2, KDialog::marginHint(), + KDialog::spacingHint(), "grid"); + grid->addRowSpacing(0, group->fontMetrics().height()); + grid->setColStretch(0, 1); +@@ -267,10 +302,25 @@ + + } + ++ ++void KDMAppearanceWidget::slotUsethemeChanged(bool state) ++{ ++ //themehlay->setEnabled(state); ++ //themecombo->setEnabled(state); ++ //themeimagelabel->setEnabled(state); ++ themegroup->setEnabled(state); ++} ++ ++ + void KDMAppearanceWidget::makeReadOnly() + { + disconnect( logobutton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotLogoButtonClicked()) ); ++ ++ themecheck->setEnabled(false); ++ //themegroup->setEnabled(false); ++ themecombo->setEnabled(false); ++ themeimagelabel->setEnabled(false); + logobutton->setAcceptDrops(false); + greetstr_lined->setReadOnly(true); + noneRadio->setEnabled(false); +@@ -352,6 +402,40 @@ + } + } + ++void KDMAppearanceWidget::loadThemes(KBackedComboBox *combo) ++{ ++ // Gets current Theme in kdmrc ++ TQString current; ++ config->setGroup("X-*-Greeter"); ++ TQFileInfo Theme = config->readEntry("Theme"); ++ if(Theme.exists()) { ++ current = Theme.fileName(); ++ } ++ ++ // List directories under "themes" directory ++ TQDir d(locate("data", TQString::fromLatin1("kdm/themes/")), "", TQDir::Name, TQDir::Dirs|TQDir::NoSymLinks|TQDir::Readable|TQDir::Executable); ++ TQStringList list = d.entryList(); ++ ++ combo->clear(); ++ for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) { ++ TQString name = (*it); ++ ++ if(name == "." || name == ".." ) { ++ continue; ++ } ++ ++ if (name.isEmpty()) { ++ name = "default"; ++ } ++ ++ combo->insertItem( *it, name); ++ ++ if (name == current) { ++ combo->setCurrentItem(combo->count()-1); ++ } ++ } ++} ++ + bool KDMAppearanceWidget::setLogo(TQString logo) + { + TQString flogo = logo.isEmpty() ? +@@ -468,6 +552,10 @@ + + config->writeEntry("GUIStyle", guicombo->currentId()); + ++ TQString Theme = locate("data", TQString::fromLatin1("kdm/themes/")); ++ Theme.append(themecombo->currentId()); ++ config->writeEntry("Theme", Theme); ++ + config->writeEntry("ColorScheme", colcombo->currentId()); + + config->writeEntry("EchoMode", echocombo->currentId()); +@@ -476,6 +564,8 @@ + + config->writeEntry("Language", langcombo->current()); + ++ config->writeEntry("UseTheme", themecheck->isChecked()); ++ + if (!sakwarning) { + config->writeEntry("UseSAK", sakbox->isChecked()); + } +@@ -523,6 +613,8 @@ + // Check the current compositor type + compositorcombo->setCurrentId(config->readEntry("Compositor")); + ++ loadThemes(themecombo); ++ + // Check the GUI type + guicombo->setCurrentId(config->readEntry("GUIStyle")); + +@@ -544,6 +636,9 @@ + // get the language + langcombo->setCurrentItem(config->readEntry("Language", "C")); + ++ themecheck->setChecked(config->readBoolEntry("UseTheme",true)); ++ slotUsethemeChanged(config->readBoolEntry("UseTheme",true)); ++ + // See if the SAK is enabled + if (!sakwarning) { + sakbox->setChecked(config->readBoolEntry("UseSAK", true)); +@@ -556,10 +651,12 @@ + + void KDMAppearanceWidget::defaults() + { ++ themecheck->setChecked(true); + greetstr_lined->setText( i18n("Welcome to %n") ); + logoRadio->setChecked( true ); + slotAreaRadioClicked( KdmLogo ); + setLogo( "" ); ++ themecombo->setCurrentId(""); + compositorcombo->setCurrentId( "" ); + guicombo->setCurrentId( "" ); + colcombo->setCurrentId( "" ); diff --git a/redhat/tdebase/tdebase-3.5.13.2-kdm_utf8_password.patch b/redhat/tdebase/tdebase-3.5.13.2-kdm_utf8_password.patch new file mode 100644 index 000000000..9ba4bdd05 --- /dev/null +++ b/redhat/tdebase/tdebase-3.5.13.2-kdm_utf8_password.patch @@ -0,0 +1,297 @@ +--- ./kdmlib/kgreet_classic.cpp.ORI 2013-05-09 17:43:03.148552793 +0200 ++++ ./kdmlib/kgreet_classic.cpp 2013-05-09 17:51:09.129324589 +0200 +@@ -26,21 +26,30 @@ + #include "themer/kdmthemer.h" + #include "themer/kdmitem.h" + ++#include + #include + #include +-#include + #include + + #include + #include + #include + +-class KDMPasswordEdit : public KPasswordEdit { ++class KDMPasswordEdit : public KLineEdit { + public: +- KDMPasswordEdit( TQWidget *parent ) : KPasswordEdit( parent, 0 ) {} +- KDMPasswordEdit( KPasswordEdit::EchoModes echoMode, TQWidget *parent ) : KPasswordEdit( echoMode, parent, 0 ) {} ++ KDMPasswordEdit( TQWidget *parent ) : KLineEdit( parent ) ++ { ++ setEchoMode(TQLineEdit::Password); ++ } ++ ++ KDMPasswordEdit( TQLineEdit::EchoMode echoMode, TQWidget *parent ) : KLineEdit( parent ) ++ { ++ setEchoMode(echoMode); ++ } ++ ++ + protected: +- virtual void contextMenuEvent( TQContextMenuEvent * ) {} ++ virtual void contextMenuEvent( TQContextMenuEvent * ) {} + }; + + static int echoMode; +@@ -104,11 +113,11 @@ + grid->addWidget( loginLabel, line, 0 ); + grid->addWidget( new TQLabel( fixedUser, parent ), line++, 1 ); + } +- if (echoMode == -1) ++ if (echoMode == -1) { + passwdEdit = new KDMPasswordEdit( parent ); +- else +- passwdEdit = new KDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode, +- parent ); ++ } else { ++ passwdEdit = new KDMPasswordEdit( (TQLineEdit::EchoMode)echoMode, parent ); ++ } + connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )), + TQT_SLOT(slotActivity()) ); + connect( passwdEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotActivity()) ); +@@ -135,8 +144,8 @@ + } + if (func != Authenticate) { + if (echoMode == -1) { +- passwd1Edit = new KDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode, parent ); +- passwd2Edit = new KDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode, parent ); ++ passwd1Edit = new KDMPasswordEdit( (TQLineEdit::EchoMode)echoMode, parent ); ++ passwd2Edit = new KDMPasswordEdit( (TQLineEdit::EchoMode)echoMode, parent ); + } else { + passwd1Edit = new KDMPasswordEdit( parent ); + passwd2Edit = new KDMPasswordEdit( parent ); +@@ -247,16 +256,16 @@ + KGreeterPluginHandler::IsUser ); + break; + case 1: +- handler->gplugReturnText( passwdEdit->password(), ++ handler->gplugReturnText( passwdEdit->text().utf8(), + KGreeterPluginHandler::IsPassword | + KGreeterPluginHandler::IsSecret ); + break; + case 2: +- handler->gplugReturnText( passwd1Edit->password(), ++ handler->gplugReturnText( passwd1Edit->text().utf8(), + KGreeterPluginHandler::IsSecret ); + break; + default: // case 3: +- handler->gplugReturnText( passwd2Edit->password(), ++ handler->gplugReturnText( passwd2Edit->text().utf8(), + KGreeterPluginHandler::IsNewPassword | + KGreeterPluginHandler::IsSecret ); + break; +@@ -405,11 +414,11 @@ + // assert( !running ); + setActive2( true ); + if (authTok) { +- passwd1Edit->erase(); +- passwd2Edit->erase(); ++ passwd1Edit->clear(); ++ passwd2Edit->clear(); + passwd1Edit->setFocus(); + } else { +- passwdEdit->erase(); ++ passwdEdit->clear(); + if (loginEdit && loginEdit->isEnabled()) + passwdEdit->setEnabled( true ); + else { +@@ -426,7 +435,7 @@ + KClassicGreeter::clear() + { + // assert( !running && !passwd1Edit ); +- passwdEdit->erase(); ++ passwdEdit->clear(); + if (loginEdit) { + loginEdit->clear(); + loginEdit->setFocus(); +@@ -484,9 +493,24 @@ + TQVariant (*getConf)( void *, const char *, const TQVariant & ), + void *ctx ) + { +- echoMode = getConf( ctx, "EchoMode", TQVariant( -1 ) ).toInt(); +- KGlobal::locale()->insertCatalogue( "kgreet_classic" ); +- return true; ++ echoMode = getConf( ctx, "EchoMode", TQVariant( -1 ) ).toInt(); ++ switch (echoMode) ++ { ++ case (0): ++ case (1): ++ echoMode = TQLineEdit::Password; ++ break; ++ ++ case (2): ++ echoMode = TQLineEdit::NoEcho; ++ break; ++ ++ default: ++ echoMode = TQLineEdit::Password; ++ } ++ ++ KGlobal::locale()->insertCatalogue( "kgreet_classic" ); ++ return true; + } + + static void done( void ) +--- ./kdmlib/kgreet_classic.h.ORI 2013-05-09 17:53:03.266961035 +0200 ++++ ./kdmlib/kgreet_classic.h 2013-05-09 17:53:49.235008948 +0200 +@@ -31,7 +31,6 @@ + #include + + class KLineEdit; +-class KPasswordEdit; + class KSimpleConfig; + class TQGridLayout; + class TQLabel; +@@ -76,7 +75,7 @@ + + TQLabel *loginLabel, *passwdLabel, *passwd1Label, *passwd2Label; + KLineEdit *loginEdit; +- KPasswordEdit *passwdEdit, *passwd1Edit, *passwd2Edit; ++ KLineEdit *passwdEdit, *passwd1Edit, *passwd2Edit; + KSimpleConfig *stsFile; + TQString fixedUser, curUser; + Function func; +--- ./kdmlib/kgreet_winbind.cpp.ORI 2013-05-09 17:54:36.906021481 +0200 ++++ ./kdmlib/kgreet_winbind.cpp 2013-05-09 18:00:23.089847329 +0200 +@@ -26,11 +26,11 @@ + #include "themer/kdmthemer.h" + #include "themer/kdmitem.h" + ++#include + #include + #include + #include + #include +-#include + #include + #include + +@@ -40,10 +40,17 @@ + + #include + +-class KDMPasswordEdit : public KPasswordEdit { ++class KDMPasswordEdit : public KLineEdit { + public: +- KDMPasswordEdit( TQWidget *parent ) : KPasswordEdit( parent, 0 ) {} +- KDMPasswordEdit( KPasswordEdit::EchoModes echoMode, TQWidget *parent ) : KPasswordEdit( echoMode, parent, 0 ) {} ++ KDMPasswordEdit( TQWidget *parent ) : KLineEdit( parent ) ++ { ++ setEchoMode(TQLineEdit::Password); ++ } ++ KDMPasswordEdit( TQLineEdit::EchoMode echoMode, TQWidget *parent ) : KLineEdit( parent ) ++ { ++ setEchoMode(echoMode); ++ } ++ + protected: + virtual void contextMenuEvent( TQContextMenuEvent * ) {} + }; +@@ -150,7 +157,7 @@ + if (echoMode == -1) + passwdEdit = new KDMPasswordEdit( parent ); + else +- passwdEdit = new KDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode, ++ passwdEdit = new KDMPasswordEdit( (TQLineEdit::EchoMode)echoMode, + parent ); + connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )), + TQT_SLOT(slotActivity()) ); +@@ -180,8 +187,8 @@ + } + if (func != Authenticate) { + if (echoMode == -1) { +- passwd1Edit = new KDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode, parent ); +- passwd2Edit = new KDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode, parent ); ++ passwd1Edit = new KDMPasswordEdit( (TQLineEdit::EchoMode)echoMode, parent ); ++ passwd2Edit = new KDMPasswordEdit( (TQLineEdit::EchoMode)echoMode, parent ); + } else { + passwd1Edit = new KDMPasswordEdit( parent ); + passwd2Edit = new KDMPasswordEdit( parent ); +@@ -328,16 +335,16 @@ + KGreeterPluginHandler::IsUser ); + break; + case 1: +- handler->gplugReturnText( passwdEdit->password(), ++ handler->gplugReturnText( passwdEdit->text().utf8(), + KGreeterPluginHandler::IsPassword | + KGreeterPluginHandler::IsSecret ); + break; + case 2: +- handler->gplugReturnText( passwd1Edit->password(), ++ handler->gplugReturnText( passwd1Edit->text().utf8(), + KGreeterPluginHandler::IsSecret ); + break; + default: // case 3: +- handler->gplugReturnText( passwd2Edit->password(), ++ handler->gplugReturnText( passwd2Edit->text().utf8(), + KGreeterPluginHandler::IsNewPassword | + KGreeterPluginHandler::IsSecret ); + break; +@@ -486,11 +493,11 @@ + // assert( !running ); + setActive2( true ); + if (authTok) { +- passwd1Edit->erase(); +- passwd2Edit->erase(); ++ passwd1Edit->clear(); ++ passwd2Edit->clear(); + passwd1Edit->setFocus(); + } else { +- passwdEdit->erase(); ++ passwdEdit->clear(); + if (loginEdit && loginEdit->isEnabled()) + passwdEdit->setEnabled( true ); + else { +@@ -507,7 +514,7 @@ + KWinbindGreeter::clear() + { + // assert( !running && !passwd1Edit ); +- passwdEdit->erase(); ++ passwdEdit->clear(); + if (loginEdit) { + domainCombo->setCurrentItem( defaultDomain ); + slotChangedDomain( defaultDomain ); +@@ -632,6 +639,21 @@ + void *ctx ) + { + echoMode = getConf( ctx, "EchoMode", TQVariant( -1 ) ).toInt(); ++ switch (echoMode) ++ { ++ case (0): ++ case (1): ++ echoMode = TQLineEdit::Password; ++ break; ++ ++ case (2): ++ echoMode = TQLineEdit::NoEcho; ++ break; ++ ++ default: ++ echoMode = TQLineEdit::Password; ++ } ++ + staticDomains = TQStringList::split( ':', getConf( ctx, "winbind.Domains", TQVariant( "" ) ).toString() ); + if (!staticDomains.contains("")) + staticDomains << ""; +--- ./kdmlib/kgreet_winbind.h.ORI 2013-05-09 18:00:46.495362083 +0200 ++++ ./kdmlib/kgreet_winbind.h 2013-05-09 18:01:22.960606033 +0200 +@@ -33,7 +33,6 @@ + + class KComboBox; + class KLineEdit; +-class KPasswordEdit; + class KSimpleConfig; + class TQGridLayout; + class TQLabel; +@@ -85,7 +84,7 @@ + TQLabel *domainLabel, *loginLabel, *passwdLabel, *passwd1Label, *passwd2Label; + KComboBox *domainCombo; + KLineEdit *loginEdit; +- KPasswordEdit *passwdEdit, *passwd1Edit, *passwd2Edit; ++ KLineEdit *passwdEdit, *passwd1Edit, *passwd2Edit; + KSimpleConfig *stsFile; + TQString fixedDomain, fixedUser, curUser; + TQStringList allUsers, mDomainListing; diff --git a/redhat/tdebase/tdebase-3.5.13.2-kickoff_add_packagekit_shortcut.patch b/redhat/tdebase/tdebase-3.5.13.2-kickoff_add_packagekit_shortcut.patch new file mode 100644 index 000000000..727cfeec0 --- /dev/null +++ b/redhat/tdebase/tdebase-3.5.13.2-kickoff_add_packagekit_shortcut.patch @@ -0,0 +1,12 @@ +--- trinity-tdebase-3.5.13.2~pre100+073a32f9/CMakeLists.txt.ORI 2013-05-10 19:40:45.930287816 +0200 ++++ trinity-tdebase-3.5.13.2~pre100+073a32f9/CMakeLists.txt 2013-05-10 19:40:57.593049243 +0200 +@@ -244,6 +244,9 @@ + endif() + + ##### Checks for a distribution-specific 2nd menu item, generally a shortcut to graphical package manager ++if(EXISTS "/usr/share/applications/gpk-application.desktop") ++ set( KICKOFF_DIST_CONFIG_SHORTCUT2 "/usr/share/applications/gpk-application.desktop" ) ++endif() + if(EXISTS "/usr/share/applications/package-manager.desktop") + set( KICKOFF_DIST_CONFIG_SHORTCUT2 "/usr/share/applications/package-manager.desktop" ) + endif() diff --git a/redhat/tdebase/tdebase-3.5.13.2-kickoff_default_favs.patch b/redhat/tdebase/tdebase-3.5.13.2-kickoff_default_favs.patch new file mode 100644 index 000000000..bbba25a86 --- /dev/null +++ b/redhat/tdebase/tdebase-3.5.13.2-kickoff_default_favs.patch @@ -0,0 +1,16 @@ +--- trinity-tdebase-3.5.13.2~pre86+807a5445/kicker/kicker/ui/default-favs.ORI 2013-05-09 22:50:36.607264087 +0200 ++++ trinity-tdebase-3.5.13.2~pre86+807a5445/kicker/kicker/ui/default-favs 2013-05-09 22:50:46.935039753 +0200 +@@ -1,9 +1,7 @@ +-MozillaFirefox.desktop +-kde-Kontact.desktop +-writer.desktop +-kde-amarok.desktop +-kde-digikam.desktop + kde-Home.desktop ++kde-konqbrowser.desktop ++kde-Kfind.desktop ++kde-kate.desktop ++kde-konsole.desktop + kde-KControl.desktop + kde-Help.desktop +-kde-konsole.desktop diff --git a/redhat/tdebase/tdebase-3.5.13.2-kickoff_xdg_dirs.patch b/redhat/tdebase/tdebase-3.5.13.2-kickoff_xdg_dirs.patch new file mode 100644 index 000000000..a3619839f --- /dev/null +++ b/redhat/tdebase/tdebase-3.5.13.2-kickoff_xdg_dirs.patch @@ -0,0 +1,45 @@ +--- ./kicker/kicker/ui/k_new_mnu.cpp.ori 2013-05-08 21:56:01.084691260 +0200 ++++ ./kicker/kicker/ui/k_new_mnu.cpp 2013-05-08 21:58:02.086130445 +0200 +@@ -1428,6 +1428,42 @@ + m_systemView->insertItem( "folder_man", i18n( "My Documents" ), documentPath, documentPath, nId++, index++ ); + } + ++ if ( KStandardDirs::exists( KGlobalSettings::picturesPath() + "/" ) ) ++ { ++ TQString picturesPath = KGlobalSettings::picturesPath(); ++ if ( picturesPath.endsWith( "/" ) ) ++ picturesPath = picturesPath.left( picturesPath.length() - 1 ); ++ if (picturesPath!=TQDir::homeDirPath()) ++ m_systemView->insertItem( "folder_image", i18n( "My Images" ), picturesPath, picturesPath, nId++, index++ ); ++ } ++ ++ if ( KStandardDirs::exists( KGlobalSettings::musicPath() + "/" ) ) ++ { ++ TQString musicPath = KGlobalSettings::musicPath(); ++ if ( musicPath.endsWith( "/" ) ) ++ musicPath = musicPath.left( musicPath.length() - 1 ); ++ if (musicPath!=TQDir::homeDirPath()) ++ m_systemView->insertItem( "folder_sound", i18n( "My Music" ), musicPath, musicPath, nId++, index++ ); ++ } ++ ++ if ( KStandardDirs::exists( KGlobalSettings::videosPath() + "/" ) ) ++ { ++ TQString videosPath = KGlobalSettings::videosPath(); ++ if ( videosPath.endsWith( "/" ) ) ++ videosPath = videosPath.left( videosPath.length() - 1 ); ++ if (videosPath!=TQDir::homeDirPath()) ++ m_systemView->insertItem( "folder_video", i18n( "My Videos" ), videosPath, videosPath, nId++, index++ ); ++ } ++ ++ if ( KStandardDirs::exists( KGlobalSettings::downloadPath() + "/" ) ) ++ { ++ TQString downloadPath = KGlobalSettings::downloadPath(); ++ if ( downloadPath.endsWith( "/" ) ) ++ downloadPath = downloadPath.left( downloadPath.length() - 1 ); ++ if (downloadPath!=TQDir::homeDirPath()) ++ m_systemView->insertItem( "folder_inbox", i18n( "My Downloads" ), downloadPath, downloadPath, nId++, index++ ); ++ } ++ + m_systemView->insertItem( "network", i18n( "Network Folders" ), + "remote:/", "remote:/", nId++, index++ ); + diff --git a/redhat/tdebase/tdebase-3.5.13.2-select_wm_gui.patch b/redhat/tdebase/tdebase-3.5.13.2-select_wm_gui.patch new file mode 100644 index 000000000..464ef3f51 --- /dev/null +++ b/redhat/tdebase/tdebase-3.5.13.2-select_wm_gui.patch @@ -0,0 +1,639 @@ +--- ./ksmserver/startup.cpp.ori 2013-05-08 20:04:32.138717187 +0200 ++++ ./ksmserver/startup.cpp 2013-05-08 20:14:12.550305958 +0200 +@@ -115,43 +115,40 @@ + int count = config->readNumEntry( "count" ); + appsToStart = count; + +- TQValueList wmCommands; +- if ( !wm.isEmpty() ) { +- for ( int i = 1; i <= count; i++ ) { +- TQString n = TQString::number(i); +- if ( wm == config->readEntry( TQString("program")+n ) ) { +- wmCommands << config->readListEntry( TQString("restartCommand")+n ); +- } +- } +- } +- if ( wmCommands.isEmpty() ) +- wmCommands << ( TQStringList() << wm ); +- + publishProgress( appsToStart, true ); + connectDCOPSignal( launcher, launcher, "autoStart0Done()", + "autoStart0Done()", true); + connectDCOPSignal( launcher, launcher, "autoStart1Done()", + "autoStart1Done()", true); + connectDCOPSignal( launcher, launcher, "autoStart2Done()", + "autoStart2Done()", true); + upAndRunning( "ksmserver" ); + +- if ( !wmCommands.isEmpty() ) { +- // when we have a window manager, we start it first and give +- // it some time before launching other processes. Results in a +- // visually more appealing startup. +- for (uint i = 0; i < wmCommands.count(); i++) +- startApplication( wmCommands[i] ); +- if ((showFancyLogin) && (!startupNotifierIPDlg)) { +- startupNotifierIPDlg = KSMStartupIPDlg::showStartupIP(); +- } +- TQTimer::singleShot( 4000, this, TQT_SLOT( autoStart0() ) ); +- } else { +- if ((showFancyLogin) && (!startupNotifierIPDlg)) { +- startupNotifierIPDlg = KSMStartupIPDlg::showStartupIP(); ++ // find all commands to launch the wm in the session ++ TQValueList wmStartCommands; ++ if ( !wm.isEmpty() ) { ++ for ( int i = 1; i <= count; i++ ) { ++ TQString n = TQString::number(i); ++ // special hack for it, both kde3(=native) and kde4 kwin have the same program, ++ // but the command for kde4 kwin starts with the kde4 wrapper ++ if( config->readEntry( TQString("program")+n ) == "kwin" ) { ++ TQStringList command = config->readListEntry( TQString("restartCommand")+n ); ++ if( wmCommands.count() > 1 && wmCommands[ 0 ].endsWith( "kde4" ) ++ && command.count() > 1 && command[ 0 ].endsWith( "kde4" )) { ++ wmStartCommands << command; // kde4 wanted, kde4 found ++ } else if(!( wmCommands.count() > 1 && wmCommands[ 0 ].endsWith( "kde4" )) ++ && !( command.count() > 1 && command[ 0 ].endsWith( "kde4" ))) { ++ wmStartCommands << command; // native wanted, native found ++ } ++ } else if ( wm == config->readEntry( TQString("program")+n ) ) { ++ wmStartCommands << config->readListEntry( TQString("restartCommand")+n ); ++ } + } +- autoStart0(); ++ } ++ if( wmStartCommands.isEmpty()) { // otherwise use the configured default ++ wmStartCommands << wmCommands; + } ++ launchWM( wmStartCommands ); + } + + /*! +@@ -180,18 +177,57 @@ + "autoStart1Done()", true); + connectDCOPSignal( launcher, launcher, "autoStart2Done()", + "autoStart2Done()", true); +- startApplication( wm ); ++ launchWM( TQValueList< TQStringList >() << wmCommands ); + if ((showFancyLogin) && (!startupNotifierIPDlg)) { + startupNotifierIPDlg = KSMStartupIPDlg::showStartupIP(); + } ++} ++ ++void KSMServer::launchWM( const QValueList< QStringList >& wmStartCommands ) ++{ ++ assert( state == LaunchingWM ); ++ ++ // when we have a window manager, we start it first and give ++ // it some time before launching other processes. Results in a ++ // visually more appealing startup. ++ wmProcess = startApplication( wmStartCommands[ 0 ] ); ++ connect( wmProcess, TQT_SIGNAL( processExited( KProcess* )), TQT_SLOT( wmProcessChange())); ++ // there can be possibly more wm's (because of forking for multihead), ++ // but in such case care only about the process of the first one ++ for (unsigned int i = 1; i < wmStartCommands.count(); i++) { ++ startApplication( wmStartCommands[i] ); ++ } + TQTimer::singleShot( 4000, this, TQT_SLOT( autoStart0() ) ); + } + + + void KSMServer::clientSetProgram( KSMClient* client ) + { +- if ( !wm.isEmpty() && client->program() == wm ) ++ if ( client->program() == wm ) { + autoStart0(); ++ } ++} ++ ++void KSMServer::wmProcessChange() ++{ ++ if( state != LaunchingWM ) ++ { // don't care about the process when not in the wm-launching state anymore ++ wmProcess = NULL; ++ return; ++ } ++ if( !wmProcess->isRunning()) ++ { // wm failed to launch for some reason, go with kwin instead ++ kdWarning( 1218 ) << "Window manager '" << wm << "' failed to launch" << endl; ++ if( wm == "kwin" ) { ++ return; // uhoh, kwin itself failed ++ } ++ kdDebug( 1218 ) << "Launching KWin" << endl; ++ wm = "kwin"; ++ wmCommands = ( TQStringList() << "kwin" ); ++ // launch it ++ launchWM( TQValueList< TQStringList >() << wmCommands ); ++ return; ++ } + } + + void KSMServer::autoStart0() +--- ./ksmserver/server.h.ORI 2013-05-08 20:16:35.950487652 +0200 ++++ ./ksmserver/server.h 2013-05-08 20:19:49.069692796 +0200 +@@ -30,6 +30,8 @@ + #define SESSION_PREVIOUS_LOGOUT "saved at previous logout" + #define SESSION_BY_USER "saved by user" + ++class KProcess; ++ + typedef TQValueList QCStringList; + class KSMListener; + class KSMConnection; +@@ -98,6 +100,8 @@ + KApplication::ShutdownType sdtype, + KApplication::ShutdownMode sdmode ); + ++ void launchWM( const TQValueList< TQStringList >& wmStartCommands ); ++ + public slots: + void cleanUp(); + +@@ -120,6 +124,7 @@ + void autoStart2(); + void tryRestoreNext(); + void startupSuspendTimeout(); ++ void wmProcessChange(); + + private: + void handlePendingInteractions(); +@@ -138,7 +143,7 @@ + void startProtection(); + void endProtection(); + +- void startApplication( TQStringList command, ++ KProcess* startApplication( TQStringList command, + const TQString& clientMachine = TQString::null, + const TQString& userId = TQString::null ); + void executeCommand( const TQStringList& command ); +@@ -149,6 +154,7 @@ + bool isCM( const TQString& program ) const; + bool isNotifier( const KSMClient* client ) const; + bool isNotifier( const TQString& program ) const; ++ void selectWm( const TQString& kdewm ); + bool defaultSession() const; // empty session + void setupXIOErrorHandler(); + +@@ -231,6 +237,8 @@ + TQString lastIdStarted; + + TQStringList excludeApps; ++ TQStringList wmCommands; ++ KProcess* wmProcess; + + WindowMap legacyWindows; + int initialClientCount; +--- ./ksmserver/CMakeLists.txt.ORI 2013-05-08 20:21:11.420074784 +0200 ++++ ./ksmserver/CMakeLists.txt 2013-05-08 20:22:16.602794164 +0200 +@@ -28,6 +28,8 @@ + ${DBUS_TQT_LIBRARY_DIRS} + ) + ++add_subdirectory( windowmanagers ) ++ + + ##### other data ################################ + +--- ./ksmserver/main.cpp.ori 2013-05-08 20:22:52.841082235 +0200 ++++ ./ksmserver/main.cpp 2013-05-08 20:23:11.717711399 +0200 +@@ -203,8 +203,6 @@ + } + + TQCString wm = args->getOption("windowmanager"); +- if ( wm.isEmpty() ) +- wm = "kwin"; + + bool only_local = args->isSet("local"); + #ifndef HAVE__ICETRANSNOLISTEN +--- ./ksmserver/server.cpp.ori 2013-05-08 20:24:02.870706512 +0200 ++++ ./ksmserver/server.cpp 2013-05-08 20:35:02.808745909 +0200 +@@ -77,6 +77,8 @@ + #include + #include + #include ++#include ++#include + + #include "server.h" + #include "global.h" +@@ -98,11 +100,11 @@ + /*! Utility function to execute a command on the local machine. Used + * to restart applications. + */ +-void KSMServer::startApplication( TQStringList command, const TQString& clientMachine, ++KProcess* KSMServer::startApplication( TQStringList command, const TQString& clientMachine, + const TQString& userId ) + { + if ( command.isEmpty() ) +- return; ++ return NULL; + if ( !userId.isEmpty()) { + struct passwd* pw = getpwuid( getuid()); + if( pw != NULL && userId != TQString::fromLocal8Bit( pw->pw_name )) { +@@ -116,12 +118,13 @@ + command.prepend( clientMachine ); + command.prepend( xonCommand ); // "xon" by default + } +- int n = command.count(); +- TQCString app = command[0].latin1(); +- TQValueList argList; +- for ( int i=1; i < n; i++) +- argList.append( TQCString(command[i].latin1())); +- DCOPRef( launcher ).send( "exec_blind", app, DCOPArg( argList, "TQValueList" ) ); ++ KProcess* process = new KProcess( this ); ++ *process << command; ++ // make it auto-delete ++ connect( process, TQT_SIGNAL( processExited( KProcess* )), process, TQT_SLOT( deleteLater())); ++ process->start(); ++ return process; ++ + } + + /*! Utility function to execute a command on the local machine. Used +@@ -579,7 +582,7 @@ + #endif + + KSMServer::KSMServer( const TQString& windowManager, bool _only_local ) +- : DCOPObject("ksmserver"), sessionGroup( "" ), startupNotifierIPDlg(0), shutdownNotifierIPDlg(0) ++ : DCOPObject("ksmserver"), sessionGroup( "" ), startupNotifierIPDlg(0), shutdownNotifierIPDlg(0), wmProcess( NULL ) + { + the_server = this; + clean = false; +@@ -595,7 +598,10 @@ + config->setGroup("General" ); + clientInteracting = 0; + xonCommand = config->readEntry( "xonCommand", "xon" ); +- ++ ++ KGlobal::dirs()->addResourceType( "windowmanagers", "share/apps/ksmserver/windowmanagers" ); ++ selectWm( windowManager ); ++ + connect( &knotifyTimeoutTimer, TQT_SIGNAL( timeout()), TQT_SLOT( knotifyTimeout())); + connect( &startupSuspendTimeoutTimer, TQT_SIGNAL( timeout()), TQT_SLOT( startupSuspendTimeout())); + connect( &pendingShutdown, TQT_SIGNAL( timeout()), TQT_SLOT( pendingShutdownTimeout())); +@@ -851,15 +857,15 @@ + config->setGroup( sessionGroup ); + count = 0; + +- if ( !wm.isEmpty() ) { +- // put the wm first +- for ( KSMClient* c = clients.first(); c; c = clients.next() ) +- if ( c->program() == wm ) { +- clients.prepend( clients.take() ); +- break; +- } ++ // put the wm first ++ for ( KSMClient* c = clients.first(); c; c = clients.next() ) { ++ if ( c->program() == wm ) { ++ clients.prepend( clients.take() ); ++ break; ++ } + } + ++ + for ( KSMClient* c = clients.first(); c; c = clients.next() ) { + int restartHint = c->restartStyleHint(); + if (restartHint == SmRestartNever) +@@ -909,11 +915,7 @@ + + bool KSMServer::isWM( const TQString& program ) const + { +- // KWin relies on ksmserver's special treatment in phase1, +- // therefore make sure it's recognized even if ksmserver +- // was initially started with different WM, and kwin replaced +- // it later +- return ((program == wm) || (program == "kwin")); ++ return program == wm; + } + + bool KSMServer::isCM( const KSMClient* client ) const +@@ -941,3 +943,62 @@ + { + return sessionGroup.isEmpty(); + } ++ ++static bool noDisplay( KDesktopFile& f ) ++{ ++ KConfigGroup gr( &f, "Desktop Entry" ); ++ if (gr.readBoolEntry("NoDisplay", false)) { ++ return true; ++ } ++ if (gr.hasKey("OnlyShowIn")) { ++ if (!gr.readListEntry("OnlyShowIn", ';').contains("KDE")) ++ return true; ++ } ++ if (gr.hasKey("NotShowIn")) { ++ if (gr.readListEntry("NotShowIn", ';').contains("KDE")) ++ return true; ++ } ++ return false; ++} ++ ++// selection logic: ++// - $KDEWM is set - use that ++// - a wm is selected using the kcm - use that ++// - if that fails, just use KWin ++void KSMServer::selectWm( const TQString& kdewm ) ++{ ++ wm = "kwin"; // defaults ++ wmCommands = ( TQStringList() << "kwin" ); ++ if( !kdewm.isEmpty()) ++ { ++ wmCommands = ( TQStringList() << kdewm ); ++ wm = kdewm; ++ return; ++ } ++ KConfigGroup config(KGlobal::config(), "General"); ++ TQString cfgwm = config.readEntry( "windowManager", "kwin" ); ++ KDesktopFile file( cfgwm + ".desktop", true, "windowmanagers" ); ++ if( noDisplay( file )) { ++ return; ++ } ++ if( !file.tryExec()) { ++ return; ++ } ++ file.setDesktopGroup(); ++ TQString testexec = file.readEntry( "X-KDE-WindowManagerTestExec" ); ++ if( !testexec.isEmpty()) ++ { ++ int ret = system( TQFile::encodeName( testexec )); ++ if( !WIFEXITED( ret ) || WEXITSTATUS( ret ) != 0 ) { ++ return; ++ } ++ } ++ TQStringList cfgWmCommands = KShell::splitArgs( file.readEntry( "Exec" )); ++ if( cfgWmCommands.isEmpty()) { ++ return; ++ } ++ TQString smname = file.readEntry( "X-KDE-WindowManagerId" ); ++ // ok ++ wm = smname.isEmpty() ? cfgwm : smname; ++ wmCommands = cfgWmCommands; ++} +Index: ksmserver/windowmanagers/CMakeLists.txt +=================================================================== +--- /dev/null ++++ ./ksmserver/windowmanagers/CMakeLists.txt +@@ -0,0 +1,4 @@ ++install( ++ FILES compiz-custom.desktop compiz.desktop kwin4.desktop metacity.desktop openbox.desktop ++ DESTINATION ${DATA_INSTALL_DIR}/ksmserver/windowmanagers ++) +Index: ksmserver/windowmanagers/openbox.desktop +=================================================================== +--- /dev/null ++++ ./ksmserver/windowmanagers/openbox.desktop +@@ -0,0 +1,5 @@ ++[Desktop Entry] ++Name=Openbox ++Exec=openbox ++TryExec=openbox ++ +Index: ksmserver/windowmanagers/compiz.desktop +=================================================================== +--- /dev/null ++++ ./ksmserver/windowmanagers/compiz.desktop +@@ -0,0 +1,4 @@ ++[Desktop Entry] ++Name=Compiz ++Exec=compiz ccp ++TryExec=compiz +Index: ksmserver/windowmanagers/compiz-custom.desktop +=================================================================== +--- /dev/null ++++ ./ksmserver/windowmanagers/compiz-custom.desktop +@@ -0,0 +1,5 @@ ++[Desktop Entry] ++Name=Compiz custom (create wrapper script 'compiz-kde-launcher' to launch it) ++Exec=compiz-kde-launcher ++TryExec=compiz ++X-KDE-WindowManagerId=compiz +Index: ksmserver/windowmanagers/kwin4.desktop +=================================================================== +--- /dev/null ++++ ./ksmserver/windowmanagers/kwin4.desktop +@@ -0,0 +1,6 @@ ++[Desktop Entry] ++Name=KWin (KDE4) ++Exec=kde4 /usr/bin/kwin ++TryExec=/usr/bin/kwin ++X-KDE-WindowManagerId=kwin ++ +Index: ksmserver/windowmanagers/metacity.desktop +=================================================================== +--- /dev/null ++++ ./ksmserver/windowmanagers/metacity.desktop +@@ -0,0 +1,4 @@ ++[Desktop Entry] ++Name=Metacity (GNOME) ++Exec=metacity ++TryExec=metacity +--- ./kcontrol/smserver/smserverconfigdlg.ui.ori 2013-05-08 20:42:59.226232919 +0200 ++++ ./kcontrol/smserver/smserverconfigdlg.ui 2013-05-08 20:45:53.648749758 +0200 +@@ -1,4 +1,4 @@ +- ++ + SMServerConfigDlg + + +@@ -8,8 +8,8 @@ + + 0 + 0 +- 325 +- 366 ++ 334 ++ 476 + + + +@@ -173,6 +173,24 @@ + + + ++ ++ ++ windowManagerGroup ++ ++ ++ Window Manager ++ ++ ++ ++ unnamed ++ ++ ++ ++ windowManagerCombo ++ ++ ++ ++ + + + advancedGroup +@@ -279,6 +297,12 @@ + SMServerConfigDlg + configChanged() + ++ ++ windowManagerCombo ++ activated(int) ++ SMServerConfigDlg ++ configChanged() ++ + + + kdialog.h +--- ./kcontrol/smserver/kcmsmserver.cpp.ORI 2013-05-08 20:47:16.855088794 +0200 ++++ ./kcontrol/smserver/kcmsmserver.cpp 2013-05-08 20:57:27.009783724 +0200 +@@ -22,6 +22,8 @@ + #include + #include + #include ++#include ++#include + + #include + +@@ -29,6 +31,12 @@ + #include + #include + #include ++#include ++#include ++#include ++#include ++#include ++#include + + #include "kcmsmserver.h" + #include "smserverconfigimpl.h" +@@ -52,6 +60,7 @@ + + dialog->show(); + topLayout->add(dialog); ++ KGlobal::dirs()->addResourceType( "windowmanagers", "share/apps/ksmserver/windowmanagers" ); + load(); + + } +@@ -90,6 +99,7 @@ + dialog->logoutRadio->setChecked(true); + break; + } ++ loadWMs(c->readEntry("windowManager", "kwin")); + dialog->excludeLineedit->setText( c->readEntry("excludeApps")); + + c->setGroup("Logout"); +@@ -121,6 +131,7 @@ + dialog->rebootRadio->isChecked() ? + int(KApplication::ShutdownTypeReboot) : + int(KApplication::ShutdownTypeNone)); ++ c->writeEntry("windowManager", currentWM()); + c->writeEntry("excludeApps", dialog->excludeLineedit->text()); + c->setGroup("Logout"); + c->writeEntry( "showLogoutStatusDlg", dialog->showLogoutStatusDialog->isChecked()); +@@ -131,6 +142,12 @@ + // update the k menu if necessary + TQByteArray data; + kapp->dcopClient()->send( "kicker", "kicker", "configure()", data ); ++ if( oldwm != currentWM()) ++ { // TODO switch it already in the session instead and tell ksmserver ++ KMessageBox::information( this, ++ i18n( "The new window manager will be used when TDE is started the next time." ), ++ i18n( "Window manager change" ), "windowmanagerchange" ); ++ } + } + + void SMServerConfig::defaults() +@@ -138,5 +155,79 @@ + load( true ); + } + ++static bool noDisplay( KDesktopFile& f ) ++{ ++ KConfigGroup gr( &f, "Desktop Entry" ); ++ if (gr.readBoolEntry("NoDisplay", false)) { ++ return true; ++ } ++ if (gr.hasKey("OnlyShowIn")) { ++ if (!gr.readListEntry("OnlyShowIn", ';').contains("KDE")) ++ return true; ++ } ++ if (gr.hasKey("NotShowIn")) { ++ if (gr.readListEntry("NotShowIn", ';').contains("KDE")) ++ return true; ++ } ++ return false; ++} ++ ++void SMServerConfig::loadWMs( const TQString& current ) ++{ ++ TQString kwinname = i18n( "KWin (KDE default)" ); ++ dialog->windowManagerCombo->insertItem( kwinname ); ++ dialog->windowManagerCombo->setCurrentItem( 0 ); ++ wms[ kwinname ] = "kwin"; ++ oldwm = "kwin"; ++ TQStringList list = KGlobal::dirs()->findAllResources( "windowmanagers", TQString(), false, true ); ++ TQRegExp reg( ".*/([^/\\.]*)\\.[^/\\.]*" ); ++ for( TQStringList::ConstIterator it = list.begin(); ++ it != list.end(); ++ ++it ) ++ { ++ TQString wmfile = *it; ++ KDesktopFile file( wmfile ); ++ if( noDisplay( file )) { ++ continue; ++ } ++ if( !file.tryExec()) { ++ continue; ++ } ++ file.setDesktopGroup(); ++ TQString testexec = file.readEntry( "X-KDE-WindowManagerTestExec" ); ++ if( !testexec.isEmpty()) ++ { ++ int ret = system( TQFile::encodeName( testexec )); ++ if( !WIFEXITED( ret ) || WEXITSTATUS( ret ) != 0 ) { ++ continue; ++ } ++ } ++ TQString name = file.readName(); ++ if( name.isEmpty()) { ++ continue; ++ } ++ if( !reg.exactMatch( wmfile )) { ++ continue; ++ } ++ TQString wm = reg.cap( 1 ); ++ if( wms.values().contains( wm )) { ++ continue; ++ } ++ wms[ name ] = wm; ++ dialog->windowManagerCombo->insertItem( name ); ++ if( wms[ name ] == current ) // make it selected ++ { ++ dialog->windowManagerCombo->setCurrentItem( dialog->windowManagerCombo->count() - 1 ); ++ oldwm = wm; ++ } ++ } ++} ++ ++TQString SMServerConfig::currentWM() const ++{ ++ return wms[ dialog->windowManagerCombo->currentText() ]; ++} ++ ++ + #include "kcmsmserver.moc" + +--- ./kcontrol/smserver/kcmsmserver.h.ORI 2013-05-08 20:58:45.880171397 +0200 ++++ ./kcontrol/smserver/kcmsmserver.h 2013-05-08 20:59:21.030453176 +0200 +@@ -40,6 +40,10 @@ + + private: + SMServerConfigImpl* dialog; ++ void loadWMs( const TQString& current ); ++ TQString currentWM() const; ++ TQMap< TQString, TQString > wms; // i18n text -> internal name ++ TQString oldwm; // the original value + + }; + diff --git a/redhat/tdebase/tdebase-3.5.13.2-suspend_unmount.patch b/redhat/tdebase/tdebase-3.5.13.2-suspend_unmount.patch new file mode 100644 index 000000000..5b8264eb0 --- /dev/null +++ b/redhat/tdebase/tdebase-3.5.13.2-suspend_unmount.patch @@ -0,0 +1,152 @@ +--- ./kioslave/media/libmediacommon/medium.cpp.ori 2013-05-08 22:57:09.317384423 +0200 ++++ ./kioslave/media/libmediacommon/medium.cpp 2013-05-08 22:57:36.730837358 +0200 +@@ -44,6 +44,7 @@ + loadUserLabel(); + + m_halmounted = false; ++ m_isHotplug = false; + } + + Medium::Medium() +@@ -65,6 +66,7 @@ + m_properties+= TQString::null; /* CLEAR_DEVICE_UDI */ + + m_halmounted = false; ++ m_isHotplug = false; + } + + const Medium Medium::create(const TQStringList &properties) +--- ./kioslave/media/libmediacommon/medium.h.ORI 2013-05-08 22:59:10.772959829 +0200 ++++ ./kioslave/media/libmediacommon/medium.h 2013-05-08 22:59:56.602044404 +0200 +@@ -92,6 +92,9 @@ + void setHalMounted(bool flag) const { m_halmounted = flag; } + bool halMounted() const { return m_halmounted; } + ++ void setIsHotplug( bool state ) { m_isHotplug = state; } ++ bool isHotplug() const { return m_isHotplug; } ++ + //private: + Medium(); + +@@ -100,6 +103,8 @@ + + TQStringList m_properties; + mutable bool m_halmounted; ++ ++ bool m_isHotplug; + + friend class TQValueListNode; + }; +--- ./kioslave/media/mediamanager/mediamanager.cpp.ori 2013-05-08 23:00:39.673183801 +0200 ++++ ./kioslave/media/mediamanager/mediamanager.cpp 2013-05-08 23:04:47.639224260 +0200 +@@ -354,6 +354,57 @@ + emit mediumChanged(name); + } + ++TQString MediaManager::unmountAllSuspend() ++{ ++ TQPtrList list = m_mediaList.list(); ++ ++ TQPtrList::const_iterator it = list.begin(); ++ TQPtrList::const_iterator end = list.end(); ++ ++ TQString result; ++ ++ for (; it!=end; ++it) ++ { ++ if ( (*it)->isMounted() && (*it)->isHotplug() ) ++ { ++ TQString tmp = unmount( (*it)->id() ); ++ if ( !tmp.isEmpty() ) { // umount failed ++ result = tmp; ++ } else { ++ m_suspendResumeMountList.append( (*it)->id() ); ++ } ++ } ++ } ++ ++ // return last error ++ return result; ++} ++ ++TQString MediaManager::remountAllResume() ++{ ++ TQString result; ++ ++ for (TQStringList::const_iterator it = m_suspendResumeMountList.begin(); ++ it != m_suspendResumeMountList.end(); ++ ++it) ++ { ++ const Medium *m = m_mediaList.findById(*it); ++ ++ if ( m && m->needMounting() ) ++ { ++ TQString tmp = mount( *it ); ++ if ( !tmp.isEmpty() ) { // mount failed ++ result = tmp; ++ } ++ } ++ } ++ ++ m_suspendResumeMountList.clear(); ++ ++ // return last error ++ return result; ++} ++ + + extern "C" { + KDE_EXPORT KDEDModule *create_mediamanager(const TQCString &obj) +--- ./kioslave/media/mediamanager/mediamanager.h.ORI 2013-05-08 23:05:36.250251036 +0200 ++++ ./kioslave/media/mediamanager/mediamanager.h 2013-05-08 23:07:27.650019601 +0200 +@@ -60,6 +60,20 @@ + bool removableUnplug(const TQString &devNode); + bool removableCamera(const TQString &devNode); + ++ /** ++ * Unmount manually all partitions when going to suspend ++ * ++ * @return last error if any ++ */ ++ TQString unmountAllSuspend(); ++ ++ /** ++ * Remount previously unmounted partitions in unmountAllSuspend() ++ * ++ * @return last error if any ++ */ ++ TQString remountAllResume(); ++ + k_dcop_signals: + void mediumAdded(const TQString &name, bool allowNotification); + void mediumRemoved(const TQString &name, bool allowNotification); +@@ -87,6 +101,8 @@ + HALBackend *m_halbackend; + MediaDirNotify m_dirNotify; + FstabBackend *m_fstabbackend; ++ TQStringList m_suspendResumeMountList; ++ + }; + + #endif +--- ./kioslave/media/mediamanager/halbackend.cpp.ori 2013-05-08 23:08:12.196126863 +0200 ++++ ./kioslave/media/mediamanager/halbackend.cpp 2013-05-08 23:08:51.096347073 +0200 +@@ -541,6 +541,7 @@ + libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ + } + ++ medium->setIsHotplug( libhal_drive_is_hotpluggable(halDrive) ); + + char* name = libhal_volume_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); + TQString volume_name = TQString::fromUtf8(name); +--- ./kioslave/media/mediamanager/halbackend.h.ORI 2013-05-08 23:09:35.761451488 +0200 ++++ ./kioslave/media/mediamanager/halbackend.h 2013-05-08 23:10:21.608531952 +0200 +@@ -89,6 +89,8 @@ + TQString decrypt(const TQString &id, const TQString &password); + TQString undecrypt(const TQString &id); + ++ static bool isHotplug( const TQString & id ); ++ + private: + /** + * Append a device in the media list. This function will check if the device diff --git a/redhat/tdebase/tdebase-3.5.13.2-vibrate_dialog.patch b/redhat/tdebase/tdebase-3.5.13.2-vibrate_dialog.patch new file mode 100644 index 000000000..346eda1f5 --- /dev/null +++ b/redhat/tdebase/tdebase-3.5.13.2-vibrate_dialog.patch @@ -0,0 +1,186 @@ +--- trinity-tdebase-3.5.13.2~pre102+43d29f86/kcontrol/screensaver/scrnsave.h.ORI 2013-05-14 22:12:18.159235590 +0200 ++++ trinity-tdebase-3.5.13.2~pre102+43d29f86/kcontrol/screensaver/scrnsave.h 2013-05-14 22:12:56.657422259 +0200 +@@ -58,6 +58,7 @@ + void slotLock( bool ); + void slotDelaySaverStart( bool ); + void slotUseTSAK( bool ); ++ void slotVibrateUnlock( bool ); + void slotUseUnmanagedLockWindows( bool ); + void slotHideActiveWindowsFromSaver( bool ); + void processLockouts(); +@@ -101,6 +102,7 @@ + TQGroupBox *mSettingsGroup; + TQCheckBox *mDelaySaverStartCheckBox; + TQCheckBox *mUseTSAKCheckBox; ++ TQCheckBox *mVibrateUnlockCheckBox; + TQCheckBox *mUseUnmanagedLockWindowsCheckBox; + TQCheckBox *mHideActiveWindowsFromSaverCheckBox; + +@@ -119,6 +121,7 @@ + bool mImmutable; + bool mDelaySaverStart; + bool mUseTSAK; ++ bool mVibrateUnlock; + bool mUseUnmanagedLockWindows; + bool mHideActiveWindowsFromSaver; + +--- trinity-tdebase-3.5.13.2~pre102+43d29f86/kcontrol/screensaver/scrnsave.cpp.vibrate_dialog 2013-04-26 22:15:23.000000000 +0200 ++++ trinity-tdebase-3.5.13.2~pre102+43d29f86/kcontrol/screensaver/scrnsave.cpp 2013-05-14 22:24:37.354375502 +0200 +@@ -270,6 +270,13 @@ + settingsGroupLayout->addWidget(mHideActiveWindowsFromSaverCheckBox, 3, 1); + TQWhatsThis::add( mHideActiveWindowsFromSaverCheckBox, i18n("Hide all active windows from the screen saver and use the desktop background as the screen saver input.") ); + ++ mVibrateUnlockCheckBox = new TQCheckBox( i18n("&Vibrate unlock dialog box on failure"), mSettingsGroup ); ++ mVibrateUnlockCheckBox->setEnabled( true ); ++ mVibrateUnlockCheckBox->setChecked( mVibrateUnlock ); ++ connect( mVibrateUnlockCheckBox, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotVibrateUnlock( bool ) ) ); ++ settingsGroupLayout->addWidget(mVibrateUnlockCheckBox, 4, 1); ++ TQWhatsThis::add( mVibrateUnlockCheckBox, i18n("Makes the unlock dialog box vibrate when entering an incorrect password.") ); ++ + // right column + TQBoxLayout* rightColumnLayout = new TQVBoxLayout(topLayout, KDialog::spacingHint()); + +@@ -429,6 +436,7 @@ + mLock = config->readBoolEntry("Lock", false); + mDelaySaverStart = config->readBoolEntry("DelaySaverStart", true); + mUseTSAK = config->readBoolEntry("UseTDESAK", true); ++ mVibrateUnlock = config->readBoolEntry("VibrateUnlock", true); + mUseUnmanagedLockWindows = config->readBoolEntry("UseUnmanagedLockWindows", false); + mHideActiveWindowsFromSaver = config->readBoolEntry("HideActiveWindowsFromSaver", true); + mSaver = config->readEntry("Saver"); +@@ -481,6 +489,7 @@ + config->writeEntry("Lock", mLock); + config->writeEntry("DelaySaverStart", mDelaySaverStart); + config->writeEntry("UseTDESAK", mUseTSAK); ++ config->writeEntry("VibrateUnlock", mVibrateUnlock); + config->writeEntry("UseUnmanagedLockWindows", mUseUnmanagedLockWindows); + config->writeEntry("HideActiveWindowsFromSaver", mHideActiveWindowsFromSaver); + +@@ -688,10 +697,14 @@ + mUseTSAKCheckBox->setChecked( false ); + } + if (!mUseUnmanagedLockWindows) { ++ mVibrateUnlockCheckBox->setEnabled( true ); ++ mVibrateUnlockCheckBox->setChecked( mVibrateUnlock ); + mHideActiveWindowsFromSaverCheckBox->setEnabled( true ); + mHideActiveWindowsFromSaverCheckBox->setChecked( mHideActiveWindowsFromSaver ); + } + else { ++ mVibrateUnlockCheckBox->setEnabled( false ); ++ mVibrateUnlockCheckBox->setChecked( false ); + mHideActiveWindowsFromSaverCheckBox->setEnabled( false ); + mHideActiveWindowsFromSaverCheckBox->setChecked( false ); + } +@@ -936,6 +949,16 @@ + processLockouts(); + mChanged = true; + emit changed(true); ++} ++ ++//--------------------------------------------------------------------------- ++// ++void KScreenSaver::slotVibrateUnlock( bool u ) ++{ ++ if (mVibrateUnlockCheckBox->isEnabled()) mVibrateUnlock = u; ++ processLockouts(); ++ mChanged = true; ++ emit changed(true); + } + + //--------------------------------------------------------------------------- +--- trinity-tdebase-3.5.13.2~pre102+43d29f86/kdesktop/lock/lockdlg.h.vibrate_dialog 2013-01-09 02:12:13.000000000 +0100 ++++ trinity-tdebase-3.5.13.2~pre102+43d29f86/kdesktop/lock/lockdlg.h 2013-05-14 22:42:50.562878532 +0200 +@@ -60,6 +60,7 @@ + void slotOK(); + void layoutClicked(); + void slotActivity(); ++ void moveTimerDone(); + + protected slots: + virtual void reject(); +@@ -79,6 +80,8 @@ + void handleVerify(); + void reapVerify(); + void cantCheck(); ++ void movedialog( int _move ); ++ void badPasswordLogin(); + GreeterPluginHandle *mPlugin; + KGreeterPlugin *greet; + TQFrame *frame; +@@ -95,6 +98,8 @@ + int sPid, sFd; + TQListView *lv; + TQDateTime m_lockStartDT; ++ bool waitMoveDialog; ++ bool VibrateUnlock; + }; + + #endif +--- trinity-tdebase-3.5.13.2~pre102+43d29f86/kdesktop/lock/lockdlg.cc.vibrate_dialog 2013-01-09 02:12:13.000000000 +0100 ++++ trinity-tdebase-3.5.13.2~pre102+43d29f86/kdesktop/lock/lockdlg.cc 2013-05-14 22:42:12.809621715 +0200 +@@ -55,6 +55,7 @@ + #include + #include + #include ++#include + + #ifndef AF_LOCAL + # define AF_LOCAL AF_UNIX +@@ -246,6 +247,11 @@ + mLayoutButton->hide(); // no kxkb running + } + capsLocked(); ++ ++ KConfig* config = new KConfig("kdesktoprc"); ++ config->setGroup("ScreenSaver"); ++ VibrateUnlock = config->readBoolEntry("VibrateUnlock", true); ++ delete config; + } + + PasswordDlg::~PasswordDlg() +@@ -302,6 +308,37 @@ + } + } + ++void PasswordDlg::movedialog( int _move ) ++{ ++ waitMoveDialog = true; ++ this->move(pos().x()+_move, pos().y()); ++ TQTimer::singleShot( 50, this, TQT_SLOT(moveTimerDone()) ); ++ while (waitMoveDialog) { ++ kapp->processEvents(); ++ } ++} ++ ++void PasswordDlg::moveTimerDone() ++{ ++ waitMoveDialog = false; ++} ++ ++void PasswordDlg::badPasswordLogin() ++{ ++ if ( VibrateUnlock && mUnlockingFailed ) ++ { ++ for ( int i = 0 ; i<2 ; i++) ++ { ++ movedialog( 10 ); ++ movedialog( -20 ); ++ movedialog( 20 ); ++ movedialog( -20 ); ++ movedialog( 20 ); ++ movedialog( -10 ); ++ } ++ } ++} ++ + //--------------------------------------------------------------------------- + // + // Handle timer events. +@@ -437,6 +474,7 @@ + ok->setEnabled(false); + cancel->setEnabled(false); + mNewSessButton->setEnabled( false ); ++ badPasswordLogin(); + return; + case AuthAbort: + return; diff --git a/redhat/tdeedu/kdeedu-3.5.13.2-fix_ftbfs.patch b/redhat/tdeedu/kdeedu-3.5.13.2-fix_ftbfs.patch new file mode 100644 index 000000000..073e49269 --- /dev/null +++ b/redhat/tdeedu/kdeedu-3.5.13.2-fix_ftbfs.patch @@ -0,0 +1,170 @@ +commit c5dacf57e07e93dd186692d4de64fbe9784af87d +Author: Timothy Pearson +Date: 1365376170 -0500 + + Allow kvoctrain to build even if undefined symbols have been disallowed + This relates to Bug 1134 + +diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp +index d48a7eb..d148f85 100644 +--- a/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp ++++ b/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp +@@ -32,6 +32,55 @@ + #include + using namespace std; + ++vector getCsvOrder(kvoctrainDoc *doc) ++{ ++ vector csv_order; ++ TQStringList lang_order = Prefs::pasteOrder(); ++ ++ if (!Prefs::useCurrent()) ++ { ++ if (/*lang_order &&*/ lang_order.count() != 0) { ++ for (int i = 0; i < (int) lang_order.count(); i++) ++ { ++ int j = doc->findIdent((lang_order)[i]); ++ if (j >= 0) ++ csv_order.push_back (j); ++ else ++ csv_order.push_back (-1); ++ } ++ } ++ } ++/* ++ for (int i = 0; i < csv_order.size(); i++) ++ cout << csv_order[i] << " "; ++ cout << endl; ++*/ ++ ++/* perhaps skip missing ?? ++ for (int i = csv_order.size()-1; i >= 0; i--) ++ if (csv_order[i] == -1) ++ csv_order.erase(csv_order.begin() + i); ++*/ ++ // append indices from doc if no order given ++ for (int i = 0; i < doc->numLangs(); i++) ++ if (::find (csv_order.begin(), csv_order.end(), i) == csv_order.end()) ++ csv_order.push_back(i); ++/* ++ if (csv_order.size() > doc->numLangs() ) ++ csv_order.erase(csv_order.begin() + doc->numLangs(), csv_order.end()); ++*/ ++ ++ // remove trailing garbage ++ for (int i = csv_order.size()-1; i >= 0; i--) { ++ if (csv_order[i] != -1) ++ break; ++ else ++ csv_order.erase(csv_order.begin() + i); ++ } ++ ++ return csv_order; ++} ++ + bool kvoctrainDoc::saveTypeNameCsv (TQTextStream &) + { + return true; +@@ -70,7 +119,7 @@ bool kvoctrainDoc::saveToCsv (TQTextStream& os, TQString &) + os << i18n("! Title:") << separator << getTitle() << "\n"; + os << i18n("! Author:") << separator << getAuthor() << "\n"; + +- vector csv_order = kvoctrainApp::getCsvOrder(this); ++ vector csv_order = getCsvOrder(this); + + vector::const_iterator first = vocabulary.begin (); + TQString exp; +commit 2e1267ad62d5a62f6ace0e5452c07f4c8b685d6a +Author: Timothy Pearson +Date: 1365377332 -0500 + + Reconsolidate split code from prior commit + +diff --git a/kvoctrain/kvoctrain/kva_clip.cpp b/kvoctrain/kvoctrain/kva_clip.cpp +index 881fbed..66e1ca9 100644 +--- a/kvoctrain/kvoctrain/kva_clip.cpp ++++ b/kvoctrain/kvoctrain/kva_clip.cpp +@@ -35,6 +35,8 @@ + #include + using namespace std; + ++extern vector getCsvOrderStatic(kvoctrainDoc *doc); ++ + void kvoctrainApp::slotSmartSearchClip() + { + TQString s; +@@ -62,51 +64,7 @@ void kvoctrainApp::slotSmartSearchClip() + + vector kvoctrainApp::getCsvOrder(kvoctrainDoc *doc) + { +- vector csv_order; +- TQStringList lang_order = Prefs::pasteOrder(); +- +- if (!Prefs::useCurrent()) +- { +- if (/*lang_order &&*/ lang_order.count() != 0) { +- for (int i = 0; i < (int) lang_order.count(); i++) +- { +- int j = doc->findIdent((lang_order)[i]); +- if (j >= 0) +- csv_order.push_back (j); +- else +- csv_order.push_back (-1); +- } +- } +- } +-/* +- for (int i = 0; i < csv_order.size(); i++) +- cout << csv_order[i] << " "; +- cout << endl; +-*/ +- +-/* perhaps skip missing ?? +- for (int i = csv_order.size()-1; i >= 0; i--) +- if (csv_order[i] == -1) +- csv_order.erase(csv_order.begin() + i); +-*/ +- // append indices from doc if no order given +- for (int i = 0; i < doc->numLangs(); i++) +- if (::find (csv_order.begin(), csv_order.end(), i) == csv_order.end()) +- csv_order.push_back(i); +-/* +- if (csv_order.size() > doc->numLangs() ) +- csv_order.erase(csv_order.begin() + doc->numLangs(), csv_order.end()); +-*/ +- +- // remove trailing garbage +- for (int i = csv_order.size()-1; i >= 0; i--) { +- if (csv_order[i] != -1) +- break; +- else +- csv_order.erase(csv_order.begin() + i); +- } +- +- return csv_order; ++ return getCsvOrderStatic(doc); + } + + +diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp +index d148f85..d1d2212 100644 +--- a/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp ++++ b/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp +@@ -32,7 +32,7 @@ + #include + using namespace std; + +-vector getCsvOrder(kvoctrainDoc *doc) ++vector getCsvOrderStatic(kvoctrainDoc *doc) + { + vector csv_order; + TQStringList lang_order = Prefs::pasteOrder(); +@@ -119,7 +119,7 @@ bool kvoctrainDoc::saveToCsv (TQTextStream& os, TQString &) + os << i18n("! Title:") << separator << getTitle() << "\n"; + os << i18n("! Author:") << separator << getAuthor() << "\n"; + +- vector csv_order = getCsvOrder(this); ++ vector csv_order = getCsvOrderStatic(this); + + vector::const_iterator first = vocabulary.begin (); + TQString exp; diff --git a/redhat/tdelibs/kdelibs-3.5.13.2-kpassivepopup_latin1.patch b/redhat/tdelibs/kdelibs-3.5.13.2-kpassivepopup_latin1.patch new file mode 100644 index 000000000..45f75e3c6 --- /dev/null +++ b/redhat/tdelibs/kdelibs-3.5.13.2-kpassivepopup_latin1.patch @@ -0,0 +1,11 @@ +--- trinity-tdelibs-3.5.13.2/kdeui/kpassivepopup.cpp.ORI 2013-02-16 23:33:04.657067698 +0100 ++++ trinity-tdelibs-3.5.13.2/kdeui/kpassivepopup.cpp 2013-02-16 23:34:42.083107895 +0100 +@@ -152,7 +152,7 @@ + } + + if ( !text.isEmpty() ) { +- msg = new TQLabel( text, vb, "msg_label" ); ++ const char* m = text.latin1(); msg = new TQLabel( TQString::fromUtf8(m), vb, "msg_label" ); + msg->setAlignment( AlignLeft ); + } + diff --git a/redhat/tdelibs/tdelibs-3.5.13.2-cups_by_default.patch b/redhat/tdelibs/tdelibs-3.5.13.2-cups_by_default.patch new file mode 100644 index 000000000..dfb472ee1 --- /dev/null +++ b/redhat/tdelibs/tdelibs-3.5.13.2-cups_by_default.patch @@ -0,0 +1,33 @@ +--- ./kdeprint/kmfactory.cpp.ORI 2013-05-09 00:14:51.664045869 +0200 ++++ ./kdeprint/kmfactory.cpp 2013-05-09 00:16:59.154367127 +0200 +@@ -249,8 +249,21 @@ + conf->writeEntry("PrintSystem", sys); + conf->sync(); + } +- else if ( sys.length()==1 && sys[0].isDigit() ) // discard old-style settings ++ else if ( sys.length()==1 && sys[0].isDigit() ) { // discard old-style settings + sys = "lpdunix"; ++ } else { ++ //Always Autodetect ++ //it will not try autodetect if user changes any option ++ //when user force some option, AlwaysSearch will be "no" and then ++ //kprinter will not to try autodetect again. ++ if(conf->readEntry("AlwaysSearch") != "no" ) { ++ sys = autoDetect(); ++ conf->writeEntry("PrintSystem",sys); ++ conf->writeEntry("AlwaysSearch","yes"); ++ conf->sync(); ++ } ++ } ++ + return sys; + } + +@@ -278,6 +291,7 @@ + { + KConfig *conf = printConfig(); + conf->setGroup("General"); ++ conf->writeEntry("AlwaysSearch","no"); + conf->writeEntry("PrintSystem", syst); + conf->sync(); + diff --git a/redhat/tdelibs/tdelibs-3.5.13.2-fix_kzip_empty_directory.patch b/redhat/tdelibs/tdelibs-3.5.13.2-fix_kzip_empty_directory.patch new file mode 100644 index 000000000..e56d7559d --- /dev/null +++ b/redhat/tdelibs/tdelibs-3.5.13.2-fix_kzip_empty_directory.patch @@ -0,0 +1,38 @@ +--- ./kio/kio/kzip.cpp.ORI 2013-05-31 23:15:23.021298550 +0200 ++++ ./kio/kio/kzip.cpp 2013-05-31 23:16:43.525633640 +0200 +@@ -1051,6 +1051,21 @@ + return true; + } + ++bool KZip::writeDir(const TQString& name, const TQString& user, const TQString& group) ++{ ++ // Zip files have no explicit directories, they are implicitly created during extraction time ++ // when file entries have paths in them. ++ // However, to support empty directories, we must create a dummy file entry which ends with '/'. ++ TQString dirName = name; ++ if (!name.endsWith("/")) { ++ dirName = dirName.append('/'); ++ } ++ ++ mode_t perm = 040755; ++ time_t the_time = time(0); ++ return writeFile(dirName, user, group, 0, perm, the_time, the_time, the_time, 0); ++} ++ + // Doesn't need to be reimplemented anymore. Remove for KDE-4.0 + bool KZip::writeFile( const TQString& name, const TQString& user, const TQString& group, uint size, const char* data ) + { +--- ./kio/kio/kzip.h.ORI 2013-05-31 23:18:30.829414791 +0200 ++++ ./kio/kio/kzip.h 2013-05-31 23:19:10.763589109 +0200 +@@ -191,10 +191,7 @@ + /// Closes the archive + virtual bool closeArchive(); + +- /** +- * @internal Not needed for zip +- */ +- virtual bool writeDir( const TQString& name, const TQString& user, const TQString& group) { Q_UNUSED(name); Q_UNUSED(user); Q_UNUSED(group); return true; } ++ virtual bool writeDir(const QString& name, const QString& user, const QString& group); + // TODO(BIC) uncomment and make virtual for KDE 4. + // bool writeDir( const TQString& name, const TQString& user, const TQString& group, + // mode_t perm, time_t atime, time_t mtime, time_t ctime ); diff --git a/redhat/tdelibs/tdelibs-3.5.13.2-xdg_dirs_set_path.patch b/redhat/tdelibs/tdelibs-3.5.13.2-xdg_dirs_set_path.patch new file mode 100644 index 000000000..28fe715b4 --- /dev/null +++ b/redhat/tdelibs/tdelibs-3.5.13.2-xdg_dirs_set_path.patch @@ -0,0 +1,150 @@ +--- ./kdecore/kglobalsettings.h.Ori 2013-05-08 22:16:42.771982104 +0200 ++++ ./kdecore/kglobalsettings.h 2013-05-08 22:18:33.882577602 +0200 +@@ -253,6 +253,29 @@ + */ + static TQString documentPath() { initStatic(); return *s_documentPath; } + ++ /** ++ * The path where documents are stored of the current user. ++ * @return the path of the videos directory ++ */ ++ static TQString videosPath() { initStatic(); return *s_videosPath; } ++ ++ /** ++ * The path where documents are stored of the current user. ++ * @return the path of the music directory ++ */ ++ static TQString musicPath() { initStatic(); return *s_musicPath; } ++ ++ /** ++ * The path where documents are stored of the current user. ++ * @return the path of the downloads directory ++ */ ++ static TQString downloadPath() { initStatic(); return *s_downloadPath; } ++ ++ /** ++ * The path where documents are stored of the current user. ++ * @return the path of the pictures directory ++ */ ++ static TQString picturesPath() { initStatic(); return *s_picturesPath; } + + /** + * The default color to use when highlighting toolbar buttons. +@@ -560,6 +583,10 @@ + static TQString* s_autostartPath; + static TQString* s_trashPath; + static TQString* s_documentPath; ++ static TQString* s_picturesPath; ++ static TQString* s_downloadPath; ++ static TQString* s_musicPath; ++ static TQString* s_videosPath; + static TQFont *_generalFont; + static TQFont *_fixedFont; + static TQFont *_toolBarFont; +--- ./kdecore/kglobalsettings.cpp.xdg_path 2013-01-09 19:23:09.000000000 +0100 ++++ ./kdecore/kglobalsettings.cpp 2013-05-08 22:26:26.451376166 +0200 +@@ -62,6 +62,10 @@ + TQString* KGlobalSettings::s_autostartPath = 0; + TQString* KGlobalSettings::s_trashPath = 0; + TQString* KGlobalSettings::s_documentPath = 0; ++TQString* KGlobalSettings::s_videosPath = 0; ++TQString* KGlobalSettings::s_musicPath = 0; ++TQString* KGlobalSettings::s_downloadPath = 0; ++TQString* KGlobalSettings::s_picturesPath = 0; + TQFont *KGlobalSettings::_generalFont = 0; + TQFont *KGlobalSettings::_fixedFont = 0; + TQFont *KGlobalSettings::_toolBarFont = 0; +@@ -83,7 +87,7 @@ + + // helper function for reading xdg user dirs: it is required in order to take + // care of locale stuff +-void readXdgUserDirs(TQString *desktop, TQString *documents) ++void readXdgUserDirs(TQString *desktop, TQString *documents, TQString *videos, TQString *music, TQString *download, TQString *pictures) + { + TQFile f( TQDir::homeDirPath() + "/.config/user-dirs.dirs" ); + +@@ -101,6 +105,14 @@ + *desktop = line.remove("XDG_DESKTOP_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath()); + else if (line.startsWith("XDG_DOCUMENTS_DIR=")) + *documents = line.remove("XDG_DOCUMENTS_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath()); ++ else if (line.startsWith("XDG_MUSIC_DIR=")) ++ *videos = line.remove("XDG_MUSIC_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath()); ++ else if (line.startsWith("XDG_DOWNLOAD_DIR=")) ++ *download = line.remove("XDG_DOWNLOAD_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath()); ++ else if (line.startsWith("XDG_VIDEOS_DIR=")) ++ *music = line.remove("XDG_VIDEOS_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath()); ++ else if (line.startsWith("XDG_PICTURES_DIR=")) ++ *pictures = line.remove("XDG_PICTURES_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath()); + + line = s.readLine(); + } +@@ -515,30 +527,45 @@ + s_autostartPath = new TQString(); + s_trashPath = new TQString(); + s_documentPath = new TQString(); ++ s_videosPath = new TQString(); ++ s_musicPath = new TQString(); ++ s_downloadPath = new TQString(); ++ s_picturesPath = new TQString(); ++ + + KConfigGroup g( KGlobal::config(), "Paths" ); + +- // Read desktop and documents path using XDG_USER_DIRS +- readXdgUserDirs(s_desktopPath, s_documentPath); ++ // Read desktop and documents path using XDG_USER_DIRS ++ readXdgUserDirs(s_desktopPath, s_documentPath, s_musicPath, s_videosPath, s_downloadPath, s_picturesPath); + + if (s_desktopPath->isEmpty() == true) { + *s_desktopPath = TQDir::homeDirPath() + "/Desktop/"; + } ++ + *s_desktopPath = TQDir::cleanDirPath( *s_desktopPath ); + if ( !s_desktopPath->endsWith("/") ) + s_desktopPath->append('/'); + +- if (s_documentPath->isEmpty() == true) { +-#ifdef Q_WS_WIN +- *s_documentPath = getWin32ShellFoldersPath("Personal"); +-#else +- *s_documentPath = TQDir::homeDirPath() + "/Documents/"; +-#endif +- } + *s_documentPath = TQDir::cleanDirPath( *s_documentPath ); + if ( !s_documentPath->endsWith("/")) + s_documentPath->append('/'); + ++ *s_musicPath = TQDir::cleanDirPath( *s_musicPath ); ++ if ( !s_musicPath->endsWith("/")) ++ s_musicPath->append('/'); ++ ++ *s_videosPath = TQDir::cleanDirPath( *s_videosPath ); ++ if ( !s_videosPath->endsWith("/")) ++ s_videosPath->append('/'); ++ ++ *s_downloadPath = TQDir::cleanDirPath( *s_downloadPath ); ++ if ( !s_downloadPath->endsWith("/")) ++ s_downloadPath->append('/'); ++ ++ *s_picturesPath = TQDir::cleanDirPath( *s_picturesPath ); ++ if ( !s_picturesPath->endsWith("/")) ++ s_picturesPath->append('/'); ++ + // Trash Path - TODO remove in KDE4 (kio_trash can't use it for interoperability reasons) + *s_trashPath = *s_desktopPath + i18n("Trash") + "/"; + *s_trashPath = g.readPathEntry( "Trash" , *s_trashPath); +@@ -603,6 +630,14 @@ + s_desktopPath = 0L; + delete s_documentPath; + s_documentPath = 0L; ++ delete s_videosPath; ++ s_videosPath = 0L; ++ delete s_picturesPath; ++ s_picturesPath = 0L; ++ delete s_downloadPath; ++ s_downloadPath = 0L; ++ delete s_musicPath; ++ s_musicPath = 0L; + } + + KGlobalSettings::KMouseSettings & KGlobalSettings::mouseSettings() diff --git a/redhat/tdemultimedia/kdemultimedia-3.5.13.2-fix_gstreamer_1.0.patch b/redhat/tdemultimedia/kdemultimedia-3.5.13.2-fix_gstreamer_1.0.patch new file mode 100644 index 000000000..acaa24101 --- /dev/null +++ b/redhat/tdemultimedia/kdemultimedia-3.5.13.2-fix_gstreamer_1.0.patch @@ -0,0 +1,11 @@ +--- trinity-tdemultimedia-3.5.13.2/juk/configure.in.in.ORI 2013-02-13 21:30:12.230539642 +0100 ++++ trinity-tdemultimedia-3.5.13.2/juk/configure.in.in 2013-02-13 22:00:07.584173123 +0100 +@@ -50,7 +50,7 @@ + PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 + export PKG_CONFIG_ALLOW_SYSTEM_LIBS + +- GST_MAJORMINOR=0.10 ++ GST_MAJORMINOR=1.0 + GST_REQ=0.10.0 + GST_VERSION=10 + diff --git a/redhat/tdemultimedia/tdemultimedia-3.5.13.2-fix_pulseaudio_mixer.patch b/redhat/tdemultimedia/tdemultimedia-3.5.13.2-fix_pulseaudio_mixer.patch new file mode 100644 index 000000000..66a796a03 --- /dev/null +++ b/redhat/tdemultimedia/tdemultimedia-3.5.13.2-fix_pulseaudio_mixer.patch @@ -0,0 +1,26 @@ +--- trinity-tdemultimedia-3.5.13.2~pre21+6e6307c6/kmix/kmixdockwidget.cpp.ORI 2013-05-21 23:07:46.511834317 +0200 ++++ trinity-tdemultimedia-3.5.13.2~pre21+6e6307c6/kmix/kmixdockwidget.cpp 2013-05-21 23:07:04.202716141 +0200 +@@ -109,6 +109,7 @@ + _oldToolTipValue = -1; + _oldPixmapType = '-'; + ++/* + if (m_mixer == 0) { + // In case that there is no mixer installed, there will be no newVolumeLevels() signal's + // Thus we prepare the dock areas manually +@@ -116,6 +117,7 @@ + updatePixmap(false); + return; + } ++*/ + // create devices + + _dockAreaPopup = new ViewDockAreaPopup(0, "dockArea", m_mixer, 0, this); +@@ -376,7 +378,6 @@ + if ( md != 0 ) { + md->setMuted( !md->isMuted() ); + m_mixer->commitVolumeChange( md ); +- updatePixmap(false); + } + } + } diff --git a/redhat/tdemultimedia/tdemultimedia-3.5.13.2-ftbfs.patch b/redhat/tdemultimedia/tdemultimedia-3.5.13.2-ftbfs.patch new file mode 100644 index 000000000..08ab1c877 --- /dev/null +++ b/redhat/tdemultimedia/tdemultimedia-3.5.13.2-ftbfs.patch @@ -0,0 +1,11 @@ +--- trinity-tdemultimedia-3.5.13.2~pre17+a4c1404c/arts/modules/common/Makefile.am.ORI 2013-05-09 10:51:39.994294437 +0200 ++++ trinity-tdemultimedia-3.5.13.2~pre17+a4c1404c/arts/modules/common/Makefile.am 2013-05-09 10:52:23.837409361 +0200 +@@ -25,7 +25,7 @@ + $(top_builddir)/arts/gui/common/libartsgui_idl.la \ + $(top_builddir)/arts/midi/libartsmidi_idl.la \ + $(top_builddir)/arts/modules/synth/libartsmodulessynth.la \ +- -lartsflow -lartsflow_idl -lmcop $(LIB_KDECORE) $(LIB_QT) $(VORBISFILE_LIBS) -lgthread-2.0 ++ -lartsflow -lartsflow_idl -lmcop $(LIB_KDECORE) $(LIB_QT) $(VORBIS_LIBS) $(VORBISFILE_LIBS) -lgthread-2.0 -lmad + + libartsmodulescommon_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -no-undefined + diff --git a/redhat/tdemultimedia/tdemultimedia-3.5.13.2-kmix_pulseaudio.patch b/redhat/tdemultimedia/tdemultimedia-3.5.13.2-kmix_pulseaudio.patch new file mode 100644 index 000000000..0759d6ebb --- /dev/null +++ b/redhat/tdemultimedia/tdemultimedia-3.5.13.2-kmix_pulseaudio.patch @@ -0,0 +1,1519 @@ +diff -Nuar ./kmix-tde-ori/kmix-platforms.cpp ./kmix/kmix-platforms.cpp +--- ./kmix-tde-ori/kmix-platforms.cpp 2013-05-09 17:10:41.010638051 +0200 ++++ ./kmix/kmix-platforms.cpp 2013-05-09 17:18:23.202075902 +0200 +@@ -46,8 +46,10 @@ + #define ALSA_MIXER + #endif + ++#define PULSE_MIXER ++ + #define OSS_MIXER +-#endif ++#endif // __linux__ + + #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(_UNIXWARE) || defined(__DragonFly__) + #define OSS_MIXER +@@ -79,6 +81,10 @@ + #include "mixer_alsa9.cpp" + #endif + ++#if defined(PULSE_MIXER) ++#include "mixer_pulse.cpp" ++#endif ++ + #if defined(OSS_MIXER) + #include "mixer_oss.cpp" + +@@ -91,7 +97,7 @@ + #define OSS4_MIXER + #endif + +-#endif ++#endif // OSS_MIXER + + #if defined(OSS4_MIXER) + #include "mixer_oss4.cpp" +@@ -137,6 +143,10 @@ + { ALSA_getMixer, ALSA_getDriverName, ALSA_getDevIterator }, + #endif + ++#if defined(PULSE_MIXER) ++ { PULSE_getMixer, PULSE_getDriverName, NULL }, ++#endif ++ + #if defined(OSS4_MIXER) + { OSS4_getMixer, OSS4_getDriverName, NULL }, + #endif +diff -Nuar ./kmix-tde-ori/Makefile.am ./kmix/Makefile.am +--- ./kmix-tde-ori/Makefile.am 2013-05-09 17:10:41.010638051 +0200 ++++ ./kmix/Makefile.am 2013-05-21 23:47:47.607546135 +0200 +@@ -41,7 +41,7 @@ + verticaltext.cpp mixerIface.skel colorwidget.ui dialogviewconfiguration.cpp \ + kmixtoolbox.cpp mixertoolbox.cpp dialogselectmaster.cpp + +-kmix_panelapplet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module ++kmix_panelapplet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -I/usr/include/glib-2.0 -module + kmix_panelapplet_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) + + xdg_apps_DATA = kmix.desktop +diff -Nuar ./kmix-tde-ori/mixer_pulse.cpp ./kmix/mixer_pulse.cpp +--- ./kmix-tde-ori/mixer_pulse.cpp 1970-01-01 01:00:00.000000000 +0100 ++++ ./kmix/mixer_pulse.cpp 2013-05-21 23:37:43.565178347 +0200 +@@ -0,0 +1,1368 @@ ++/* ++ * KMix -- KDE's full featured mini mixer ++ * ++ * ++ * Copyright (C) 2008 Helio Chissini de Castro ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Library 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 ++ * Library General Public License for more details. ++ * ++ * You should have received a copy of the GNU Library General Public ++ * License along with this program; if not, write to the Free ++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ ++ ++#include "mixer_pulse.h" ++ ++#include ++//#include ++#include ++ ++#include ++ ++#include "mixer.h" ++//#include "core/ControlManager.h" ++//#include "core/GlobalConfig.h" ++ ++#include ++#include ++#if defined(HAVE_CANBERRA) ++# include ++#endif ++ ++// PA_VOLUME_UI_MAX landed in pulseaudio-0.9.23, so this can be removed when/if ++// minimum requirement is ever bumped up (from 0.9.12 currently) ++#ifndef PA_VOLUME_UI_MAX ++#define PA_VOLUME_UI_MAX (pa_sw_volume_from_dB(+11.0)) ++#endif ++ ++#define HAVE_SOURCE_OUTPUT_VOLUMES PA_CHECK_VERSION(1,0,0) ++ ++#define KMIXPA_PLAYBACK 0 ++#define KMIXPA_CAPTURE 1 ++#define KMIXPA_APP_PLAYBACK 2 ++#define KMIXPA_APP_CAPTURE 3 ++#define KMIXPA_WIDGET_MAX KMIXPA_APP_CAPTURE ++ ++#define KMIXPA_EVENT_KEY "sink-input-by-media-role:event" ++ ++static unsigned int refcount = 0; ++static pa_glib_mainloop *s_mainloop = NULL; ++static pa_context *s_context = NULL; ++static enum { UNKNOWN, ACTIVE, INACTIVE } s_pulseActive = UNKNOWN; ++static int s_outstandingRequests = 0; ++ ++#if defined(HAVE_CANBERRA) ++static ca_context *s_ccontext = NULL; ++#endif ++ ++TQMap s_mixers; ++ ++typedef TQMap devmap; ++static devmap outputDevices; ++static devmap captureDevices; ++static TQMap clients; ++static devmap outputStreams; ++static devmap captureStreams; ++static devmap outputRoles; ++ ++typedef struct { ++ pa_channel_map channel_map; ++ pa_cvolume volume; ++ bool mute; ++ TQString device; ++} restoreRule; ++static TQMap s_RestoreRules; ++ ++static void dec_outstanding(pa_context *c) { ++ if (s_outstandingRequests <= 0) ++ return; ++ ++ if (--s_outstandingRequests == 0) ++ { ++ s_pulseActive = ACTIVE; ++ ++ // If this is our probe phase, exit our context immediately ++ if (s_context != c) { ++ pa_context_disconnect(c); ++ } else ++ kDebug(67100) << "Reconnected to PulseAudio"; ++ } ++} ++ ++static void translateMasksAndMaps(devinfo& dev) ++{ ++ dev.chanMask = Volume::MNONE; ++ dev.chanIDs.clear(); ++ ++ if (dev.channel_map.channels != dev.volume.channels) { ++ kError() << "Hiddeous Channel mixup map says " << dev.channel_map.channels << ", volume says: " << dev.volume.channels; ++ return; ++ } ++ if (1 == dev.channel_map.channels && PA_CHANNEL_POSITION_MONO == dev.channel_map.map[0]) { ++ // We just use the left channel to represent this. ++ dev.chanMask = (Volume::ChannelMask)( dev.chanMask | Volume::MLEFT); ++ dev.chanIDs[0] = Volume::LEFT; ++ } else { ++ for (uint8_t i = 0; i < dev.channel_map.channels; ++i) { ++ switch (dev.channel_map.map[i]) { ++ case PA_CHANNEL_POSITION_MONO: ++ kWarning(67100) << "Channel Map contains a MONO element but has >1 channel - we can't handle this."; ++ return; ++ ++ case PA_CHANNEL_POSITION_FRONT_LEFT: ++ dev.chanMask = (Volume::ChannelMask)( dev.chanMask | Volume::MLEFT); ++ dev.chanIDs[i] = Volume::LEFT; ++ break; ++ case PA_CHANNEL_POSITION_FRONT_RIGHT: ++ dev.chanMask = (Volume::ChannelMask)( dev.chanMask | Volume::MRIGHT); ++ dev.chanIDs[i] = Volume::RIGHT; ++ break; ++ case PA_CHANNEL_POSITION_FRONT_CENTER: ++ dev.chanMask = (Volume::ChannelMask)( dev.chanMask | Volume::MCENTER); ++ dev.chanIDs[i] = Volume::CENTER; ++ break; ++ case PA_CHANNEL_POSITION_REAR_CENTER: ++ dev.chanMask = (Volume::ChannelMask)( dev.chanMask | Volume::MREARCENTER); ++ dev.chanIDs[i] = Volume::REARCENTER; ++ break; ++ case PA_CHANNEL_POSITION_REAR_LEFT: ++ dev.chanMask = (Volume::ChannelMask)( dev.chanMask | Volume::MSURROUNDLEFT); ++ dev.chanIDs[i] = Volume::SURROUNDLEFT; ++ break; ++ case PA_CHANNEL_POSITION_REAR_RIGHT: ++ dev.chanMask = (Volume::ChannelMask)( dev.chanMask | Volume::MSURROUNDRIGHT); ++ dev.chanIDs[i] = Volume::SURROUNDRIGHT; ++ break; ++ case PA_CHANNEL_POSITION_LFE: ++ dev.chanMask = (Volume::ChannelMask)( dev.chanMask | Volume::MWOOFER); ++ dev.chanIDs[i] = Volume::WOOFER; ++ break; ++ case PA_CHANNEL_POSITION_SIDE_LEFT: ++ dev.chanMask = (Volume::ChannelMask)( dev.chanMask | Volume::MREARSIDELEFT); ++ dev.chanIDs[i] = Volume::REARSIDELEFT; ++ break; ++ case PA_CHANNEL_POSITION_SIDE_RIGHT: ++ dev.chanMask = (Volume::ChannelMask)( dev.chanMask | Volume::MREARSIDERIGHT); ++ dev.chanIDs[i] = Volume::REARSIDERIGHT; ++ break; ++ default: ++ kWarning(67100) << "Channel Map contains a pa_channel_position we cannot handle " << dev.channel_map.map[i]; ++ break; ++ } ++ } ++ } ++} ++ ++static TQString getIconNameFromProplist(pa_proplist *l) { ++ const char *t; ++ ++ if ((t = pa_proplist_gets(l, PA_PROP_MEDIA_ICON_NAME))) ++ return TQString::fromUtf8(t); ++ ++ if ((t = pa_proplist_gets(l, PA_PROP_WINDOW_ICON_NAME))) ++ return TQString::fromUtf8(t); ++ ++ if ((t = pa_proplist_gets(l, PA_PROP_APPLICATION_ICON_NAME))) ++ return TQString::fromUtf8(t); ++ ++ if ((t = pa_proplist_gets(l, PA_PROP_MEDIA_ROLE))) { ++ ++ if (strcmp(t, "video") == 0 || strcmp(t, "phone") == 0) ++ return TQString::fromUtf8(t); ++ ++ if (strcmp(t, "music") == 0) ++ return "audio"; ++ ++ if (strcmp(t, "game") == 0) ++ return "applications-games"; ++ ++ if (strcmp(t, "event") == 0) ++ return "dialog-information"; ++ } ++ ++ return ""; ++} ++ ++static void sink_cb(pa_context *c, const pa_sink_info *i, int eol, void *) { ++ ++ if (eol < 0) { ++ if (pa_context_errno(c) == PA_ERR_NOENTITY) ++ return; ++ ++ kWarning(67100) << "Sink callback failure"; ++ return; ++ } ++ ++ if (eol > 0) { ++ dec_outstanding(c); ++ if (s_mixers.contains(KMIXPA_PLAYBACK)) ++ s_mixers[KMIXPA_PLAYBACK]->triggerUpdate(); ++ return; ++ } ++ ++ devinfo s; ++ s.index = s.device_index = i->index; ++ s.name = TQString::fromUtf8(i->name).replace(' ', '_'); ++ s.description = TQString::fromUtf8(i->description); ++ s.icon_name = TQString::fromUtf8(pa_proplist_gets(i->proplist, PA_PROP_DEVICE_ICON_NAME)); ++ s.volume = i->volume; ++ s.channel_map = i->channel_map; ++ s.mute = !!i->mute; ++ s.stream_restore_rule = ""; ++ ++ translateMasksAndMaps(s); ++ ++ bool is_new = !outputDevices.contains(s.index); ++ outputDevices[s.index] = s; ++// kDebug(67100) << "Got some info about sink: " << s.description; ++ ++ if (s_mixers.contains(KMIXPA_PLAYBACK)) { ++ if (is_new) ++ s_mixers[KMIXPA_PLAYBACK]->addWidget(s.index); ++ else { ++ int mid = s_mixers[KMIXPA_PLAYBACK]->id2num(s.name); ++ if (mid >= 0) { ++ MixSet *ms = s_mixers[KMIXPA_PLAYBACK]->getMixSet(); ++ (*ms)[mid]->setReadableName(s.description); ++ } ++ } ++ } ++} ++ ++static void source_cb(pa_context *c, const pa_source_info *i, int eol, void *) { ++ ++ if (eol < 0) { ++ if (pa_context_errno(c) == PA_ERR_NOENTITY) ++ return; ++ ++ kWarning(67100) << "Source callback failure"; ++ return; ++ } ++ ++ if (eol > 0) { ++ dec_outstanding(c); ++ if (s_mixers.contains(KMIXPA_CAPTURE)) ++ s_mixers[KMIXPA_CAPTURE]->triggerUpdate(); ++ return; ++ } ++ ++ // Do something.... ++ if (PA_INVALID_INDEX != i->monitor_of_sink) ++ { ++ kDebug(67100) << "Ignoring Monitor Source: " << i->description; ++ return; ++ } ++ ++ devinfo s; ++ s.index = s.device_index = i->index; ++ s.name = TQString::fromUtf8(i->name).replace(' ', '_'); ++ s.description = TQString::fromUtf8(i->description); ++ s.icon_name = TQString::fromUtf8(pa_proplist_gets(i->proplist, PA_PROP_DEVICE_ICON_NAME)); ++ s.volume = i->volume; ++ s.channel_map = i->channel_map; ++ s.mute = !!i->mute; ++ s.stream_restore_rule = ""; ++ ++ translateMasksAndMaps(s); ++ ++ bool is_new = !captureDevices.contains(s.index); ++ captureDevices[s.index] = s; ++// kDebug(67100) << "Got some info about source: " << s.description; ++ ++ if (s_mixers.contains(KMIXPA_CAPTURE)) { ++ if (is_new) ++ s_mixers[KMIXPA_CAPTURE]->addWidget(s.index); ++ else { ++ int mid = s_mixers[KMIXPA_CAPTURE]->id2num(s.name); ++ if (mid >= 0) { ++ MixSet *ms = s_mixers[KMIXPA_CAPTURE]->getMixSet(); ++ (*ms)[mid]->setReadableName(s.description); ++ } ++ } ++ } ++} ++ ++static void client_cb(pa_context *c, const pa_client_info *i, int eol, void *) { ++ ++ if (eol < 0) { ++ if (pa_context_errno(c) == PA_ERR_NOENTITY) ++ return; ++ ++ kWarning(67100) << "Client callback failure"; ++ return; ++ } ++ ++ if (eol > 0) { ++ dec_outstanding(c); ++ return; ++ } ++ ++ clients[i->index] = TQString::fromUtf8(i->name); ++ //kDebug(67100) << "Got some info about client: " << clients[i->index]; ++} ++ ++static void sink_input_cb(pa_context *c, const pa_sink_input_info *i, int eol, void *) { ++ ++ if (eol < 0) { ++ if (pa_context_errno(c) == PA_ERR_NOENTITY) ++ return; ++ ++ kWarning(67100) << "Sink Input callback failure"; ++ return; ++ } ++ ++ if (eol > 0) { ++ dec_outstanding(c); ++ if (s_mixers.contains(KMIXPA_APP_PLAYBACK)) ++ s_mixers[KMIXPA_APP_PLAYBACK]->triggerUpdate(); ++ return; ++ } ++ ++ const char *t; ++ if ((t = pa_proplist_gets(i->proplist, "module-stream-restore.id"))) { ++ if (strcmp(t, KMIXPA_EVENT_KEY) == 0) { ++ kWarning(67100) << "Ignoring sink-input due to it being designated as an event and thus handled by the Event slider"; ++ return; ++ } ++ } ++ ++ TQString appname = i18n("Unknown Application"); ++ if (clients.contains(i->client)) ++ appname = clients[i->client]; ++ ++ TQString prefix = TQString("%1: ").arg(appname); ++ ++ devinfo s; ++ s.index = i->index; ++ s.device_index = i->sink; ++ s.description = prefix + TQString::fromUtf8(i->name); ++ s.name = TQString("stream:") + TQString::number(i->index); //appname.replace(' ', '_').toLower(); ++ s.icon_name = getIconNameFromProplist(i->proplist); ++ s.channel_map = i->channel_map; ++ s.volume = i->volume; ++ s.mute = !!i->mute; ++ s.stream_restore_rule = TQString::fromUtf8(t); ++ ++ translateMasksAndMaps(s); ++ ++ bool is_new = !outputStreams.contains(s.index); ++ outputStreams[s.index] = s; ++// kDebug(67100) << "Got some info about sink input (playback stream): " << s.description; ++ ++ if (s_mixers.contains(KMIXPA_APP_PLAYBACK)) { ++ if (is_new) ++ s_mixers[KMIXPA_APP_PLAYBACK]->addWidget(s.index, true); ++ else { ++ int mid = s_mixers[KMIXPA_APP_PLAYBACK]->id2num(s.name); ++ if (mid >= 0) { ++ MixSet *ms = s_mixers[KMIXPA_APP_PLAYBACK]->getMixSet(); ++ (*ms)[mid]->setReadableName(s.description); ++ } ++ } ++ } ++} ++ ++static void source_output_cb(pa_context *c, const pa_source_output_info *i, int eol, void *) { ++ ++ if (eol < 0) { ++ if (pa_context_errno(c) == PA_ERR_NOENTITY) ++ return; ++ ++ kWarning(67100) << "Source Output callback failure"; ++ return; ++ } ++ ++ if (eol > 0) { ++ dec_outstanding(c); ++ if (s_mixers.contains(KMIXPA_APP_CAPTURE)) ++ s_mixers[KMIXPA_APP_CAPTURE]->triggerUpdate(); ++ return; ++ } ++ ++ /* NB Until Source Outputs support volumes, we just use the volume of the source itself */ ++ if (!captureDevices.contains(i->source)) { ++ kDebug(67100) << "Source Output refers to a Source we don't have any info for (probably just a peak meter or similar)"; ++ return; ++ } ++ ++ TQString appname = i18n("Unknown Application"); ++ if (clients.contains(i->client)) ++ appname = clients[i->client]; ++ ++ TQString prefix = TQString("%1: ").arg(appname); ++ ++ devinfo s; ++ s.index = i->index; ++ s.device_index = i->source; ++ s.description = prefix + TQString::fromUtf8(i->name); ++ s.name = TQString("stream:") + TQString::number(i->index); //appname.replace(' ', '_').toLower(); ++ s.icon_name = getIconNameFromProplist(i->proplist); ++ s.channel_map = i->channel_map; ++#if HAVE_SOURCE_OUTPUT_VOLUMES ++ s.volume = i->volume; ++ s.mute = !!i->mute; ++#else ++ s.volume = captureDevices[i->source].volume; ++ s.mute = captureDevices[i->source].mute; ++#endif ++ s.stream_restore_rule = TQString::fromUtf8(pa_proplist_gets(i->proplist, "module-stream-restore.id")); ++ ++ translateMasksAndMaps(s); ++ ++ bool is_new = !captureStreams.contains(s.index); ++ captureStreams[s.index] = s; ++// kDebug(67100) << "Got some info about source output (capture stream): " << s.description; ++ ++ if (s_mixers.contains(KMIXPA_APP_CAPTURE)) { ++ if (is_new) ++ s_mixers[KMIXPA_APP_CAPTURE]->addWidget(s.index, true); ++ else { ++ int mid = s_mixers[KMIXPA_APP_CAPTURE]->id2num(s.name); ++ if (mid >= 0) { ++ MixSet *ms = s_mixers[KMIXPA_APP_CAPTURE]->getMixSet(); ++ (*ms)[mid]->setReadableName(s.description); ++ } ++ } ++ } ++} ++ ++ ++static devinfo create_role_devinfo(TQString name) { ++ ++ TQ_ASSERT(s_RestoreRules.contains(name)); ++ ++ devinfo s; ++ s.index = s.device_index = PA_INVALID_INDEX; ++ s.description = i18n("Event Sounds"); ++ s.name = TQString("restore:") + name; ++ s.icon_name = "dialog-information"; ++ s.channel_map = s_RestoreRules[name].channel_map; ++ s.volume = s_RestoreRules[name].volume; ++ s.mute = s_RestoreRules[name].mute; ++ s.stream_restore_rule = name; ++ ++ translateMasksAndMaps(s); ++ return s; ++} ++ ++ ++void ext_stream_restore_read_cb(pa_context *c, const pa_ext_stream_restore_info *i, int eol, void *) { ++ ++ if (eol < 0) { ++ dec_outstanding(c); ++ kWarning(67100) << "Failed to initialize stream_restore extension: " << pa_strerror(pa_context_errno(s_context)); ++ return; ++ } ++ ++ if (eol > 0) { ++ dec_outstanding(c); ++ ++ // Special case: ensure that our media events exists. ++ // On first login by a new users, this wont be in our database so we should create it. ++ if (!s_RestoreRules.contains(KMIXPA_EVENT_KEY)) { ++ // Create a fake rule ++ restoreRule rule; ++ rule.channel_map.channels = 1; ++ rule.channel_map.map[0] = PA_CHANNEL_POSITION_MONO; ++ rule.volume.channels = 1; ++ rule.volume.values[0] = PA_VOLUME_NORM; ++ rule.mute = false; ++ rule.device = ""; ++ s_RestoreRules[KMIXPA_EVENT_KEY] = rule; ++ kDebug(67100) << "Initialising restore rule for new user: " << i18n("Event Sounds"); ++ } ++ ++ if (s_mixers.contains(KMIXPA_APP_PLAYBACK)) { ++ // If we have rules, it will be created below... but if no rules ++ // then we add it here. ++ if (!outputRoles.contains(PA_INVALID_INDEX)) { ++ devinfo s = create_role_devinfo(KMIXPA_EVENT_KEY); ++ outputRoles[s.index] = s; ++ ++ s_mixers[KMIXPA_APP_PLAYBACK]->addWidget(s.index); ++ } ++ ++ s_mixers[KMIXPA_APP_PLAYBACK]->triggerUpdate(); ++ } ++ ++ return; ++ } ++ ++ ++ TQString name = TQString::fromUtf8(i->name); ++// kDebug(67100) << TQString("Got some info about restore rule: '%1' (Device: %2)").arg(name).arg(i->device ? i->device : "None"); ++ restoreRule rule; ++ rule.channel_map = i->channel_map; ++ rule.volume = i->volume; ++ rule.mute = !!i->mute; ++ rule.device = i->device; ++ ++ if (rule.channel_map.channels < 1 && name == KMIXPA_EVENT_KEY) { ++ // Stream restore rules may not have valid volumes/channel maps (as these are optional) ++ // but we need a valid volume+channelmap for our events sounds so fix it up. ++ rule.channel_map.channels = 1; ++ rule.channel_map.map[0] = PA_CHANNEL_POSITION_MONO; ++ rule.volume.channels = 1; ++ rule.volume.values[0] = PA_VOLUME_NORM; ++ } ++ ++ s_RestoreRules[name] = rule; ++ ++ if (s_mixers.contains(KMIXPA_APP_PLAYBACK)) { ++ // We only want to know about Sound Events for now... ++ if (name == KMIXPA_EVENT_KEY) { ++ devinfo s = create_role_devinfo(name); ++ bool is_new = !outputRoles.contains(s.index); ++ outputRoles[s.index] = s; ++ ++ if (is_new) ++ s_mixers[KMIXPA_APP_PLAYBACK]->addWidget(s.index, true); ++ } ++ } ++} ++ ++static void ext_stream_restore_subscribe_cb(pa_context *c, void *) { ++ ++ TQ_ASSERT(c == s_context); ++ ++ pa_operation *o; ++ if (!(o = pa_ext_stream_restore_read(c, ext_stream_restore_read_cb, NULL))) { ++ kWarning(67100) << "pa_ext_stream_restore_read() failed"; ++ return; ++ } ++ ++ pa_operation_unref(o); ++} ++ ++ ++static void subscribe_cb(pa_context *c, pa_subscription_event_type_t t, uint32_t index, void *) { ++ ++ TQ_ASSERT(c == s_context); ++ ++ switch (t & PA_SUBSCRIPTION_EVENT_FACILITY_MASK) { ++ case PA_SUBSCRIPTION_EVENT_SINK: ++ if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) { ++ if (s_mixers.contains(KMIXPA_PLAYBACK)) ++ s_mixers[KMIXPA_PLAYBACK]->removeWidget(index); ++ } else { ++ pa_operation *o; ++ if (!(o = pa_context_get_sink_info_by_index(c, index, sink_cb, NULL))) { ++ kWarning(67100) << "pa_context_get_sink_info_by_index() failed"; ++ return; ++ } ++ pa_operation_unref(o); ++ } ++ break; ++ ++ case PA_SUBSCRIPTION_EVENT_SOURCE: ++ if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) { ++ if (s_mixers.contains(KMIXPA_CAPTURE)) ++ s_mixers[KMIXPA_CAPTURE]->removeWidget(index); ++ } else { ++ pa_operation *o; ++ if (!(o = pa_context_get_source_info_by_index(c, index, source_cb, NULL))) { ++ kWarning(67100) << "pa_context_get_source_info_by_index() failed"; ++ return; ++ } ++ pa_operation_unref(o); ++ } ++ break; ++ ++ case PA_SUBSCRIPTION_EVENT_SINK_INPUT: ++ if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) { ++ if (s_mixers.contains(KMIXPA_APP_PLAYBACK)) ++ s_mixers[KMIXPA_APP_PLAYBACK]->removeWidget(index); ++ } else { ++ pa_operation *o; ++ if (!(o = pa_context_get_sink_input_info(c, index, sink_input_cb, NULL))) { ++ kWarning(67100) << "pa_context_get_sink_input_info() failed"; ++ return; ++ } ++ pa_operation_unref(o); ++ } ++ break; ++ ++ case PA_SUBSCRIPTION_EVENT_SOURCE_OUTPUT: ++ if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) { ++ if (s_mixers.contains(KMIXPA_APP_CAPTURE)) ++ s_mixers[KMIXPA_APP_CAPTURE]->removeWidget(index); ++ } else { ++ pa_operation *o; ++ if (!(o = pa_context_get_source_output_info(c, index, source_output_cb, NULL))) { ++ kWarning(67100) << "pa_context_get_sink_input_info() failed"; ++ return; ++ } ++ pa_operation_unref(o); ++ } ++ break; ++ ++ case PA_SUBSCRIPTION_EVENT_CLIENT: ++ if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) { ++ clients.remove(index); ++ } else { ++ pa_operation *o; ++ if (!(o = pa_context_get_client_info(c, index, client_cb, NULL))) { ++ kWarning(67100) << "pa_context_get_client_info() failed"; ++ return; ++ } ++ pa_operation_unref(o); ++ } ++ break; ++ ++ } ++} ++ ++ ++static void context_state_callback(pa_context *c, void *) ++{ ++ pa_context_state_t state = pa_context_get_state(c); ++ if (state == PA_CONTEXT_READY) { ++ // Attempt to load things up ++ pa_operation *o; ++ ++ // 1. Register for the stream changes (except during probe) ++ if (s_context == c) { ++ pa_context_set_subscribe_callback(c, subscribe_cb, NULL); ++ ++ if (!(o = pa_context_subscribe(c, (pa_subscription_mask_t) ++ (PA_SUBSCRIPTION_MASK_SINK| ++ PA_SUBSCRIPTION_MASK_SOURCE| ++ PA_SUBSCRIPTION_MASK_CLIENT| ++ PA_SUBSCRIPTION_MASK_SINK_INPUT| ++ PA_SUBSCRIPTION_MASK_SOURCE_OUTPUT), NULL, NULL))) { ++ kWarning(67100) << "pa_context_subscribe() failed"; ++ return; ++ } ++ pa_operation_unref(o); ++ } ++ ++ if (!(o = pa_context_get_sink_info_list(c, sink_cb, NULL))) { ++ kWarning(67100) << "pa_context_get_sink_info_list() failed"; ++ return; ++ } ++ pa_operation_unref(o); ++ s_outstandingRequests++; ++ ++ if (!(o = pa_context_get_source_info_list(c, source_cb, NULL))) { ++ kWarning(67100) << "pa_context_get_source_info_list() failed"; ++ return; ++ } ++ pa_operation_unref(o); ++ s_outstandingRequests++; ++ ++ ++ if (!(o = pa_context_get_client_info_list(c, client_cb, NULL))) { ++ kWarning(67100) << "pa_context_client_info_list() failed"; ++ return; ++ } ++ pa_operation_unref(o); ++ s_outstandingRequests++; ++ ++ if (!(o = pa_context_get_sink_input_info_list(c, sink_input_cb, NULL))) { ++ kWarning(67100) << "pa_context_get_sink_input_info_list() failed"; ++ return; ++ } ++ pa_operation_unref(o); ++ s_outstandingRequests++; ++ ++ if (!(o = pa_context_get_source_output_info_list(c, source_output_cb, NULL))) { ++ kWarning(67100) << "pa_context_get_source_output_info_list() failed"; ++ return; ++ } ++ pa_operation_unref(o); ++ s_outstandingRequests++; ++ ++ /* These calls are not always supported */ ++ if ((o = pa_ext_stream_restore_read(c, ext_stream_restore_read_cb, NULL))) { ++ pa_operation_unref(o); ++ s_outstandingRequests++; ++ ++ pa_ext_stream_restore_set_subscribe_cb(c, ext_stream_restore_subscribe_cb, NULL); ++ ++ if ((o = pa_ext_stream_restore_subscribe(c, 1, NULL, NULL))) ++ pa_operation_unref(o); ++ } else { ++ kWarning(67100) << "Failed to initialize stream_restore extension: " << pa_strerror(pa_context_errno(s_context)); ++ } ++ } else if (!PA_CONTEXT_IS_GOOD(state)) { ++ // If this is our probe phase, exit our context immediately ++ if (s_context != c) { ++ pa_context_disconnect(c); ++ } else { ++ // If we're not probing, it means we've been disconnected from our ++ // glib context ++ pa_context_unref(s_context); ++ s_context = NULL; ++ ++ // Remove all GUI elements ++ TQMap::iterator it; ++ for (it = s_mixers.begin(); it != s_mixers.end(); ++it) { ++ (*it)->removeAllWidgets(); ++ } ++ // This one is not handled above. ++ clients.clear(); ++ ++ if (s_mixers.contains(KMIXPA_PLAYBACK)) { ++ kWarning(67100) << "Connection to PulseAudio daemon closed. Attempting reconnection."; ++ s_pulseActive = UNKNOWN; ++ TQTimer::singleShot(50, s_mixers[KMIXPA_PLAYBACK], SLOT(reinit())); ++ } ++ } ++ } ++} ++ ++static void setVolumeFromPulse(Volume& volume, const devinfo& dev) ++{ ++ chanIDMap::const_iterator iter; ++ for (iter = dev.chanIDs.begin(); iter != dev.chanIDs.end(); ++iter) ++ { ++ //kDebug(67100) << "Setting volume for channel " << iter.value() << " to " << (long)dev.volume.values[iter.key()] << " (" << ((100*(long)dev.volume.values[iter.key()]) / PA_VOLUME_NORM) << "%)"; ++ volume.setVolume(iter.value(), (long)dev.volume.values[iter.key()]); ++ } ++} ++ ++static pa_cvolume genVolumeForPulse(const devinfo& dev, Volume& volume) ++{ ++ pa_cvolume cvol = dev.volume; ++ ++ chanIDMap::const_iterator iter; ++ for (iter = dev.chanIDs.begin(); iter != dev.chanIDs.end(); ++iter) ++ { ++ cvol.values[iter.key()] = (uint32_t)volume.getVolume(iter.value()); ++ //kDebug(67100) << "Setting volume for channel " << iter.value() << " to " << cvol.values[iter.key()] << " (" << ((100*cvol.values[iter.key()]) / PA_VOLUME_NORM) << "%)"; ++ } ++ return cvol; ++} ++ ++static devmap* get_widget_map(int type, TQString id = "") ++{ ++ TQ_ASSERT(type >= 0 && type <= KMIXPA_WIDGET_MAX); ++ ++ if (KMIXPA_PLAYBACK == type) ++ return &outputDevices; ++ else if (KMIXPA_CAPTURE == type) ++ return &captureDevices; ++ else if (KMIXPA_APP_PLAYBACK == type) { ++ if (id.startsWith("restore:")) ++ return &outputRoles; ++ return &outputStreams; ++ } else if (KMIXPA_APP_CAPTURE == type) ++ return &captureStreams; ++ ++ TQ_ASSERT(0); ++ return NULL; ++} ++static devmap* get_widget_map(int type, int index) ++{ ++ if (PA_INVALID_INDEX == (uint32_t)index) ++ return get_widget_map(type, "restore:"); ++ return get_widget_map(type); ++} ++ ++void Mixer_PULSE::emitControlsReconfigured() ++{ ++ ControlManager::instance().announce(_mixer->id(), ControlChangeType::ControlList, getDriverName()); ++} ++ ++void Mixer_PULSE::addWidget(int index, bool isAppStream) ++{ ++ devmap* map = get_widget_map(m_devnum, index); ++ ++ if (!map->contains(index)) { ++ kWarning(67100) << "New " << m_devnum << " widget notified for index " << index << " but I cannot find it in my list :s"; ++ return; ++ } ++ addDevice((*map)[index], isAppStream); ++ emitControlsReconfigured(); ++} ++ ++void Mixer_PULSE::removeWidget(int index) ++{ ++ devmap* map = get_widget_map(m_devnum); ++ ++ if (!map->contains(index)) { ++ //kWarning(67100) << "Removing " << m_devnum << " widget notified for index " << index << " but I cannot find it in my list :s"; ++ // Sometimes we ignore things (e.g. event sounds) so don't be too noisy here. ++ return; ++ } ++ ++ TQString id = (*map)[index].name; ++ map->remove(index); ++ ++ // We need to find the MixDevice that goes with this widget and remove it. ++ MixSet::iterator iter; ++ for (iter = m_mixDevices.begin(); iter != m_mixDevices.end(); ++iter) ++ { ++ if ((*iter)->id() == id) ++ { ++ shared_ptr md = m_mixDevices.get(id); ++ kDebug() << "MixDevice 1 useCount=" << md.use_count(); ++ md->close(); ++ kDebug() << "MixDevice 2 useCount=" << md.use_count(); ++ ++ m_mixDevices.erase(iter); ++ kDebug() << "MixDevice 3 useCount=" << md.use_count(); ++ emitControlsReconfigured(); ++ kDebug() << "MixDevice 4 useCount=" << md.use_count(); ++ return; ++ } ++ } ++} ++ ++void Mixer_PULSE::removeAllWidgets() ++{ ++ devmap* map = get_widget_map(m_devnum); ++ map->clear(); ++ ++ // Special case ++ if (KMIXPA_APP_PLAYBACK == m_devnum) ++ outputRoles.clear(); ++ ++ freeMixDevices(); ++ emitControlsReconfigured(); ++} ++ ++void Mixer_PULSE::addDevice(devinfo& dev, bool isAppStream) ++{ ++ if (dev.chanMask != Volume::MNONE) { ++ MixSet *ms = 0; ++ if (m_devnum == KMIXPA_APP_PLAYBACK && s_mixers.contains(KMIXPA_PLAYBACK)) ++ ms = s_mixers[KMIXPA_PLAYBACK]->getMixSet(); ++ else if (m_devnum == KMIXPA_APP_CAPTURE && s_mixers.contains(KMIXPA_CAPTURE)) ++ ms = s_mixers[KMIXPA_CAPTURE]->getMixSet(); ++ ++ int maxVol = GlobalConfig::instance().volumeOverdrive ? PA_VOLUME_UI_MAX : PA_VOLUME_NORM; ++ Volume v(maxVol, PA_VOLUME_MUTED, true, false); ++ v.addVolumeChannels(dev.chanMask); ++ setVolumeFromPulse(v, dev); ++ MixDevice* md = new MixDevice( _mixer, dev.name, dev.description, dev.icon_name, ms); ++ if (isAppStream) ++ md->setApplicationStream(true); ++ ++ kDebug() << "Adding Pulse volume " << dev.name << ", isCapture= " << (m_devnum == KMIXPA_CAPTURE || m_devnum == KMIXPA_APP_CAPTURE) << ", isAppStream= " << isAppStream << "=" << md->isApplicationStream() << ", devnum=" << m_devnum; ++ md->addPlaybackVolume(v); ++ md->setMuted(dev.mute); ++ m_mixDevices.append(md->addToPool()); ++ } ++} ++ ++Mixer_Backend* PULSE_getMixer( Mixer *mixer, int devnum ) ++{ ++ Mixer_Backend *l_mixer; ++ l_mixer = new Mixer_PULSE( mixer, devnum ); ++ return l_mixer; ++} ++ ++bool Mixer_PULSE::connectToDaemon() ++{ ++ TQ_ASSERT(NULL == s_context); ++ ++ kDebug(67100) << "Attempting connection to PulseAudio sound daemon"; ++ pa_mainloop_api *api = pa_glib_mainloop_get_api(s_mainloop); ++ TQ_ASSERT(api); ++ ++ s_context = pa_context_new(api, "KMix"); ++ TQ_ASSERT(s_context); ++ ++ if (pa_context_connect(s_context, NULL, PA_CONTEXT_NOFAIL, 0) < 0) { ++ pa_context_unref(s_context); ++ s_context = NULL; ++ return false; ++ } ++ pa_context_set_state_callback(s_context, &context_state_callback, NULL); ++ return true; ++} ++ ++ ++Mixer_PULSE::Mixer_PULSE(Mixer *mixer, int devnum) : Mixer_Backend(mixer, devnum) ++{ ++ if ( devnum == -1 ) ++ m_devnum = 0; ++ ++ TQString pulseenv = qgetenv("KMIX_PULSEAUDIO_DISABLE"); ++ if (pulseenv.toInt()) ++ s_pulseActive = INACTIVE; ++ ++ // We require a glib event loop ++ if (!QByteArray(QAbstractEventDispatcher::instance()->metaObject()->className()).contains("EventDispatcherGlib")) { ++ kDebug(67100) << "Disabling PulseAudio integration for lack of GLib event loop"; ++ s_pulseActive = INACTIVE; ++ } ++ ++ ++ ++refcount; ++ if (INACTIVE != s_pulseActive && 1 == refcount) ++ { ++ // First of all conenct to PA via simple/blocking means and if that succeeds, ++ // use a fully async integrated mainloop method to connect and get proper support. ++ pa_mainloop *p_test_mainloop; ++ if (!(p_test_mainloop = pa_mainloop_new())) { ++ kDebug(67100) << "PulseAudio support disabled: Unable to create mainloop"; ++ s_pulseActive = INACTIVE; ++ goto endconstruct; ++ } ++ ++ pa_context *p_test_context; ++ if (!(p_test_context = pa_context_new(pa_mainloop_get_api(p_test_mainloop), "kmix-probe"))) { ++ kDebug(67100) << "PulseAudio support disabled: Unable to create context"; ++ pa_mainloop_free(p_test_mainloop); ++ s_pulseActive = INACTIVE; ++ goto endconstruct; ++ } ++ ++ kDebug(67100) << "Probing for PulseAudio..."; ++ // (cg) Convert to PA_CONTEXT_NOFLAGS when PulseAudio 0.9.19 is required ++ if (pa_context_connect(p_test_context, NULL, static_cast(0), NULL) < 0) { ++ kDebug(67100) << TQString("PulseAudio support disabled: %1").arg(pa_strerror(pa_context_errno(p_test_context))); ++ pa_context_disconnect(p_test_context); ++ pa_context_unref(p_test_context); ++ pa_mainloop_free(p_test_mainloop); ++ s_pulseActive = INACTIVE; ++ goto endconstruct; ++ } ++ ++ // Assume we are inactive, it will be set to active if appropriate ++ s_pulseActive = INACTIVE; ++ pa_context_set_state_callback(p_test_context, &context_state_callback, NULL); ++ for (;;) { ++ pa_mainloop_iterate(p_test_mainloop, 1, NULL); ++ ++ if (!PA_CONTEXT_IS_GOOD(pa_context_get_state(p_test_context))) { ++ kDebug(67100) << "PulseAudio probe complete."; ++ break; ++ } ++ } ++ pa_context_disconnect(p_test_context); ++ pa_context_unref(p_test_context); ++ pa_mainloop_free(p_test_mainloop); ++ ++ ++ if (INACTIVE != s_pulseActive) ++ { ++ // Reconnect via integrated mainloop ++ s_mainloop = pa_glib_mainloop_new(NULL); ++ TQ_ASSERT(s_mainloop); ++ ++ connectToDaemon(); ++ ++#if defined(HAVE_CANBERRA) ++ int ret = ca_context_create(&s_ccontext); ++ if (ret < 0) { ++ kDebug(67100) << "Disabling Sound Feedback. Canberra context failed."; ++ s_ccontext = NULL; ++ } else ++ ca_context_set_driver(s_ccontext, "pulse"); ++#endif ++ } ++ ++ kDebug(67100) << "PulseAudio status: " << (s_pulseActive==UNKNOWN ? "Unknown (bug)" : (s_pulseActive==ACTIVE ? "Active" : "Inactive")); ++ } ++ ++endconstruct: ++ s_mixers[m_devnum] = this; ++} ++ ++Mixer_PULSE::~Mixer_PULSE() ++{ ++ s_mixers.remove(m_devnum); ++ ++ if (refcount > 0) ++ { ++ --refcount; ++ if (0 == refcount) ++ { ++#if defined(HAVE_CANBERRA) ++ if (s_ccontext) { ++ ca_context_destroy(s_ccontext); ++ s_ccontext = NULL; ++ } ++#endif ++ ++ if (s_context) { ++ pa_context_unref(s_context); ++ s_context = NULL; ++ } ++ ++ if (s_mainloop) { ++ pa_glib_mainloop_free(s_mainloop); ++ s_mainloop = NULL; ++ } ++ } ++ } ++ ++ closeCommon(); ++} ++ ++int Mixer_PULSE::open() ++{ ++ //kDebug(67100) << "Trying Pulse sink"; ++ ++ if (ACTIVE == s_pulseActive && m_devnum <= KMIXPA_APP_CAPTURE) ++ { ++ // Make sure the GUI layers know we are dynamic so as to always paint us ++ _mixer->setDynamic(); ++ ++ devmap::iterator iter; ++ if (KMIXPA_PLAYBACK == m_devnum) ++ { ++ _id = "Playback Devices"; ++ m_mixerName = i18n("Playback Devices"); ++ for (iter = outputDevices.begin(); iter != outputDevices.end(); ++iter) ++ addDevice(*iter); ++ } ++ else if (KMIXPA_CAPTURE == m_devnum) ++ { ++ _id = "Capture Devices"; ++ m_mixerName = i18n("Capture Devices"); ++ for (iter = captureDevices.begin(); iter != captureDevices.end(); ++iter) ++ addDevice(*iter); ++ } ++ else if (KMIXPA_APP_PLAYBACK == m_devnum) ++ { ++ _id = "Playback Streams"; ++ m_mixerName = i18n("Playback Streams"); ++ for (iter = outputRoles.begin(); iter != outputRoles.end(); ++iter) ++ addDevice(*iter, true); ++ for (iter = outputStreams.begin(); iter != outputStreams.end(); ++iter) ++ addDevice(*iter, true); ++ } ++ else if (KMIXPA_APP_CAPTURE == m_devnum) ++ { ++ _id = "Capture Streams"; ++ m_mixerName = i18n("Capture Streams"); ++ for (iter = captureStreams.begin(); iter != captureStreams.end(); ++iter) ++ addDevice(*iter); ++ } ++ ++ kDebug(67100) << "Using PulseAudio for mixer: " << m_mixerName; ++ m_isOpen = true; ++ } ++ ++ return 0; ++} ++ ++int Mixer_PULSE::close() ++{ ++ closeCommon(); ++ return 1; ++} ++ ++int Mixer_PULSE::id2num(const TQString& id) { ++ //kDebug(67100) << "id2num() id=" << id; ++ int num = -1; ++ // todo: Store this in a hash or similar ++ int i; ++ for (i = 0; i < m_mixDevices.size(); ++i) { ++ if (m_mixDevices[i]->id() == id) { ++ num = i; ++ break; ++ } ++ } ++ //kDebug(67100) << "id2num() num=" << num; ++ return num; ++} ++ ++int Mixer_PULSE::readVolumeFromHW( const TQString& id, shared_ptr md ) ++{ ++ devmap *map = get_widget_map(m_devnum, id); ++ ++ devmap::iterator iter; ++ for (iter = map->begin(); iter != map->end(); ++iter) ++ { ++ if (iter->name == id) ++ { ++ setVolumeFromPulse(md->playbackVolume(), *iter); ++ md->setMuted(iter->mute); ++ break; ++ } ++ } ++ ++ return 0; ++} ++ ++int Mixer_PULSE::writeVolumeToHW( const TQString& id, shared_ptr md ) ++{ ++ devmap::iterator iter; ++ if (KMIXPA_PLAYBACK == m_devnum) ++ { ++ for (iter = outputDevices.begin(); iter != outputDevices.end(); ++iter) ++ { ++ if (iter->name == id) ++ { ++ pa_operation *o; ++ ++ pa_cvolume volume = genVolumeForPulse(*iter, md->playbackVolume()); ++ if (!(o = pa_context_set_sink_volume_by_index(s_context, iter->index, &volume, NULL, NULL))) { ++ kWarning(67100) << "pa_context_set_sink_volume_by_index() failed"; ++ return Mixer::ERR_READ; ++ } ++ pa_operation_unref(o); ++ ++ if (!(o = pa_context_set_sink_mute_by_index(s_context, iter->index, (md->isMuted() ? 1 : 0), NULL, NULL))) { ++ kWarning(67100) << "pa_context_set_sink_mute_by_index() failed"; ++ return Mixer::ERR_READ; ++ } ++ pa_operation_unref(o); ++ ++#if defined(HAVE_CANBERRA) ++ if (s_ccontext && Mixer::getBeepOnVolumeChange() ) { ++ int playing = 0; ++ int cindex = 2; // Note "2" is simply the index we've picked. It's somewhat irrelevant. ++ ++ ++ ca_context_playing(s_ccontext, cindex, &playing); ++ ++ // NB Depending on how this is desired to work, we may want to simply ++ // skip playing, or cancel the currently playing sound and play our ++ // new one... for now, let's do the latter. ++ if (playing) { ++ ca_context_cancel(s_ccontext, cindex); ++ playing = 0; ++ } ++ ++ if (!playing) { ++ char dev[64]; ++ ++ snprintf(dev, sizeof(dev), "%lu", (unsigned long) iter->index); ++ ca_context_change_device(s_ccontext, dev); ++ ++ // Ideally we'd use something like ca_gtk_play_for_widget()... ++ ca_context_play( ++ s_ccontext, ++ cindex, ++ CA_PROP_EVENT_DESCRIPTION, i18n("Volume Control Feedback Sound").toUtf8().constData(), ++ CA_PROP_EVENT_ID, "audio-volume-change", ++ CA_PROP_CANBERRA_CACHE_CONTROL, "permanent", ++ CA_PROP_CANBERRA_ENABLE, "1", ++ NULL ++ ); ++ ++ ca_context_change_device(s_ccontext, NULL); ++ } ++ } ++#endif ++ ++ return 0; ++ } ++ } ++ } ++ else if (KMIXPA_CAPTURE == m_devnum) ++ { ++ for (iter = captureDevices.begin(); iter != captureDevices.end(); ++iter) ++ { ++ if (iter->name == id) ++ { ++ pa_operation *o; ++ ++ pa_cvolume volume = genVolumeForPulse(*iter, md->playbackVolume()); ++ if (!(o = pa_context_set_source_volume_by_index(s_context, iter->index, &volume, NULL, NULL))) { ++ kWarning(67100) << "pa_context_set_source_volume_by_index() failed"; ++ return Mixer::ERR_READ; ++ } ++ pa_operation_unref(o); ++ ++ if (!(o = pa_context_set_source_mute_by_index(s_context, iter->index, (md->isMuted() ? 1 : 0), NULL, NULL))) { ++ kWarning(67100) << "pa_context_set_source_mute_by_index() failed"; ++ return Mixer::ERR_READ; ++ } ++ pa_operation_unref(o); ++ ++ return 0; ++ } ++ } ++ } ++ else if (KMIXPA_APP_PLAYBACK == m_devnum) ++ { ++ if (id.startsWith("stream:")) ++ { ++ for (iter = outputStreams.begin(); iter != outputStreams.end(); ++iter) ++ { ++ if (iter->name == id) ++ { ++ pa_operation *o; ++ ++ pa_cvolume volume = genVolumeForPulse(*iter, md->playbackVolume()); ++ if (!(o = pa_context_set_sink_input_volume(s_context, iter->index, &volume, NULL, NULL))) { ++ kWarning(67100) << "pa_context_set_sink_input_volume() failed"; ++ return Mixer::ERR_READ; ++ } ++ pa_operation_unref(o); ++ ++ if (!(o = pa_context_set_sink_input_mute(s_context, iter->index, (md->isMuted() ? 1 : 0), NULL, NULL))) { ++ kWarning(67100) << "pa_context_set_sink_input_mute() failed"; ++ return Mixer::ERR_READ; ++ } ++ pa_operation_unref(o); ++ ++ return 0; ++ } ++ } ++ } ++ else if (id.startsWith("restore:")) ++ { ++ for (iter = outputRoles.begin(); iter != outputRoles.end(); ++iter) ++ { ++ if (iter->name == id) ++ { ++ restoreRule &rule = s_RestoreRules[iter->stream_restore_rule]; ++ pa_ext_stream_restore_info info; ++ info.name = iter->stream_restore_rule.toUtf8().constData(); ++ info.channel_map = rule.channel_map; ++ info.volume = genVolumeForPulse(*iter, md->playbackVolume()); ++ info.device = rule.device.isEmpty() ? NULL : rule.device.toUtf8().constData(); ++ info.mute = (md->isMuted() ? 1 : 0); ++ ++ pa_operation* o; ++ if (!(o = pa_ext_stream_restore_write(s_context, PA_UPDATE_REPLACE, &info, 1, true, NULL, NULL))) { ++ kWarning(67100) << "pa_ext_stream_restore_write() failed" << info.channel_map.channels << info.volume.channels << info.name; ++ return Mixer::ERR_READ; ++ } ++ pa_operation_unref(o); ++ ++ return 0; ++ } ++ } ++ } ++ } ++ else if (KMIXPA_APP_CAPTURE == m_devnum) ++ { ++ for (iter = captureStreams.begin(); iter != captureStreams.end(); ++iter) ++ { ++ if (iter->name == id) ++ { ++ pa_operation *o; ++ ++#if HAVE_SOURCE_OUTPUT_VOLUMES ++ pa_cvolume volume = genVolumeForPulse(*iter, md->playbackVolume()); ++ if (!(o = pa_context_set_source_output_volume(s_context, iter->index, &volume, NULL, NULL))) { ++ kWarning(67100) << "pa_context_set_source_output_volume_by_index() failed"; ++ return Mixer::ERR_READ; ++ } ++ pa_operation_unref(o); ++ ++ if (!(o = pa_context_set_source_output_mute(s_context, iter->index, (md->isMuted() ? 1 : 0), NULL, NULL))) { ++ kWarning(67100) << "pa_context_set_source_output_mute_by_index() failed"; ++ return Mixer::ERR_READ; ++ } ++ pa_operation_unref(o); ++#else ++ // NB Note that this is different from APP_PLAYBACK in that we set the volume on the source itself. ++ pa_cvolume volume = genVolumeForPulse(*iter, md->playbackVolume()); ++ if (!(o = pa_context_set_source_volume_by_index(s_context, iter->device_index, &volume, NULL, NULL))) { ++ kWarning(67100) << "pa_context_set_source_volume_by_index() failed"; ++ return Mixer::ERR_READ; ++ } ++ pa_operation_unref(o); ++ ++ if (!(o = pa_context_set_source_mute_by_index(s_context, iter->device_index, (md->isMuted() ? 1 : 0), NULL, NULL))) { ++ kWarning(67100) << "pa_context_set_source_mute_by_index() failed"; ++ return Mixer::ERR_READ; ++ } ++ pa_operation_unref(o); ++#endif ++ ++ return 0; ++ } ++ } ++ } ++ ++ return 0; ++} ++ ++/** ++* Move the stream to a new destination ++*/ ++bool Mixer_PULSE::moveStream( const TQString& id, const TQString& destId ) { ++ TQ_ASSERT(KMIXPA_APP_PLAYBACK == m_devnum || KMIXPA_APP_CAPTURE == m_devnum); ++ ++ kDebug(67100) << "Mixer_PULSE::moveStream(): Move Stream Requested - Stream: " << id << ", Destination: " << destId; ++ ++ // Lookup the stream index. ++ uint32_t stream_index = PA_INVALID_INDEX; ++ TQString stream_restore_rule = ""; ++ devmap::iterator iter; ++ devmap *map = get_widget_map(m_devnum); ++ for (iter = map->begin(); iter != map->end(); ++iter) { ++ if (iter->name == id) { ++ stream_index = iter->index; ++ stream_restore_rule = iter->stream_restore_rule; ++ break; ++ } ++ } ++ ++ if (PA_INVALID_INDEX == stream_index) { ++ kError(67100) << "Mixer_PULSE::moveStream(): Cannot find stream index"; ++ return false; ++ } ++ ++ if (destId.isEmpty()) { ++ // We want to remove any specific device in the stream restore rule. ++ if (stream_restore_rule.isEmpty() || !s_RestoreRules.contains(stream_restore_rule)) { ++ kWarning(67100) << "Mixer_PULSE::moveStream(): Trying to set Automatic on a stream with no rule"; ++ } else { ++ restoreRule &rule = s_RestoreRules[stream_restore_rule]; ++ pa_ext_stream_restore_info info; ++ info.name = stream_restore_rule.toUtf8().constData(); ++ info.channel_map = rule.channel_map; ++ info.volume = rule.volume; ++ info.device = NULL; ++ info.mute = rule.mute ? 1 : 0; ++ ++ pa_operation* o; ++ if (!(o = pa_ext_stream_restore_write(s_context, PA_UPDATE_REPLACE, &info, 1, true, NULL, NULL))) { ++ kWarning(67100) << "pa_ext_stream_restore_write() failed" << info.channel_map.channels << info.volume.channels << info.name; ++ return Mixer::ERR_READ; ++ } ++ pa_operation_unref(o); ++ } ++ } else { ++ pa_operation* o; ++ if (KMIXPA_APP_PLAYBACK == m_devnum) { ++ if (!(o = pa_context_move_sink_input_by_name(s_context, stream_index, destId.toUtf8().constData(), NULL, NULL))) { ++ kWarning(67100) << "pa_context_move_sink_input_by_name() failed"; ++ return false; ++ } ++ } else { ++ if (!(o = pa_context_move_source_output_by_name(s_context, stream_index, destId.toUtf8().constData(), NULL, NULL))) { ++ kWarning(67100) << "pa_context_move_source_output_by_name() failed"; ++ return false; ++ } ++ } ++ pa_operation_unref(o); ++ } ++ ++ return true; ++} ++ ++void Mixer_PULSE::reinit() ++{ ++ // We only support reinit on our primary mixer. ++ TQ_ASSERT(KMIXPA_PLAYBACK == m_devnum); ++ connectToDaemon(); ++} ++ ++void Mixer_PULSE::triggerUpdate() ++{ ++ readSetFromHWforceUpdate(); ++ readSetFromHW(); ++} ++ ++// Please see KMixWindow::initActionsAfterInitMixer(), it uses the driverName ++ ++TQString PULSE_getDriverName() { ++ return "PulseAudio"; ++} ++ ++TQString Mixer_PULSE::getDriverName() ++{ ++ return "PulseAudio"; ++} ++ +diff -Nuar ./kmix-tde-ori/mixer_pulse.h ./kmix/mixer_pulse.h +--- ./kmix-tde-ori/mixer_pulse.h 1970-01-01 01:00:00.000000000 +0100 ++++ ./kmix/mixer_pulse.h 2013-05-21 23:27:28.960083350 +0200 +@@ -0,0 +1,85 @@ ++/* ++ * KMix -- KDE's full featured mini mixer ++ * ++ * ++ * Copyright (C) 2008 Helio Chissini de Castro ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Library 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 ++ * Library General Public License for more details. ++ * ++ * You should have received a copy of the GNU Library 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. ++ */ ++ ++#ifndef MIXER_PULSE_H ++#define MIXER_PULSE_H ++ ++#include ++ ++#include "mixer_backend.h" ++#include ++ ++typedef TQMap chanIDMap; ++typedef struct { ++ int index; ++ int device_index; ++ TQString name; ++ TQString description; ++ TQString icon_name; ++ pa_cvolume volume; ++ pa_channel_map channel_map; ++ bool mute; ++ TQString stream_restore_rule; ++ ++ Volume::ChannelMask chanMask; ++ chanIDMap chanIDs; ++} devinfo; ++ ++class Mixer_PULSE : public Mixer_Backend ++{ ++ public: ++ Mixer_PULSE(Mixer *mixer, int devnum); ++ virtual ~Mixer_PULSE(); ++ ++ virtual int readVolumeFromHW( const TQString& id, shared_ptr ); ++ virtual int writeVolumeToHW ( const TQString& id, shared_ptr ); ++ ++ virtual bool moveStream( const TQString& id, const TQString& destId ); ++ ++ virtual TQString getDriverName(); ++ virtual TQString getId() const { return _id; }; ++ ++ virtual bool needsPolling() { return false; } ++ ++ void triggerUpdate(); ++ void addWidget(int index, bool = false); ++ void removeWidget(int index); ++ void removeAllWidgets(); ++ MixSet *getMixSet() { return &m_mixDevices; } ++ int id2num(const TQString& id); ++ ++ protected: ++ virtual int open(); ++ virtual int close(); ++ ++ int fd; ++ TQString _id; ++ ++ private: ++ void addDevice(devinfo& dev, bool = false); ++ bool connectToDaemon(); ++ void emitControlsReconfigured(); ++public: ++ void reinit(); ++ ++}; ++ ++#endif diff --git a/redhat/tdenetwork/tdenetwork-3.5.13.2-fix_conflicting_definitions.patch b/redhat/tdenetwork/tdenetwork-3.5.13.2-fix_conflicting_definitions.patch new file mode 100644 index 000000000..6c3204712 --- /dev/null +++ b/redhat/tdenetwork/tdenetwork-3.5.13.2-fix_conflicting_definitions.patch @@ -0,0 +1,35 @@ +--- trinity-tdenetwork-3.5.13.2/kopete/plugins/motionautoaway/motionawayplugin.cpp.ORI 2013-06-17 19:40:31.327502606 +0200 ++++ trinity-tdenetwork-3.5.13.2/kopete/plugins/motionautoaway/motionawayplugin.cpp 2013-06-17 19:43:02.745097904 +0200 +@@ -44,32 +44,6 @@ + + #include "kopeteaccountmanager.h" + #include "kopeteaway.h" +-/* The following is a hack: +- * e.g. Mandrake 9.x ships with a patched +- * kernel which doesn't define this 64 bit types (we need GNU C lib +- * because we use long long and warning - gcc extensions.) +- * +- * This is caused by the !defined(__STRICT_ANSI__) check in +- * /usr/include/asm/types.h +- */ +-#if !defined(__u64) && defined(__GNUC__) +-#if SIZEOF_UNSIGNED_LONG >= 8 +-typedef unsigned long __u64; +-#else +-typedef unsigned long long __u64; +-#endif +-#endif +- +-#if !defined(__s64) && defined(__GNUC__) +-#if SIZEOF_LONG >= 8 +-typedef signed long __s64; +-#else +-typedef __signed__ long long __s64; +-#endif +-#endif +-/* +- * End hack +- */ + + #include + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,50) diff --git a/redhat/tdepim/tdepim-3.5.13.2-kmail_networkmanager_support.patch b/redhat/tdepim/tdepim-3.5.13.2-kmail_networkmanager_support.patch new file mode 100644 index 000000000..e6dc1ead3 --- /dev/null +++ b/redhat/tdepim/tdepim-3.5.13.2-kmail_networkmanager_support.patch @@ -0,0 +1,251 @@ +--- trinity-tdepim-3.5.13.2~pre23+6c74b892/kmail/CMakeLists.txt.ORI 2013-05-25 17:07:04.113241481 +0200 ++++ trinity-tdepim-3.5.13.2~pre23+6c74b892/kmail/CMakeLists.txt 2013-05-25 17:09:01.115862006 +0200 +@@ -178,7 +178,7 @@ + localsubscriptiondialog.cpp editorwatcher.cpp favoritefolderview.cpp + foldertreebase.cpp snippetdlgbase.ui snippetwidget.cpp snippetconfig.cpp + snippetdlg.cpp snippetitem.cpp snippetsettings.cpp snippetsettingsbase.ui +- messageactions.cpp korghelper.cpp foldersetselector.cpp stringutil.cpp ++ messageactions.cpp korghelper.cpp kmnetworkmonitor.cpp foldersetselector.cpp stringutil.cpp + treebase.cpp backupjob.cpp importjob.cpp folderutil.cpp archivefolderdialog.cpp + importarchivedialog.cpp ${CMAKE_SOURCE_DIR}/korganizer/kcalendariface.stub + ${CMAKE_SOURCE_DIR}/korganizer/korganizeriface.stub ) +@@ -192,7 +192,7 @@ + SOURCES ${${target}_SRCS} + LINK + emailfunctions-static kmime-shared kpgp-shared kdepim-shared kpimidentities-shared +- mimelib-shared ksieve-shared khtml-shared ${INDEX_LIBRARY} ++ mimelib-shared ksieve-shared khtml-shared kdedbus-shared ${INDEX_LIBRARY} + DESTINATION ${LIB_INSTALL_DIR} + ) + +--- trinity-tdepim-3.5.13.2~pre23+6c74b892/kmail/kmkernel.cpp.ORI 2013-05-25 17:10:26.899117831 +0200 ++++ trinity-tdepim-3.5.13.2~pre23+6c74b892/kmail/kmkernel.cpp 2013-05-25 17:12:30.471605868 +0200 +@@ -72,6 +72,7 @@ + #include + using KWallet::Wallet; + #include "actionscheduler.h" ++#include "kmnetworkmonitor.h" + + #include + #include +@@ -169,6 +170,9 @@ + + connectDCOPSignal( 0, 0, "kmailSelectFolder(TQString)", + "selectFolder(TQString)", false ); ++ ++ networkMonitor = new KMNetworkMonitor(this, "KMNetworkMonitor"); ++ connect(networkMonitor, TQT_SIGNAL(stateChanged(bool)), TQT_SLOT(slotNetworkStateChanged(bool))); + } + + KMKernel::~KMKernel () +@@ -2056,6 +2060,15 @@ + mPutJobs.remove(it); + } + ++void KMKernel::slotNetworkStateChanged(bool state) ++{ ++ if(state) { ++ resumeNetworkJobs(); ++ } else { ++ stopNetworkJobs(); ++ } ++} ++ + void KMKernel::slotRequestConfigSync() { + // ### FIXME: delay as promised in the kdoc of this function ;-) + KMKernel::config()->sync(); +--- trinity-tdepim-3.5.13.2~pre23+6c74b892/kmail/kmkernel.h.ORI 2013-05-25 17:13:53.309922294 +0200 ++++ trinity-tdepim-3.5.13.2~pre23+6c74b892/kmail/kmkernel.h 2013-05-25 17:15:29.587965912 +0200 +@@ -28,6 +28,8 @@ + class Wallet; + } + ++class KMNetworkMonitor; ++ + /** The KMail namespace contains classes used for KMail. + * This is to keep them out of the way from all the other + * un-namespaced classes in libs and the rest of PIM. +@@ -434,6 +436,7 @@ + protected slots: + void slotDataReq(KIO::Job*,TQByteArray&); + void slotResult(KIO::Job*); ++ void slotNetworkStateChanged(bool); + + signals: + void configChanged(); +@@ -517,6 +520,8 @@ + KPIM::ThreadWeaver::WeaverThreadLogger *the_weaverLogger; + + KWallet::Wallet *mWallet; ++ ++ KMNetworkMonitor *networkMonitor; + + // variables used by dcopAddMessage() + TQStringList mAddMessageMsgIds; +--- /dev/null 2013-05-25 09:16:59.792134055 +0200 ++++ trinity-tdepim-3.5.13.2~pre23+6c74b892/kmail/kmnetworkmonitor.h 2013-05-25 17:20:02.351394952 +0200 +@@ -0,0 +1,45 @@ ++/* ++ This file is part of the KDE3 Fork Project ++ Copyright (c) 2013 Serghei Amelian ++ ++ This library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Library General Public ++ License version 2 as published by the Free Software Foundation. ++ ++ This library 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 ++ Library General Public License for more details. ++ ++ You should have received a copy of the GNU Library General Public License ++ along with this library; see the file COPYING.LIB. If not, write to ++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ Boston, MA 02110-1301, USA. ++*/ ++#ifndef _KMNETWORKMONITOR_H_ ++#define _KMNETWORKMONITOR_H_ ++ ++#include ++ ++class KMNetworkMonitorPrivate; ++ ++ ++class KMNetworkMonitor : public TQObject { ++ ++ TQ_OBJECT ++ ++ friend class KMNetworkMonitorPrivate; ++ ++public: ++ KMNetworkMonitor(TQObject *parent = 0, const char *name = 0); ++ ~KMNetworkMonitor(); ++ ++signals: ++ void stateChanged(bool); ++ ++private: ++ KMNetworkMonitorPrivate *d; ++}; ++ ++ ++#endif +--- /dev/null 2013-05-25 09:16:59.792134055 +0200 ++++ trinity-tdepim-3.5.13.2~pre23+6c74b892/kmail/kmnetworkmonitor.cpp 2013-05-25 17:21:55.565054211 +0200 +@@ -0,0 +1,116 @@ ++/* ++ This file is part of the KDE3 Fork Project ++ Copyright (c) 2013 Serghei Amelian ++ ++ This library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Library General Public ++ License version 2 as published by the Free Software Foundation. ++ ++ This library 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 ++ Library General Public License for more details. ++ ++ You should have received a copy of the GNU Library General Public License ++ along with this library; see the file COPYING.LIB. If not, write to ++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ Boston, MA 02110-1301, USA. ++*/ ++ ++#include ++ ++#include ++#include ++#include ++#include ++ ++#include ++ ++#include "kmnetworkmonitor.h" ++ ++ ++class KMNetworkMonitorPrivate : public TQDBusProxy { ++ ++ TQ_OBJECT ++ ++public: ++ KMNetworkMonitorPrivate(KMNetworkMonitor *parent) ++ : TQDBusProxy(parent, "KMNetworkMonitorPrivate"), lastStatus(-1) ++ { ++ setService("org.freedesktop.NetworkManager"); ++ setPath("/org/freedesktop/NetworkManager"); ++ setInterface("org.freedesktop.NetworkManager"); ++ ++ TQTime::singleShot(0, this, TQT_SLOT(initialize())); ++ } ++ ++protected slots: ++ void initialize() ++ { ++ // connect to DBUS ++ TQDBusConnection dbus = TQDBusConnection::systemBus(); ++ if(!dbus.isConnected()) { ++ kdDebug() << "Unable to connect to DBus: " << dbus.lastError().message() << endl; ++ return; ++ } ++ setConnection(dbus); ++ ++ // check for current status ++ int rc = sendWithAsyncReply("state", TQValueList()); ++ if(0 == rc) { ++ kdDebug() << "Unable to send \"state\" command to DBus" << endl; ++ return; ++ } ++ } ++ ++ void handleDBusSignal(const TQDBusMessage &message) ++ { ++ // the message is for us ++ if(path() == message.path() && interface() == message.interface() && "StateChanged" == message.member()) ++ handleMessage(message); ++ } ++ ++ void handleAsyncReply(const TQDBusMessage &message) ++ { ++ handleMessage(message); ++ } ++ ++ void handleMessage(const TQDBusMessage &message) ++ { ++ bool ok; ++ TQ_UINT32 state = message[0].toUInt32(&ok); ++ ++ if(!ok) { ++ kdDebug() << "KMNetworkMonitor: received unexpected type for state (" << message[0].typeName() << ")" << endl; ++ return; ++ } ++ ++ int currStatus = (50 < state ? 1 : 0); ++ ++ if(lastStatus != currStatus) { ++ emit static_cast(parent())->stateChanged(1 == currStatus); ++ lastStatus = currStatus; ++ } ++ } ++ ++private: ++ // -1 = unitialized, 0 = offline, 1 = online ++ int lastStatus; ++}; ++ ++ ++KMNetworkMonitor::KMNetworkMonitor(TQObject *parent, const char *name) ++ : TQObject(parent, name) ++{ ++ d = new KMNetworkMonitorPrivate(this); ++} ++ ++ ++KMNetworkMonitor::~KMNetworkMonitor() ++{ ++ delete d; ++} ++ ++ ++#include "kmnetworkmonitor.moc" ++#include "kmnetworkmonitor.cpp.moc" diff --git a/redhat/tdeutils/kdeutils-3.5.13.2-rhel4.patch b/redhat/tdeutils/kdeutils-3.5.13.2-rhel4.patch new file mode 100644 index 000000000..ddc9c77e4 --- /dev/null +++ b/redhat/tdeutils/kdeutils-3.5.13.2-rhel4.patch @@ -0,0 +1,11 @@ +--- trinity-tdeutils-3.5.13.2/ConfigureChecks.cmake.rhel4 2013-01-09 02:43:16.000000000 +0100 ++++ trinity-tdeutils-3.5.13.2/ConfigureChecks.cmake 2013-03-10 16:25:27.108634832 +0100 +@@ -109,8 +107,6 @@ + set( CMAKE_REQUIRED_LIBRARIES ) + set( HAVE_DPMS 1 ) + endif( WITH_DPMS ) +- else( XEXT_FOUND ) +- tde_message_fatal( "libXext is requested, but was not found on your system" ) + endif( XEXT_FOUND ) + endif( ) +