From 637c241165a409d8fe4f0cc289a6a0f03c47e016 Mon Sep 17 00:00:00 2001
From: Jasper Huijsmans <jbhuijsmans@home.nl>
Date: Thu, 1 Apr 2004 22:17:21 +0000
Subject: [PATCH] - Reduce handle width to show only one line of dots - disable
completion combo, because it doesn't work on new installs - put
'Properties...' and 'Remove' in a submenu of panel item right-click menus.
May prevent some accidental removals.
(Old svn revision: 3997)
---
Makefile.in | 1 -
NEWS | 7 +
aclocal.m4 | 8 +-
config.h.in | 3 -
configure | 1464 +++++++-------------
configure.ac | 12 +-
doc/C/Makefile.in | 1 -
doc/C/images/Makefile.in | 1 -
doc/Makefile.in | 1 -
doc/fr/Makefile.in | 1 -
doc/fr/images/Makefile.in | 1 -
icons/Makefile.in | 1 -
ltmain.sh | 3 -
panel/Makefile.in | 1 -
panel/controls.c | 51 +-
panel/panel.c | 52 +-
plugins/Makefile.in | 1 -
plugins/clock/Makefile.in | 1 -
plugins/mailcheck/Makefile.in | 1 -
plugins/pager/Makefile.in | 1 -
plugins/separator/Makefile.in | 1 -
plugins/switcher/Makefile.in | 1 -
plugins/systembuttons/Makefile.in | 1 -
settings/Makefile.in | 1 -
themes/Crystal/22x22/Makefile.in | 1 -
themes/Crystal/22x22/emblems/Makefile.in | 1 -
themes/Crystal/48x48/Makefile.in | 1 -
themes/Crystal/48x48/emblems/Makefile.in | 1 -
themes/Crystal/Makefile.in | 1 -
themes/Curve/22x22/Makefile.in | 1 -
themes/Curve/22x22/emblems/Makefile.in | 1 -
themes/Curve/48x48/Makefile.in | 1 -
themes/Curve/48x48/emblems/Makefile.in | 1 -
themes/Curve/Makefile.in | 1 -
themes/FreeIcons/22x22/Makefile.in | 1 -
themes/FreeIcons/22x22/emblems/Makefile.in | 1 -
themes/FreeIcons/24x24/Makefile.in | 1 -
themes/FreeIcons/24x24/emblems/Makefile.in | 1 -
themes/FreeIcons/48x48/Makefile.in | 1 -
themes/FreeIcons/48x48/emblems/Makefile.in | 1 -
themes/FreeIcons/Makefile.in | 1 -
themes/Gnome/24x24/Makefile.in | 1 -
themes/Gnome/24x24/emblems/Makefile.in | 1 -
themes/Gnome/48x48/Makefile.in | 1 -
themes/Gnome/48x48/emblems/Makefile.in | 1 -
themes/Gnome/50x50/Makefile.in | 1 -
themes/Gnome/50x50/emblems/Makefile.in | 1 -
themes/Gnome/Makefile.in | 1 -
themes/Makefile.in | 1 -
themes/Noia/22x22/Makefile.in | 1 -
themes/Noia/22x22/emblems/Makefile.in | 1 -
themes/Noia/48x48/Makefile.in | 1 -
themes/Noia/48x48/emblems/Makefile.in | 1 -
themes/Noia/Makefile.in | 1 -
themes/XFce/14x14/Makefile.in | 1 -
themes/XFce/14x14/emblems/Makefile.in | 1 -
themes/XFce/16x16/Makefile.in | 1 -
themes/XFce/16x16/emblems/Makefile.in | 1 -
themes/XFce/19x19/Makefile.in | 1 -
themes/XFce/19x19/emblems/Makefile.in | 1 -
themes/XFce/24x24/Makefile.in | 1 -
themes/XFce/24x24/emblems/Makefile.in | 1 -
themes/XFce/48x48/Makefile.in | 1 -
themes/XFce/48x48/emblems/Makefile.in | 1 -
themes/XFce/50x50/Makefile.in | 1 -
themes/XFce/50x50/emblems/Makefile.in | 1 -
themes/XFce/53x53/Makefile.in | 1 -
themes/XFce/53x53/emblems/Makefile.in | 1 -
themes/XFce/Makefile.in | 1 -
69 files changed, 581 insertions(+), 1080 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index d89db5aee..bda96547f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -121,7 +121,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/NEWS b/NEWS
index e887ebd50..38840ad97 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,12 @@
Noteworthy updates to the xfce4 panel should be recorded here.
+* 2004-04-02 Jasper Huijsmans <jasper@xfce.org>
+
+- Reduce handle width to show only one line of dots
+- disable completion combo, because it doesn't work on new installs
+- put 'Properties...' and 'Remove' in a submenu of panel item right-click
+ menus. May prevent some accidental removals.
+
* 2004-01-18 Jasper Huijsmans <jasper@moongroup.com>
Split out the code for choosing a command and choosing an icon from
diff --git a/aclocal.m4 b/aclocal.m4
index 2cc1533c7..c559fa7d6 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -290,7 +290,7 @@ glib_DEFUN([GLIB_WITH_NLS],
# on various variables needed by the Makefile.in.in installed by
# glib-gettextize.
dnl
-glib_DEFUN([GLIB_GNU_GETTEXT],
+glib_DEFUN(GLIB_GNU_GETTEXT,
[AC_REQUIRE([AC_PROG_CC])dnl
AC_REQUIRE([AC_HEADER_STDC])dnl
@@ -367,7 +367,7 @@ glib_DEFUN([GLIB_GNU_GETTEXT],
# -------------------------------
# Define VARIABLE to the location where catalog files will
# be installed by po/Makefile.
-glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
+glib_DEFUN(GLIB_DEFINE_LOCALEDIR,
[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
glib_save_prefix="$prefix"
glib_save_exec_prefix="$exec_prefix"
@@ -388,8 +388,8 @@ dnl
dnl Now the definitions that aclocal will find
dnl
ifdef(glib_configure_in,[],[
-AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
-AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
+AC_DEFUN(AM_GLIB_GNU_GETTEXT,[GLIB_GNU_GETTEXT($@)])
+AC_DEFUN(AM_GLIB_DEFINE_LOCALEDIR,[GLIB_DEFINE_LOCALEDIR($@)])
])dnl
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
diff --git a/config.h.in b/config.h.in
index cc4d508c6..49a64e1d1 100644
--- a/config.h.in
+++ b/config.h.in
@@ -30,9 +30,6 @@
/* Define if your <locale.h> file defines LC_MESSAGES. */
#undef HAVE_LC_MESSAGES
-/* Define if you have dbh-1.0 >= 1.0 */
-#undef HAVE_LIBDBH
-
/* Define if you have libstartup-notification-1.0 >= 0.5 */
#undef HAVE_LIBSTARTUP_NOTIFICATION
diff --git a/configure b/configure
index 554b5c04c..a4abbda8e 100755
--- a/configure
+++ b/configure
@@ -391,9 +391,9 @@ fi
-tagnames=${tagnames+${tagnames},}CXX
+tagnames=`echo "$tagnames,CXX" | sed 's/^,//'`
-tagnames=${tagnames+${tagnames},}F77
+tagnames=`echo "$tagnames,F77" | sed 's/^,//'`
# Name of the host.
# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
@@ -463,7 +463,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP LN_S build build_cpu build_vendor build_os host host_cpu host_vendor host_os ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS localedir X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LIBX11_CFLAGS LIBX11_LDFLAGS LIBX11_LIBS PKG_CONFIG LIBXFCE4MCS_CLIENT_CFLAGS LIBXFCE4MCS_CLIENT_LIBS LIBXFCE4MCS_CLIENT_REQUIRED_VERSION LIBXFCEGUI4_CFLAGS LIBXFCEGUI4_LIBS LIBXFCEGUI4_REQUIRED_VERSION LIBXML_CFLAGS LIBXML_LIBS LIBXML_REQUIRED_VERSION LIBDBH_CFLAGS LIBDBH_LIBS LIBDBH_REQUIRED_VERSION XFCE_MCS_MANAGER_CFLAGS XFCE_MCS_MANAGER_LIBS XFCE_MCS_MANAGER_REQUIRED_VERSION XFCE_MCS_MANAGER_PLUGINSDIR LIBSTARTUP_NOTIFICATION_CFLAGS LIBSTARTUP_NOTIFICATION_LIBS LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP LN_S build build_cpu build_vendor build_os host host_cpu host_vendor host_os ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS localedir X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LIBX11_CFLAGS LIBX11_LDFLAGS LIBX11_LIBS PKG_CONFIG LIBXFCE4MCS_CLIENT_CFLAGS LIBXFCE4MCS_CLIENT_LIBS LIBXFCE4MCS_CLIENT_REQUIRED_VERSION LIBXFCEGUI4_CFLAGS LIBXFCEGUI4_LIBS LIBXFCEGUI4_REQUIRED_VERSION LIBXML_CFLAGS LIBXML_LIBS LIBXML_REQUIRED_VERSION LIBDBH_CFLAGS LIBDBH_LIBS XFCE_MCS_MANAGER_CFLAGS XFCE_MCS_MANAGER_LIBS XFCE_MCS_MANAGER_REQUIRED_VERSION XFCE_MCS_MANAGER_PLUGINSDIR LIBSTARTUP_NOTIFICATION_CFLAGS LIBSTARTUP_NOTIFICATION_LIBS LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -1038,8 +1038,6 @@ Optional Features:
--enable-fast-install[=PKGS]
optimize for fast installation [default=yes]
--disable-libtool-lock avoid locking (might break parallel builds)
- --enable-dbh Enable checking for DBH library (default=yes)
- --disable-dbh Disable checking for DBH library
--enable-startup-notification
Enable checking for startup notification library
(default=yes)
@@ -5009,7 +5007,7 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
# Accept absolute paths.
[\\/]* | ?:[\\/]*)
re_direlt='/[^/][^/]*/\.\./'
- # Canonicalize the pathname of ld
+ # Canonicalize the path 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%/%"`
@@ -5188,24 +5186,28 @@ bsdi4*)
lt_cv_file_magic_test_file=/shlib/libc.so
;;
-cygwin*)
+cygwin* | mingw* | pw32*)
# win32_libid is a shell function defined in ltmain.sh
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
lt_cv_file_magic_cmd='win32_libid'
;;
-mingw* | pw32*)
- # Base MSYS/MinGW do not provide the 'file' command needed by
- # win32_libid shell function, so use a weaker test based on 'objdump'.
- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
- lt_cv_file_magic_cmd='$OBJDUMP -f'
- ;;
-
darwin* | rhapsody*)
+ # this will be overwritten by pass_all, but leave it in just in case
+ lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
+ lt_cv_file_magic_cmd='/usr/bin/file -L'
+ case "$host_os" in
+ rhapsody* | darwin1.[012])
+ lt_cv_file_magic_test_file=`/System/Library/Frameworks/System.framework/System`
+ ;;
+ *) # Darwin 1.3 on
+ lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
+ ;;
+ esac
lt_cv_deplibs_check_method=pass_all
;;
-freebsd* | kfreebsd*-gnu)
+freebsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
@@ -5244,27 +5246,36 @@ hpux10.20* | hpux11*)
;;
irix5* | irix6* | nonstopux*)
- case $LD in
- *-32|*"-32 ") libmagic=32-bit;;
- *-n32|*"-n32 ") libmagic=N32;;
- *-64|*"-64 ") libmagic=64-bit;;
- *) libmagic=never-match;;
+ case $host_os in
+ irix5* | nonstopux*)
+ # this will be overridden with pass_all, but let us keep it just in case
+ lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
+ ;;
+ *)
+ case $LD in
+ *-32|*"-32 ") libmagic=32-bit;;
+ *-n32|*"-n32 ") libmagic=N32;;
+ *-64|*"-64 ") libmagic=64-bit;;
+ *) libmagic=never-match;;
+ esac
+ # this will be overridden with pass_all, but let us keep it just in case
+ lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"
+ ;;
esac
+ lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
lt_cv_deplibs_check_method=pass_all
;;
# This must be Linux ELF.
linux*)
case $host_cpu in
- alpha*|hppa*|i*86|ia64*|m68*|mips*|powerpc*|sparc*|s390*|sh*|x86_64*)
+ alpha* | hppa* | i*86 | ia64* | m68* | mips | mipsel | powerpc* | sparc* | s390* | sh* | x86_64*)
lt_cv_deplibs_check_method=pass_all ;;
*)
# glibc up to 2.1.1 does not perform some relocations on ARM
- # this will be overridden with pass_all, but let us keep it just in case
lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
esac
lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
- lt_cv_deplibs_check_method=pass_all
;;
netbsd*)
@@ -5281,7 +5292,7 @@ newos6*)
lt_cv_file_magic_test_file=/usr/lib/libnls.so
;;
-nto-qnx*)
+nto-qnx)
lt_cv_deplibs_check_method=unknown
;;
@@ -5296,6 +5307,9 @@ openbsd*)
;;
osf3* | osf4* | osf5*)
+ # this will be overridden with pass_all, but let us keep it just in case
+ lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
+ lt_cv_file_magic_test_file=/shlib/libc.so
lt_cv_deplibs_check_method=pass_all
;;
@@ -5305,6 +5319,7 @@ sco3.2v5*)
solaris*)
lt_cv_deplibs_check_method=pass_all
+ lt_cv_file_magic_test_file=/lib/libc.so
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
@@ -5383,7 +5398,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5386 "configure"' > conftest.$ac_ext
+ echo '#line 5401 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5432,7 +5447,7 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
- ppc64-*linux*|powerpc64-*linux*)
+ ppc64-*linux*)
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
@@ -5464,24 +5479,6 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
rm -rf conftest*
;;
-*-*-linux*)
- # Test if the compiler is 64bit
- echo 'int i;' > conftest.$ac_ext
- lt_cv_cc_64bit_output=no
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- case `/usr/bin/file conftest.$ac_objext` in
- *"ELF 64"*)
- lt_cv_cc_64bit_output=yes
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
-
*-*-sco3.2v5*)
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
@@ -6493,7 +6490,7 @@ fi
# Provide some information about the compiler.
-echo "$as_me:6496:" \
+echo "$as_me:6493:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6677,12 +6674,6 @@ else
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;
- ;;
-
*)
# 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
@@ -7508,8 +7499,7 @@ lt_prog_compiler_no_builtin_flag=
if test "$GCC" = yes; then
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
-
-echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7527,11 +7517,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7530: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7520: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7534: \$? = $ac_status" >&5
+ echo "$as_me:7524: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -7674,12 +7664,12 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
linux*)
case $CC in
- icc* | ecc*)
+ icc|ecc)
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-static'
;;
- ccc*)
+ ccc)
lt_prog_compiler_wl='-Wl,'
# All Alpha code is PIC.
lt_prog_compiler_static='-non_shared'
@@ -7741,8 +7731,7 @@ echo "${ECHO_T}$lt_prog_compiler_pic" >&6
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic"; then
-
-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6
if test "${lt_prog_compiler_pic_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7760,11 +7749,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7763: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7752: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7767: \$? = $ac_status" >&5
+ echo "$as_me:7756: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -7811,6 +7800,13 @@ else
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+ # that will create temporary files in the current directory regardless of
+ # the output directory. Thus, making CWD read-only will cause this test
+ # to fail, enabling locking or at least warning the user not to do parallel
+ # builds.
+ chmod -w .
+
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
@@ -7820,11 +7816,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7823: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7819: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7827: \$? = $ac_status" >&5
+ echo "$as_me:7823: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -7834,11 +7830,8 @@ else
fi
fi
chmod u+w .
- $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
+ $rm conftest* out/*
+ rmdir out
cd ..
rmdir conftest
$rm conftest*
@@ -8350,27 +8343,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
;;
darwin* | rhapsody*)
- if test "$GXX" = yes ; then
+ if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
archive_cmds_need_lc=no
case "$host_os" in
rhapsody* | darwin1.[012])
allow_undefined_flag='-undefined suppress'
;;
*) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- allow_undefined_flag='-flat_namespace -undefined suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[012])
- allow_undefined_flag='-flat_namespace -undefined suppress'
- ;;
- 10.*)
- allow_undefined_flag='-undefined dynamic_lookup'
- ;;
- esac
- fi
+ test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag='-flat_namespace -undefined suppress'
;;
esac
+ # FIXME: Relying on posixy $() will cause problems for
+ # cross-compilation, but unfortunately the echo tests do not
+ # yet detect zsh echo's removal of \ escapes. Also zsh mangles
+ # `"' quotes if we put them in here... so don't!
lt_int_apple_cc_single_mod=no
output_verbose_link_cmd='echo'
if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
@@ -8381,21 +8367,19 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
else
archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
fi
- module_cmds='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ module_cmds='$CC -bundle ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags'
# Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
else
archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
fi
- module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
hardcode_direct=no
hardcode_automatic=yes
hardcode_shlibpath_var=unsupported
whole_archive_flag_spec='-all_load $convenience'
link_all_deplibs=yes
- else
- ld_shlibs=no
fi
;;
@@ -8429,7 +8413,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu)
+ freebsd*)
archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
@@ -8789,6 +8773,72 @@ echo "${ECHO_T}$archive_cmds_need_lc" >&6
;;
esac
+echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+hardcode_action=
+if test -n "$hardcode_libdir_flag_spec" || \
+ test -n "$runpath_var " || \
+ test "X$hardcode_automatic"="Xyes" ; then
+
+ # We can hardcode non-existant directories.
+ if test "$hardcode_direct" != no &&
+ # If the only mechanism to avoid hardcoding is shlibpath_var, we
+ # have to relink, otherwise we might link with an installed library
+ # when we should be linking with a yet-to-be-installed one
+ ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no &&
+ test "$hardcode_minus_L" != no; then
+ # Linking always hardcodes the temporary library directory.
+ hardcode_action=relink
+ else
+ # We can link without hardcoding, and we can hardcode nonexisting dirs.
+ hardcode_action=immediate
+ fi
+else
+ # We cannot hardcode anything, or else we can only hardcode existing
+ # directories.
+ hardcode_action=unsupported
+fi
+echo "$as_me:$LINENO: result: $hardcode_action" >&5
+echo "${ECHO_T}$hardcode_action" >&6
+
+if test "$hardcode_action" = relink; then
+ # Fast installation is not supported
+ enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+ test "$enable_shared" = no; then
+ # Fast installation is not necessary
+ enable_fast_install=needless
+fi
+
+striplib=
+old_striplib=
+echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+ test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+ case $host_os in
+ darwin*)
+ if test -n "$STRIP" ; then
+ striplib="$STRIP -x"
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+ ;;
+ *)
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+ ;;
+ esac
+fi
+
echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
library_names_spec=
@@ -8882,7 +8932,7 @@ aix4* | aix5*)
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
;;
beos*)
@@ -8929,7 +8979,7 @@ cygwin* | mingw* | pw32*)
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"
+ sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib"
;;
mingw*)
# MinGW DLLs use traditional 'lib' prefix
@@ -8954,30 +9004,6 @@ cygwin* | mingw* | pw32*)
esac
;;
- linux*)
- if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- 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
- if test $supports_anon_versioning = yes; then
- archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-$echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- else
- $archive_expsym_cmds="$archive_cmds"
- fi
- else
- ld_shlibs=no
- fi
- ;;
-
*)
library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
;;
@@ -8992,16 +9018,17 @@ darwin* | rhapsody*)
version_type=darwin
need_lib_prefix=no
need_version=no
+ # FIXME: Relying on posixy $() will cause problems for
+ # cross-compilation, but unfortunately the echo tests do not
+ # yet detect zsh echo's removal of \ escapes.
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='$(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'
+ if $CC -v 2>&1 | grep 'Apple' >/dev/null ; 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"`
fi
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
@@ -9019,18 +9046,6 @@ freebsd1*)
dynamic_linker=no
;;
-kfreebsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
freebsd*)
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
version_type=freebsd-$objformat
@@ -9174,19 +9189,6 @@ linux*)
# 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
- ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
- fi
-
- case $host_cpu:$lt_cv_cc_64bit_output in
- powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes)
- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /usr/X11R6/lib64"
- sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64 /usr/X11R6/lib64"
- ;;
- esac
-
# 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,
@@ -9198,8 +9200,8 @@ linux*)
# Find out which ABI we are using (multilib Linux x86_64 hack).
libsuff=
case "$host_cpu" in
- x86_64*)
- echo '#line 9202 "configure"' > conftest.$ac_ext
+ x86_64*|s390x*|powerpc64*)
+ echo '#line 9204 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -9220,18 +9222,6 @@ linux*)
sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
;;
-knetbsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -9241,7 +9231,7 @@ netbsd*)
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}'
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
@@ -9257,7 +9247,7 @@ newsos6)
shlibpath_overrides_runpath=yes
;;
-nto-qnx*)
+nto-qnx)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -9270,7 +9260,7 @@ nto-qnx*)
openbsd*)
version_type=sunos
need_lib_prefix=no
- need_version=yes
+ need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
@@ -9388,72 +9378,6 @@ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
echo "${ECHO_T}$dynamic_linker" >&6
test "$dynamic_linker" = no && can_build_shared=no
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
-hardcode_action=
-if test -n "$hardcode_libdir_flag_spec" || \
- test -n "$runpath_var " || \
- test "X$hardcode_automatic"="Xyes" ; then
-
- # We can hardcode non-existant directories.
- if test "$hardcode_direct" != no &&
- # If the only mechanism to avoid hardcoding is shlibpath_var, we
- # have to relink, otherwise we might link with an installed library
- # when we should be linking with a yet-to-be-installed one
- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no &&
- test "$hardcode_minus_L" != no; then
- # Linking always hardcodes the temporary library directory.
- hardcode_action=relink
- else
- # We can link without hardcoding, and we can hardcode nonexisting dirs.
- hardcode_action=immediate
- fi
-else
- # We cannot hardcode anything, or else we can only hardcode existing
- # directories.
- hardcode_action=unsupported
-fi
-echo "$as_me:$LINENO: result: $hardcode_action" >&5
-echo "${ECHO_T}$hardcode_action" >&6
-
-if test "$hardcode_action" = relink; then
- # Fast installation is not supported
- enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
- test "$enable_shared" = no; then
- # Fast installation is not necessary
- enable_fast_install=needless
-fi
-
-striplib=
-old_striplib=
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
- test -z "$striplib" && striplib="$STRIP --strip-unneeded"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-# FIXME - insert some real tests, host_os isn't really good enough
- case $host_os in
- darwin*)
- if test -n "$STRIP" ; then
- striplib="$STRIP -x"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
- ;;
- *)
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- ;;
- esac
-fi
-
if test "x$enable_dlopen" != xyes; then
enable_dlopen=unknown
enable_dlopen_self=unknown
@@ -10059,7 +9983,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10062 "configure"
+#line 9986 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10157,7 +10081,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10160 "configure"
+#line 10084 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10288,41 +10212,32 @@ aix4*)
fi
;;
darwin* | rhapsody*)
- if test "$GCC" = yes; then
+ if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
archive_cmds_need_lc=no
case "$host_os" in
rhapsody* | darwin1.[012])
allow_undefined_flag='-undefined suppress'
;;
*) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- allow_undefined_flag='-flat_namespace -undefined suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[012])
- allow_undefined_flag='-flat_namespace -undefined suppress'
- ;;
- 10.*)
- allow_undefined_flag='-undefined dynamic_lookup'
- ;;
- esac
- fi
+ test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag='-flat_namespace -undefined suppress'
;;
esac
- output_verbose_link_cmd='echo'
+ # FIXME: Relying on posixy $() will cause problems for
+ # cross-compilation, but unfortunately the echo tests do not
+ # yet detect zsh echo's removal of \ escapes. Also zsh mangles
+ # `"' quotes if we put them in here... so don't!
+ output_verbose_link_cmd='echo'
archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
- module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ module_cmds='$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags'
# Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
hardcode_direct=no
hardcode_automatic=yes
hardcode_shlibpath_var=unsupported
whole_archive_flag_spec='-all_load $convenience'
link_all_deplibs=yes
- else
- ld_shlibs=no
- fi
+ fi
;;
esac
echo "$as_me:$LINENO: result: $enable_shared" >&5
@@ -10348,8 +10263,7 @@ if test -f "$ltmain"; then
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
- SED SHELL STRIP \
+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
@@ -10527,7 +10441,7 @@ LN_S=$lt_LN_S
NM=$lt_NM
# A symbol stripping program
-STRIP=$lt_STRIP
+STRIP=$STRIP
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
@@ -10800,10 +10714,7 @@ 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
+ test -f Makefile && make "$ltmain"
fi
@@ -10984,7 +10895,7 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
# Accept absolute paths.
[\\/]* | ?:[\\/]*)
re_direlt='/[^/][^/]*/\.\./'
- # Canonicalize the pathname of ld
+ # Canonicalize the path 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%/%"`
@@ -11368,54 +11279,41 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
;;
darwin* | rhapsody*)
- if test "$GXX" = yes; then
+ if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
archive_cmds_need_lc_CXX=no
case "$host_os" in
rhapsody* | darwin1.[012])
allow_undefined_flag_CXX='-undefined suppress'
;;
*) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[012])
- allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
- ;;
- 10.*)
- allow_undefined_flag_CXX='-undefined dynamic_lookup'
- ;;
- esac
- fi
+ test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
;;
esac
- lt_int_apple_cc_single_mod=no
- output_verbose_link_cmd='echo'
- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
- lt_int_apple_cc_single_mod=yes
- fi
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- else
- archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- fi
- module_cmds_CXX='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ lt_int_apple_cc_single_mod=no
+ output_verbose_link_cmd='echo'
+ if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+ lt_int_apple_cc_single_mod=yes
+ fi
+ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+ archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+ else
+ archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+ fi
+ module_cmds_CXX='$CC -bundle ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags'
# Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- fi
- module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ else
+ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ fi
+ module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
hardcode_direct_CXX=no
hardcode_automatic_CXX=yes
hardcode_shlibpath_var_CXX=unsupported
whole_archive_flag_spec_CXX='-all_load $convenience'
link_all_deplibs_CXX=yes
- else
- ld_shlibs_CXX=no
- fi
+ fi
;;
dgux*)
@@ -11442,7 +11340,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
freebsd-elf*)
archive_cmds_need_lc_CXX=no
;;
- freebsd* | kfreebsd*-gnu)
+ freebsd*)
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
@@ -12149,7 +12047,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
;;
esac
;;
- freebsd* | kfreebsd*-gnu)
+ freebsd*)
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
@@ -12317,8 +12215,7 @@ echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic_CXX"; then
-
-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6
if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12336,11 +12233,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12339: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12236: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12343: \$? = $ac_status" >&5
+ echo "$as_me:12240: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -12387,6 +12284,13 @@ else
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+ # that will create temporary files in the current directory regardless of
+ # the output directory. Thus, making CWD read-only will cause this test
+ # to fail, enabling locking or at least warning the user not to do parallel
+ # builds.
+ chmod -w .
+
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
@@ -12396,11 +12300,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12399: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12303: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12403: \$? = $ac_status" >&5
+ echo "$as_me:12307: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12410,11 +12314,8 @@ else
fi
fi
chmod u+w .
- $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
+ $rm conftest* out/*
+ rmdir out
cd ..
rmdir conftest
$rm conftest*
@@ -12542,6 +12443,72 @@ echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6
;;
esac
+echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+hardcode_action_CXX=
+if test -n "$hardcode_libdir_flag_spec_CXX" || \
+ test -n "$runpath_var CXX" || \
+ test "X$hardcode_automatic_CXX"="Xyes" ; then
+
+ # We can hardcode non-existant directories.
+ if test "$hardcode_direct_CXX" != 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, CXX)" != no &&
+ test "$hardcode_minus_L_CXX" != no; then
+ # Linking always hardcodes the temporary library directory.
+ hardcode_action_CXX=relink
+ else
+ # We can link without hardcoding, and we can hardcode nonexisting dirs.
+ hardcode_action_CXX=immediate
+ fi
+else
+ # We cannot hardcode anything, or else we can only hardcode existing
+ # directories.
+ hardcode_action_CXX=unsupported
+fi
+echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
+echo "${ECHO_T}$hardcode_action_CXX" >&6
+
+if test "$hardcode_action_CXX" = relink; then
+ # Fast installation is not supported
+ enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+ test "$enable_shared" = no; then
+ # Fast installation is not necessary
+ enable_fast_install=needless
+fi
+
+striplib=
+old_striplib=
+echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+ test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+ case $host_os in
+ darwin*)
+ if test -n "$STRIP" ; then
+ striplib="$STRIP -x"
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+ ;;
+ *)
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+ ;;
+ esac
+fi
+
echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
library_names_spec=
@@ -12635,7 +12602,7 @@ aix4* | aix5*)
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
;;
beos*)
@@ -12682,7 +12649,7 @@ cygwin* | mingw* | pw32*)
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"
+ sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib"
;;
mingw*)
# MinGW DLLs use traditional 'lib' prefix
@@ -12707,30 +12674,6 @@ cygwin* | mingw* | pw32*)
esac
;;
- linux*)
- if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- 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
- if test $supports_anon_versioning = yes; then
- archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-$echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- else
- $archive_expsym_cmds="$archive_cmds"
- fi
- else
- ld_shlibs=no
- fi
- ;;
-
*)
library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
;;
@@ -12745,16 +12688,17 @@ darwin* | rhapsody*)
version_type=darwin
need_lib_prefix=no
need_version=no
+ # FIXME: Relying on posixy $() will cause problems for
+ # cross-compilation, but unfortunately the echo tests do not
+ # yet detect zsh echo's removal of \ escapes.
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='$(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'
+ if $CC -v 2>&1 | grep 'Apple' >/dev/null ; 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"`
fi
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
@@ -12772,18 +12716,6 @@ freebsd1*)
dynamic_linker=no
;;
-kfreebsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
freebsd*)
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
version_type=freebsd-$objformat
@@ -12927,19 +12859,6 @@ linux*)
# 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
- ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
- fi
-
- case $host_cpu:$lt_cv_cc_64bit_output in
- powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes)
- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /usr/X11R6/lib64"
- sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64 /usr/X11R6/lib64"
- ;;
- esac
-
# 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,
@@ -12951,8 +12870,8 @@ linux*)
# Find out which ABI we are using (multilib Linux x86_64 hack).
libsuff=
case "$host_cpu" in
- x86_64*)
- echo '#line 12955 "configure"' > conftest.$ac_ext
+ x86_64*|s390x*|powerpc64*)
+ echo '#line 12874 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -12973,18 +12892,6 @@ linux*)
sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
;;
-knetbsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -12994,7 +12901,7 @@ netbsd*)
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}'
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
@@ -13010,7 +12917,7 @@ newsos6)
shlibpath_overrides_runpath=yes
;;
-nto-qnx*)
+nto-qnx)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -13023,7 +12930,7 @@ nto-qnx*)
openbsd*)
version_type=sunos
need_lib_prefix=no
- need_version=yes
+ need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
@@ -13141,72 +13048,6 @@ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
echo "${ECHO_T}$dynamic_linker" >&6
test "$dynamic_linker" = no && can_build_shared=no
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
-hardcode_action_CXX=
-if test -n "$hardcode_libdir_flag_spec_CXX" || \
- test -n "$runpath_var CXX" || \
- test "X$hardcode_automatic_CXX"="Xyes" ; then
-
- # We can hardcode non-existant directories.
- if test "$hardcode_direct_CXX" != 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, CXX)" != no &&
- test "$hardcode_minus_L_CXX" != no; then
- # Linking always hardcodes the temporary library directory.
- hardcode_action_CXX=relink
- else
- # We can link without hardcoding, and we can hardcode nonexisting dirs.
- hardcode_action_CXX=immediate
- fi
-else
- # We cannot hardcode anything, or else we can only hardcode existing
- # directories.
- hardcode_action_CXX=unsupported
-fi
-echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
-echo "${ECHO_T}$hardcode_action_CXX" >&6
-
-if test "$hardcode_action_CXX" = relink; then
- # Fast installation is not supported
- enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
- test "$enable_shared" = no; then
- # Fast installation is not necessary
- enable_fast_install=needless
-fi
-
-striplib=
-old_striplib=
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
- test -z "$striplib" && striplib="$STRIP --strip-unneeded"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-# FIXME - insert some real tests, host_os isn't really good enough
- case $host_os in
- darwin*)
- if test -n "$STRIP" ; then
- striplib="$STRIP -x"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
- ;;
- *)
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- ;;
- esac
-fi
-
if test "x$enable_dlopen" != xyes; then
enable_dlopen=unknown
enable_dlopen_self=unknown
@@ -13812,7 +13653,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 13815 "configure"
+#line 13656 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13910,7 +13751,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 13913 "configure"
+#line 13754 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -14027,8 +13868,7 @@ if test -f "$ltmain"; then
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
- SED SHELL STRIP \
+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
@@ -14158,7 +13998,7 @@ LN_S=$lt_LN_S
NM=$lt_NM
# A symbol stripping program
-STRIP=$lt_STRIP
+STRIP=$STRIP
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
@@ -14406,10 +14246,7 @@ 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
+ test -f Makefile && make "$ltmain"
fi
@@ -14651,12 +14488,12 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
linux*)
case $CC in
- icc* | ecc*)
+ icc|ecc)
lt_prog_compiler_wl_F77='-Wl,'
lt_prog_compiler_pic_F77='-KPIC'
lt_prog_compiler_static_F77='-static'
;;
- ccc*)
+ ccc)
lt_prog_compiler_wl_F77='-Wl,'
# All Alpha code is PIC.
lt_prog_compiler_static_F77='-non_shared'
@@ -14718,8 +14555,7 @@ echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic_F77"; then
-
-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
+ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6
if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14737,11 +14573,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14740: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14576: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14744: \$? = $ac_status" >&5
+ echo "$as_me:14580: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -14788,6 +14624,13 @@ else
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+ # that will create temporary files in the current directory regardless of
+ # the output directory. Thus, making CWD read-only will cause this test
+ # to fail, enabling locking or at least warning the user not to do parallel
+ # builds.
+ chmod -w .
+
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
@@ -14797,11 +14640,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14800: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14643: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14804: \$? = $ac_status" >&5
+ echo "$as_me:14647: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14811,11 +14654,8 @@ else
fi
fi
chmod u+w .
- $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
+ $rm conftest* out/*
+ rmdir out
cd ..
rmdir conftest
$rm conftest*
@@ -15307,27 +15147,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
;;
darwin* | rhapsody*)
- if test "$GXX" = yes ; then
+ if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
archive_cmds_need_lc_F77=no
case "$host_os" in
rhapsody* | darwin1.[012])
allow_undefined_flag_F77='-undefined suppress'
;;
*) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- allow_undefined_flag_F77='-flat_namespace -undefined suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[012])
- allow_undefined_flag_F77='-flat_namespace -undefined suppress'
- ;;
- 10.*)
- allow_undefined_flag_F77='-undefined dynamic_lookup'
- ;;
- esac
- fi
+ test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_F77='-flat_namespace -undefined suppress'
;;
esac
+ # FIXME: Relying on posixy $() will cause problems for
+ # cross-compilation, but unfortunately the echo tests do not
+ # yet detect zsh echo's removal of \ escapes. Also zsh mangles
+ # `"' quotes if we put them in here... so don't!
lt_int_apple_cc_single_mod=no
output_verbose_link_cmd='echo'
if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
@@ -15338,21 +15171,19 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
else
archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
fi
- module_cmds_F77='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ module_cmds_F77='$CC -bundle ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags'
# Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
else
archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
fi
- module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
hardcode_direct_F77=no
hardcode_automatic_F77=yes
hardcode_shlibpath_var_F77=unsupported
whole_archive_flag_spec_F77='-all_load $convenience'
link_all_deplibs_F77=yes
- else
- ld_shlibs_F77=no
fi
;;
@@ -15386,7 +15217,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu)
+ freebsd*)
archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
@@ -15746,6 +15577,72 @@ echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6
;;
esac
+echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+hardcode_action_F77=
+if test -n "$hardcode_libdir_flag_spec_F77" || \
+ test -n "$runpath_var F77" || \
+ test "X$hardcode_automatic_F77"="Xyes" ; then
+
+ # We can hardcode non-existant directories.
+ if test "$hardcode_direct_F77" != 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, F77)" != no &&
+ test "$hardcode_minus_L_F77" != no; then
+ # Linking always hardcodes the temporary library directory.
+ hardcode_action_F77=relink
+ else
+ # We can link without hardcoding, and we can hardcode nonexisting dirs.
+ hardcode_action_F77=immediate
+ fi
+else
+ # We cannot hardcode anything, or else we can only hardcode existing
+ # directories.
+ hardcode_action_F77=unsupported
+fi
+echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
+echo "${ECHO_T}$hardcode_action_F77" >&6
+
+if test "$hardcode_action_F77" = relink; then
+ # Fast installation is not supported
+ enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+ test "$enable_shared" = no; then
+ # Fast installation is not necessary
+ enable_fast_install=needless
+fi
+
+striplib=
+old_striplib=
+echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+ test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+ case $host_os in
+ darwin*)
+ if test -n "$STRIP" ; then
+ striplib="$STRIP -x"
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+ ;;
+ *)
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+ ;;
+ esac
+fi
+
echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
library_names_spec=
@@ -15839,7 +15736,7 @@ aix4* | aix5*)
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
;;
beos*)
@@ -15886,7 +15783,7 @@ cygwin* | mingw* | pw32*)
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"
+ sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib"
;;
mingw*)
# MinGW DLLs use traditional 'lib' prefix
@@ -15911,30 +15808,6 @@ cygwin* | mingw* | pw32*)
esac
;;
- linux*)
- if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- 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
- if test $supports_anon_versioning = yes; then
- archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-$echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- else
- $archive_expsym_cmds="$archive_cmds"
- fi
- else
- ld_shlibs=no
- fi
- ;;
-
*)
library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
;;
@@ -15949,16 +15822,17 @@ darwin* | rhapsody*)
version_type=darwin
need_lib_prefix=no
need_version=no
+ # FIXME: Relying on posixy $() will cause problems for
+ # cross-compilation, but unfortunately the echo tests do not
+ # yet detect zsh echo's removal of \ escapes.
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='$(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'
+ if $CC -v 2>&1 | grep 'Apple' >/dev/null ; 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"`
fi
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
@@ -15976,18 +15850,6 @@ freebsd1*)
dynamic_linker=no
;;
-kfreebsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
freebsd*)
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
version_type=freebsd-$objformat
@@ -16131,19 +15993,6 @@ linux*)
# 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
- ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
- fi
-
- case $host_cpu:$lt_cv_cc_64bit_output in
- powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes)
- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /usr/X11R6/lib64"
- sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64 /usr/X11R6/lib64"
- ;;
- esac
-
# 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,
@@ -16155,8 +16004,8 @@ linux*)
# Find out which ABI we are using (multilib Linux x86_64 hack).
libsuff=
case "$host_cpu" in
- x86_64*)
- echo '#line 16159 "configure"' > conftest.$ac_ext
+ x86_64*|s390x*|powerpc64*)
+ echo '#line 16008 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -16177,18 +16026,6 @@ linux*)
sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
;;
-knetbsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -16198,7 +16035,7 @@ netbsd*)
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}'
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
@@ -16214,7 +16051,7 @@ newsos6)
shlibpath_overrides_runpath=yes
;;
-nto-qnx*)
+nto-qnx)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -16227,7 +16064,7 @@ nto-qnx*)
openbsd*)
version_type=sunos
need_lib_prefix=no
- need_version=yes
+ need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
@@ -16345,73 +16182,6 @@ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
echo "${ECHO_T}$dynamic_linker" >&6
test "$dynamic_linker" = no && can_build_shared=no
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
-hardcode_action_F77=
-if test -n "$hardcode_libdir_flag_spec_F77" || \
- test -n "$runpath_var F77" || \
- test "X$hardcode_automatic_F77"="Xyes" ; then
-
- # We can hardcode non-existant directories.
- if test "$hardcode_direct_F77" != 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, F77)" != no &&
- test "$hardcode_minus_L_F77" != no; then
- # Linking always hardcodes the temporary library directory.
- hardcode_action_F77=relink
- else
- # We can link without hardcoding, and we can hardcode nonexisting dirs.
- hardcode_action_F77=immediate
- fi
-else
- # We cannot hardcode anything, or else we can only hardcode existing
- # directories.
- hardcode_action_F77=unsupported
-fi
-echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
-echo "${ECHO_T}$hardcode_action_F77" >&6
-
-if test "$hardcode_action_F77" = relink; then
- # Fast installation is not supported
- enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
- test "$enable_shared" = no; then
- # Fast installation is not necessary
- enable_fast_install=needless
-fi
-
-striplib=
-old_striplib=
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
- test -z "$striplib" && striplib="$STRIP --strip-unneeded"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-# FIXME - insert some real tests, host_os isn't really good enough
- case $host_os in
- darwin*)
- if test -n "$STRIP" ; then
- striplib="$STRIP -x"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
- ;;
- *)
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- ;;
- esac
-fi
-
-
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
@@ -16426,8 +16196,7 @@ if test -f "$ltmain"; then
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
- SED SHELL STRIP \
+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
@@ -16557,7 +16326,7 @@ LN_S=$lt_LN_S
NM=$lt_NM
# A symbol stripping program
-STRIP=$lt_STRIP
+STRIP=$STRIP
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
@@ -16805,10 +16574,7 @@ 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
+ test -f Makefile && make "$ltmain"
fi
@@ -16867,8 +16633,7 @@ lt_prog_compiler_no_builtin_flag_GCJ=
if test "$GCC" = yes; then
lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
-
-echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16886,11 +16651,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16889: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16654: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16893: \$? = $ac_status" >&5
+ echo "$as_me:16658: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -17033,12 +16798,12 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
linux*)
case $CC in
- icc* | ecc*)
+ icc|ecc)
lt_prog_compiler_wl_GCJ='-Wl,'
lt_prog_compiler_pic_GCJ='-KPIC'
lt_prog_compiler_static_GCJ='-static'
;;
- ccc*)
+ ccc)
lt_prog_compiler_wl_GCJ='-Wl,'
# All Alpha code is PIC.
lt_prog_compiler_static_GCJ='-non_shared'
@@ -17100,8 +16865,7 @@ echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic_GCJ"; then
-
-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
+ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6
if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17119,11 +16883,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17122: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16886: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17126: \$? = $ac_status" >&5
+ echo "$as_me:16890: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -17170,6 +16934,13 @@ else
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+ # that will create temporary files in the current directory regardless of
+ # the output directory. Thus, making CWD read-only will cause this test
+ # to fail, enabling locking or at least warning the user not to do parallel
+ # builds.
+ chmod -w .
+
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
@@ -17179,11 +16950,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17182: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16953: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17186: \$? = $ac_status" >&5
+ echo "$as_me:16957: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17193,11 +16964,8 @@ else
fi
fi
chmod u+w .
- $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
+ $rm conftest* out/*
+ rmdir out
cd ..
rmdir conftest
$rm conftest*
@@ -17709,27 +17477,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
;;
darwin* | rhapsody*)
- if test "$GXX" = yes ; then
+ if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
archive_cmds_need_lc_GCJ=no
case "$host_os" in
rhapsody* | darwin1.[012])
allow_undefined_flag_GCJ='-undefined suppress'
;;
*) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[012])
- allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
- ;;
- 10.*)
- allow_undefined_flag_GCJ='-undefined dynamic_lookup'
- ;;
- esac
- fi
+ test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
;;
esac
+ # FIXME: Relying on posixy $() will cause problems for
+ # cross-compilation, but unfortunately the echo tests do not
+ # yet detect zsh echo's removal of \ escapes. Also zsh mangles
+ # `"' quotes if we put them in here... so don't!
lt_int_apple_cc_single_mod=no
output_verbose_link_cmd='echo'
if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
@@ -17740,21 +17501,19 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
else
archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
fi
- module_cmds_GCJ='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ module_cmds_GCJ='$CC -bundle ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags'
# Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
else
archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
fi
- module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
hardcode_direct_GCJ=no
hardcode_automatic_GCJ=yes
hardcode_shlibpath_var_GCJ=unsupported
whole_archive_flag_spec_GCJ='-all_load $convenience'
link_all_deplibs_GCJ=yes
- else
- ld_shlibs_GCJ=no
fi
;;
@@ -17788,7 +17547,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu)
+ freebsd*)
archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
@@ -18148,6 +17907,72 @@ echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6
;;
esac
+echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+hardcode_action_GCJ=
+if test -n "$hardcode_libdir_flag_spec_GCJ" || \
+ test -n "$runpath_var GCJ" || \
+ test "X$hardcode_automatic_GCJ"="Xyes" ; then
+
+ # We can hardcode non-existant directories.
+ if test "$hardcode_direct_GCJ" != no &&
+ # If the only mechanism to avoid hardcoding is shlibpath_var, we
+ # have to relink, otherwise we might link with an installed library
+ # when we should be linking with a yet-to-be-installed one
+ ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
+ test "$hardcode_minus_L_GCJ" != no; then
+ # Linking always hardcodes the temporary library directory.
+ hardcode_action_GCJ=relink
+ else
+ # We can link without hardcoding, and we can hardcode nonexisting dirs.
+ hardcode_action_GCJ=immediate
+ fi
+else
+ # We cannot hardcode anything, or else we can only hardcode existing
+ # directories.
+ hardcode_action_GCJ=unsupported
+fi
+echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
+echo "${ECHO_T}$hardcode_action_GCJ" >&6
+
+if test "$hardcode_action_GCJ" = relink; then
+ # Fast installation is not supported
+ enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+ test "$enable_shared" = no; then
+ # Fast installation is not necessary
+ enable_fast_install=needless
+fi
+
+striplib=
+old_striplib=
+echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+ test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+ case $host_os in
+ darwin*)
+ if test -n "$STRIP" ; then
+ striplib="$STRIP -x"
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+ ;;
+ *)
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+ ;;
+ esac
+fi
+
echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
library_names_spec=
@@ -18241,7 +18066,7 @@ aix4* | aix5*)
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
;;
beos*)
@@ -18288,7 +18113,7 @@ cygwin* | mingw* | pw32*)
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"
+ sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib"
;;
mingw*)
# MinGW DLLs use traditional 'lib' prefix
@@ -18313,30 +18138,6 @@ cygwin* | mingw* | pw32*)
esac
;;
- linux*)
- if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- 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
- if test $supports_anon_versioning = yes; then
- archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-$echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- else
- $archive_expsym_cmds="$archive_cmds"
- fi
- else
- ld_shlibs=no
- fi
- ;;
-
*)
library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
;;
@@ -18351,16 +18152,17 @@ darwin* | rhapsody*)
version_type=darwin
need_lib_prefix=no
need_version=no
+ # FIXME: Relying on posixy $() will cause problems for
+ # cross-compilation, but unfortunately the echo tests do not
+ # yet detect zsh echo's removal of \ escapes.
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='$(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'
+ if $CC -v 2>&1 | grep 'Apple' >/dev/null ; 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"`
fi
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
@@ -18378,18 +18180,6 @@ freebsd1*)
dynamic_linker=no
;;
-kfreebsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
freebsd*)
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
version_type=freebsd-$objformat
@@ -18533,19 +18323,6 @@ linux*)
# 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
- ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
- fi
-
- case $host_cpu:$lt_cv_cc_64bit_output in
- powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes)
- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /usr/X11R6/lib64"
- sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64 /usr/X11R6/lib64"
- ;;
- esac
-
# 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,
@@ -18557,8 +18334,8 @@ linux*)
# Find out which ABI we are using (multilib Linux x86_64 hack).
libsuff=
case "$host_cpu" in
- x86_64*)
- echo '#line 18561 "configure"' > conftest.$ac_ext
+ x86_64*|s390x*|powerpc64*)
+ echo '#line 18338 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -18579,18 +18356,6 @@ linux*)
sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
;;
-knetbsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -18600,7 +18365,7 @@ netbsd*)
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}'
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
@@ -18616,7 +18381,7 @@ newsos6)
shlibpath_overrides_runpath=yes
;;
-nto-qnx*)
+nto-qnx)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -18629,7 +18394,7 @@ nto-qnx*)
openbsd*)
version_type=sunos
need_lib_prefix=no
- need_version=yes
+ need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
@@ -18747,72 +18512,6 @@ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
echo "${ECHO_T}$dynamic_linker" >&6
test "$dynamic_linker" = no && can_build_shared=no
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
-hardcode_action_GCJ=
-if test -n "$hardcode_libdir_flag_spec_GCJ" || \
- test -n "$runpath_var GCJ" || \
- test "X$hardcode_automatic_GCJ"="Xyes" ; then
-
- # We can hardcode non-existant directories.
- if test "$hardcode_direct_GCJ" != no &&
- # If the only mechanism to avoid hardcoding is shlibpath_var, we
- # have to relink, otherwise we might link with an installed library
- # when we should be linking with a yet-to-be-installed one
- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
- test "$hardcode_minus_L_GCJ" != no; then
- # Linking always hardcodes the temporary library directory.
- hardcode_action_GCJ=relink
- else
- # We can link without hardcoding, and we can hardcode nonexisting dirs.
- hardcode_action_GCJ=immediate
- fi
-else
- # We cannot hardcode anything, or else we can only hardcode existing
- # directories.
- hardcode_action_GCJ=unsupported
-fi
-echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
-echo "${ECHO_T}$hardcode_action_GCJ" >&6
-
-if test "$hardcode_action_GCJ" = relink; then
- # Fast installation is not supported
- enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
- test "$enable_shared" = no; then
- # Fast installation is not necessary
- enable_fast_install=needless
-fi
-
-striplib=
-old_striplib=
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
- test -z "$striplib" && striplib="$STRIP --strip-unneeded"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-# FIXME - insert some real tests, host_os isn't really good enough
- case $host_os in
- darwin*)
- if test -n "$STRIP" ; then
- striplib="$STRIP -x"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
- ;;
- *)
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- ;;
- esac
-fi
-
if test "x$enable_dlopen" != xyes; then
enable_dlopen=unknown
enable_dlopen_self=unknown
@@ -19418,7 +19117,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 19421 "configure"
+#line 19120 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -19516,7 +19215,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 19519 "configure"
+#line 19218 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -19633,8 +19332,7 @@ if test -f "$ltmain"; then
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
- SED SHELL STRIP \
+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
@@ -19764,7 +19462,7 @@ LN_S=$lt_LN_S
NM=$lt_NM
# A symbol stripping program
-STRIP=$lt_STRIP
+STRIP=$STRIP
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
@@ -20012,10 +19710,7 @@ 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
+ test -f Makefile && make "$ltmain"
fi
@@ -20078,8 +19773,7 @@ if test -f "$ltmain"; then
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
- SED SHELL STRIP \
+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
@@ -20209,7 +19903,7 @@ LN_S=$lt_LN_S
NM=$lt_NM
# A symbol stripping program
-STRIP=$lt_STRIP
+STRIP=$STRIP
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
@@ -20457,10 +20151,7 @@ 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
+ test -f Makefile && make "$ltmain"
fi
@@ -20502,24 +20193,6 @@ echo "$as_me: error: unable to update list of available tagged configurations."
fi
- if test ! -f "${ofile}"; then
- { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
-echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
- fi
- if test -z `grep -e 'shared_ext.*shrext' $ofile`; then
- # Make sure $shared_ext gets set to $shrext
- if sed -e 's/shared_ext/shrext/g' "$ofile" > "${ofile}T"; then
- mv "${ofile}T" "$ofile"
- chmod +x "$ofile"
- else
- rm -f "${ofile}T"
- { { echo "$as_me:$LINENO: error: unable to update shared_ext." >&5
-echo "$as_me: error: unable to update shared_ext." >&2;}
- { (exit 1); exit 1; }; }
- fi
- fi
-
-
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -24260,133 +23933,9 @@ echo "$as_me: error: Library requirements (libxml-2.0 >= 2.4.0) not met; conside
+LIBDBH_CFLAGS=
+LIBDBH_LIBS=
- # Check whether --enable-dbh or --disable-dbh was given.
-if test "${enable_dbh+set}" = set; then
- enableval="$enable_dbh"
- ac_cv_LIBDBH_check=$enableval
-else
- ac_cv_LIBDBH_check=yes
-fi;
-
- if test x"$ac_cv_LIBDBH_check" = x"yes"; then
- echo "$as_me:$LINENO: checking for dbh-1.0 >= 1.0" >&5
-echo $ECHO_N "checking for dbh-1.0 >= 1.0... $ECHO_C" >&6
- if $PKG_CONFIG --atleast-version=1.0 dbh-1.0 2> /dev/null; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-
- succeeded=no
-
- if test -z "$PKG_CONFIG"; then
- # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- case $PKG_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-
- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
- ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
-if test -n "$PKG_CONFIG"; then
- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
- fi
-
- if test "$PKG_CONFIG" = "no" ; then
- echo "*** The pkg-config script could not be found. Make sure it is"
- echo "*** in your path, or set the PKG_CONFIG environment variable"
- echo "*** to the full path to pkg-config."
- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
- else
- PKG_CONFIG_MIN_VERSION=0.9.0
- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- echo "$as_me:$LINENO: checking for dbh-1.0 >= 1.0" >&5
-echo $ECHO_N "checking for dbh-1.0 >= 1.0... $ECHO_C" >&6
-
- if $PKG_CONFIG --exists "dbh-1.0 >= 1.0" ; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- succeeded=yes
-
- echo "$as_me:$LINENO: checking LIBDBH_CFLAGS" >&5
-echo $ECHO_N "checking LIBDBH_CFLAGS... $ECHO_C" >&6
- LIBDBH_CFLAGS=`$PKG_CONFIG --cflags "dbh-1.0 >= 1.0"`
- echo "$as_me:$LINENO: result: $LIBDBH_CFLAGS" >&5
-echo "${ECHO_T}$LIBDBH_CFLAGS" >&6
-
- echo "$as_me:$LINENO: checking LIBDBH_LIBS" >&5
-echo $ECHO_N "checking LIBDBH_LIBS... $ECHO_C" >&6
- LIBDBH_LIBS=`$PKG_CONFIG --libs "dbh-1.0 >= 1.0"`
- echo "$as_me:$LINENO: result: $LIBDBH_LIBS" >&5
-echo "${ECHO_T}$LIBDBH_LIBS" >&6
- else
- LIBDBH_CFLAGS=""
- LIBDBH_LIBS=""
- ## If we have a custom action on failure, don't print errors, but
- ## do set a variable so people can do so.
- LIBDBH_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbh-1.0 >= 1.0"`
- echo $LIBDBH_PKG_ERRORS
- fi
-
-
-
- else
- echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
- echo "*** See http://www.freedesktop.org/software/pkgconfig"
- fi
- fi
-
- if test $succeeded = yes; then
- :
- else
- { { echo "$as_me:$LINENO: error: Library requirements (dbh-1.0 >= 1.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
-echo "$as_me: error: Library requirements (dbh-1.0 >= 1.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
- { (exit 1); exit 1; }; }
- fi
-
- LIBDBH_REQUIRED_VERSION=1.0
-
-
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBDBH 1
-_ACEOF
-
- else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- fi
- fi
@@ -25550,7 +25099,6 @@ s,@LIBXML_LIBS@,$LIBXML_LIBS,;t t
s,@LIBXML_REQUIRED_VERSION@,$LIBXML_REQUIRED_VERSION,;t t
s,@LIBDBH_CFLAGS@,$LIBDBH_CFLAGS,;t t
s,@LIBDBH_LIBS@,$LIBDBH_LIBS,;t t
-s,@LIBDBH_REQUIRED_VERSION@,$LIBDBH_REQUIRED_VERSION,;t t
s,@XFCE_MCS_MANAGER_CFLAGS@,$XFCE_MCS_MANAGER_CFLAGS,;t t
s,@XFCE_MCS_MANAGER_LIBS@,$XFCE_MCS_MANAGER_LIBS,;t t
s,@XFCE_MCS_MANAGER_REQUIRED_VERSION@,$XFCE_MCS_MANAGER_REQUIRED_VERSION,;t t
diff --git a/configure.ac b/configure.ac
index 66bff855a..854a95deb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,9 +44,15 @@ BM_DEPEND([LIBXFCE4MCS_CLIENT], [libxfce4mcs-client-1.0], [4.0.0])
BM_DEPEND([LIBXFCEGUI4], [libxfcegui4-1.0], [4.1.11])
BM_DEPEND([LIBXML], [libxml-2.0], [2.4.0])
-dnl Check for dbh installed
-BM_DEPEND_CHECK([LIBDBH], [dbh-1.0], [1.0],
- [dbh], [DBH library], [yes])
+dnl Check for dbh installed for completion combo
+dnl disable for now, doesn't work for new install, only after
+dnl combo has been used in xffm or xfrun.
+dnl BM_DEPEND_CHECK([LIBDBH], [dbh-1.0], [1.0],
+dnl [dbh], [DBH library], [yes])
+LIBDBH_CFLAGS=
+LIBDBH_LIBS=
+AC_SUBST([LIBDBH_CFLAGS])
+AC_SUBST([LIBDBH_LIBS])
dnl Configure the mcs plugin
XFCE_MCS_PLUGIN([XFCE_MCS_MANAGER], [4.0.0])
diff --git a/doc/C/Makefile.in b/doc/C/Makefile.in
index 449f2d09d..c73a046d0 100644
--- a/doc/C/Makefile.in
+++ b/doc/C/Makefile.in
@@ -105,7 +105,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/doc/C/images/Makefile.in b/doc/C/images/Makefile.in
index dce21cb7d..c9073f66b 100644
--- a/doc/C/images/Makefile.in
+++ b/doc/C/images/Makefile.in
@@ -96,7 +96,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/doc/Makefile.in b/doc/Makefile.in
index bd63fced3..465ba464b 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -103,7 +103,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/doc/fr/Makefile.in b/doc/fr/Makefile.in
index e722cc8a3..6baf45fa5 100644
--- a/doc/fr/Makefile.in
+++ b/doc/fr/Makefile.in
@@ -105,7 +105,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/doc/fr/images/Makefile.in b/doc/fr/images/Makefile.in
index 255853d3d..fa17c92f2 100644
--- a/doc/fr/images/Makefile.in
+++ b/doc/fr/images/Makefile.in
@@ -96,7 +96,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/icons/Makefile.in b/icons/Makefile.in
index 53c0f6c08..b4ef4b704 100644
--- a/icons/Makefile.in
+++ b/icons/Makefile.in
@@ -94,7 +94,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/ltmain.sh b/ltmain.sh
index 5b79699cd..e6e79cb7d 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -48,9 +48,6 @@ EOF
exit 0
fi
-# define SED for historic ltconfig's generated by Libtool 1.3
-test -z "$SED" && SED=sed
-
# The name of this program.
progname=`$echo "$0" | ${SED} 's%^.*/%%'`
modename="$progname"
diff --git a/panel/Makefile.in b/panel/Makefile.in
index a8af636a3..e69ebffbd 100644
--- a/panel/Makefile.in
+++ b/panel/Makefile.in
@@ -143,7 +143,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/panel/controls.c b/panel/controls.c
index cd13c561e..0303ad4a6 100644
--- a/panel/controls.c
+++ b/panel/controls.c
@@ -575,12 +575,11 @@ add_control (GtkWidget * w, ControlClassInfo *info)
}
static GtkItemFactoryEntry control_items[] = {
- {"/Item", NULL, NULL, 0, "<Title>"},
- {"/sep", NULL, NULL, 0, "<Separator>"},
- {N_("/Add _new item"), NULL, NULL, 0, "<Branch>"},
- {"/sep", NULL, NULL, 0, "<Separator>"},
+ {"/Item", NULL, NULL, 0, "<Branch>"},
{N_("/_Properties..."), NULL, edit_control, 0, "<Item>"},
{N_("/_Remove"), NULL, remove_control, 0, "<Item>"},
+ {"/sep", NULL, NULL, 0, "<Separator>"},
+ {N_("/Add _new item"), NULL, NULL, 0, "<Branch>"},
};
static const char *
@@ -628,31 +627,47 @@ get_controls_submenu (void)
static GtkWidget *
get_control_menu (void)
{
- static GtkItemFactory *factory;
static GtkWidget *menu = NULL;
- GtkWidget *submenu, *item;
+ GtkWidget *submenu, *mi;
if (!menu)
{
- factory = gtk_item_factory_new (GTK_TYPE_MENU, "<popup>", NULL);
+ menu = gtk_menu_new ();
- gtk_item_factory_set_translate_func (factory,
- (GtkTranslateFunc)
- translate_menu, NULL, NULL);
-
- gtk_item_factory_create_items (factory, G_N_ELEMENTS (control_items),
- control_items, NULL);
-
- menu = gtk_item_factory_get_widget (factory, "<popup>");
+ /* replaced with actual name */
+ mi = gtk_menu_item_new_with_label("Item");
+ gtk_widget_show (mi);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
+
+ submenu = gtk_menu_new ();
+ gtk_menu_item_set_submenu (GTK_MENU_ITEM (mi), submenu);
+
+ mi = gtk_menu_item_new_with_mnemonic (_("_Properties..."));
+ gtk_widget_show (mi);
+ g_signal_connect (mi, "activate", G_CALLBACK (edit_control), NULL);
+ gtk_menu_shell_append (GTK_MENU_SHELL (submenu), mi);
+
+ mi = gtk_menu_item_new_with_mnemonic (_("_Remove"));
+ gtk_widget_show (mi);
+ g_signal_connect (mi, "activate", G_CALLBACK (remove_control), NULL);
+ gtk_menu_shell_append (GTK_MENU_SHELL (submenu), mi);
+
+ mi = gtk_separator_menu_item_new ();
+ gtk_widget_show (mi);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
+
+ mi = gtk_menu_item_new_with_label(_("Add _new item"));
+ gtk_widget_show (mi);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
}
g_assert (menu != NULL);
- /* the third item, keep in sync with factory */
- item = GTK_MENU_SHELL (menu)->children->next->next->data;
+ /* the third item, keep in sync with menu */
+ mi = GTK_MENU_SHELL (menu)->children->next->next->data;
submenu = get_controls_submenu();
- gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), submenu);
+ gtk_menu_item_set_submenu (GTK_MENU_ITEM (mi), submenu);
return menu;
}
diff --git a/panel/panel.c b/panel/panel.c
index b86d94be4..30efabb5a 100644
--- a/panel/panel.c
+++ b/panel/panel.c
@@ -1,6 +1,6 @@
/* xfce4
*
- * Copyright (C) 2002 Jasper Huijsmans(huysmans@users.sourceforge.net)
+ * Copyright (C) 2002-2004 Jasper Huijsmans (jasper@xfce.org)
*
* 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
@@ -49,7 +49,9 @@
#define HIDE_TIMEOUT 500
#define UNHIDE_TIMEOUT 100
-#define HIDDEN_SIZE 5
+#define HIDDEN_SIZE 3
+
+#define HANDLE_WIDTH 10
/* TODO: I didn't actually check this ... -- Jasper */
#define FRAME_IPADDING 1
@@ -74,7 +76,6 @@ int top_height[] = { 14, 16, 18, 20 };
int popup_icon_size[] = { 22, 26, 26, 32 };
/* lock settings update when panel is not yet (re)build */
-
static gboolean panel_created = FALSE;
/* original screen sizes, used if screen is not the same
@@ -83,7 +84,6 @@ static int old_screen_width = 0;
static int old_screen_height = 0;
/* screen properties */
-
static Display *dpy = NULL;
Screen *xscreen = NULL;
static int scr = 0;
@@ -187,9 +187,6 @@ update_xinerama_coordinates (Panel * p)
*
* - keep inside the screen
* - update position status (see above)
- * - if on the edge, move slightly over the edge by the width of the shadow
- * to take advantage of Fitts law: putting the mouse pointer on the edge
- * will hit the buttons, instead of the window border.
*
* Assumes panel_req and xinerama_scr are up-to-date.
**/
@@ -203,7 +200,8 @@ update_position (Panel * p, int *x, int *y)
DBG ("desired position: %d,%d", *x, *y);
- /* use an 'error' margin of 2 */
+ /* NOTE: using an 'error' margin of 2 */
+
if (settings.orientation == HORIZONTAL)
{
if (*y + panel_req.height > xinerama_scr.ymax - 2)
@@ -340,10 +338,6 @@ panel_reallocate (Panel * p, GtkRequisition * previous)
update_position (p, &xnew, &ynew);
- DBG ("reallocate: %d,%d+%dx%d -> %d,%d+%dx%d",
- xold, yold, previous->width, previous->height,
- xnew, ynew, new.width, new.height);
-
if (xnew != xold || ynew != yold)
{
gtk_window_move (GTK_WINDOW (p->toplevel), xnew, ynew);
@@ -470,14 +464,10 @@ get_handle_menu (void)
static void
handle_set_size (GtkWidget * mh, int size)
{
- int h = (size == TINY) ? top_height[TINY] : top_height[SMALL];
- int w = icon_size[size] + 2 * border_width;
- gboolean vertical = settings.orientation == VERTICAL;
-
- if (vertical)
- gtk_widget_set_size_request (mh, w, h);
+ if (settings.orientation == VERTICAL)
+ gtk_widget_set_size_request (mh, -1, HANDLE_WIDTH);
else
- gtk_widget_set_size_request (mh, h, w);
+ gtk_widget_set_size_request (mh, HANDLE_WIDTH, -1);
}
/* defined in controls.c, must be set to NULL to indicate the menu
@@ -822,13 +812,6 @@ create_panel_window (Panel * p)
g_signal_connect (w, "delete-event", G_CALLBACK (panel_delete_cb), p);
- g_signal_connect (w, "size-allocate", G_CALLBACK (panel_allocate_cb), p);
-
-#if GTK_CHECK_VERSION(2,2,0)
- g_signal_connect (G_OBJECT (gdk_screen_get_default ()), "size-changed",
- G_CALLBACK (screen_size_changed), p);
-#endif
-
return w;
}
@@ -988,16 +971,25 @@ create_panel (void)
panel.position.y = y;
panel_set_position ();
- /* this must be before set_autohide() and after set_position()
- * otherwise the initial position will be messed up */
- panel_created = TRUE;
-
gtk_widget_show (panel.toplevel);
set_window_layer (panel.toplevel, settings.layer);
set_window_skip (panel.toplevel);
+ /* this must be before set_autohide() and after set_position()
+ * otherwise the initial position will be messed up */
+ panel_created = TRUE;
+
if (hidden)
panel_set_autohide (TRUE);
+
+#if GTK_CHECK_VERSION(2,2,0)
+ g_signal_connect (G_OBJECT (gdk_screen_get_default ()), "size-changed",
+ G_CALLBACK (screen_size_changed), &panel);
+#endif
+
+ g_signal_connect (GTK_WINDOW (panel.toplevel), "size-allocate",
+ G_CALLBACK (panel_allocate_cb), &panel);
+
}
/* Panel settings
diff --git a/plugins/Makefile.in b/plugins/Makefile.in
index 66d7ba5b3..7f888c969 100644
--- a/plugins/Makefile.in
+++ b/plugins/Makefile.in
@@ -101,7 +101,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/plugins/clock/Makefile.in b/plugins/clock/Makefile.in
index 544401784..b630b1821 100644
--- a/plugins/clock/Makefile.in
+++ b/plugins/clock/Makefile.in
@@ -115,7 +115,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/plugins/mailcheck/Makefile.in b/plugins/mailcheck/Makefile.in
index 900b6ea03..710e933ee 100644
--- a/plugins/mailcheck/Makefile.in
+++ b/plugins/mailcheck/Makefile.in
@@ -115,7 +115,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/plugins/pager/Makefile.in b/plugins/pager/Makefile.in
index 1f57582bc..bd6507f97 100644
--- a/plugins/pager/Makefile.in
+++ b/plugins/pager/Makefile.in
@@ -115,7 +115,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/plugins/separator/Makefile.in b/plugins/separator/Makefile.in
index 2e325aaa7..6e1aa6505 100644
--- a/plugins/separator/Makefile.in
+++ b/plugins/separator/Makefile.in
@@ -115,7 +115,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/plugins/switcher/Makefile.in b/plugins/switcher/Makefile.in
index 707d13a08..ea04c347c 100644
--- a/plugins/switcher/Makefile.in
+++ b/plugins/switcher/Makefile.in
@@ -115,7 +115,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/plugins/systembuttons/Makefile.in b/plugins/systembuttons/Makefile.in
index c0a8ba39e..322b3e760 100644
--- a/plugins/systembuttons/Makefile.in
+++ b/plugins/systembuttons/Makefile.in
@@ -116,7 +116,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/settings/Makefile.in b/settings/Makefile.in
index 0672f100d..2925e50e3 100644
--- a/settings/Makefile.in
+++ b/settings/Makefile.in
@@ -118,7 +118,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/themes/Crystal/22x22/Makefile.in b/themes/Crystal/22x22/Makefile.in
index 6004dc706..9d714c54d 100644
--- a/themes/Crystal/22x22/Makefile.in
+++ b/themes/Crystal/22x22/Makefile.in
@@ -101,7 +101,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/themes/Crystal/22x22/emblems/Makefile.in b/themes/Crystal/22x22/emblems/Makefile.in
index 23b6e1fc9..028ee22e8 100644
--- a/themes/Crystal/22x22/emblems/Makefile.in
+++ b/themes/Crystal/22x22/emblems/Makefile.in
@@ -96,7 +96,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/themes/Crystal/48x48/Makefile.in b/themes/Crystal/48x48/Makefile.in
index fb0d4f8a7..a2986b6b5 100644
--- a/themes/Crystal/48x48/Makefile.in
+++ b/themes/Crystal/48x48/Makefile.in
@@ -101,7 +101,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/themes/Crystal/48x48/emblems/Makefile.in b/themes/Crystal/48x48/emblems/Makefile.in
index 85906d190..9be152389 100644
--- a/themes/Crystal/48x48/emblems/Makefile.in
+++ b/themes/Crystal/48x48/emblems/Makefile.in
@@ -96,7 +96,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/themes/Crystal/Makefile.in b/themes/Crystal/Makefile.in
index 1ef62ea91..e063bb585 100644
--- a/themes/Crystal/Makefile.in
+++ b/themes/Crystal/Makefile.in
@@ -105,7 +105,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/themes/Curve/22x22/Makefile.in b/themes/Curve/22x22/Makefile.in
index fb85ccfd0..a5ea3fb64 100644
--- a/themes/Curve/22x22/Makefile.in
+++ b/themes/Curve/22x22/Makefile.in
@@ -101,7 +101,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/themes/Curve/22x22/emblems/Makefile.in b/themes/Curve/22x22/emblems/Makefile.in
index ecee70060..a3b5c078f 100644
--- a/themes/Curve/22x22/emblems/Makefile.in
+++ b/themes/Curve/22x22/emblems/Makefile.in
@@ -96,7 +96,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/themes/Curve/48x48/Makefile.in b/themes/Curve/48x48/Makefile.in
index 736ec65fd..04829fdc6 100644
--- a/themes/Curve/48x48/Makefile.in
+++ b/themes/Curve/48x48/Makefile.in
@@ -101,7 +101,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/themes/Curve/48x48/emblems/Makefile.in b/themes/Curve/48x48/emblems/Makefile.in
index 0cec20bf4..eadc84a19 100644
--- a/themes/Curve/48x48/emblems/Makefile.in
+++ b/themes/Curve/48x48/emblems/Makefile.in
@@ -96,7 +96,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/themes/Curve/Makefile.in b/themes/Curve/Makefile.in
index e4628b6c1..a078baeff 100644
--- a/themes/Curve/Makefile.in
+++ b/themes/Curve/Makefile.in
@@ -105,7 +105,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/themes/FreeIcons/22x22/Makefile.in b/themes/FreeIcons/22x22/Makefile.in
index 7f7d184d8..219b2dccf 100644
--- a/themes/FreeIcons/22x22/Makefile.in
+++ b/themes/FreeIcons/22x22/Makefile.in
@@ -101,7 +101,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/themes/FreeIcons/22x22/emblems/Makefile.in b/themes/FreeIcons/22x22/emblems/Makefile.in
index 8f49409f9..9b2b3ebf6 100644
--- a/themes/FreeIcons/22x22/emblems/Makefile.in
+++ b/themes/FreeIcons/22x22/emblems/Makefile.in
@@ -96,7 +96,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/themes/FreeIcons/24x24/Makefile.in b/themes/FreeIcons/24x24/Makefile.in
index b0d6c71f6..b1f788bd9 100644
--- a/themes/FreeIcons/24x24/Makefile.in
+++ b/themes/FreeIcons/24x24/Makefile.in
@@ -101,7 +101,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/themes/FreeIcons/24x24/emblems/Makefile.in b/themes/FreeIcons/24x24/emblems/Makefile.in
index 81af15ce2..142f6ea77 100644
--- a/themes/FreeIcons/24x24/emblems/Makefile.in
+++ b/themes/FreeIcons/24x24/emblems/Makefile.in
@@ -96,7 +96,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/themes/FreeIcons/48x48/Makefile.in b/themes/FreeIcons/48x48/Makefile.in
index 558d8151f..2fc30670a 100644
--- a/themes/FreeIcons/48x48/Makefile.in
+++ b/themes/FreeIcons/48x48/Makefile.in
@@ -101,7 +101,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/themes/FreeIcons/48x48/emblems/Makefile.in b/themes/FreeIcons/48x48/emblems/Makefile.in
index 49b60d042..26aa4f56e 100644
--- a/themes/FreeIcons/48x48/emblems/Makefile.in
+++ b/themes/FreeIcons/48x48/emblems/Makefile.in
@@ -96,7 +96,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/themes/FreeIcons/Makefile.in b/themes/FreeIcons/Makefile.in
index b8298581d..4a26c97a8 100644
--- a/themes/FreeIcons/Makefile.in
+++ b/themes/FreeIcons/Makefile.in
@@ -105,7 +105,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/themes/Gnome/24x24/Makefile.in b/themes/Gnome/24x24/Makefile.in
index cbf38423b..8941edd0f 100644
--- a/themes/Gnome/24x24/Makefile.in
+++ b/themes/Gnome/24x24/Makefile.in
@@ -101,7 +101,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/themes/Gnome/24x24/emblems/Makefile.in b/themes/Gnome/24x24/emblems/Makefile.in
index 0d99cc8e2..788c37b68 100644
--- a/themes/Gnome/24x24/emblems/Makefile.in
+++ b/themes/Gnome/24x24/emblems/Makefile.in
@@ -96,7 +96,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/themes/Gnome/48x48/Makefile.in b/themes/Gnome/48x48/Makefile.in
index 59ce3b32b..6ad47dbc4 100644
--- a/themes/Gnome/48x48/Makefile.in
+++ b/themes/Gnome/48x48/Makefile.in
@@ -101,7 +101,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/themes/Gnome/48x48/emblems/Makefile.in b/themes/Gnome/48x48/emblems/Makefile.in
index 939318633..c7dbdc3dd 100644
--- a/themes/Gnome/48x48/emblems/Makefile.in
+++ b/themes/Gnome/48x48/emblems/Makefile.in
@@ -96,7 +96,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/themes/Gnome/50x50/Makefile.in b/themes/Gnome/50x50/Makefile.in
index 3ff64c503..20a15a25a 100644
--- a/themes/Gnome/50x50/Makefile.in
+++ b/themes/Gnome/50x50/Makefile.in
@@ -101,7 +101,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/themes/Gnome/50x50/emblems/Makefile.in b/themes/Gnome/50x50/emblems/Makefile.in
index 9ffe7b50f..714422c34 100644
--- a/themes/Gnome/50x50/emblems/Makefile.in
+++ b/themes/Gnome/50x50/emblems/Makefile.in
@@ -96,7 +96,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/themes/Gnome/Makefile.in b/themes/Gnome/Makefile.in
index f9e71493d..75f619dc0 100644
--- a/themes/Gnome/Makefile.in
+++ b/themes/Gnome/Makefile.in
@@ -105,7 +105,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/themes/Makefile.in b/themes/Makefile.in
index 84e5e3b22..452b20ff4 100644
--- a/themes/Makefile.in
+++ b/themes/Makefile.in
@@ -101,7 +101,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/themes/Noia/22x22/Makefile.in b/themes/Noia/22x22/Makefile.in
index 5000d15c9..f6bc51631 100644
--- a/themes/Noia/22x22/Makefile.in
+++ b/themes/Noia/22x22/Makefile.in
@@ -101,7 +101,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/themes/Noia/22x22/emblems/Makefile.in b/themes/Noia/22x22/emblems/Makefile.in
index 272ac21dd..934c0ab5e 100644
--- a/themes/Noia/22x22/emblems/Makefile.in
+++ b/themes/Noia/22x22/emblems/Makefile.in
@@ -96,7 +96,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/themes/Noia/48x48/Makefile.in b/themes/Noia/48x48/Makefile.in
index b9bd69ce1..a08d9dbf4 100644
--- a/themes/Noia/48x48/Makefile.in
+++ b/themes/Noia/48x48/Makefile.in
@@ -101,7 +101,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/themes/Noia/48x48/emblems/Makefile.in b/themes/Noia/48x48/emblems/Makefile.in
index dda17a8da..58d5b7e4a 100644
--- a/themes/Noia/48x48/emblems/Makefile.in
+++ b/themes/Noia/48x48/emblems/Makefile.in
@@ -96,7 +96,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/themes/Noia/Makefile.in b/themes/Noia/Makefile.in
index 37159b5a9..f93aa13a3 100644
--- a/themes/Noia/Makefile.in
+++ b/themes/Noia/Makefile.in
@@ -105,7 +105,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/themes/XFce/14x14/Makefile.in b/themes/XFce/14x14/Makefile.in
index 9907cd15d..679489b9a 100644
--- a/themes/XFce/14x14/Makefile.in
+++ b/themes/XFce/14x14/Makefile.in
@@ -101,7 +101,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/themes/XFce/14x14/emblems/Makefile.in b/themes/XFce/14x14/emblems/Makefile.in
index 58cc38898..5a2ca3107 100644
--- a/themes/XFce/14x14/emblems/Makefile.in
+++ b/themes/XFce/14x14/emblems/Makefile.in
@@ -96,7 +96,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/themes/XFce/16x16/Makefile.in b/themes/XFce/16x16/Makefile.in
index 99b4a46d0..be34ea17d 100644
--- a/themes/XFce/16x16/Makefile.in
+++ b/themes/XFce/16x16/Makefile.in
@@ -101,7 +101,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/themes/XFce/16x16/emblems/Makefile.in b/themes/XFce/16x16/emblems/Makefile.in
index ad4925821..b0c5a032f 100644
--- a/themes/XFce/16x16/emblems/Makefile.in
+++ b/themes/XFce/16x16/emblems/Makefile.in
@@ -96,7 +96,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/themes/XFce/19x19/Makefile.in b/themes/XFce/19x19/Makefile.in
index f3574df5f..9087f7638 100644
--- a/themes/XFce/19x19/Makefile.in
+++ b/themes/XFce/19x19/Makefile.in
@@ -101,7 +101,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/themes/XFce/19x19/emblems/Makefile.in b/themes/XFce/19x19/emblems/Makefile.in
index a29b71da0..198cf2303 100644
--- a/themes/XFce/19x19/emblems/Makefile.in
+++ b/themes/XFce/19x19/emblems/Makefile.in
@@ -96,7 +96,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/themes/XFce/24x24/Makefile.in b/themes/XFce/24x24/Makefile.in
index 938e0f8e8..bc940594e 100644
--- a/themes/XFce/24x24/Makefile.in
+++ b/themes/XFce/24x24/Makefile.in
@@ -101,7 +101,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/themes/XFce/24x24/emblems/Makefile.in b/themes/XFce/24x24/emblems/Makefile.in
index ac66e8b11..0e701950d 100644
--- a/themes/XFce/24x24/emblems/Makefile.in
+++ b/themes/XFce/24x24/emblems/Makefile.in
@@ -96,7 +96,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/themes/XFce/48x48/Makefile.in b/themes/XFce/48x48/Makefile.in
index 87981b7fb..a432129da 100644
--- a/themes/XFce/48x48/Makefile.in
+++ b/themes/XFce/48x48/Makefile.in
@@ -101,7 +101,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/themes/XFce/48x48/emblems/Makefile.in b/themes/XFce/48x48/emblems/Makefile.in
index d5a4d9616..5835ffe9d 100644
--- a/themes/XFce/48x48/emblems/Makefile.in
+++ b/themes/XFce/48x48/emblems/Makefile.in
@@ -96,7 +96,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/themes/XFce/50x50/Makefile.in b/themes/XFce/50x50/Makefile.in
index 73baa55b0..de9bf819a 100644
--- a/themes/XFce/50x50/Makefile.in
+++ b/themes/XFce/50x50/Makefile.in
@@ -101,7 +101,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/themes/XFce/50x50/emblems/Makefile.in b/themes/XFce/50x50/emblems/Makefile.in
index b265cd1e2..68cbae847 100644
--- a/themes/XFce/50x50/emblems/Makefile.in
+++ b/themes/XFce/50x50/emblems/Makefile.in
@@ -96,7 +96,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/themes/XFce/53x53/Makefile.in b/themes/XFce/53x53/Makefile.in
index 9b85e8ae6..ac496d76b 100644
--- a/themes/XFce/53x53/Makefile.in
+++ b/themes/XFce/53x53/Makefile.in
@@ -101,7 +101,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/themes/XFce/53x53/emblems/Makefile.in b/themes/XFce/53x53/emblems/Makefile.in
index 94dee9d63..ad9ca445d 100644
--- a/themes/XFce/53x53/emblems/Makefile.in
+++ b/themes/XFce/53x53/emblems/Makefile.in
@@ -96,7 +96,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/themes/XFce/Makefile.in b/themes/XFce/Makefile.in
index 9d6750f7d..84070ac03 100644
--- a/themes/XFce/Makefile.in
+++ b/themes/XFce/Makefile.in
@@ -105,7 +105,6 @@ INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
LIBDBH_LIBS = @LIBDBH_LIBS@
-LIBDBH_REQUIRED_VERSION = @LIBDBH_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
--
GitLab