Codebase list gnome-menus / af1a054
* New upstream release. * 07_gnomevfs.patch, 70_reautogen.patch: updated from the Ubuntu package. inotify is now used as default if available, otherwise the gnomevfs backend will be used. Sebastian Dröge 17 years ago
5 changed file(s) with 13401 addition(s) and 7959 deletion(s). Raw diff Collapse all Expand all
0 gnome-menus (2.18.0-1) unstable; urgency=low
1
2 * New upstream release.
3 * 07_gnomevfs.patch, 70_reautogen.patch: updated from the Ubuntu package.
4 inotify is now used as default if available, otherwise the gnomevfs
5 backend will be used.
6
7 -- Sebastian Dröge <slomo@debian.org> Wed, 25 Apr 2007 06:26:26 +0200
8
09 gnome-menus (2.16.1-3) unstable; urgency=medium
110
211 [ Loic Minier ]
11 Section: gnome
22 Priority: optional
33 Maintainer: Sebastien Bacher <seb128@debian.org>
4 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Andrew Lau <netsnipe@users.sourceforge.net>, Clément Stenac <zorglub@debian.org>, Dafydd Harries <daf@debian.org>, Guilherme de S. Pastore <gpastore@debian.org>, Gustavo Franco <stratus@debian.org>, Gustavo Noronha Silva <kov@debian.org>, J.H.M. Dassen (Ray) <jdassen@debian.org>, Jordi Mallach <jordi@debian.org>, Jose Carlos Garcia Sogo <jsogo@debian.org>, Josselin Mouette <joss@debian.org>, Loic Minier <lool@dooz.org>, Marc 'HE' Brockschmidt <he@debian.org>, Marco Cabizza <marco87@gmail.com>, Oystein Gisnas <oystein@gisnas.net>, Ondřej Surý <ondrej@debian.org>, Ross Burton <ross@debian.org>, Sjoerd Simons <sjoerd@debian.org>
4 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Josselin Mouette <joss@debian.org>, Loic Minier <lool@dooz.org>, Sebastian Dröge <slomo@debian.org>
55 Build-Depends: debhelper (>= 5.0.37.2), cdbs (>= 0.4.43), libglib2.0-dev (>= 2.5.6), python-all-dev, libxml-parser-perl, gnome-pkg-tools, libgnomevfs2-dev (>= 2.14), dpkg-dev (>= 1.13.19), python-central (>= 0.5)
66 Standards-Version: 3.7.2
77 XS-Python-Version: >= 2.3
0 libgnome-menu 2 libgnome-menu2 (>= 2.16.1-1)
0 libgnome-menu 2 libgnome-menu2 (>= 2.15.4)
0 diff -urN gnome-menus-2.15.91.orig/configure.in gnome-menus-2.15.91/configure.in
1 --- gnome-menus-2.15.91.orig/configure.in 2006-08-08 00:30:06.000000000 +0200
2 +++ gnome-menus-2.15.91/configure.in 2006-08-13 18:52:55.000000000 +0200
3 @@ -39,22 +39,9 @@
0 diff -Naur gnome-menus-2.18.0-old/configure.in gnome-menus-2.18.0/configure.in
1 --- gnome-menus-2.18.0-old/configure.in 2007-03-12 19:52:10.000000000 +0100
2 +++ gnome-menus-2.18.0/configure.in 2007-04-25 07:03:58.000000000 +0200
3 @@ -39,6 +39,9 @@
44 PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.6.0)
55 AC_SUBST(GLIB_CFLAGS)
66 AC_SUBST(GLIB_LIBS)
7 -
8 -dnl check for FAM
9 -FAM_LIBS=
10 -AC_CHECK_LIB(fam, FAMOpen,
11 - [AC_CHECK_HEADERS(fam.h,
12 - [AC_DEFINE(HAVE_FAM, [], [Define if we have FAM])
13 - FAM_LIBS="-lfam"],
14 - AC_MSG_WARN(*** FAM support will not be built (header files not found) ***))],
15 - AC_MSG_WARN(*** FAM support will not be built (FAM library not found) ***))
16 -AC_SUBST(FAM_LIBS)
17 -
18 -dnl check for gamin extension
19 -gmenu_save_libs="$LIBS"
20 -LIBS="$LIBS $FAM_LIBS"
21 -AC_CHECK_FUNCS(FAMNoExists)
22 -LIBS="$gmenu_save_libs"
237 +PKG_CHECK_MODULES(GNOMEVFS, gnome-vfs-2.0 >= 2.14)
248 +AC_SUBST(GNOMEVFS_CFLAGS)
259 +AC_SUBST(GNOMEVFS_LIBS)
2610
11 AC_ARG_ENABLE(inotify,
12 [AC_HELP_STRING([--enable-inotify],
13 @@ -56,24 +59,6 @@
14
15 AM_CONDITIONAL(INOTIFY_SUPPORT, test "x$enable_inotify" = "xyes")
16
17 -if test "x$enable_inotify" != "xyes" ; then
18 - dnl check for FAM
19 - FAM_LIBS=
20 - AC_CHECK_LIB(fam, FAMOpen,
21 - [AC_CHECK_HEADERS(fam.h,
22 - [AC_DEFINE(HAVE_FAM, [], [Define if we have FAM])
23 - FAM_LIBS="-lfam"],
24 - AC_MSG_WARN(*** FAM support will not be built (header files not found) ***))],
25 - AC_MSG_WARN(*** FAM support will not be built (FAM library not found) ***))
26 - AC_SUBST(FAM_LIBS)
27 -
28 - dnl check for gamin extension
29 - gmenu_save_libs="$LIBS"
30 - LIBS="$LIBS $FAM_LIBS"
31 - AC_CHECK_FUNCS(FAMNoExists)
32 - LIBS="$gmenu_save_libs"
33 -fi
34 -
2735 GNOME_COMPILE_WARNINGS(yes)
2836
29 diff -urN gnome-menus-2.15.91.orig/libmenu/Makefile.am gnome-menus-2.15.91/libmenu/Makefile.am
30 --- gnome-menus-2.15.91.orig/libmenu/Makefile.am 2006-01-29 18:57:12.000000000 +0100
31 +++ gnome-menus-2.15.91/libmenu/Makefile.am 2006-08-13 18:52:55.000000000 +0200
37 AC_ARG_ENABLE(deprecations,
38 diff -Naur gnome-menus-2.18.0-old/libmenu/Makefile.am gnome-menus-2.18.0/libmenu/Makefile.am
39 --- gnome-menus-2.18.0-old/libmenu/Makefile.am 2007-03-12 19:49:27.000000000 +0100
40 +++ gnome-menus-2.18.0/libmenu/Makefile.am 2007-04-25 07:04:25.000000000 +0200
3241 @@ -3,6 +3,7 @@
3342 INCLUDES = \
3443 -DGMENU_I_KNOW_THIS_IS_UNSTABLE \
3746 $(DISABLE_DEPRECATED_CFLAGS) \
3847 $(DEBUG_CFLAGS) \
3948 $(WARN_CFLAGS) \
40 @@ -24,14 +25,14 @@
41 menu-monitor.c \
42 menu-monitor.h \
43 menu-monitor-backend.h \
44 - menu-monitor-fam.c \
45 + menu-monitor-gnomevfs.c \
46 menu-util.c \
47 menu-util.h \
48 $(NULL)
49 @@ -12,10 +13,10 @@
50
51 if INOTIFY_SUPPORT
52 MONITOR_BACKEND_SOURCES = menu-monitor-inotify.c
53 -MONITOR_BACKEND_EX_DIST = menu-monitor-fam.c
54 +MONITOR_BACKEND_EX_DIST = menu-monitor-gnomevfs.c menu-monitor-fam.c
55 else
56 -MONITOR_BACKEND_SOURCES = menu-monitor-fam.c
57 -MONITOR_BACKEND_EX_DIST = menu-monitor-inotify.c
58 +MONITOR_BACKEND_SOURCES = menu-monitor-gnomevfs.c
59 +MONITOR_BACKEND_EX_DIST = menu-monitor-inotify.c menu-monitor-fam.c
60 endif
61
62 libgnome_menu_la_SOURCES = \
63 @@ -39,7 +40,7 @@
4964
5065 libgnome_menu_la_LIBADD = \
5166 $(GLIB_LIBS) \
5267 - $(FAM_LIBS) \
53 + $(GNOMEVFS_LIBS) \
68 + $(GNOMEVFS_LIBS) \
5469 $(NULL)
5570 libgnome_menu_la_LDFLAGS = \
5671 -version-info $(LIB_MENU_LT_VERSION) \
57 diff -urN gnome-menus-2.15.91.orig/libmenu/menu-monitor-gnomevfs.c gnome-menus-2.15.91/libmenu/menu-monitor-gnomevfs.c
58 --- gnome-menus-2.15.91.orig/libmenu/menu-monitor-gnomevfs.c 1970-01-01 01:00:00.000000000 +0100
59 +++ gnome-menus-2.15.91/libmenu/menu-monitor-gnomevfs.c 2006-08-13 18:52:55.000000000 +0200
72 diff -Naur gnome-menus-2.18.0-old/libmenu/Makefile.am.orig gnome-menus-2.18.0/libmenu/Makefile.am.orig
73 --- gnome-menus-2.18.0-old/libmenu/Makefile.am.orig 1970-01-01 01:00:00.000000000 +0100
74 +++ gnome-menus-2.18.0/libmenu/Makefile.am.orig 2007-03-12 19:49:27.000000000 +0100
75 @@ -0,0 +1,63 @@
76 +NULL =
77 +
78 +INCLUDES = \
79 + -DGMENU_I_KNOW_THIS_IS_UNSTABLE \
80 + $(GLIB_CFLAGS) \
81 + $(DISABLE_DEPRECATED_CFLAGS) \
82 + $(DEBUG_CFLAGS) \
83 + $(WARN_CFLAGS) \
84 + $(NULL)
85 +
86 +lib_LTLIBRARIES = libgnome-menu.la
87 +
88 +if INOTIFY_SUPPORT
89 +MONITOR_BACKEND_SOURCES = menu-monitor-inotify.c
90 +MONITOR_BACKEND_EX_DIST = menu-monitor-fam.c
91 +else
92 +MONITOR_BACKEND_SOURCES = menu-monitor-fam.c
93 +MONITOR_BACKEND_EX_DIST = menu-monitor-inotify.c
94 +endif
95 +
96 +libgnome_menu_la_SOURCES = \
97 + canonicalize.c \
98 + canonicalize.h \
99 + desktop-entries.c \
100 + desktop-entries.h \
101 + entry-directories.c \
102 + entry-directories.h \
103 + gmenu-tree.c \
104 + gmenu-tree.h \
105 + menu-layout.c \
106 + menu-layout.h \
107 + menu-monitor.c \
108 + menu-monitor.h \
109 + menu-monitor-backend.h \
110 + menu-util.c \
111 + menu-util.h \
112 + $(MONITOR_BACKEND_SOURCES) \
113 + $(NULL)
114 +
115 +libgnome_menu_la_LIBADD = \
116 + $(GLIB_LIBS) \
117 + $(FAM_LIBS) \
118 + $(NULL)
119 +libgnome_menu_la_LDFLAGS = \
120 + -version-info $(LIB_MENU_LT_VERSION) \
121 + -no-undefined \
122 + -export-symbols-regex gmenu_tree \
123 + $(NULL)
124 +
125 +libgnome_menu_includedir = $(includedir)/gnome-menus
126 +
127 +libgnome_menu_include_HEADERS = \
128 + gmenu-tree.h \
129 + $(NULL)
130 +
131 +EXTRA_DIST = \
132 + libgnome-menu.pc.in \
133 + libgnome-menu-uninstalled.pc.in \
134 + $(MONITOR_BACKEND_EX_DIST) \
135 + $(NULL)
136 +
137 +pkgconfigdir = $(libdir)/pkgconfig
138 +pkgconfig_DATA = libgnome-menu.pc
139 diff -Naur gnome-menus-2.18.0-old/libmenu/menu-monitor-gnomevfs.c gnome-menus-2.18.0/libmenu/menu-monitor-gnomevfs.c
140 --- gnome-menus-2.18.0-old/libmenu/menu-monitor-gnomevfs.c 1970-01-01 01:00:00.000000000 +0100
141 +++ gnome-menus-2.18.0/libmenu/menu-monitor-gnomevfs.c 2007-04-25 07:03:58.000000000 +0200
60142 @@ -0,0 +1,112 @@
61143 +/*
62144 + * Copyright (C) 2005 Red Hat, Inc.
0 diff -urN gnome-menus-2.15.91.orig/Makefile.in gnome-menus-2.15.91/Makefile.in
1 --- gnome-menus-2.15.91.orig/Makefile.in 2006-08-08 00:30:55.000000000 +0200
2 +++ gnome-menus-2.15.91/Makefile.in 2006-08-13 18:57:15.000000000 +0200
3 @@ -109,13 +109,14 @@
4 EGREP = @EGREP@
5 EXEEXT = @EXEEXT@
6 F77 = @F77@
7 -FAM_LIBS = @FAM_LIBS@
8 FFLAGS = @FFLAGS@
9 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
10 GLIB_CFLAGS = @GLIB_CFLAGS@
11 GLIB_LIBS = @GLIB_LIBS@
12 GMOFILES = @GMOFILES@
13 GMSGFMT = @GMSGFMT@
14 +GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
15 +GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
16 HAVE_PYTHON_FALSE = @HAVE_PYTHON_FALSE@
17 HAVE_PYTHON_TRUE = @HAVE_PYTHON_TRUE@
18 INSTALL_DATA = @INSTALL_DATA@
19 diff -urN gnome-menus-2.15.91.orig/aclocal.m4 gnome-menus-2.15.91/aclocal.m4
20 --- gnome-menus-2.15.91.orig/aclocal.m4 2006-08-08 00:30:47.000000000 +0200
21 +++ gnome-menus-2.15.91/aclocal.m4 2006-08-13 18:56:50.000000000 +0200
22 @@ -11,4569 +11,4635 @@
0 diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur gnome-menus-2.18.0-old/aclocal.m4 gnome-menus-2.18.0/aclocal.m4
1 --- gnome-menus-2.18.0-old/aclocal.m4 2007-03-12 19:54:13.000000000 +0100
2 +++ gnome-menus-2.18.0/aclocal.m4 2007-04-25 07:13:26.000000000 +0200
3 @@ -1,7 +1,7 @@
4 -# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
5 +# generated automatically by aclocal 1.10 -*- Autoconf -*-
6
7 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
8 -# 2005 Free Software Foundation, Inc.
9 +# 2005, 2006 Free Software Foundation, Inc.
10 # This file is free software; the Free Software Foundation
11 # gives unlimited permission to copy and/or distribute it,
12 # with or without modifications, as long as this notice is preserved.
13 @@ -11,6388 +11,5336 @@
2314 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
2415 # PARTICULAR PURPOSE.
2516
2617 -# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
27 +# Copyright (C) 1995-2002 Free Software Foundation, Inc.
28 +# Copyright (C) 2001-2003,2004 Red Hat, Inc.
29 #
18 -#
3019 -# This file is free software; the Free Software Foundation
3120 -# gives unlimited permission to copy and/or distribute it,
3221 -# with or without modifications, as long as this notice is preserved.
4534 - [AM_AUTOMAKE_VERSION([1.9.6])])
4635 -
4736 -# AM_AUX_DIR_EXPAND -*- Autoconf -*-
48 -
37 +m4_if(m4_PACKAGE_VERSION, [2.61],,
38 +[m4_fatal([this file was generated for autoconf 2.61.
39 +You have another version of autoconf. If you want to use that,
40 +you should regenerate the build system entirely.], [63])])
41
4942 -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
50 +# This file is free software, distributed under the terms of the GNU
51 +# General Public License. As a special exception to the GNU General
52 +# Public License, this file may be distributed as part of a program
53 +# that contains a configuration script generated by Autoconf, under
54 +# the same distribution terms as the rest of that program.
43 +# Copyright (C) 1995-2002 Free Software Foundation, Inc.
44 +# Copyright (C) 2001-2003,2004 Red Hat, Inc.
5545 #
5646 -# This file is free software; the Free Software Foundation
5747 -# gives unlimited permission to copy and/or distribute it,
6050 -# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
6151 -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
6252 -# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
63 +# This file can be copied and used freely without restrictions. It can
64 +# be used in projects which are not available under the GNU Public License
65 +# but which still want to provide support for the GNU gettext functionality.
53 +# This file is free software, distributed under the terms of the GNU
54 +# General Public License. As a special exception to the GNU General
55 +# Public License, this file may be distributed as part of a program
56 +# that contains a configuration script generated by Autoconf, under
57 +# the same distribution terms as the rest of that program.
6658 #
6759 -# Of course, Automake must honor this variable whenever it calls a
6860 -# tool from the auxiliary directory. The problem is that $srcdir (and
7163 -# it makes $ac_aux_dir quite unusable in subdirectories: in the top
7264 -# source directory, any form will work fine, but in subdirectories a
7365 -# relative path needs to be adjusted first.
74 +# Macro to add for using GNU gettext.
75 +# Ulrich Drepper <drepper@cygnus.com>, 1995, 1996
66 +# This file can be copied and used freely without restrictions. It can
67 +# be used in projects which are not available under the GNU Public License
68 +# but which still want to provide support for the GNU gettext functionality.
7669 #
7770 -# $ac_aux_dir/missing
7871 -# fails when called from a subdirectory if $ac_aux_dir is relative
8073 -# fails if $ac_aux_dir is absolute,
8174 -# fails when called from a subdirectory in a VPATH build with
8275 -# a relative $ac_aux_dir
83 +# Modified to never use included libintl.
84 +# Owen Taylor <otaylor@redhat.com>, 12/15/1998
76 +# Macro to add for using GNU gettext.
77 +# Ulrich Drepper <drepper@cygnus.com>, 1995, 1996
8578 #
8679 -# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
8780 -# are both prefixed by $srcdir. In an in-source build this is usually
8881 -# harmless because $srcdir is `.', but things will broke when you
8982 -# start a VPATH build or use an absolute $srcdir.
90 +# Major rework to remove unused code
91 +# Owen Taylor <otaylor@redhat.com>, 12/11/2002
83 +# Modified to never use included libintl.
84 +# Owen Taylor <otaylor@redhat.com>, 12/15/1998
9285 #
9386 -# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
9487 -# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
9992 -# unfortunately $(top_srcdir) has no meaning in configure.
10093 -# However there are other variables, like CC, which are often used in
10194 -# configure, and could therefore not use this "fixed" $ac_aux_dir.
102 +# Added better handling of ALL_LINGUAS from GNU gettext version
103 +# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
95 +# Major rework to remove unused code
96 +# Owen Taylor <otaylor@redhat.com>, 12/11/2002
10497 #
10598 -# Another solution, used here, is to always expand $ac_aux_dir to an
10699 -# absolute PATH. The drawback is that using absolute paths prevent a
117110 -
118111 -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
119112 -# Free Software Foundation, Inc.
120 +# Modified to require ngettext
121 +# Matthias Clasen <mclasen@redhat.com> 08/06/2004
113 +# Added better handling of ALL_LINGUAS from GNU gettext version
114 +# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
122115 #
123116 -# This file is free software; the Free Software Foundation
124117 -# gives unlimited permission to copy and/or distribute it,
125118 -# with or without modifications, as long as this notice is preserved.
119 +# Modified to require ngettext
120 +# Matthias Clasen <mclasen@redhat.com> 08/06/2004
121 +#
126122 +# We need this here as well, since someone might use autoconf-2.5x
127123 +# to configure GLib then an older version to configure a package
128124 +# using AM_GLIB_GNU_GETTEXT
129125 +AC_PREREQ(2.53)
130
131 -# serial 7
126 +
132127 +dnl
133128 +dnl We go to great lengths to make sure that aclocal won't
134129 +dnl try to pull in the installed version of these macros
141136 +dnl definitions in terms of our private definitions.
142137 +dnl
143138
144 -# AM_CONDITIONAL(NAME, SHELL-CONDITION)
145 -# -------------------------------------
146 -# Define a conditional.
147 -AC_DEFUN([AM_CONDITIONAL],
148 -[AC_PREREQ(2.52)dnl
149 - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
150 - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
151 -AC_SUBST([$1_TRUE])
152 -AC_SUBST([$1_FALSE])
153 -if $2; then
154 - $1_TRUE=
155 - $1_FALSE='#'
139 -# serial 7
156140 +# GLIB_LC_MESSAGES
157141 +#--------------------
158142 +glib_DEFUN([GLIB_LC_MESSAGES],
166150 + [Define if your <locale.h> file defines LC_MESSAGES.])
167151 + fi
168152 + fi])
169 +
153
154 -# AM_CONDITIONAL(NAME, SHELL-CONDITION)
155 -# -------------------------------------
156 -# Define a conditional.
157 -AC_DEFUN([AM_CONDITIONAL],
158 -[AC_PREREQ(2.52)dnl
159 - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
160 - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
161 -AC_SUBST([$1_TRUE])
162 -AC_SUBST([$1_FALSE])
163 -if $2; then
164 - $1_TRUE=
165 - $1_FALSE='#'
170166 +# GLIB_PATH_PROG_WITH_TEST
171167 +#----------------------------
172168 +dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
211207 - AC_MSG_ERROR([[conditional "$1" was never defined.
212208 -Usually this means the macro was only invoked conditionally.]])
213209 -fi])])
210 -
214211 +AC_SUBST($1)dnl
215212 +])
216
217 +# GLIB_WITH_NLS
218 +#-----------------
219 +glib_DEFUN([GLIB_WITH_NLS],
220 + dnl NLS is obligatory
221 + [USE_NLS=yes
222 + AC_SUBST(USE_NLS)
223213
224214 -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
225215 -# Free Software Foundation, Inc.
227217 -# This file is free software; the Free Software Foundation
228218 -# gives unlimited permission to copy and/or distribute it,
229219 -# with or without modifications, as long as this notice is preserved.
220 +# GLIB_WITH_NLS
221 +#-----------------
222 +glib_DEFUN([GLIB_WITH_NLS],
223 + dnl NLS is obligatory
224 + [AC_REQUIRE([AC_CANONICAL_HOST])dnl
225 + USE_NLS=yes
226 + AC_SUBST(USE_NLS)
227
228 -# serial 8
230229 + gt_cv_have_gettext=no
231
232 -# serial 8
233 + CATOBJEXT=NONE
234 + XGETTEXT=:
235 + INTLLIBS=
236230
237231 -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
238232 -# written in clear, in which case automake, when reading aclocal.m4,
239233 -# will think it sees a *use*, and therefore will trigger all it's
240234 -# C support machinery. Also note that it means that autoscan, seeing
241235 -# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
236 + CATOBJEXT=NONE
237 + XGETTEXT=:
238 + INTLLIBS=
239
242240 + AC_CHECK_HEADER(libintl.h,
243241 + [gt_cv_func_dgettext_libintl="no"
244242 + libintl_extra_libs=""
245243
244 -# _AM_DEPENDENCIES(NAME)
245 -# ----------------------
246 -# See how the compiler implements dependency checking.
247 -# NAME is "CC", "CXX", "GCJ", or "OBJC".
248 -# We try a few techniques and use that to set a single cache variable.
249 -#
250 -# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
251 -# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
252 -# dependency, and given that the user is not expected to run this macro,
253 -# just rely on AC_PROG_CC.
254 -AC_DEFUN([_AM_DEPENDENCIES],
255 -[AC_REQUIRE([AM_SET_DEPDIR])dnl
256 -AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
257 -AC_REQUIRE([AM_MAKE_INCLUDE])dnl
258 -AC_REQUIRE([AM_DEP_TRACK])dnl
246259 + #
247260 + # First check in libc
248261 + #
270283 + AC_CHECK_FUNCS(bind_textdomain_codeset)
271284 + fi
272285
273 -# _AM_DEPENDENCIES(NAME)
274 -# ----------------------
275 -# See how the compiler implements dependency checking.
276 -# NAME is "CC", "CXX", "GCJ", or "OBJC".
277 -# We try a few techniques and use that to set a single cache variable.
278 -#
279 -# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
280 -# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
281 -# dependency, and given that the user is not expected to run this macro,
282 -# just rely on AC_PROG_CC.
283 -AC_DEFUN([_AM_DEPENDENCIES],
284 -[AC_REQUIRE([AM_SET_DEPDIR])dnl
285 -AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
286 -AC_REQUIRE([AM_MAKE_INCLUDE])dnl
287 -AC_REQUIRE([AM_DEP_TRACK])dnl
286 -ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
287 - [$1], CXX, [depcc="$CXX" am_compiler_list=],
288 - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
289 - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
290 - [depcc="$$1" am_compiler_list=])
288291 + #
289292 + # If we don't have everything we want, check in libintl
290293 + #
296299 + [AC_CHECK_LIB(intl, ngettext,
297300 + [AC_CHECK_LIB(intl, dgettext,
298301 + gt_cv_func_dgettext_libintl=yes)])])
299
300 -ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
301 - [$1], CXX, [depcc="$CXX" am_compiler_list=],
302 - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
303 - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
304 - [depcc="$$1" am_compiler_list=])
305 + if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
306 + AC_MSG_CHECKING([if -liconv is needed to use gettext])
307 + AC_MSG_RESULT([])
308 + AC_CHECK_LIB(intl, ngettext,
309 + [AC_CHECK_LIB(intl, dcgettext,
310 + [gt_cv_func_dgettext_libintl=yes
311 + libintl_extra_libs=-liconv],
312 + :,-liconv)],
313 + :,-liconv)
314 + fi
315302
316303 -AC_CACHE_CHECK([dependency style of $depcc],
317304 - [am_cv_$1_dependencies_compiler_type],
333320 - # the current directory while Tru64 will put them in the object
334321 - # directory.
335322 - mkdir sub
336 + #
337 + # If we found libintl, then check in it for bind_textdomain_codeset();
338 + # we'll prefer libc if neither have bind_textdomain_codeset(),
339 + # and both have dgettext and ngettext
340 + #
341 + if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
342 + glib_save_LIBS="$LIBS"
343 + LIBS="$LIBS -lintl $libintl_extra_libs"
344 + unset ac_cv_func_bind_textdomain_codeset
345 + AC_CHECK_FUNCS(bind_textdomain_codeset)
346 + LIBS="$glib_save_LIBS"
323 + if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
324 + AC_MSG_CHECKING([if -liconv is needed to use gettext])
325 + AC_MSG_RESULT([])
326 + AC_CHECK_LIB(intl, ngettext,
327 + [AC_CHECK_LIB(intl, dcgettext,
328 + [gt_cv_func_dgettext_libintl=yes
329 + libintl_extra_libs=-liconv],
330 + :,-liconv)],
331 + :,-liconv)
332 + fi
347333
348334 - am_cv_$1_dependencies_compiler_type=none
349335 - if test "$am_compiler_list" = ""; then
365351 - touch sub/conftst$i.h
366352 - done
367353 - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
368 + if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
369 + gt_cv_func_dgettext_libc=no
370 + else
371 + if test "$gt_cv_func_dgettext_libc" = "yes" \
372 + && test "$gt_cv_func_ngettext_libc" = "yes"; then
373 + gt_cv_func_dgettext_libintl=no
374 + fi
375 + fi
376 + fi
377 + fi
354 + #
355 + # If we found libintl, then check in it for bind_textdomain_codeset();
356 + # we'll prefer libc if neither have bind_textdomain_codeset(),
357 + # and both have dgettext and ngettext
358 + #
359 + if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
360 + glib_save_LIBS="$LIBS"
361 + LIBS="$LIBS -lintl $libintl_extra_libs"
362 + unset ac_cv_func_bind_textdomain_codeset
363 + AC_CHECK_FUNCS(bind_textdomain_codeset)
364 + LIBS="$glib_save_LIBS"
378365
379366 - case $depmode in
380367 - nosideeffect)
384371 - continue
385372 - else
386373 - break
387 + if test "$gt_cv_func_dgettext_libc" = "yes" \
388 + || test "$gt_cv_func_dgettext_libintl" = "yes"; then
389 + gt_cv_have_gettext=yes
390 fi
374 - fi
391375 - ;;
392376 - none) break ;;
393377 - esac
413397 - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
414398 - am_cv_$1_dependencies_compiler_type=$depmode
415399 - break
416 +
417 + if test "$gt_cv_func_dgettext_libintl" = "yes"; then
418 + INTLLIBS="-lintl $libintl_extra_libs"
400 + if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
401 + gt_cv_func_dgettext_libc=no
402 + else
403 + if test "$gt_cv_func_dgettext_libc" = "yes" \
404 + && test "$gt_cv_func_ngettext_libc" = "yes"; then
405 + gt_cv_func_dgettext_libintl=no
406 + fi
407 + fi
408 + fi
419409 fi
420410 - fi
421411 - done
422 -
412
423413 - cd ..
424414 - rm -rf conftest.dir
425415 -else
431421 - test "x$enable_dependency_tracking" != xno \
432422 - && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
433423 -])
424 + if test "$gt_cv_func_dgettext_libc" = "yes" \
425 + || test "$gt_cv_func_dgettext_libintl" = "yes"; then
426 + gt_cv_have_gettext=yes
427 + fi
428 +
429 + if test "$gt_cv_func_dgettext_libintl" = "yes"; then
430 + INTLLIBS="-lintl $libintl_extra_libs"
431 + fi
434432 +
435433 + if test "$gt_cv_have_gettext" = "yes"; then
436434 + AC_DEFINE(HAVE_GETTEXT,1,
441439 + glib_save_LIBS="$LIBS"
442440 + LIBS="$LIBS $INTLLIBS"
443441 + AC_CHECK_FUNCS(dcgettext)
442 + MSGFMT_OPTS=
443 + AC_MSG_CHECKING([if msgfmt accepts -c])
444 + GLIB_RUN_PROG([msgfmt -c -o /dev/null],[
445 +msgid ""
446 +msgstr ""
447 +"Content-Type: text/plain; charset=UTF-8\n"
448 +"Project-Id-Version: test 1.0\n"
449 +"PO-Revision-Date: 2007-02-15 12:01+0100\n"
450 +"Last-Translator: test <foo@bar.xx>\n"
451 +"Language-Team: C <LL@li.org>\n"
452 +"MIME-Version: 1.0\n"
453 +"Content-Transfer-Encoding: 8bit\n"
454 +], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
455 + AC_SUBST(MSGFMT_OPTS)
444456 + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
445457 + GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
446458 + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
550562 + ])
551563
552564 -#serial 3
553 +# AM_GLIB_GNU_GETTEXT
554 +# -------------------
555 +# Do checks necessary for use of gettext. If a suitable implementation
556 +# of gettext is found in either in libintl or in the C library,
557 +# it will set INTLLIBS to the libraries needed for use of gettext
558 +# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
559 +# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
560 +# on various variables needed by the Makefile.in.in installed by
561 +# glib-gettextize.
562 +dnl
563 +glib_DEFUN([GLIB_GNU_GETTEXT],
564 + [AC_REQUIRE([AC_PROG_CC])dnl
565 + AC_REQUIRE([AC_HEADER_STDC])dnl
566 +
567 + GLIB_LC_MESSAGES
568 + GLIB_WITH_NLS
569
565 -
570566 -# _AM_OUTPUT_DEPENDENCY_COMMANDS
571567 -# ------------------------------
572568 -AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
609605 - done
610606 -done
611607 -])# _AM_OUTPUT_DEPENDENCY_COMMANDS
608 +# AM_GLIB_GNU_GETTEXT
609 +# -------------------
610 +# Do checks necessary for use of gettext. If a suitable implementation
611 +# of gettext is found in either in libintl or in the C library,
612 +# it will set INTLLIBS to the libraries needed for use of gettext
613 +# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
614 +# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
615 +# on various variables needed by the Makefile.in.in installed by
616 +# glib-gettextize.
617 +dnl
618 +glib_DEFUN([GLIB_GNU_GETTEXT],
619 + [AC_REQUIRE([AC_PROG_CC])dnl
620 + AC_REQUIRE([AC_HEADER_STDC])dnl
621 +
622 + GLIB_LC_MESSAGES
623 + GLIB_WITH_NLS
624
612625 + if test "$gt_cv_have_gettext" = "yes"; then
613626 + if test "x$ALL_LINGUAS" = "x"; then
614627 + LINGUAS=
640653 + AC_MSG_RESULT($LINGUAS)
641654 + fi
642655
643 + dnl Construct list of names of catalog files to be constructed.
644 + if test -n "$LINGUAS"; then
645 + for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
646 + fi
647 + fi
648
649656 -# AM_OUTPUT_DEPENDENCY_COMMANDS
650657 -# -----------------------------
651658 -# This macro should only be invoked once -- use via AC_REQUIRE.
658665 - [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
659666 - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
660667 -])
668 + dnl Construct list of names of catalog files to be constructed.
669 + if test -n "$LINGUAS"; then
670 + for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
671 + fi
672 + fi
673
674 -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
675 -# Free Software Foundation, Inc.
676 -#
677 -# This file is free software; the Free Software Foundation
678 -# gives unlimited permission to copy and/or distribute it,
679 -# with or without modifications, as long as this notice is preserved.
661680 + dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
662681 + dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
663682 + dnl Try to locate is.
670689 + fi
671690 + AC_SUBST(MKINSTALLDIRS)
672691
673 -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
674 -# Free Software Foundation, Inc.
675 -#
676 -# This file is free software; the Free Software Foundation
677 -# gives unlimited permission to copy and/or distribute it,
678 -# with or without modifications, as long as this notice is preserved.
692 -# serial 8
679693 + dnl Generate list of files to be processed by xgettext which will
680694 + dnl be included in po/Makefile.
681695 + test -d po || mkdir po
693707 + < $srcdir/po/POTFILES.in > po/POTFILES
694708 + ])
695709
696 -# serial 8
710 -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
711 -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
697712 +# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
698713 +# -------------------------------
699714 +# Define VARIABLE to the location where catalog files will
702717 +[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
703718 +glib_save_prefix="$prefix"
704719 +glib_save_exec_prefix="$exec_prefix"
720 +glib_save_datarootdir="$datarootdir"
705721 +test "x$prefix" = xNONE && prefix=$ac_default_prefix
706722 +test "x$exec_prefix" = xNONE && exec_prefix=$prefix
723 +datarootdir=`eval echo "${datarootdir}"`
707724 +if test "x$CATOBJEXT" = "x.mo" ; then
708725 + localedir=`eval echo "${libdir}/locale"`
709726 +else
711728 +fi
712729 +prefix="$glib_save_prefix"
713730 +exec_prefix="$glib_save_exec_prefix"
731 +datarootdir="$glib_save_datarootdir"
714732 +AC_DEFINE_UNQUOTED($1, "$localedir",
715733 + [Define the location where the catalogs will be installed])
716734 +])
717735
718 -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
719 -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
736 -# Do all the work for Automake. -*- Autoconf -*-
720737 +dnl
721738 +dnl Now the definitions that aclocal will find
722739 +dnl
725742 +AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
726743 +])dnl
727744
728 -# Do all the work for Automake. -*- Autoconf -*-
745 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
746 -# Free Software Foundation, Inc.
747 -#
748 -# This file is free software; the Free Software Foundation
749 -# gives unlimited permission to copy and/or distribute it,
750 -# with or without modifications, as long as this notice is preserved.
751 +# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
752 +#
753 +# Create a temporary file with TEST-FILE as its contents and pass the
754 +# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with
755 +# 0 and perform ACTION-IF-FAIL for any other exit status.
756 +AC_DEFUN([GLIB_RUN_PROG],
757 +[cat >conftest.foo <<_ACEOF
758 +$2
759 +_ACEOF
760 +if AC_RUN_LOG([$1 conftest.foo]); then
761 + m4_ifval([$3], [$3], [:])
762 +m4_ifvaln([$4], [else $4])dnl
763 +echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
764 +sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
765 +fi])
766
767 -# serial 12
768
769 -# This macro actually does too much. Some checks are only needed if
770 -# your package does certain things. But this isn't really a big deal.
729771 +dnl GNOME_COMPILE_WARNINGS
730772 +dnl Turn on many useful compiler warnings
731773 +dnl For now, only works on GCC
733775 + dnl ******************************
734776 + dnl More compiler warnings
735777 + dnl ******************************
736
737 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
738 -# Free Software Foundation, Inc.
739 -#
740 -# This file is free software; the Free Software Foundation
741 -# gives unlimited permission to copy and/or distribute it,
742 -# with or without modifications, as long as this notice is preserved.
743 + AC_ARG_ENABLE(compile-warnings,
744 + AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
745 + [Turn on compiler warnings]),,
746 + [enable_compile_warnings="m4_default([$1],[yes])"])
747
748 -# serial 12
749 + warnCFLAGS=
750 + if test "x$GCC" != xyes; then
751 + enable_compile_warnings=no
752 + fi
753
754 -# This macro actually does too much. Some checks are only needed if
755 -# your package does certain things. But this isn't really a big deal.
756 + warning_flags=
757 + realsave_CFLAGS="$CFLAGS"
758778
759779 -# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
760780 -# AM_INIT_AUTOMAKE([OPTIONS])
779799 - test -f $srcdir/config.status; then
780800 - AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
781801 -fi
802 + AC_ARG_ENABLE(compile-warnings,
803 + AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
804 + [Turn on compiler warnings]),,
805 + [enable_compile_warnings="m4_default([$1],[yes])"])
806
807 -# test whether we have cygpath
808 -if test -z "$CYGPATH_W"; then
809 - if (cygpath --version) >/dev/null 2>/dev/null; then
810 - CYGPATH_W='cygpath -w'
811 - else
812 - CYGPATH_W=echo
813 - fi
814 -fi
815 -AC_SUBST([CYGPATH_W])
816 + warnCFLAGS=
817 + if test "x$GCC" != xyes; then
818 + enable_compile_warnings=no
819 + fi
820
821 -# Define the identity of the package.
822 -dnl Distinguish between old-style and new-style calls.
823 -m4_ifval([$2],
824 -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
825 - AC_SUBST([PACKAGE], [$1])dnl
826 - AC_SUBST([VERSION], [$2])],
827 -[_AM_SET_OPTIONS([$1])dnl
828 - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
829 - AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
830 + warning_flags=
831 + realsave_CFLAGS="$CFLAGS"
832
833 -_AM_IF_OPTION([no-define],,
834 -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
835 - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
782836 + case "$enable_compile_warnings" in
783837 + no)
784838 + warning_flags=
820874 + AC_MSG_CHECKING(what warning flags to pass to the C compiler)
821875 + AC_MSG_RESULT($warning_flags)
822876
823 -# test whether we have cygpath
824 -if test -z "$CYGPATH_W"; then
825 - if (cygpath --version) >/dev/null 2>/dev/null; then
826 - CYGPATH_W='cygpath -w'
827 - else
828 - CYGPATH_W=echo
829 - fi
830 -fi
831 -AC_SUBST([CYGPATH_W])
832 + AC_ARG_ENABLE(iso-c,
833 + AC_HELP_STRING([--enable-iso-c],
834 + [Try to warn if code is not ISO C ]),,
835 + [enable_iso_c=no])
836
837 -# Define the identity of the package.
838 -dnl Distinguish between old-style and new-style calls.
839 -m4_ifval([$2],
840 -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
841 - AC_SUBST([PACKAGE], [$1])dnl
842 - AC_SUBST([VERSION], [$2])],
843 -[_AM_SET_OPTIONS([$1])dnl
844 - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
845 - AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
846 -
847 -_AM_IF_OPTION([no-define],,
848 -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
849 - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
850 + AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
851 + complCFLAGS=
852 + if test "x$enable_iso_c" != "xno"; then
853 + if test "x$GCC" = "xyes"; then
854 + case " $CFLAGS " in
855 + *[\ \ ]-ansi[\ \ ]*) ;;
856 + *) complCFLAGS="$complCFLAGS -ansi" ;;
857 + esac
858 + case " $CFLAGS " in
859 + *[\ \ ]-pedantic[\ \ ]*) ;;
860 + *) complCFLAGS="$complCFLAGS -pedantic" ;;
861 + esac
862 + fi
863 + fi
864 + AC_MSG_RESULT($complCFLAGS)
865
866877 -# Some tools Automake needs.
867878 -AC_REQUIRE([AM_SANITY_CHECK])dnl
868879 -AC_REQUIRE([AC_ARG_PROGRAM])dnl
892903 - [define([AC_PROG_CXX],
893904 - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
894905 -])
906 + AC_ARG_ENABLE(iso-c,
907 + AC_HELP_STRING([--enable-iso-c],
908 + [Try to warn if code is not ISO C ]),,
909 + [enable_iso_c=no])
910 +
911 + AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
912 + complCFLAGS=
913 + if test "x$enable_iso_c" != "xno"; then
914 + if test "x$GCC" = "xyes"; then
915 + case " $CFLAGS " in
916 + *[\ \ ]-ansi[\ \ ]*) ;;
917 + *) complCFLAGS="$complCFLAGS -ansi" ;;
918 + esac
919 + case " $CFLAGS " in
920 + *[\ \ ]-pedantic[\ \ ]*) ;;
921 + *) complCFLAGS="$complCFLAGS -pedantic" ;;
922 + esac
923 + fi
924 + fi
925 + AC_MSG_RESULT($complCFLAGS)
926 +
895927 + WARN_CFLAGS="$warning_flags $complCFLAGS"
896928 + AC_SUBST(WARN_CFLAGS)
897929 ])
924956 -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
925957 + AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
926958 + warnCXXFLAGS=
927 + if test "x$GCC" != xyes; then
928 + enable_compile_warnings=no
959 + if test "x$GXX" != xyes; then
960 + enable_cxx_warnings=no
929961 + fi
930962 + if test "x$enable_cxx_warnings" != "xno"; then
931 + if test "x$GCC" = "xyes"; then
963 + if test "x$GXX" = "xyes"; then
932964 + case " $CXXFLAGS " in
933965 + *[\ \ ]-Wall[\ \ ]*) ;;
934966 + *) warnCXXFLAGS="-Wall -Wno-unused" ;;
9681000 + AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
9691001 + complCXXFLAGS=
9701002 + if test "x$enable_iso_cxx" != "xno"; then
971 + if test "x$GCC" = "xyes"; then
1003 + if test "x$GXX" = "xyes"; then
9721004 + case " $CXXFLAGS " in
9731005 + *[\ \ ]-ansi[\ \ ]*) ;;
9741006 + *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
11541186 -])
11551187
11561188 -# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
1157 +AC_PATH_PROG(INTLTOOL_ICONV, iconv, iconv)
1158 +AC_PATH_PROG(INTLTOOL_MSGFMT, msgfmt, msgfmt)
1159 +AC_PATH_PROG(INTLTOOL_MSGMERGE, msgmerge, msgmerge)
1160 +AC_PATH_PROG(INTLTOOL_XGETTEXT, xgettext, xgettext)
1161
1189 -
11621190 -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
11631191 -# Free Software Foundation, Inc.
11641192 -#
11651193 -# This file is free software; the Free Software Foundation
11661194 -# gives unlimited permission to copy and/or distribute it,
11671195 -# with or without modifications, as long as this notice is preserved.
1196 +AC_PATH_PROG(INTLTOOL_ICONV, iconv, iconv)
1197 +AC_PATH_PROG(INTLTOOL_MSGFMT, msgfmt, msgfmt)
1198 +AC_PATH_PROG(INTLTOOL_MSGMERGE, msgmerge, msgmerge)
1199 +AC_PATH_PROG(INTLTOOL_XGETTEXT, xgettext, xgettext)
1200
1201 -# serial 4
11681202 +# Substitute ALL_LINGUAS so we can use it in po/Makefile
11691203 +AC_SUBST(ALL_LINGUAS)
1170 +
1204
1205 -# AM_MISSING_PROG(NAME, PROGRAM)
1206 -# ------------------------------
1207 -AC_DEFUN([AM_MISSING_PROG],
1208 -[AC_REQUIRE([AM_MISSING_HAS_RUN])
1209 -$1=${$1-"${am_missing_run}$2"}
1210 -AC_SUBST($1)])
1211 +# Set DATADIRNAME correctly if it is not set yet
1212 +# (copied from glib-gettext.m4)
1213 +if test -z "$DATADIRNAME"; then
1214 + AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
1215 + return _nl_msg_cat_cntr],
1216 + [DATADIRNAME=share],
1217 + [case $host in
1218 + *-*-solaris*)
1219 + dnl On Solaris, if bind_textdomain_codeset is in libc,
1220 + dnl GNU format message catalog is always supported,
1221 + dnl since both are added to the libc all together.
1222 + dnl Hence, we'd like to go with DATADIRNAME=share
1223 + dnl in this case.
1224 + AC_CHECK_FUNC(bind_textdomain_codeset,
1225 + [DATADIRNAME=share], [DATADIRNAME=lib])
1226 + ;;
1227 + *)
1228 + [DATADIRNAME=lib]
1229 + ;;
1230 + esac])
1231 +fi
1232 +AC_SUBST(DATADIRNAME)
1233
11711234 +IT_PO_SUBDIR([po])
11721235
1173 -# serial 4
1236 -# AM_MISSING_HAS_RUN
1237 -# ------------------
1238 -# Define MISSING if not defined so far and test if it supports --run.
1239 -# If it does, set am_missing_run to use it, otherwise, to nothing.
1240 -AC_DEFUN([AM_MISSING_HAS_RUN],
1241 -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
1242 -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
1243 -# Use eval to expand $SHELL
1244 -if eval "$MISSING --run true"; then
1245 - am_missing_run="$MISSING --run "
1246 -else
1247 - am_missing_run=
1248 - AC_MSG_WARN([`missing' script is too old or missing])
1249 -fi
1250 -])
11741251 +dnl The following is very similar to
11751252 +dnl
11761253 +dnl AC_CONFIG_FILES([intltool-extract intltool-merge intltool-update])
11861263 +dnl Nothing crucial here, and we could use AC_CONFIG_FILES, if there were
11871264 +dnl a reason for it.
11881265
1189 -# AM_MISSING_PROG(NAME, PROGRAM)
1190 -# ------------------------------
1191 -AC_DEFUN([AM_MISSING_PROG],
1192 -[AC_REQUIRE([AM_MISSING_HAS_RUN])
1193 -$1=${$1-"${am_missing_run}$2"}
1194 -AC_SUBST($1)])
1195 +AC_CONFIG_COMMANDS([intltool], [
1196
1197 +for file in intltool-extract intltool-merge intltool-update; do
1198 + sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
1199 + -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
1200 + -e "s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g" \
1201 + -e "s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g" \
1202 + -e "s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g" \
1203 + -e "s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g" \
1204 + -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
1205 + < ${ac_aux_dir}/${file}.in > ${file}.out
1206 + if cmp -s ${file} ${file}.out 2>/dev/null; then
1207 + rm -f ${file}.out
1208 + else
1209 + mv -f ${file}.out ${file}
1210 + fi
1211 + chmod ugo+x ${file}
1212 + chmod u+w ${file}
1213 +done
1214 +
1215 +],
1216 +[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
1217 +prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
1218 +INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' INTLTOOL_ICONV='${INTLTOOL_ICONV}'
1219 +INTLTOOL_MSGFMT='${INTLTOOL_MSGFMT}' INTLTOOL_MSGMERGE='${INTLTOOL_MSGMERGE}'
1220 +INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}'])
1221
1222 -# AM_MISSING_HAS_RUN
1223 -# ------------------
1224 -# Define MISSING if not defined so far and test if it supports --run.
1225 -# If it does, set am_missing_run to use it, otherwise, to nothing.
1226 -AC_DEFUN([AM_MISSING_HAS_RUN],
1227 -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
1228 -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
1229 -# Use eval to expand $SHELL
1230 -if eval "$MISSING --run true"; then
1231 - am_missing_run="$MISSING --run "
1232 -else
1233 - am_missing_run=
1234 - AC_MSG_WARN([`missing' script is too old or missing])
1235 -fi
1236 ])
1237
12381266 -# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
12391267 -#
12401268 -# This file is free software; the Free Software Foundation
12411269 -# gives unlimited permission to copy and/or distribute it,
12421270 -# with or without modifications, as long as this notice is preserved.
1271 +AC_CONFIG_COMMANDS([intltool], [
12431272
12441273 -# AM_PROG_MKDIR_P
12451274 -# ---------------
12551284 -#
12561285 -# Do not use -m 0755 and let people choose whatever they expect by
12571286 -# setting umask.
1258 +# IT_PO_SUBDIR(DIRNAME)
1259 +# ---------------------
1260 +# All po subdirs have to be declared with this macro; the subdir "po" is
1261 +# declared by IT_PROG_INTLTOOL.
1262 #
1287 -#
12631288 -# We cannot accept any implementation of `mkdir' that recognizes `-p'.
12641289 -# Some implementations (such as Solaris 8's) are not thread-safe: if a
12651290 -# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
12961321 - # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
12971322 - if test -f "$ac_aux_dir/mkinstalldirs"; then
12981323 - mkdir_p='$(mkinstalldirs)'
1299 - else
1324 +for file in intltool-extract intltool-merge intltool-update; do
1325 + sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
1326 + -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
1327 + -e "s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g" \
1328 + -e "s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g" \
1329 + -e "s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g" \
1330 + -e "s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g" \
1331 + -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
1332 + < ${ac_aux_dir}/${file}.in > ${file}.out
1333 + if cmp -s ${file} ${file}.out 2>/dev/null; then
1334 + rm -f ${file}.out
1335 else
13001336 - mkdir_p='$(install_sh) -d'
1301 - fi
1337 + mv -f ${file}.out ${file}
1338 fi
13021339 -fi
13031340 -AC_SUBST([mkdir_p])])
1341 + chmod ugo+x ${file}
1342 + chmod u+w ${file}
1343 +done
1344
1345 -# Helper functions for option handling. -*- Autoconf -*-
1346 +],
1347 +[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
1348 +prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
1349 +INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' INTLTOOL_ICONV='${INTLTOOL_ICONV}'
1350 +INTLTOOL_MSGFMT='${INTLTOOL_MSGFMT}' INTLTOOL_MSGMERGE='${INTLTOOL_MSGMERGE}'
1351 +INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}'])
1352
1353 -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
1354 +])
1355 +
1356 +
1357 +# IT_PO_SUBDIR(DIRNAME)
1358 +# ---------------------
1359 +# All po subdirs have to be declared with this macro; the subdir "po" is
1360 +# declared by IT_PROG_INTLTOOL.
1361 #
1362 -# This file is free software; the Free Software Foundation
1363 -# gives unlimited permission to copy and/or distribute it,
1364 -# with or without modifications, as long as this notice is preserved.
13041365 +AC_DEFUN([IT_PO_SUBDIR],
13051366 +[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
13061367 +dnl
13311392 +])dnl
13321393 +])
13331394
1334 -# Helper functions for option handling. -*- Autoconf -*-
1335
1336 -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
1337 -#
1338 -# This file is free software; the Free Software Foundation
1339 -# gives unlimited permission to copy and/or distribute it,
1340 -# with or without modifications, as long as this notice is preserved.
1395 -# serial 3
1396
1397 -# _AM_MANGLE_OPTION(NAME)
1398 -# -----------------------
1399 -AC_DEFUN([_AM_MANGLE_OPTION],
1400 -[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
13411401 +# deprecated macros
13421402 +AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
13431403 +# A hint is needed for aclocal from Automake <= 1.9.4:
13441404 +# AC_DEFUN([AC_PROG_INTLTOOL], ...)
1345
1346 -# serial 3
1347
1348 -# _AM_MANGLE_OPTION(NAME)
1349 -# -----------------------
1350 -AC_DEFUN([_AM_MANGLE_OPTION],
1351 -[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
1352 +# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
13531405
13541406 -# _AM_SET_OPTION(NAME)
13551407 -# ------------------------------
13561408 -# Set option NAME. Presently that only means defining a flag for this option.
13571409 -AC_DEFUN([_AM_SET_OPTION],
13581410 -[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
1359 +# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL
13601411
13611412 -# _AM_SET_OPTIONS(OPTIONS)
13621413 -# ----------------------------------
13631414 -# OPTIONS is a space-separated list of Automake options.
13641415 -AC_DEFUN([_AM_SET_OPTIONS],
13651416 -[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
1417 +# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
13661418
13671419 -# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
13681420 -# -------------------------------------------
13691421 -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
13701422 -AC_DEFUN([_AM_IF_OPTION],
13711423 -[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
1372 +# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
1373 +# -----------------------------------------------------------
1374 +# If this macro is not defined by Autoconf, define it here.
1375 +m4_ifdef([AC_PROVIDE_IFELSE],
1376 + [],
1377 + [m4_define([AC_PROVIDE_IFELSE],
1378 + [m4_ifdef([AC_PROVIDE_$1],
1379 + [$2], [$3])])])
1424 +# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL
13801425
13811426 -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
13821427 -# Free Software Foundation, Inc.
14161461 - m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
14171462 - [python python2 python2.5 python2.4 python2.3 python2.2 dnl
14181463 -python2.1 python2.0 python1.6 python1.5])
1419 +# AC_PROG_LIBTOOL
1420 +# ---------------
1421 +AC_DEFUN([AC_PROG_LIBTOOL],
1422 +[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
1423 +dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
1424 +dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
1425 + AC_PROVIDE_IFELSE([AC_PROG_CXX],
1426 + [AC_LIBTOOL_CXX],
1427 + [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
1428 + ])])
1429 +dnl And a similar setup for Fortran 77 support
1430 + AC_PROVIDE_IFELSE([AC_PROG_F77],
1431 + [AC_LIBTOOL_F77],
1432 + [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
1433 +])])
1464 +# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
1465 +# -----------------------------------------------------------
1466 +# If this macro is not defined by Autoconf, define it here.
1467 +m4_ifdef([AC_PROVIDE_IFELSE],
1468 + [],
1469 + [m4_define([AC_PROVIDE_IFELSE],
1470 + [m4_ifdef([AC_PROVIDE_$1],
1471 + [$2], [$3])])])
14341472
14351473 - m4_if([$1],[],[
14361474 - dnl No version check is needed.
14661504 - am_display_PYTHON=$am_cv_pathless_PYTHON
14671505 - fi
14681506 - ])
1507
1508 - if test "$PYTHON" = :; then
1509 - dnl Run any user-specified action, or abort.
1510 - m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])])
1511 - else
1512 +# AC_PROG_LIBTOOL
1513 +# ---------------
1514 +AC_DEFUN([AC_PROG_LIBTOOL],
1515 +[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
1516 +dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
1517 +dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
1518 + AC_PROVIDE_IFELSE([AC_PROG_CXX],
1519 + [AC_LIBTOOL_CXX],
1520 + [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
1521 + ])])
1522 +dnl And a similar setup for Fortran 77 support
1523 + AC_PROVIDE_IFELSE([AC_PROG_F77],
1524 + [AC_LIBTOOL_F77],
1525 + [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
1526 +])])
1527
1528 - dnl Query Python for its version number. Getting [:3] seems to be
1529 - dnl the best way to do this; it's what "site.py" does in the standard
1530 - dnl library.
14691531 +dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
14701532 +dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
14711533 +dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
14841546 + defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
14851547 +])])# AC_PROG_LIBTOOL
14861548
1487 - if test "$PYTHON" = :; then
1488 - dnl Run any user-specified action, or abort.
1489 - m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])])
1490 - else
1491
1492 - dnl Query Python for its version number. Getting [:3] seems to be
1493 - dnl the best way to do this; it's what "site.py" does in the standard
1494 - dnl library.
1549 - AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version],
1550 - [am_cv_python_version=`$PYTHON -c "import sys; print sys.version[[:3]]"`])
1551 - AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
1552
1553 - dnl Use the values of $prefix and $exec_prefix for the corresponding
1554 - dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX. These are made
1555 - dnl distinct variables so they can be overridden if need be. However,
1556 - dnl general consensus is that you shouldn't need this ability.
14951557 +# _AC_PROG_LIBTOOL
14961558 +# ----------------
14971559 +AC_DEFUN([_AC_PROG_LIBTOOL],
15001562 +AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
15011563 +AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
15021564
1503 - AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version],
1504 - [am_cv_python_version=`$PYTHON -c "import sys; print sys.version[[:3]]"`])
1505 - AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
1565 - AC_SUBST([PYTHON_PREFIX], ['${prefix}'])
1566 - AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}'])
15061567 +# This can be used to rebuild libtool when needed
15071568 +LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
15081569
1509 - dnl Use the values of $prefix and $exec_prefix for the corresponding
1510 - dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX. These are made
1511 - dnl distinct variables so they can be overridden if need be. However,
1512 - dnl general consensus is that you shouldn't need this ability.
1570 - dnl At times (like when building shared libraries) you may want
1571 - dnl to know which OS platform Python thinks this is.
15131572 +# Always use our own libtool.
15141573 +LIBTOOL='$(SHELL) $(top_builddir)/libtool'
15151574 +AC_SUBST(LIBTOOL)dnl
15161575
1517 - AC_SUBST([PYTHON_PREFIX], ['${prefix}'])
1518 - AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}'])
1576 - AC_CACHE_CHECK([for $am_display_PYTHON platform], [am_cv_python_platform],
1577 - [am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"`])
1578 - AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform])
15191579 +# Prevent multiple expansion
15201580 +define([AC_PROG_LIBTOOL], [])
15211581 +])# _AC_PROG_LIBTOOL
15221582
1523 - dnl At times (like when building shared libraries) you may want
1524 - dnl to know which OS platform Python thinks this is.
1525
1526 - AC_CACHE_CHECK([for $am_display_PYTHON platform], [am_cv_python_platform],
1527 - [am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"`])
1528 - AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform])
1583
1584 - dnl Set up 4 directories:
15291585 +# AC_LIBTOOL_SETUP
15301586 +# ----------------
15311587 +AC_DEFUN([AC_LIBTOOL_SETUP],
15401596 +AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
15411597 +AC_REQUIRE([AC_PROG_NM])dnl
15421598
1543 +AC_REQUIRE([AC_PROG_LN_S])dnl
1544 +AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
1545 +# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
1546 +AC_REQUIRE([AC_OBJEXT])dnl
1547 +AC_REQUIRE([AC_EXEEXT])dnl
1548 +dnl
1549
1550 - dnl Set up 4 directories:
1551 +AC_LIBTOOL_SYS_MAX_CMD_LEN
1552 +AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
1553 +AC_LIBTOOL_OBJDIR
1554
15551599 - dnl pythondir -- where to install python scripts. This is the
15561600 - dnl site-packages directory, not the python standard library
15571601 - dnl directory like in previous automake betas. This behavior
15641608 - [am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
15651609 - echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`])
15661610 - AC_SUBST([pythondir], [$am_cv_python_pythondir])
1567 +AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
1568 +_LT_AC_PROG_ECHO_BACKSLASH
1611 +AC_REQUIRE([AC_PROG_LN_S])dnl
1612 +AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
1613 +# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
1614 +AC_REQUIRE([AC_OBJEXT])dnl
1615 +AC_REQUIRE([AC_EXEEXT])dnl
1616 +dnl
15691617
15701618 - dnl pkgpythondir -- $PACKAGE directory under pythondir. Was
15711619 - dnl PYTHON_SITE_PACKAGE in previous betas, but this naming is
15721620 - dnl more consistent with the rest of automake.
1621 +AC_LIBTOOL_SYS_MAX_CMD_LEN
1622 +AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
1623 +AC_LIBTOOL_OBJDIR
1624
1625 - AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE])
1626 +AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
1627 +_LT_AC_PROG_ECHO_BACKSLASH
1628
1629 - dnl pyexecdir -- directory for installing python extension modules
1630 - dnl (shared libraries)
1631 - dnl Query distutils for this directory. distutils does not exist in
1632 - dnl Python 1.5, so we fall back to the hardcoded directory if it
1633 - dnl doesn't work.
1634 - AC_CACHE_CHECK([for $am_display_PYTHON extension module directory],
1635 - [am_cv_python_pyexecdir],
1636 - [am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
1637 - echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`])
1638 - AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
15731639 +case $host_os in
15741640 +aix3*)
15751641 + # AIX sometimes has problems with the GCC collect2 program. For some
15821648 + ;;
15831649 +esac
15841650
1585 - AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE])
1651 - dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE)
15861652 +# Sed substitution that helps us do robust quoting. It backslashifies
15871653 +# metacharacters that are still active within double-quoted strings.
15881654 +Xsed='sed -e 1s/^X//'
15891655 +[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
15901656
1591 - dnl pyexecdir -- directory for installing python extension modules
1592 - dnl (shared libraries)
1593 - dnl Query distutils for this directory. distutils does not exist in
1594 - dnl Python 1.5, so we fall back to the hardcoded directory if it
1595 - dnl doesn't work.
1596 - AC_CACHE_CHECK([for $am_display_PYTHON extension module directory],
1597 - [am_cv_python_pyexecdir],
1598 - [am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
1599 - echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`])
1600 - AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
1657 - AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE])
16011658 +# Same as above, but do not quote variable references.
16021659 +[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
16031660
1604 - dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE)
1661 - dnl Run any user-specified action.
1662 - $2
1663 - fi
16051664 +# Sed substitution to delay expansion of an escaped shell variable in a
16061665 +# double_quote_subst'ed string.
16071666 +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
16081667
1609 - AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE])
1668 -])
16101669 +# Sed substitution to avoid accidental globbing in evaled expressions
16111670 +no_glob_subst='s/\*/\\\*/g'
16121671
1613 - dnl Run any user-specified action.
1614 - $2
1615 - fi
16161672 +# Constants:
16171673 +rm="rm -f"
1618
1619 -])
1620 +# Global variables:
1621 +default_ofile=libtool
1622 +can_build_shared=yes
1623
1624 +# All known linkers require a `.a' archive for static linking (except MSVC,
1625 +# which needs '.lib').
1626 +libext=a
1627 +ltmain="$ac_aux_dir/ltmain.sh"
1628 +ofile="$default_ofile"
1629 +with_gnu_ld="$lt_cv_prog_gnu_ld"
16301674
16311675 -# AM_PYTHON_CHECK_VERSION(PROG, VERSION, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
16321676 -# ---------------------------------------------------------------------------
16451689 -for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[[i]]
16461690 -sys.exit(sys.hexversion < minverhex)"
16471691 - AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])])
1648 +AC_CHECK_TOOL(AR, ar, false)
1649 +AC_CHECK_TOOL(RANLIB, ranlib, :)
1650 +AC_CHECK_TOOL(STRIP, strip, :)
1692 +# Global variables:
1693 +default_ofile=libtool
1694 +can_build_shared=yes
16511695
16521696 -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
16531697 -#
16541698 -# This file is free software; the Free Software Foundation
16551699 -# gives unlimited permission to copy and/or distribute it,
16561700 -# with or without modifications, as long as this notice is preserved.
1657 +old_CC="$CC"
1658 +old_CFLAGS="$CFLAGS"
1701 +# All known linkers require a `.a' archive for static linking (except MSVC,
1702 +# which needs '.lib').
1703 +libext=a
1704 +ltmain="$ac_aux_dir/ltmain.sh"
1705 +ofile="$default_ofile"
1706 +with_gnu_ld="$lt_cv_prog_gnu_ld"
16591707
16601708 -# AM_RUN_LOG(COMMAND)
16611709 -# -------------------
16671715 - ac_status=$?
16681716 - echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
16691717 - (exit $ac_status); }])
1718 +AC_CHECK_TOOL(AR, ar, false)
1719 +AC_CHECK_TOOL(RANLIB, ranlib, :)
1720 +AC_CHECK_TOOL(STRIP, strip, :)
1721
1722 -# Check to make sure that the build environment is sane. -*- Autoconf -*-
1723 +old_CC="$CC"
1724 +old_CFLAGS="$CFLAGS"
1725
1726 -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
1727 -# Free Software Foundation, Inc.
1728 -#
1729 -# This file is free software; the Free Software Foundation
1730 -# gives unlimited permission to copy and/or distribute it,
1731 -# with or without modifications, as long as this notice is preserved.
16701732 +# Set sane defaults for various variables
16711733 +test -z "$AR" && AR=ar
16721734 +test -z "$AR_FLAGS" && AR_FLAGS=cru
16851747 +test -z "$STRIP" && STRIP=:
16861748 +test -z "$ac_objext" && ac_objext=o
16871749
1688 -# Check to make sure that the build environment is sane. -*- Autoconf -*-
1750 -# serial 4
16891751 +# Determine commands to create old-style static archives.
16901752 +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
16911753 +old_postinstall_cmds='chmod 644 $oldlib'
16921754 +old_postuninstall_cmds=
1693
1694 -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
1695 -# Free Software Foundation, Inc.
1696 -#
1697 -# This file is free software; the Free Software Foundation
1698 -# gives unlimited permission to copy and/or distribute it,
1699 -# with or without modifications, as long as this notice is preserved.
1700 +if test -n "$RANLIB"; then
1701 + case $host_os in
1702 + openbsd*)
1703 + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
1704 + ;;
1705 + *)
1706 + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
1707 + ;;
1708 + esac
1709 + old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
1710 +fi
1711
1712 -# serial 4
1713 +_LT_CC_BASENAME([$compiler])
17141755
17151756 -# AM_SANITY_CHECK
17161757 -# ---------------
17331774 - rm -f conftest.file
17341775 - if test "$[*]" != "X $srcdir/configure conftest.file" \
17351776 - && test "$[*]" != "X conftest.file $srcdir/configure"; then
1736 +# Only perform the check for file, if the check method requires it
1737 +case $deplibs_check_method in
1738 +file_magic*)
1739 + if test "$file_magic_cmd" = '$MAGIC_CMD'; then
1740 + AC_PATH_MAGIC
1741 + fi
1742 + ;;
1743 +esac
1744
1777 -
17451778 - # If neither matched, then we have a broken ls. This can happen
17461779 - # if, for instance, CONFIG_SHELL is bash and it inherits a
17471780 - # broken ls alias from the environment. This has actually
17491782 - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
17501783 -alias in your environment])
17511784 - fi
1752 +AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
1753 +AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
1754 +enable_win32_dll=yes, enable_win32_dll=no)
1755
1785 -
17561786 - test "$[2]" = conftest.file
17571787 - )
17581788 -then
17611791 -else
17621792 - AC_MSG_ERROR([newly created file is older than distributed files!
17631793 -Check your system clock])
1764 -fi
1794 +if test -n "$RANLIB"; then
1795 + case $host_os in
1796 + openbsd*)
1797 + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
1798 + ;;
1799 + *)
1800 + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
1801 + ;;
1802 + esac
1803 + old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
1804 fi
17651805 -AC_MSG_RESULT(yes)])
1766 +AC_ARG_ENABLE([libtool-lock],
1767 + [AC_HELP_STRING([--disable-libtool-lock],
1768 + [avoid locking (might break parallel builds)])])
1769 +test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
17701806
17711807 -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
17721808 -#
17731809 -# This file is free software; the Free Software Foundation
17741810 -# gives unlimited permission to copy and/or distribute it,
17751811 -# with or without modifications, as long as this notice is preserved.
1776 +AC_ARG_WITH([pic],
1777 + [AC_HELP_STRING([--with-pic],
1778 + [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
1779 + [pic_mode="$withval"],
1780 + [pic_mode=default])
1781 +test -z "$pic_mode" && pic_mode=default
1812 +_LT_CC_BASENAME([$compiler])
17821813
17831814 -# AM_PROG_INSTALL_STRIP
17841815 -# ---------------------
18011832 -fi
18021833 -INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
18031834 -AC_SUBST([INSTALL_STRIP_PROGRAM])])
1804 +# Use C for the default configuration in the libtool script
1805 +tagname=
1806 +AC_LIBTOOL_LANG_C_CONFIG
1807 +_LT_AC_TAGCONFIG
1808 +])# AC_LIBTOOL_SETUP
1835 +# Only perform the check for file, if the check method requires it
1836 +case $deplibs_check_method in
1837 +file_magic*)
1838 + if test "$file_magic_cmd" = '$MAGIC_CMD'; then
1839 + AC_PATH_MAGIC
1840 + fi
1841 + ;;
1842 +esac
18091843
18101844 -# Check how to create a tarball. -*- Autoconf -*-
1845 +AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
1846 +AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
1847 +enable_win32_dll=yes, enable_win32_dll=no)
18111848
18121849 -# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
18131850 -#
18141851 -# This file is free software; the Free Software Foundation
18151852 -# gives unlimited permission to copy and/or distribute it,
18161853 -# with or without modifications, as long as this notice is preserved.
1817 +# _LT_AC_SYS_COMPILER
1818 +# -------------------
1819 +AC_DEFUN([_LT_AC_SYS_COMPILER],
1820 +[AC_REQUIRE([AC_PROG_CC])dnl
1854 +AC_ARG_ENABLE([libtool-lock],
1855 + [AC_HELP_STRING([--disable-libtool-lock],
1856 + [avoid locking (might break parallel builds)])])
1857 +test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
18211858
18221859 -# serial 2
1823 +# If no C compiler was specified, use CC.
1824 +LTCC=${LTCC-"$CC"}
1860 +AC_ARG_WITH([pic],
1861 + [AC_HELP_STRING([--with-pic],
1862 + [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
1863 + [pic_mode="$withval"],
1864 + [pic_mode=default])
1865 +test -z "$pic_mode" && pic_mode=default
18251866
18261867 -# _AM_PROG_TAR(FORMAT)
18271868 -# --------------------
18851926 - am__untar=false
18861927 - ;;
18871928 - esac
1888 +# If no C compiler flags were specified, use CFLAGS.
1889 +LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
1929 +# Use C for the default configuration in the libtool script
1930 +tagname=
1931 +AC_LIBTOOL_LANG_C_CONFIG
1932 +_LT_AC_TAGCONFIG
1933 +])# AC_LIBTOOL_SETUP
18901934
18911935 - # If the value was cached, stop now. We just wanted to have am__tar
18921936 - # and am__untar set.
18931937 - test -n "${am_cv_prog_tar_$1}" && break
1894 +# Allow CC to be a program name with arguments.
1895 +compiler=$CC
1896 +])# _LT_AC_SYS_COMPILER
18971938
18981939 - # tar/untar a dummy directory, and stop if the command works
18991940 - rm -rf conftest.dir
19051946 - AM_RUN_LOG([$am__untar <conftest.tar])
19061947 - grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
19071948 - fi
1908 +
1909 +# _LT_CC_BASENAME(CC)
1949 -done
1950 -rm -rf conftest.dir
1951 +# _LT_AC_SYS_COMPILER
19101952 +# -------------------
1911 +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
1912 +AC_DEFUN([_LT_CC_BASENAME],
1913 +[for cc_temp in $1""; do
1914 + case $cc_temp in
1915 + compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
1916 + distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
1917 + \-*) ;;
1918 + *) break;;
1919 + esac
1920 done
1921 -rm -rf conftest.dir
1922 +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
1923 +])
1953 +AC_DEFUN([_LT_AC_SYS_COMPILER],
1954 +[AC_REQUIRE([AC_PROG_CC])dnl
19241955
19251956 -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
19261957 -AC_MSG_RESULT([$am_cv_prog_tar_$1])])
19271958 -AC_SUBST([am__tar])
19281959 -AC_SUBST([am__untar])
19291960 -]) # _AM_PROG_TAR
1961 +# If no C compiler was specified, use CC.
1962 +LTCC=${LTCC-"$CC"}
19301963
19311964 -# Copyright (C) 1995-2002 Free Software Foundation, Inc.
19321965 -# Copyright (C) 2001-2003,2004 Red Hat, Inc.
19601993 -# to configure GLib then an older version to configure a package
19611994 -# using AM_GLIB_GNU_GETTEXT
19621995 -AC_PREREQ(2.53)
1963 +# _LT_COMPILER_BOILERPLATE
1964 +# ------------------------
1965 +# Check for compiler boilerplate output or warnings with
1966 +# the simple compiler test code.
1967 +AC_DEFUN([_LT_COMPILER_BOILERPLATE],
1968 +[ac_outfile=conftest.$ac_objext
1969 +printf "$lt_simple_compile_test_code" >conftest.$ac_ext
1970 +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
1971 +_lt_compiler_boilerplate=`cat conftest.err`
1972 +$rm conftest*
1973 +])# _LT_COMPILER_BOILERPLATE
1996 +# If no C compiler flags were specified, use CFLAGS.
1997 +LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
19741998
19751999 -dnl
19762000 -dnl We go to great lengths to make sure that aclocal won't
19832007 -dnl At the end, if we're not within glib, we'll define the public
19842008 -dnl definitions in terms of our private definitions.
19852009 -dnl
2010 +# Allow CC to be a program name with arguments.
2011 +compiler=$CC
2012 +])# _LT_AC_SYS_COMPILER
19862013
19872014 -# GLIB_LC_MESSAGES
19882015 -#--------------------
19972024 - [Define if your <locale.h> file defines LC_MESSAGES.])
19982025 - fi
19992026 - fi])
2000 +# _LT_LINKER_BOILERPLATE
2001 +# ----------------------
2002 +# Check for linker boilerplate output or warnings with
2003 +# the simple link test code.
2004 +AC_DEFUN([_LT_LINKER_BOILERPLATE],
2005 +[ac_outfile=conftest.$ac_objext
2006 +printf "$lt_simple_link_test_code" >conftest.$ac_ext
2007 +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
2008 +_lt_linker_boilerplate=`cat conftest.err`
2009 +$rm conftest*
2010 +])# _LT_LINKER_BOILERPLATE
20112027
20122028 -# GLIB_PATH_PROG_WITH_TEST
20132029 -#----------------------------
20472063 - AC_MSG_RESULT(no)
20482064 -fi
20492065 -AC_SUBST($1)dnl
2050 -])
2066 +# _LT_CC_BASENAME(CC)
2067 +# -------------------
2068 +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
2069 +AC_DEFUN([_LT_CC_BASENAME],
2070 +[for cc_temp in $1""; do
2071 + case $cc_temp in
2072 + compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
2073 + distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
2074 + \-*) ;;
2075 + *) break;;
2076 + esac
2077 +done
2078 +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
2079 ])
20512080
20522081 -# GLIB_WITH_NLS
20532082 -#-----------------
20542083 -glib_DEFUN([GLIB_WITH_NLS],
20552084 - dnl NLS is obligatory
2056 - [USE_NLS=yes
2085 - [AC_REQUIRE([AC_CANONICAL_HOST])dnl
2086 - USE_NLS=yes
20572087 - AC_SUBST(USE_NLS)
2058 +# _LT_AC_SYS_LIBPATH_AIX
2059 +# ----------------------
2060 +# Links a minimal program and checks the executable
2061 +# for the system default hardcoded library path. In most cases,
2062 +# this is /usr/lib:/lib, but when the MPI compilers are used
2063 +# the location of the communication and MPI libs are included too.
2064 +# If we don't find anything, use the default library path according
2065 +# to the aix ld manual.
2066 +AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
2067 +[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
2068 +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
2069 +}'`
2070 +# Check for a 64-bit object if we didn't find anything.
2071 +if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
2072 +}'`; fi],[])
2073 +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
2074 +])# _LT_AC_SYS_LIBPATH_AIX
20752088
20762089 - gt_cv_have_gettext=no
2090 +# _LT_COMPILER_BOILERPLATE
2091 +# ------------------------
2092 +# Check for compiler boilerplate output or warnings with
2093 +# the simple compiler test code.
2094 +AC_DEFUN([_LT_COMPILER_BOILERPLATE],
2095 +[ac_outfile=conftest.$ac_objext
2096 +printf "$lt_simple_compile_test_code" >conftest.$ac_ext
2097 +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
2098 +_lt_compiler_boilerplate=`cat conftest.err`
2099 +$rm conftest*
2100 +])# _LT_COMPILER_BOILERPLATE
20772101
20782102 - CATOBJEXT=NONE
20792103 - XGETTEXT=:
20802104 - INTLLIBS=
2081 +# _LT_AC_SHELL_INIT(ARG)
2082 +# ----------------------
2083 +AC_DEFUN([_LT_AC_SHELL_INIT],
2084 +[ifdef([AC_DIVERSION_NOTICE],
2085 + [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
2086 + [AC_DIVERT_PUSH(NOTICE)])
2087 +$1
2088 +AC_DIVERT_POP
2089 +])# _LT_AC_SHELL_INIT
20902105
20912106 - AC_CHECK_HEADER(libintl.h,
20922107 - [gt_cv_func_dgettext_libintl="no"
20932108 - libintl_extra_libs=""
2109 +# _LT_LINKER_BOILERPLATE
2110 +# ----------------------
2111 +# Check for linker boilerplate output or warnings with
2112 +# the simple link test code.
2113 +AC_DEFUN([_LT_LINKER_BOILERPLATE],
2114 +[ac_outfile=conftest.$ac_objext
2115 +printf "$lt_simple_link_test_code" >conftest.$ac_ext
2116 +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
2117 +_lt_linker_boilerplate=`cat conftest.err`
2118 +$rm conftest*
2119 +])# _LT_LINKER_BOILERPLATE
20942120
20952121 - #
20962122 - # First check in libc
21182144 - if test "$gt_cv_func_ngettext_libc" = "yes" ; then
21192145 - AC_CHECK_FUNCS(bind_textdomain_codeset)
21202146 - fi
2121 +# _LT_AC_PROG_ECHO_BACKSLASH
2122 +# --------------------------
2123 +# Add some code to the start of the generated configure script which
2124 +# will find an echo command which doesn't interpret backslashes.
2125 +AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
2126 +[_LT_AC_SHELL_INIT([
2127 +# Check that we are running under the correct shell.
2128 +SHELL=${CONFIG_SHELL-/bin/sh}
21292147
21302148 - #
21312149 - # If we don't have everything we want, check in libintl
21382156 - [AC_CHECK_LIB(intl, ngettext,
21392157 - [AC_CHECK_LIB(intl, dgettext,
21402158 - gt_cv_func_dgettext_libintl=yes)])])
2141 +case X$ECHO in
2142 +X*--fallback-echo)
2143 + # Remove one level of quotation (which was required for Make).
2144 + ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
2145 + ;;
2146 +esac
2159 +# _LT_AC_SYS_LIBPATH_AIX
2160 +# ----------------------
2161 +# Links a minimal program and checks the executable
2162 +# for the system default hardcoded library path. In most cases,
2163 +# this is /usr/lib:/lib, but when the MPI compilers are used
2164 +# the location of the communication and MPI libs are included too.
2165 +# If we don't find anything, use the default library path according
2166 +# to the aix ld manual.
2167 +AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
2168 +[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
2169 +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
2170 +}'`
2171 +# Check for a 64-bit object if we didn't find anything.
2172 +if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
2173 +}'`; fi],[])
2174 +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
2175 +])# _LT_AC_SYS_LIBPATH_AIX
21472176
21482177 - if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
21492178 - AC_MSG_CHECKING([if -liconv is needed to use gettext])
21552184 - :,-liconv)],
21562185 - :,-liconv)
21572186 - fi
2158 +echo=${ECHO-echo}
2159 +if test "X[$]1" = X--no-reexec; then
2160 + # Discard the --no-reexec flag, and continue.
2161 + shift
2162 +elif test "X[$]1" = X--fallback-echo; then
2163 + # Avoid inline document here, it may be left over
2164 + :
2165 +elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
2166 + # Yippee, $echo works!
2167 + :
2168 +else
2169 + # Restart under the correct shell.
2170 + exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
2171 +fi
21722187
21732188 - #
21742189 - # If we found libintl, then check in it for bind_textdomain_codeset();
21812196 - unset ac_cv_func_bind_textdomain_codeset
21822197 - AC_CHECK_FUNCS(bind_textdomain_codeset)
21832198 - LIBS="$glib_save_LIBS"
2184 +if test "X[$]1" = X--fallback-echo; then
2185 + # used as fallback echo
2186 + shift
2187 + cat <<EOF
2188 +[$]*
2189 +EOF
2190 + exit 0
2191 +fi
2199 +# _LT_AC_SHELL_INIT(ARG)
2200 +# ----------------------
2201 +AC_DEFUN([_LT_AC_SHELL_INIT],
2202 +[ifdef([AC_DIVERSION_NOTICE],
2203 + [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
2204 + [AC_DIVERT_PUSH(NOTICE)])
2205 +$1
2206 +AC_DIVERT_POP
2207 +])# _LT_AC_SHELL_INIT
21922208
21932209 - if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
21942210 - gt_cv_func_dgettext_libc=no
22002216 - fi
22012217 - fi
22022218 - fi
2203 +# The HP-UX ksh and POSIX shell print the target directory to stdout
2204 +# if CDPATH is set.
2205 +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
22062219
22072220 - if test "$gt_cv_func_dgettext_libc" = "yes" \
22082221 - || test "$gt_cv_func_dgettext_libintl" = "yes"; then
22542267 - fi
22552268 - fi
22562269 - ])
2257 -
2270 +# _LT_AC_PROG_ECHO_BACKSLASH
2271 +# --------------------------
2272 +# Add some code to the start of the generated configure script which
2273 +# will find an echo command which doesn't interpret backslashes.
2274 +AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
2275 +[_LT_AC_SHELL_INIT([
2276 +# Check that we are running under the correct shell.
2277 +SHELL=${CONFIG_SHELL-/bin/sh}
2278
22582279 - if test "$gt_cv_have_gettext" = "yes" ; then
22592280 - AC_DEFINE(ENABLE_NLS, 1,
22602281 - [always defined to indicate that i18n is enabled])
2261 +if test -z "$ECHO"; then
2262 +if test "X${echo_test_string+set}" != Xset; then
2263 +# find a string as large as possible, as long as the shell can cope with it
2264 + for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
2265 + # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
2266 + if (echo_test_string=`eval $cmd`) 2>/dev/null &&
2267 + echo_test_string=`eval $cmd` &&
2268 + (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
2269 + then
2270 + break
2271 fi
2272 + done
2273 +fi
2282 - fi
2283 +case X$ECHO in
2284 +X*--fallback-echo)
2285 + # Remove one level of quotation (which was required for Make).
2286 + ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
2287 + ;;
2288 +esac
22742289
22752290 - dnl Test whether we really found GNU xgettext.
22762291 - if test "$XGETTEXT" != ":"; then
22832298 - [found xgettext program is not GNU xgettext; ignore it])
22842299 - XGETTEXT=":"
22852300 - fi
2301 - fi
2302 -
2303 - # We need to process the po/ directory.
2304 - POSUB=po
2305 +echo=${ECHO-echo}
2306 +if test "X[$]1" = X--no-reexec; then
2307 + # Discard the --no-reexec flag, and continue.
2308 + shift
2309 +elif test "X[$]1" = X--fallback-echo; then
2310 + # Avoid inline document here, it may be left over
2311 + :
2312 +elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
2313 + # Yippee, $echo works!
2314 + :
2315 +else
2316 + # Restart under the correct shell.
2317 + exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
2318 +fi
2319
2320 - AC_OUTPUT_COMMANDS(
2321 - [case "$CONFIG_FILES" in *po/Makefile.in*)
2322 - sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
2323 - esac])
2324 +if test "X[$]1" = X--fallback-echo; then
2325 + # used as fallback echo
2326 + shift
2327 + cat <<EOF
2328 +[$]*
2329 +EOF
2330 + exit 0
2331 +fi
2332
2333 - dnl These rules are solely for the distribution goal. While doing this
2334 - dnl we only have to keep exactly one list of the available catalogs
2335 - dnl in configure.in.
2336 - for lang in $ALL_LINGUAS; do
2337 - GMOFILES="$GMOFILES $lang.gmo"
2338 - POFILES="$POFILES $lang.po"
2339 - done
2340 +# The HP-UX ksh and POSIX shell print the target directory to stdout
2341 +# if CDPATH is set.
2342 +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
2343
2344 - dnl Make all variables we use known to autoconf.
2345 - AC_SUBST(CATALOGS)
2346 - AC_SUBST(CATOBJEXT)
2347 - AC_SUBST(DATADIRNAME)
2348 - AC_SUBST(GMOFILES)
2349 - AC_SUBST(INSTOBJEXT)
2350 - AC_SUBST(INTLLIBS)
2351 - AC_SUBST(PO_IN_DATADIR_TRUE)
2352 - AC_SUBST(PO_IN_DATADIR_FALSE)
2353 - AC_SUBST(POFILES)
2354 - AC_SUBST(POSUB)
2355 - ])
2356 +if test -z "$ECHO"; then
2357 +if test "X${echo_test_string+set}" != Xset; then
2358 +# find a string as large as possible, as long as the shell can cope with it
2359 + for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
2360 + # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
2361 + if (echo_test_string=`eval $cmd`) 2>/dev/null &&
2362 + echo_test_string=`eval $cmd` &&
2363 + (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
2364 + then
2365 + break
2366 + fi
2367 + done
2368 +fi
2369
2370 -# AM_GLIB_GNU_GETTEXT
2371 -# -------------------
2372 -# Do checks necessary for use of gettext. If a suitable implementation
2373 -# of gettext is found in either in libintl or in the C library,
2374 -# it will set INTLLIBS to the libraries needed for use of gettext
2375 -# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
2376 -# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
2377 -# on various variables needed by the Makefile.in.in installed by
2378 -# glib-gettextize.
2379 -dnl
2380 -glib_DEFUN([GLIB_GNU_GETTEXT],
2381 - [AC_REQUIRE([AC_PROG_CC])dnl
2382 - AC_REQUIRE([AC_HEADER_STDC])dnl
2383 -
2384 - GLIB_LC_MESSAGES
2385 - GLIB_WITH_NLS
22862386 +if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
22872387 + echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
22882388 + test "X$echo_testing_string" = "X$echo_test_string"; then
22932393 + # echo "$something" | sed 's/\\/\\\\/g'
22942394 + #
22952395 + # So, first we look for a working echo in the user's PATH.
2296 +
2396
2397 - if test "$gt_cv_have_gettext" = "yes"; then
2398 - if test "x$ALL_LINGUAS" = "x"; then
2399 - LINGUAS=
2400 - else
2401 - AC_MSG_CHECKING(for catalogs to be installed)
2402 - NEW_LINGUAS=
2403 - for presentlang in $ALL_LINGUAS; do
2404 - useit=no
2405 - if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
2406 - desiredlanguages="$LINGUAS"
2407 - else
2408 - desiredlanguages="$ALL_LINGUAS"
2409 - fi
2410 - for desiredlang in $desiredlanguages; do
2411 - # Use the presentlang catalog if desiredlang is
2412 - # a. equal to presentlang, or
2413 - # b. a variant of presentlang (because in this case,
2414 - # presentlang can be used as a fallback for messages
2415 - # which are not translated in the desiredlang catalog).
2416 - case "$desiredlang" in
2417 - "$presentlang"*) useit=yes;;
2418 - esac
2419 - done
2420 - if test $useit = yes; then
2421 - NEW_LINGUAS="$NEW_LINGUAS $presentlang"
2422 - fi
2423 - done
2424 - LINGUAS=$NEW_LINGUAS
2425 - AC_MSG_RESULT($LINGUAS)
2426 - fi
22972427 + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
22982428 + for dir in $PATH /usr/ucb; do
22992429 + IFS="$lt_save_ifs"
23032433 + test "X$echo_testing_string" = "X$echo_test_string"; then
23042434 + echo="$dir/echo"
23052435 + break
2306 fi
2436 + fi
23072437 + done
23082438 + IFS="$lt_save_ifs"
23092439
2310 - # We need to process the po/ directory.
2311 - POSUB=po
2440 - dnl Construct list of names of catalog files to be constructed.
2441 - if test -n "$LINGUAS"; then
2442 - for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
2443 - fi
2444 - fi
23122445 + if test "X$echo" = Xecho; then
23132446 + # We didn't find a better echo, so look for alternatives.
23142447 + if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
23502483 + # maybe with a smaller string...
23512484 + prev=:
23522485
2353 - AC_OUTPUT_COMMANDS(
2354 - [case "$CONFIG_FILES" in *po/Makefile.in*)
2355 - sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
2356 - esac])
2486 - dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
2487 - dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
2488 - dnl Try to locate is.
2489 - MKINSTALLDIRS=
2490 - if test -n "$ac_aux_dir"; then
2491 - MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
2492 - fi
2493 - if test -z "$MKINSTALLDIRS"; then
2494 - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
2495 - fi
2496 - AC_SUBST(MKINSTALLDIRS)
23572497 + for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
23582498 + if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
23592499 + then
23622502 + prev="$cmd"
23632503 + done
23642504
2365 - dnl These rules are solely for the distribution goal. While doing this
2366 - dnl we only have to keep exactly one list of the available catalogs
2367 - dnl in configure.in.
2368 - for lang in $ALL_LINGUAS; do
2369 - GMOFILES="$GMOFILES $lang.gmo"
2370 - POFILES="$POFILES $lang.po"
2371 - done
2505 - dnl Generate list of files to be processed by xgettext which will
2506 - dnl be included in po/Makefile.
2507 - test -d po || mkdir po
2508 - if test "x$srcdir" != "x."; then
2509 - if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
2510 - posrcprefix="$srcdir/"
2511 - else
2512 - posrcprefix="../$srcdir/"
2513 - fi
2514 - else
2515 - posrcprefix="../"
2516 - fi
2517 - rm -f po/POTFILES
2518 - sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
2519 - < $srcdir/po/POTFILES.in > po/POTFILES
2520 - ])
23722521 + if test "$prev" != 'sed 50q "[$]0"'; then
23732522 + echo_test_string=`eval $prev`
23742523 + export echo_test_string
23832532 +fi
23842533 +fi
23852534
2386 - dnl Make all variables we use known to autoconf.
2387 - AC_SUBST(CATALOGS)
2388 - AC_SUBST(CATOBJEXT)
2389 - AC_SUBST(DATADIRNAME)
2390 - AC_SUBST(GMOFILES)
2391 - AC_SUBST(INSTOBJEXT)
2392 - AC_SUBST(INTLLIBS)
2393 - AC_SUBST(PO_IN_DATADIR_TRUE)
2394 - AC_SUBST(PO_IN_DATADIR_FALSE)
2395 - AC_SUBST(POFILES)
2396 - AC_SUBST(POSUB)
2397 - ])
2398 +# Copy echo and quote the copy suitably for passing to libtool from
2399 +# the Makefile, instead of quoting the original, which is used later.
2400 +ECHO=$echo
2401 +if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
2402 + ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
2403 +fi
2404
2405 -# AM_GLIB_GNU_GETTEXT
2406 -# -------------------
2407 -# Do checks necessary for use of gettext. If a suitable implementation
2408 -# of gettext is found in either in libintl or in the C library,
2409 -# it will set INTLLIBS to the libraries needed for use of gettext
2410 -# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
2411 -# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
2412 -# on various variables needed by the Makefile.in.in installed by
2413 -# glib-gettextize.
2414 -dnl
2415 -glib_DEFUN([GLIB_GNU_GETTEXT],
2416 - [AC_REQUIRE([AC_PROG_CC])dnl
2417 - AC_REQUIRE([AC_HEADER_STDC])dnl
2418 -
2419 - GLIB_LC_MESSAGES
2420 - GLIB_WITH_NLS
2421 +AC_SUBST(ECHO)
2422 +])])# _LT_AC_PROG_ECHO_BACKSLASH
2423
2424 - if test "$gt_cv_have_gettext" = "yes"; then
2425 - if test "x$ALL_LINGUAS" = "x"; then
2426 - LINGUAS=
2427 - else
2428 - AC_MSG_CHECKING(for catalogs to be installed)
2429 - NEW_LINGUAS=
2430 - for presentlang in $ALL_LINGUAS; do
2431 - useit=no
2432 - if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
2433 - desiredlanguages="$LINGUAS"
2434 - else
2435 - desiredlanguages="$ALL_LINGUAS"
2436 - fi
2437 - for desiredlang in $desiredlanguages; do
2438 - # Use the presentlang catalog if desiredlang is
2439 - # a. equal to presentlang, or
2440 - # b. a variant of presentlang (because in this case,
2441 - # presentlang can be used as a fallback for messages
2442 - # which are not translated in the desiredlang catalog).
2443 - case "$desiredlang" in
2444 - "$presentlang"*) useit=yes;;
2445 - esac
2446 - done
2447 - if test $useit = yes; then
2448 - NEW_LINGUAS="$NEW_LINGUAS $presentlang"
2449 - fi
2450 - done
2451 - LINGUAS=$NEW_LINGUAS
2452 - AC_MSG_RESULT($LINGUAS)
2453 - fi
2454
2455 - dnl Construct list of names of catalog files to be constructed.
2456 - if test -n "$LINGUAS"; then
2457 - for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
2458 - fi
2459 - fi
2460 +# _LT_AC_LOCK
2461 +# -----------
2462 +AC_DEFUN([_LT_AC_LOCK],
2463 +[AC_ARG_ENABLE([libtool-lock],
2464 + [AC_HELP_STRING([--disable-libtool-lock],
2465 + [avoid locking (might break parallel builds)])])
2466 +test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
2467
2468 - dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
2469 - dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
2470 - dnl Try to locate is.
2471 - MKINSTALLDIRS=
2472 - if test -n "$ac_aux_dir"; then
2473 - MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
2474 - fi
2475 - if test -z "$MKINSTALLDIRS"; then
2476 - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
2477 - fi
2478 - AC_SUBST(MKINSTALLDIRS)
2479 -
2480 - dnl Generate list of files to be processed by xgettext which will
2481 - dnl be included in po/Makefile.
2482 - test -d po || mkdir po
2483 - if test "x$srcdir" != "x."; then
2484 - if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
2485 - posrcprefix="$srcdir/"
2486 - else
2487 - posrcprefix="../$srcdir/"
2488 - fi
2489 +# Some flags need to be propagated to the compiler or linker for good
2490 +# libtool support.
2491 +case $host in
2492 +ia64-*-hpux*)
2493 + # Find out which ABI we are using.
2494 + echo 'int i;' > conftest.$ac_ext
2495 + if AC_TRY_EVAL(ac_compile); then
2496 + case `/usr/bin/file conftest.$ac_objext` in
2497 + *ELF-32*)
2498 + HPUX_IA64_MODE="32"
2499 + ;;
2500 + *ELF-64*)
2501 + HPUX_IA64_MODE="64"
2502 + ;;
2503 + esac
2504 + fi
2505 + rm -rf conftest*
2506 + ;;
2507 +*-*-irix6*)
2508 + # Find out which ABI we are using.
2509 + echo '[#]line __oline__ "configure"' > conftest.$ac_ext
2510 + if AC_TRY_EVAL(ac_compile); then
2511 + if test "$lt_cv_prog_gnu_ld" = yes; then
2512 + case `/usr/bin/file conftest.$ac_objext` in
2513 + *32-bit*)
2514 + LD="${LD-ld} -melf32bsmip"
2515 + ;;
2516 + *N32*)
2517 + LD="${LD-ld} -melf32bmipn32"
2518 + ;;
2519 + *64-bit*)
2520 + LD="${LD-ld} -melf64bmip"
2521 + ;;
2522 + esac
2523 else
2524 - posrcprefix="../"
2525 + case `/usr/bin/file conftest.$ac_objext` in
2526 + *32-bit*)
2527 + LD="${LD-ld} -32"
2528 + ;;
2529 + *N32*)
2530 + LD="${LD-ld} -n32"
2531 + ;;
2532 + *64-bit*)
2533 + LD="${LD-ld} -64"
2534 + ;;
2535 + esac
2536 fi
2537 - rm -f po/POTFILES
2538 - sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
2539 - < $srcdir/po/POTFILES.in > po/POTFILES
2540 - ])
2541 -
25422535 -# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
25432536 -# -------------------------------
25442537 -# Define VARIABLE to the location where catalog files will
25472540 -[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
25482541 -glib_save_prefix="$prefix"
25492542 -glib_save_exec_prefix="$exec_prefix"
2543 -glib_save_datarootdir="$datarootdir"
25502544 -test "x$prefix" = xNONE && prefix=$ac_default_prefix
25512545 -test "x$exec_prefix" = xNONE && exec_prefix=$prefix
2546 -datarootdir=`eval echo "${datarootdir}"`
25522547 -if test "x$CATOBJEXT" = "x.mo" ; then
25532548 - localedir=`eval echo "${libdir}/locale"`
25542549 -else
25552550 - localedir=`eval echo "${datadir}/locale"`
2556 -fi
2551 +# Copy echo and quote the copy suitably for passing to libtool from
2552 +# the Makefile, instead of quoting the original, which is used later.
2553 +ECHO=$echo
2554 +if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
2555 + ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
2556 fi
25572557 -prefix="$glib_save_prefix"
25582558 -exec_prefix="$glib_save_exec_prefix"
2559 -datarootdir="$glib_save_datarootdir"
25592560 -AC_DEFINE_UNQUOTED($1, "$localedir",
25602561 - [Define the location where the catalogs will be installed])
25612562 -])
2562 -
2563
25632564 -dnl
25642565 -dnl Now the definitions that aclocal will find
25652566 -dnl
25802581 - AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
25812582 - [Turn on compiler warnings]),,
25822583 - [enable_compile_warnings="m4_default([$1],[yes])"])
2583 -
2584 +AC_SUBST(ECHO)
2585 +])])# _LT_AC_PROG_ECHO_BACKSLASH
2586
25842587 - warnCFLAGS=
25852588 - if test "x$GCC" != xyes; then
25862589 - enable_compile_warnings=no
25872590 - fi
2591
2592 - warning_flags=
2593 - realsave_CFLAGS="$CFLAGS"
2594 +# _LT_AC_LOCK
2595 +# -----------
2596 +AC_DEFUN([_LT_AC_LOCK],
2597 +[AC_ARG_ENABLE([libtool-lock],
2598 + [AC_HELP_STRING([--disable-libtool-lock],
2599 + [avoid locking (might break parallel builds)])])
2600 +test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
2601
2602 - case "$enable_compile_warnings" in
2603 - no)
2604 - warning_flags=
2605 - ;;
2606 - minimum)
2607 - warning_flags="-Wall"
2608 - ;;
2609 - yes)
2610 - warning_flags="-Wall -Wmissing-prototypes"
2611 - ;;
2612 - maximum|error)
2613 - warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
2614 - CFLAGS="$warning_flags $CFLAGS"
2615 - for option in -Wno-sign-compare; do
2616 - SAVE_CFLAGS="$CFLAGS"
2617 - CFLAGS="$CFLAGS $option"
2618 - AC_MSG_CHECKING([whether gcc understands $option])
2619 - AC_TRY_COMPILE([], [],
2620 - has_option=yes,
2621 - has_option=no,)
2622 - CFLAGS="$SAVE_CFLAGS"
2623 - AC_MSG_RESULT($has_option)
2624 - if test $has_option = yes; then
2625 - warning_flags="$warning_flags $option"
2626 - fi
2627 - unset has_option
2628 - unset SAVE_CFLAGS
2629 - done
2630 - unset option
2631 - if test "$enable_compile_warnings" = "error" ; then
2632 - warning_flags="$warning_flags -Werror"
2633 - fi
2634 - ;;
2635 - *)
2636 - AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
2637 - ;;
2638 +# Some flags need to be propagated to the compiler or linker for good
2639 +# libtool support.
2640 +case $host in
2641 +ia64-*-hpux*)
2642 + # Find out which ABI we are using.
2643 + echo 'int i;' > conftest.$ac_ext
2644 + if AC_TRY_EVAL(ac_compile); then
2645 + case `/usr/bin/file conftest.$ac_objext` in
2646 + *ELF-32*)
2647 + HPUX_IA64_MODE="32"
2648 + ;;
2649 + *ELF-64*)
2650 + HPUX_IA64_MODE="64"
2651 + ;;
2652 esac
2653 - CFLAGS="$realsave_CFLAGS"
2654 - AC_MSG_CHECKING(what warning flags to pass to the C compiler)
2655 - AC_MSG_RESULT($warning_flags)
2656 -
2657 - AC_ARG_ENABLE(iso-c,
2658 - AC_HELP_STRING([--enable-iso-c],
2659 - [Try to warn if code is not ISO C ]),,
2660 - [enable_iso_c=no])
2661 -
2662 - AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
2663 - complCFLAGS=
2664 - if test "x$enable_iso_c" != "xno"; then
2665 - if test "x$GCC" = "xyes"; then
2666 - case " $CFLAGS " in
2667 - *[\ \ ]-ansi[\ \ ]*) ;;
2668 - *) complCFLAGS="$complCFLAGS -ansi" ;;
2669 - esac
2670 - case " $CFLAGS " in
2671 - *[\ \ ]-pedantic[\ \ ]*) ;;
2672 - *) complCFLAGS="$complCFLAGS -pedantic" ;;
2673 - esac
2674 - fi
2675 - fi
2676 - AC_MSG_RESULT($complCFLAGS)
2677 -
2678 - WARN_CFLAGS="$warning_flags $complCFLAGS"
2679 - AC_SUBST(WARN_CFLAGS)
2680 -])
2681 -
2682 -dnl For C++, do basically the same thing.
25882683 + fi
25892684 + rm -rf conftest*
25902685 + ;;
2591
2592 - warning_flags=
2593 - realsave_CFLAGS="$CFLAGS"
2686 +*-*-irix6*)
2687 + # Find out which ABI we are using.
2688 + echo '[#]line __oline__ "configure"' > conftest.$ac_ext
2689 + if AC_TRY_EVAL(ac_compile); then
2690 + if test "$lt_cv_prog_gnu_ld" = yes; then
2691 + case `/usr/bin/file conftest.$ac_objext` in
2692 + *32-bit*)
2693 + LD="${LD-ld} -melf32bsmip"
2694 + ;;
2695 + *N32*)
2696 + LD="${LD-ld} -melf32bmipn32"
2697 + ;;
2698 + *64-bit*)
2699 + LD="${LD-ld} -melf64bmip"
2700 + ;;
2701 + esac
2702 + else
2703 + case `/usr/bin/file conftest.$ac_objext` in
2704 + *32-bit*)
2705 + LD="${LD-ld} -32"
2706 + ;;
2707 + *N32*)
2708 + LD="${LD-ld} -n32"
2709 + ;;
2710 + *64-bit*)
2711 + LD="${LD-ld} -64"
2712 + ;;
2713 + esac
2714 + fi
2715 + fi
2716 + rm -rf conftest*
2717 + ;;
2718
2719 -AC_DEFUN([GNOME_CXX_WARNINGS],[
2720 - AC_ARG_ENABLE(cxx-warnings,
2721 - AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
2722 - [Turn on compiler warnings.]),,
2723 - [enable_cxx_warnings="m4_default([$1],[minimum])"])
25942724 +x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
25952725 + # Find out which ABI we are using.
25962726 + echo 'int i;' > conftest.$ac_ext
26332763 + rm -rf conftest*
26342764 + ;;
26352765
2636 - case "$enable_compile_warnings" in
2637 - no)
2638 - warning_flags=
2639 - ;;
2640 - minimum)
2641 - warning_flags="-Wall"
2642 - ;;
2643 - yes)
2644 - warning_flags="-Wall -Wmissing-prototypes"
2645 - ;;
2646 - maximum|error)
2647 - warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
2648 - CFLAGS="$warning_flags $CFLAGS"
2649 - for option in -Wno-sign-compare; do
2650 - SAVE_CFLAGS="$CFLAGS"
2651 - CFLAGS="$CFLAGS $option"
2652 - AC_MSG_CHECKING([whether gcc understands $option])
2653 - AC_TRY_COMPILE([], [],
2654 - has_option=yes,
2655 - has_option=no,)
2656 - CFLAGS="$SAVE_CFLAGS"
2657 - AC_MSG_RESULT($has_option)
2658 - if test $has_option = yes; then
2659 - warning_flags="$warning_flags $option"
2660 - fi
2661 - unset has_option
2662 - unset SAVE_CFLAGS
2663 - done
2664 - unset option
2665 - if test "$enable_compile_warnings" = "error" ; then
2666 - warning_flags="$warning_flags -Werror"
2667 - fi
2668 - ;;
2669 - *)
2670 - AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
2671 - ;;
2766 - AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
2767 - warnCXXFLAGS=
2768 - if test "x$GXX" != xyes; then
2769 - enable_cxx_warnings=no
26722770 +*-*-sco3.2v5*)
26732771 + # On SCO OpenServer 5, we need -belf to get full-featured binaries.
26742772 + SAVE_CFLAGS="$CFLAGS"
26802778 + if test x"$lt_cv_cc_needs_belf" != x"yes"; then
26812779 + # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
26822780 + CFLAGS="$SAVE_CFLAGS"
2683 + fi
2781 fi
2782 - if test "x$enable_cxx_warnings" != "xno"; then
2783 - if test "x$GXX" = "xyes"; then
2784 - case " $CXXFLAGS " in
2785 - *[\ \ ]-Wall[\ \ ]*) ;;
2786 - *) warnCXXFLAGS="-Wall -Wno-unused" ;;
26842787 + ;;
26852788 +sparc*-*solaris*)
26862789 + # Find out which ABI we are using.
26912794 + case $lt_cv_prog_gnu_ld in
26922795 + yes*) LD="${LD-ld} -m elf64_sparc" ;;
26932796 + *) LD="${LD-ld} -64" ;;
2694 + esac
2797 esac
2798 -
2799 - ## -W is not all that useful. And it cannot be controlled
2800 - ## with individual -Wno-xxx flags, unlike -Wall
2801 - if test "x$enable_cxx_warnings" = "xyes"; then
2802 - warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual"
2803 - fi
2804 - fi
26952805 + ;;
2696 esac
2697 - CFLAGS="$realsave_CFLAGS"
2698 - AC_MSG_CHECKING(what warning flags to pass to the C compiler)
2699 - AC_MSG_RESULT($warning_flags)
2700 + fi
2806 + esac
2807 fi
2808 - AC_MSG_RESULT($warnCXXFLAGS)
27012809 + rm -rf conftest*
27022810 + ;;
27032811
2704 - AC_ARG_ENABLE(iso-c,
2705 - AC_HELP_STRING([--enable-iso-c],
2706 - [Try to warn if code is not ISO C ]),,
2707 - [enable_iso_c=no])
2812 - AC_ARG_ENABLE(iso-cxx,
2813 - AC_HELP_STRING([--enable-iso-cxx],
2814 - [Try to warn if code is not ISO C++ ]),,
2815 - [enable_iso_cxx=no])
27082816 +AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
27092817 +[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
27102818 + AC_CHECK_TOOL(DLLTOOL, dlltool, false)
27142822 + ])
27152823 +esac
27162824
2717 - AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
2718 - complCFLAGS=
2719 - if test "x$enable_iso_c" != "xno"; then
2720 - if test "x$GCC" = "xyes"; then
2721 - case " $CFLAGS " in
2722 - *[\ \ ]-ansi[\ \ ]*) ;;
2723 - *) complCFLAGS="$complCFLAGS -ansi" ;;
2724 - esac
2725 - case " $CFLAGS " in
2726 - *[\ \ ]-pedantic[\ \ ]*) ;;
2727 - *) complCFLAGS="$complCFLAGS -pedantic" ;;
2728 - esac
2729 - fi
2730 - fi
2731 - AC_MSG_RESULT($complCFLAGS)
2825 - AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
2826 - complCXXFLAGS=
2827 - if test "x$enable_iso_cxx" != "xno"; then
2828 - if test "x$GXX" = "xyes"; then
2829 - case " $CXXFLAGS " in
2830 - *[\ \ ]-ansi[\ \ ]*) ;;
2831 - *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
2832 - esac
27322833 +need_locks="$enable_libtool_lock"
27332834
2734 - WARN_CFLAGS="$warning_flags $complCFLAGS"
2735 - AC_SUBST(WARN_CFLAGS)
2736 -])
2835 - case " $CXXFLAGS " in
2836 - *[\ \ ]-pedantic[\ \ ]*) ;;
2837 - *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
2838 - esac
27372839 +])# _LT_AC_LOCK
2738
2739 -dnl For C++, do basically the same thing.
2740
2741 -AC_DEFUN([GNOME_CXX_WARNINGS],[
2742 - AC_ARG_ENABLE(cxx-warnings,
2743 - AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
2744 - [Turn on compiler warnings.]),,
2745 - [enable_cxx_warnings="m4_default([$1],[minimum])"])
2746 -
2747 - AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
2748 - warnCXXFLAGS=
2749 - if test "x$GCC" != xyes; then
2750 - enable_compile_warnings=no
2751 - fi
2752 - if test "x$enable_cxx_warnings" != "xno"; then
2753 - if test "x$GCC" = "xyes"; then
2754 - case " $CXXFLAGS " in
2755 - *[\ \ ]-Wall[\ \ ]*) ;;
2756 - *) warnCXXFLAGS="-Wall -Wno-unused" ;;
2757 - esac
2758 -
2759 - ## -W is not all that useful. And it cannot be controlled
2760 - ## with individual -Wno-xxx flags, unlike -Wall
2761 - if test "x$enable_cxx_warnings" = "xyes"; then
2762 - warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual"
2763 - fi
2764 - fi
2765 - fi
2766 - AC_MSG_RESULT($warnCXXFLAGS)
2840 +
2841 +
27672842 +# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
27682843 +# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
27692844 +# ----------------------------------------------------------------
27962871 + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
27972872 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
27982873 + $2=yes
2799 + fi
2800 + fi
2874 fi
2875 fi
2876 - AC_MSG_RESULT($complCXXFLAGS)
2877 -
2878 - WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
2879 - AC_SUBST(WARN_CXXFLAGS)
28012880 + $rm conftest*
2802 +])
2803
2804 - AC_ARG_ENABLE(iso-cxx,
2805 - AC_HELP_STRING([--enable-iso-cxx],
2806 - [Try to warn if code is not ISO C++ ]),,
2807 - [enable_iso_cxx=no])
2881 ])
2882
2883 -
2884 -dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
2885 -# serial 35 IT_PROG_INTLTOOL
2886 -AC_DEFUN([IT_PROG_INTLTOOL],
2887 -[AC_PREREQ([2.50])dnl
2888 -
2889 -case "$am__api_version" in
2890 - 1.[01234])
2891 - AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
2892 - ;;
2893 - *)
2894 - ;;
2895 -esac
2896 -
2897 -if test -n "$1"; then
2898 - AC_MSG_CHECKING(for intltool >= $1)
2899 -
2900 - INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
2901 - INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
2902 - [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
2903 - ]
2904 - AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
2905 - test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
2906 - AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.])
28082907 +if test x"[$]$2" = xyes; then
28092908 + ifelse([$5], , :, [$5])
28102909 +else
28112910 + ifelse([$6], , :, [$6])
2812 +fi
2911 fi
28132912 +])# AC_LIBTOOL_COMPILER_OPTION
28142913
2815 - AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
2816 - complCXXFLAGS=
2817 - if test "x$enable_iso_cxx" != "xno"; then
2818 - if test "x$GCC" = "xyes"; then
2819 - case " $CXXFLAGS " in
2820 - *[\ \ ]-ansi[\ \ ]*) ;;
2821 - *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
2822 - esac
2823
2824 - case " $CXXFLAGS " in
2825 - *[\ \ ]-pedantic[\ \ ]*) ;;
2826 - *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
2827 - esac
2914 - INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
2915 -INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
2916 - INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
2917 - INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
2918 - INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@'
2919 - INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
2920 - INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
2921 - INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
2922 -INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
2923 - INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
2924 - INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
2925 - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@'
2926 - INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
2927 - INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
2928 - INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
2929 - INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
2930 - INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
2931 - INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
2932 -
2933 -AC_SUBST(INTLTOOL_DESKTOP_RULE)
2934 -AC_SUBST(INTLTOOL_DIRECTORY_RULE)
2935 -AC_SUBST(INTLTOOL_KEYS_RULE)
2936 -AC_SUBST(INTLTOOL_PROP_RULE)
2937 -AC_SUBST(INTLTOOL_OAF_RULE)
2938 -AC_SUBST(INTLTOOL_PONG_RULE)
2939 -AC_SUBST(INTLTOOL_SERVER_RULE)
2940 -AC_SUBST(INTLTOOL_SHEET_RULE)
2941 -AC_SUBST(INTLTOOL_SOUNDLIST_RULE)
2942 -AC_SUBST(INTLTOOL_UI_RULE)
2943 -AC_SUBST(INTLTOOL_XAM_RULE)
2944 -AC_SUBST(INTLTOOL_KBD_RULE)
2945 -AC_SUBST(INTLTOOL_XML_RULE)
2946 -AC_SUBST(INTLTOOL_XML_NOMERGE_RULE)
2947 -AC_SUBST(INTLTOOL_CAVES_RULE)
2948 -AC_SUBST(INTLTOOL_SCHEMAS_RULE)
2949 -AC_SUBST(INTLTOOL_THEME_RULE)
2950 -AC_SUBST(INTLTOOL_SERVICE_RULE)
2951 -
2952 -# Use the tools built into the package, not the ones that are installed.
2953 -AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
2954 -AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge')
2955 -AC_SUBST(INTLTOOL_UPDATE, '$(top_builddir)/intltool-update')
2956
2957 -AC_PATH_PROG(INTLTOOL_PERL, perl)
2958 -if test -z "$INTLTOOL_PERL"; then
2959 - AC_MSG_ERROR([perl not found; required for intltool])
2960 -fi
2961 -if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
2962 - AC_MSG_ERROR([perl 5.x required for intltool])
2963 -fi
2964 -if test "x$2" != "xno-xml"; then
2965 - AC_MSG_CHECKING([for XML::Parser])
2966 - if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
2967 - AC_MSG_RESULT([ok])
2968 - else
2969 - AC_MSG_ERROR([XML::Parser perl module is required for intltool])
28282970 +# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
28292971 +# [ACTION-SUCCESS], [ACTION-FAILURE])
28302972 +# ------------------------------------------------------------
28482990 + fi
28492991 + else
28502992 + $2=yes
2851 fi
2993 + fi
28522994 fi
2853 - AC_MSG_RESULT($complCXXFLAGS)
2854 -
2855 - WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
2856 - AC_SUBST(WARN_CXXFLAGS)
28572995 + $rm conftest*
28582996 + LDFLAGS="$save_LDFLAGS"
2859 ])
2860
2997 +])
2998 +
28612999 +if test x"[$]$2" = xyes; then
28623000 + ifelse([$4], , :, [$4])
28633001 +else
28643002 + ifelse([$5], , :, [$5])
2865 +fi
3003 fi
28663004 +])# AC_LIBTOOL_LINKER_OPTION
28673005
2868 -dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
2869 -# serial 35 IT_PROG_INTLTOOL
2870 -AC_DEFUN([IT_PROG_INTLTOOL],
2871 -[AC_PREREQ([2.50])dnl
2872 -
2873 -case "$am__api_version" in
2874 - 1.[01234])
2875 - AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
2876 - ;;
2877 - *)
2878 - ;;
2879 -esac
2880 -
2881 -if test -n "$1"; then
2882 - AC_MSG_CHECKING(for intltool >= $1)
2883
2884 - INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
2885 - INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
2886 - [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
2887 - ]
2888 - AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
2889 - test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
2890 - AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.])
2891 -fi
3006 -AC_PATH_PROG(INTLTOOL_ICONV, iconv, iconv)
3007 -AC_PATH_PROG(INTLTOOL_MSGFMT, msgfmt, msgfmt)
3008 -AC_PATH_PROG(INTLTOOL_MSGMERGE, msgmerge, msgmerge)
3009 -AC_PATH_PROG(INTLTOOL_XGETTEXT, xgettext, xgettext)
3010
3011 -# Substitute ALL_LINGUAS so we can use it in po/Makefile
3012 -AC_SUBST(ALL_LINGUAS)
28923013 +# AC_LIBTOOL_SYS_MAX_CMD_LEN
28933014 +# --------------------------
28943015 +AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
28983019 + i=0
28993020 + teststring="ABCD"
29003021
2901 - INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
2902 -INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
2903 - INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
2904 - INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
2905 - INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@'
2906 - INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
2907 - INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
2908 - INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
2909 -INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
2910 - INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
2911 - INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
2912 - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@'
2913 - INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
2914 - INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
2915 - INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
2916 - INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
2917 - INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
2918 - INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
3022 -# Set DATADIRNAME correctly if it is not set yet
3023 -# (copied from glib-gettext.m4)
3024 -if test -z "$DATADIRNAME"; then
3025 - AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
3026 - return _nl_msg_cat_cntr],
3027 - [DATADIRNAME=share],
3028 - [case $host in
3029 - *-*-solaris*)
3030 - dnl On Solaris, if bind_textdomain_codeset is in libc,
3031 - dnl GNU format message catalog is always supported,
3032 - dnl since both are added to the libc all together.
3033 - dnl Hence, we'd like to go with DATADIRNAME=share
3034 - dnl in this case.
3035 - AC_CHECK_FUNC(bind_textdomain_codeset,
3036 - [DATADIRNAME=share], [DATADIRNAME=lib])
29193037 + case $build_os in
29203038 + msdosdjgpp*)
29213039 + # On DJGPP, this test can blow up pretty badly due to problems in libc
29233041 + # during glob expansion). Even if it were fixed, the result of this
29243042 + # check would be larger than it should be.
29253043 + lt_cv_sys_max_cmd_len=12288; # 12K is about right
2926 + ;;
2927
2928 -AC_SUBST(INTLTOOL_DESKTOP_RULE)
2929 -AC_SUBST(INTLTOOL_DIRECTORY_RULE)
2930 -AC_SUBST(INTLTOOL_KEYS_RULE)
2931 -AC_SUBST(INTLTOOL_PROP_RULE)
2932 -AC_SUBST(INTLTOOL_OAF_RULE)
2933 -AC_SUBST(INTLTOOL_PONG_RULE)
2934 -AC_SUBST(INTLTOOL_SERVER_RULE)
2935 -AC_SUBST(INTLTOOL_SHEET_RULE)
2936 -AC_SUBST(INTLTOOL_SOUNDLIST_RULE)
2937 -AC_SUBST(INTLTOOL_UI_RULE)
2938 -AC_SUBST(INTLTOOL_XAM_RULE)
2939 -AC_SUBST(INTLTOOL_KBD_RULE)
2940 -AC_SUBST(INTLTOOL_XML_RULE)
2941 -AC_SUBST(INTLTOOL_XML_NOMERGE_RULE)
2942 -AC_SUBST(INTLTOOL_CAVES_RULE)
2943 -AC_SUBST(INTLTOOL_SCHEMAS_RULE)
2944 -AC_SUBST(INTLTOOL_THEME_RULE)
2945 -AC_SUBST(INTLTOOL_SERVICE_RULE)
3044 ;;
3045 - *)
3046 - [DATADIRNAME=lib]
3047 +
29463048 + gnu*)
29473049 + # Under GNU Hurd, this test is not required because there is
29483050 + # no limit to the length of command line arguments.
29493051 + # Libtool will interpret -1 as no limit whatsoever
29503052 + lt_cv_sys_max_cmd_len=-1;
2951 + ;;
2952
2953 -# Use the tools built into the package, not the ones that are installed.
2954 -AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
2955 -AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge')
2956 -AC_SUBST(INTLTOOL_UPDATE, '$(top_builddir)/intltool-update')
3053 ;;
3054 - esac])
3055 -fi
3056 -AC_SUBST(DATADIRNAME)
3057
3058 -IT_PO_SUBDIR([po])
29573059 + cygwin* | mingw*)
29583060 + # On Win9x/ME, this test blows up -- it succeeds, but takes
29593061 + # about 5 minutes as the teststring grows exponentially.
29633065 + # Instead, let's just punt: use the minimum linelength reported by
29643066 + # all of the supported platforms: 8192 (on NT/2K/XP).
29653067 + lt_cv_sys_max_cmd_len=8192;
2966 + ;;
2967
2968 -AC_PATH_PROG(INTLTOOL_PERL, perl)
2969 -if test -z "$INTLTOOL_PERL"; then
2970 - AC_MSG_ERROR([perl not found; required for intltool])
2971 -fi
2972 -if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
2973 - AC_MSG_ERROR([perl 5.x required for intltool])
2974 -fi
2975 -if test "x$2" != "xno-xml"; then
2976 - AC_MSG_CHECKING([for XML::Parser])
2977 - if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
2978 - AC_MSG_RESULT([ok])
2979 - else
2980 - AC_MSG_ERROR([XML::Parser perl module is required for intltool])
2981 - fi
2982 -fi
2983 + amigaos*)
2984 + # On AmigaOS with pdksh, this test takes hours, literally.
2985 + # So we just punt and use a minimum line length of 8192.
2986 + lt_cv_sys_max_cmd_len=8192;
2987 + ;;
2988
2989 -AC_PATH_PROG(INTLTOOL_ICONV, iconv, iconv)
2990 -AC_PATH_PROG(INTLTOOL_MSGFMT, msgfmt, msgfmt)
2991 -AC_PATH_PROG(INTLTOOL_MSGMERGE, msgmerge, msgmerge)
2992 -AC_PATH_PROG(INTLTOOL_XGETTEXT, xgettext, xgettext)
2993 + netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
2994 + # This has been around since 386BSD, at least. Likely further.
2995 + if test -x /sbin/sysctl; then
2996 + lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
2997 + elif test -x /usr/sbin/sysctl; then
2998 + lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
2999 + else
3000 + lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs
3001 + fi
3002 + # And add a safety zone
3003 + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
3004 + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
3005 + ;;
3006
3007 -# Substitute ALL_LINGUAS so we can use it in po/Makefile
3008 -AC_SUBST(ALL_LINGUAS)
3009 -
3010 -IT_PO_SUBDIR([po])
3011 + interix*)
3012 + # We know the value 262144 and hardcode it with a safety zone (like BSD)
3013 + lt_cv_sys_max_cmd_len=196608
30143068 + ;;
30153069
30163070 -dnl The following is very similar to
30273081 -dnl
30283082 -dnl Nothing crucial here, and we could use AC_CONFIG_FILES, if there were
30293083 -dnl a reason for it.
3084 + amigaos*)
3085 + # On AmigaOS with pdksh, this test takes hours, literally.
3086 + # So we just punt and use a minimum line length of 8192.
3087 + lt_cv_sys_max_cmd_len=8192;
3088 + ;;
3089
3090 -AC_CONFIG_COMMANDS([intltool], [
3091 -
3092 -for file in intltool-extract intltool-merge intltool-update; do
3093 - sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
3094 - -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
3095 - -e "s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g" \
3096 - -e "s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g" \
3097 - -e "s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g" \
3098 - -e "s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g" \
3099 - -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
3100 - < ${ac_aux_dir}/${file}.in > ${file}.out
3101 - if cmp -s ${file} ${file}.out 2>/dev/null; then
3102 - rm -f ${file}.out
3103 - else
3104 - mv -f ${file}.out ${file}
3105 - fi
3106 - chmod ugo+x ${file}
3107 - chmod u+w ${file}
3108 -done
3109 -
3110 -],
3111 -[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
3112 -prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
3113 -INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' INTLTOOL_ICONV='${INTLTOOL_ICONV}'
3114 -INTLTOOL_MSGFMT='${INTLTOOL_MSGFMT}' INTLTOOL_MSGMERGE='${INTLTOOL_MSGMERGE}'
3115 -INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}'])
3116 -
3117 -])
3118 + netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
3119 + # This has been around since 386BSD, at least. Likely further.
3120 + if test -x /sbin/sysctl; then
3121 + lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
3122 + elif test -x /usr/sbin/sysctl; then
3123 + lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
3124 + else
3125 + lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs
3126 + fi
3127 + # And add a safety zone
3128 + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
3129 + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
3130 + ;;
3131
3132 + interix*)
3133 + # We know the value 262144 and hardcode it with a safety zone (like BSD)
3134 + lt_cv_sys_max_cmd_len=196608
3135 + ;;
3136
3137 -# IT_PO_SUBDIR(DIRNAME)
3138 -# ---------------------
3139 -# All po subdirs have to be declared with this macro; the subdir "po" is
3140 -# declared by IT_PROG_INTLTOOL.
3141 -#
3142 -AC_DEFUN([IT_PO_SUBDIR],
3143 -[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
3144 -dnl
3145 -dnl The following CONFIG_COMMANDS should be exetuted at the very end
3146 -dnl of config.status.
3147 -AC_CONFIG_COMMANDS_PRE([
3148 - AC_CONFIG_COMMANDS([$1/stamp-it], [
3149 - rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
3150 - >"$1/stamp-it.tmp"
3151 - [sed '/^#/d
3152 - s/^[[].*] *//
3153 - /^[ ]*$/d
3154 - '"s|^| $ac_top_srcdir/|" \
3155 - "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
3156 - ]
3157 - if test ! -f "$1/Makefile"; then
3158 - AC_MSG_ERROR([$1/Makefile is not ready.])
30303159 + osf*)
30313160 + # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
30323161 + # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
30383167 + case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
30393168 + *1*) lt_cv_sys_max_cmd_len=-1 ;;
30403169 + esac
3041 + fi
3170 fi
3171 - mv "$1/Makefile" "$1/Makefile.tmp"
3172 - [sed '/^POTFILES =/,/[^\\]$/ {
3173 - /^POTFILES =/!d
3174 - r $1/POTFILES
3175 - }
3176 - ' "$1/Makefile.tmp" >"$1/Makefile"]
3177 - rm -f "$1/Makefile.tmp"
3178 - mv "$1/stamp-it.tmp" "$1/stamp-it"
3179 - ])
3180 -])dnl
30423181 + ;;
30433182 + sco3.2v5*)
30443183 + lt_cv_sys_max_cmd_len=102400
30723211 + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
30733212 + ;;
30743213 + esac
3075 +])
3214 ])
30763215 +if test -n $lt_cv_sys_max_cmd_len ; then
30773216 + AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
30783217 +else
30803219 +fi
30813220 +])# AC_LIBTOOL_SYS_MAX_CMD_LEN
30823221
3083 -AC_CONFIG_COMMANDS([intltool], [
3084
3085 -for file in intltool-extract intltool-merge intltool-update; do
3086 - sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
3087 - -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
3088 - -e "s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g" \
3089 - -e "s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g" \
3090 - -e "s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g" \
3091 - -e "s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g" \
3092 - -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
3093 - < ${ac_aux_dir}/${file}.in > ${file}.out
3094 - if cmp -s ${file} ${file}.out 2>/dev/null; then
3095 - rm -f ${file}.out
3096 - else
3097 - mv -f ${file}.out ${file}
3098 - fi
3099 - chmod ugo+x ${file}
3100 - chmod u+w ${file}
3101 -done
3222
3223 -# deprecated macros
3224 -AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
3225 -# A hint is needed for aclocal from Automake <= 1.9.4:
3226 -# AC_DEFUN([AC_PROG_INTLTOOL], ...)
3227 -
3228 -
3229 -# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
3230 -
3231 -# serial 48 AC_PROG_LIBTOOL
31023232 +# _LT_AC_CHECK_DLFCN
31033233 +# ------------------
31043234 +AC_DEFUN([_LT_AC_CHECK_DLFCN],
31053235 +[AC_CHECK_HEADERS(dlfcn.h)dnl
31063236 +])# _LT_AC_CHECK_DLFCN
31073237
3108 -],
3109 -[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
3110 -prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
3111 -INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' INTLTOOL_ICONV='${INTLTOOL_ICONV}'
3112 -INTLTOOL_MSGFMT='${INTLTOOL_MSGFMT}' INTLTOOL_MSGMERGE='${INTLTOOL_MSGMERGE}'
3113 -INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}'])
3114
3115 -])
3238
3239 -# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
3240 -# -----------------------------------------------------------
3241 -# If this macro is not defined by Autoconf, define it here.
3242 -m4_ifdef([AC_PROVIDE_IFELSE],
3243 - [],
3244 - [m4_define([AC_PROVIDE_IFELSE],
3245 - [m4_ifdef([AC_PROVIDE_$1],
3246 - [$2], [$3])])])
31163247 +# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
31173248 +# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
31183249 +# ---------------------------------------------------------------------
31313262 +#include <dlfcn.h>
31323263 +#endif
31333264
3134 -# IT_PO_SUBDIR(DIRNAME)
3135 -# ---------------------
3136 -# All po subdirs have to be declared with this macro; the subdir "po" is
3137 -# declared by IT_PROG_INTLTOOL.
3138 -#
3139 -AC_DEFUN([IT_PO_SUBDIR],
3140 -[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
3141 -dnl
3142 -dnl The following CONFIG_COMMANDS should be exetuted at the very end
3143 -dnl of config.status.
3144 -AC_CONFIG_COMMANDS_PRE([
3145 - AC_CONFIG_COMMANDS([$1/stamp-it], [
3146 - rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
3147 - >"$1/stamp-it.tmp"
3148 - [sed '/^#/d
3149 - s/^[[].*] *//
3150 - /^[ ]*$/d
3151 - '"s|^| $ac_top_srcdir/|" \
3152 - "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
3153 - ]
3154 - if test ! -f "$1/Makefile"; then
3155 - AC_MSG_ERROR([$1/Makefile is not ready.])
3156 - fi
3157 - mv "$1/Makefile" "$1/Makefile.tmp"
3158 - [sed '/^POTFILES =/,/[^\\]$/ {
3159 - /^POTFILES =/!d
3160 - r $1/POTFILES
3161 - }
3162 - ' "$1/Makefile.tmp" >"$1/Makefile"]
3163 - rm -f "$1/Makefile.tmp"
3164 - mv "$1/stamp-it.tmp" "$1/stamp-it"
3165 - ])
3166 -])dnl
3167 -])
3265 -# AC_PROG_LIBTOOL
3266 -# ---------------
3267 -AC_DEFUN([AC_PROG_LIBTOOL],
3268 -[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
3269 -dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
3270 -dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
3271 - AC_PROVIDE_IFELSE([AC_PROG_CXX],
3272 - [AC_LIBTOOL_CXX],
3273 - [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
3274 - ])])
3275 -dnl And a similar setup for Fortran 77 support
3276 - AC_PROVIDE_IFELSE([AC_PROG_F77],
3277 - [AC_LIBTOOL_F77],
3278 - [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
3279 -])])
31683280 +#include <stdio.h>
31693281
3282 -dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
3283 -dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
3284 -dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
3285 - AC_PROVIDE_IFELSE([AC_PROG_GCJ],
3286 - [AC_LIBTOOL_GCJ],
3287 - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
3288 - [AC_LIBTOOL_GCJ],
3289 - [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
3290 - [AC_LIBTOOL_GCJ],
3291 - [ifdef([AC_PROG_GCJ],
3292 - [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
3293 - ifdef([A][M_PROG_GCJ],
3294 - [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
3295 - ifdef([LT_AC_PROG_GCJ],
3296 - [define([LT_AC_PROG_GCJ],
3297 - defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
3298 -])])# AC_PROG_LIBTOOL
31703299 +#ifdef RTLD_GLOBAL
31713300 +# define LT_DLGLOBAL RTLD_GLOBAL
31723301 +#else
31773306 +# endif
31783307 +#endif
31793308
3180 -# deprecated macros
3181 -AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
3182 -# A hint is needed for aclocal from Automake <= 1.9.4:
3183 -# AC_DEFUN([AC_PROG_INTLTOOL], ...)
31843309 +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
31853310 + find out it does not work in some platform. */
31863311 +#ifndef LT_DLLAZY_OR_NOW
32033328 +# endif
32043329 +#endif
32053330
3331 -# _AC_PROG_LIBTOOL
3332 -# ----------------
3333 -AC_DEFUN([_AC_PROG_LIBTOOL],
3334 -[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
3335 -AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
3336 -AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
3337 -AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
32063338 +#ifdef __cplusplus
32073339 +extern "C" void exit (int);
32083340 +#endif
32093341
3210 -# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
3342 -# This can be used to rebuild libtool when needed
3343 -LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
32113344 +void fnord() { int i=42;}
32123345 +int main ()
32133346 +{
32143347 + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
32153348 + int status = $lt_dlunknown;
32163349
3217 -# serial 48 AC_PROG_LIBTOOL
3350 -# Always use our own libtool.
3351 -LIBTOOL='$(SHELL) $(top_builddir)/libtool'
3352 -AC_SUBST(LIBTOOL)dnl
32183353 + if (self)
32193354 + {
32203355 + if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
32243359 + else
32253360 + puts (dlerror ());
32263361
3362 -# Prevent multiple expansion
3363 -define([AC_PROG_LIBTOOL], [])
3364 -])# _AC_PROG_LIBTOOL
32273365 + exit (status);
32283366 +}]
32293367 +EOF
32433381 +rm -fr conftest*
32443382 +])# _LT_AC_TRY_DLOPEN_SELF
32453383
3246 -# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
3247 -# -----------------------------------------------------------
3248 -# If this macro is not defined by Autoconf, define it here.
3249 -m4_ifdef([AC_PROVIDE_IFELSE],
3250 - [],
3251 - [m4_define([AC_PROVIDE_IFELSE],
3252 - [m4_ifdef([AC_PROVIDE_$1],
3253 - [$2], [$3])])])
3254
3384
3385 -# AC_LIBTOOL_SETUP
3386 -# ----------------
3387 -AC_DEFUN([AC_LIBTOOL_SETUP],
3388 -[AC_PREREQ(2.50)dnl
3389 -AC_REQUIRE([AC_ENABLE_SHARED])dnl
3390 -AC_REQUIRE([AC_ENABLE_STATIC])dnl
3391 -AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
3392 -AC_REQUIRE([AC_CANONICAL_HOST])dnl
3393 -AC_REQUIRE([AC_CANONICAL_BUILD])dnl
3394 -AC_REQUIRE([AC_PROG_CC])dnl
3395 -AC_REQUIRE([AC_PROG_LD])dnl
3396 -AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
3397 -AC_REQUIRE([AC_PROG_NM])dnl
3398 -
3399 -AC_REQUIRE([AC_PROG_LN_S])dnl
3400 -AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
3401 -# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
3402 -AC_REQUIRE([AC_OBJEXT])dnl
3403 -AC_REQUIRE([AC_EXEEXT])dnl
3404 -dnl
3405 -
3406 -AC_LIBTOOL_SYS_MAX_CMD_LEN
3407 -AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
3408 -AC_LIBTOOL_OBJDIR
3409 -
3410 -AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
3411 -_LT_AC_PROG_ECHO_BACKSLASH
3412 -
3413 -case $host_os in
3414 -aix3*)
3415 - # AIX sometimes has problems with the GCC collect2 program. For some
3416 - # reason, if we set the COLLECT_NAMES environment variable, the problems
3417 - # vanish in a puff of smoke.
3418 - if test "X${COLLECT_NAMES+set}" != Xset; then
3419 - COLLECT_NAMES=
3420 - export COLLECT_NAMES
3421 - fi
3422 - ;;
3423 -esac
3424 -
3425 -# Sed substitution that helps us do robust quoting. It backslashifies
3426 -# metacharacters that are still active within double-quoted strings.
3427 -Xsed='sed -e 1s/^X//'
3428 -[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
3429 -
3430 -# Same as above, but do not quote variable references.
3431 -[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
3432 -
3433 -# Sed substitution to delay expansion of an escaped shell variable in a
3434 -# double_quote_subst'ed string.
3435 -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
3436 -
3437 -# Sed substitution to avoid accidental globbing in evaled expressions
3438 -no_glob_subst='s/\*/\\\*/g'
3439 -
3440 -# Constants:
3441 -rm="rm -f"
3442 -
3443 -# Global variables:
3444 -default_ofile=libtool
3445 -can_build_shared=yes
3446 -
3447 -# All known linkers require a `.a' archive for static linking (except MSVC,
3448 -# which needs '.lib').
3449 -libext=a
3450 -ltmain="$ac_aux_dir/ltmain.sh"
3451 -ofile="$default_ofile"
3452 -with_gnu_ld="$lt_cv_prog_gnu_ld"
32553453 +# AC_LIBTOOL_DLOPEN_SELF
32563454 +# ----------------------
32573455 +AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
32643462 + lt_cv_dlopen=no
32653463 + lt_cv_dlopen_libs=
32663464
3267 -# AC_PROG_LIBTOOL
3268 -# ---------------
3269 -AC_DEFUN([AC_PROG_LIBTOOL],
3270 -[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
3271 -dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
3272 -dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
3273 - AC_PROVIDE_IFELSE([AC_PROG_CXX],
3274 - [AC_LIBTOOL_CXX],
3275 - [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
3276 - ])])
3277 -dnl And a similar setup for Fortran 77 support
3278 - AC_PROVIDE_IFELSE([AC_PROG_F77],
3279 - [AC_LIBTOOL_F77],
3280 - [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
3281 -])])
3282 -
3283 -dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
3284 -dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
3285 -dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
3286 - AC_PROVIDE_IFELSE([AC_PROG_GCJ],
3287 - [AC_LIBTOOL_GCJ],
3288 - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
3289 - [AC_LIBTOOL_GCJ],
3290 - [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
3291 - [AC_LIBTOOL_GCJ],
3292 - [ifdef([AC_PROG_GCJ],
3293 - [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
3294 - ifdef([A][M_PROG_GCJ],
3295 - [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
3296 - ifdef([LT_AC_PROG_GCJ],
3297 - [define([LT_AC_PROG_GCJ],
3298 - defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
3299 -])])# AC_PROG_LIBTOOL
3465 -AC_CHECK_TOOL(AR, ar, false)
3466 -AC_CHECK_TOOL(RANLIB, ranlib, :)
3467 -AC_CHECK_TOOL(STRIP, strip, :)
33003468 + case $host_os in
33013469 + beos*)
33023470 + lt_cv_dlopen="load_add_on"
33043472 + lt_cv_dlopen_self=yes
33053473 + ;;
33063474
3475 -old_CC="$CC"
3476 -old_CFLAGS="$CFLAGS"
33073477 + mingw* | pw32*)
33083478 + lt_cv_dlopen="LoadLibrary"
33093479 + lt_cv_dlopen_libs=
33103480 + ;;
33113481
3312 -# _AC_PROG_LIBTOOL
3313 -# ----------------
3314 -AC_DEFUN([_AC_PROG_LIBTOOL],
3315 -[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
3316 -AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
3317 -AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
3318 -AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
3482 -# Set sane defaults for various variables
3483 -test -z "$AR" && AR=ar
3484 -test -z "$AR_FLAGS" && AR_FLAGS=cru
3485 -test -z "$AS" && AS=as
3486 -test -z "$CC" && CC=cc
3487 -test -z "$LTCC" && LTCC=$CC
3488 -test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
3489 -test -z "$DLLTOOL" && DLLTOOL=dlltool
3490 -test -z "$LD" && LD=ld
3491 -test -z "$LN_S" && LN_S="ln -s"
3492 -test -z "$MAGIC_CMD" && MAGIC_CMD=file
3493 -test -z "$NM" && NM=nm
3494 -test -z "$SED" && SED=sed
3495 -test -z "$OBJDUMP" && OBJDUMP=objdump
3496 -test -z "$RANLIB" && RANLIB=:
3497 -test -z "$STRIP" && STRIP=:
3498 -test -z "$ac_objext" && ac_objext=o
33193499 + cygwin*)
33203500 + lt_cv_dlopen="dlopen"
33213501 + lt_cv_dlopen_libs=
33223502 + ;;
33233503
3324 -# This can be used to rebuild libtool when needed
3325 -LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
3504 -# Determine commands to create old-style static archives.
3505 -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
3506 -old_postinstall_cmds='chmod 644 $oldlib'
3507 -old_postuninstall_cmds=
33263508 + darwin*)
33273509 + # if libdl is installed we need to link against it
33283510 + AC_CHECK_LIB([dl], [dlopen],
33333515 + ])
33343516 + ;;
33353517
3336 -# Always use our own libtool.
3337 -LIBTOOL='$(SHELL) $(top_builddir)/libtool'
3338 -AC_SUBST(LIBTOOL)dnl
3339 + *)
3518 -if test -n "$RANLIB"; then
3519 - case $host_os in
3520 - openbsd*)
3521 - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
3522 - ;;
3523 *)
3524 - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
33403525 + AC_CHECK_FUNC([shl_load],
33413526 + [lt_cv_dlopen="shl_load"],
33423527 + [AC_CHECK_LIB([dld], [shl_load],
33543539 + ])
33553540 + ])
33563541 + ])
3357 + ;;
3358 + esac
3359
3360 -# Prevent multiple expansion
3361 -define([AC_PROG_LIBTOOL], [])
3362 -])# _AC_PROG_LIBTOOL
3542 ;;
3543 esac
3544 - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
3545 -fi
3546 -
3547 -_LT_CC_BASENAME([$compiler])
3548
3549 -# Only perform the check for file, if the check method requires it
3550 -case $deplibs_check_method in
3551 -file_magic*)
3552 - if test "$file_magic_cmd" = '$MAGIC_CMD'; then
3553 - AC_PATH_MAGIC
33633554 + if test "x$lt_cv_dlopen" != xno; then
33643555 + enable_dlopen=yes
33653556 + else
33663557 + enable_dlopen=no
3367 + fi
3368
3558 fi
3559 - ;;
3560 -esac
3561 -
3562 -AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
3563 -AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
3564 -enable_win32_dll=yes, enable_win32_dll=no)
3565 -
3566 -AC_ARG_ENABLE([libtool-lock],
3567 - [AC_HELP_STRING([--disable-libtool-lock],
3568 - [avoid locking (might break parallel builds)])])
3569 -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
3570 -
3571 -AC_ARG_WITH([pic],
3572 - [AC_HELP_STRING([--with-pic],
3573 - [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
3574 - [pic_mode="$withval"],
3575 - [pic_mode=default])
3576 -test -z "$pic_mode" && pic_mode=default
3577
3578 -# Use C for the default configuration in the libtool script
3579 -tagname=
3580 -AC_LIBTOOL_LANG_C_CONFIG
3581 -_LT_AC_TAGCONFIG
3582 -])# AC_LIBTOOL_SETUP
33693583 + case $lt_cv_dlopen in
33703584 + dlopen)
33713585 + save_CPPFLAGS="$CPPFLAGS"
33723586 + test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
33733587
3374 -# AC_LIBTOOL_SETUP
3375 -# ----------------
3376 -AC_DEFUN([AC_LIBTOOL_SETUP],
3377 -[AC_PREREQ(2.50)dnl
3378 -AC_REQUIRE([AC_ENABLE_SHARED])dnl
3379 -AC_REQUIRE([AC_ENABLE_STATIC])dnl
3380 -AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
3381 -AC_REQUIRE([AC_CANONICAL_HOST])dnl
3382 -AC_REQUIRE([AC_CANONICAL_BUILD])dnl
3383 -AC_REQUIRE([AC_PROG_CC])dnl
3384 -AC_REQUIRE([AC_PROG_LD])dnl
3385 -AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
3386 -AC_REQUIRE([AC_PROG_NM])dnl
33873588 + save_LDFLAGS="$LDFLAGS"
33883589 + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
33893590
3390 -AC_REQUIRE([AC_PROG_LN_S])dnl
3391 -AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
3392 -# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
3393 -AC_REQUIRE([AC_OBJEXT])dnl
3394 -AC_REQUIRE([AC_EXEEXT])dnl
3395 -dnl
3591 -# _LT_AC_SYS_COMPILER
3592 -# -------------------
3593 -AC_DEFUN([_LT_AC_SYS_COMPILER],
3594 -[AC_REQUIRE([AC_PROG_CC])dnl
33963595 + save_LIBS="$LIBS"
33973596 + LIBS="$lt_cv_dlopen_libs $LIBS"
33983597
3399 -AC_LIBTOOL_SYS_MAX_CMD_LEN
3400 -AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
3401 -AC_LIBTOOL_OBJDIR
3598 -# If no C compiler was specified, use CC.
3599 -LTCC=${LTCC-"$CC"}
34023600 + AC_CACHE_CHECK([whether a program can dlopen itself],
34033601 + lt_cv_dlopen_self, [dnl
34043602 + _LT_AC_TRY_DLOPEN_SELF(
34063604 + lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
34073605 + ])
34083606
3409 -AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
3410 -_LT_AC_PROG_ECHO_BACKSLASH
3607 -# If no C compiler flags were specified, use CFLAGS.
3608 -LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
34113609 + if test "x$lt_cv_dlopen_self" = xyes; then
34123610 + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
34133611 + AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
34183616 + ])
34193617 + fi
34203618
3421 -case $host_os in
3422 -aix3*)
3423 - # AIX sometimes has problems with the GCC collect2 program. For some
3424 - # reason, if we set the COLLECT_NAMES environment variable, the problems
3425 - # vanish in a puff of smoke.
3426 - if test "X${COLLECT_NAMES+set}" != Xset; then
3427 - COLLECT_NAMES=
3428 - export COLLECT_NAMES
3429 - fi
3430 - ;;
3431 -esac
3619 -# Allow CC to be a program name with arguments.
3620 -compiler=$CC
3621 -])# _LT_AC_SYS_COMPILER
34323622 + CPPFLAGS="$save_CPPFLAGS"
34333623 + LDFLAGS="$save_LDFLAGS"
34343624 + LIBS="$save_LIBS"
34353625 + ;;
34363626 + esac
34373627
3438 -# Sed substitution that helps us do robust quoting. It backslashifies
3439 -# metacharacters that are still active within double-quoted strings.
3440 -Xsed='sed -e 1s/^X//'
3441 -[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
34423628 + case $lt_cv_dlopen_self in
34433629 + yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
34443630 + *) enable_dlopen_self=unknown ;;
34453631 + esac
34463632
3447 -# Same as above, but do not quote variable references.
3448 -[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
3633 -# _LT_CC_BASENAME(CC)
3634 -# -------------------
3635 -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
3636 -AC_DEFUN([_LT_CC_BASENAME],
3637 -[for cc_temp in $1""; do
3638 - case $cc_temp in
3639 - compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
3640 - distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
3641 - \-*) ;;
3642 - *) break;;
34493643 + case $lt_cv_dlopen_self_static in
34503644 + yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
34513645 + *) enable_dlopen_self_static=unknown ;;
3452 + esac
3646 esac
3647 -done
3648 -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
3649 -])
34533650 +fi
34543651 +])# AC_LIBTOOL_DLOPEN_SELF
34553652
3456 -# Sed substitution to delay expansion of an escaped shell variable in a
3457 -# double_quote_subst'ed string.
3458 -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
3459
3460 -# Sed substitution to avoid accidental globbing in evaled expressions
3461 -no_glob_subst='s/\*/\\\*/g'
3653
3654 -# _LT_COMPILER_BOILERPLATE
3655 -# ------------------------
3656 -# Check for compiler boilerplate output or warnings with
3657 -# the simple compiler test code.
3658 -AC_DEFUN([_LT_COMPILER_BOILERPLATE],
3659 -[ac_outfile=conftest.$ac_objext
3660 -printf "$lt_simple_compile_test_code" >conftest.$ac_ext
3661 -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
3662 -_lt_compiler_boilerplate=`cat conftest.err`
3663 -$rm conftest*
3664 -])# _LT_COMPILER_BOILERPLATE
3665 -
34623666 +# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
34633667 +# ---------------------------------
34643668 +# Check to see if options -c and -o are simultaneously supported by compiler
34733677 + mkdir out
34743678 + printf "$lt_simple_compile_test_code" > conftest.$ac_ext
34753679
3476 -# Constants:
3477 -rm="rm -f"
3680 -# _LT_LINKER_BOILERPLATE
3681 -# ----------------------
3682 -# Check for linker boilerplate output or warnings with
3683 -# the simple link test code.
3684 -AC_DEFUN([_LT_LINKER_BOILERPLATE],
3685 -[ac_outfile=conftest.$ac_objext
3686 -printf "$lt_simple_link_test_code" >conftest.$ac_ext
3687 -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
3688 -_lt_linker_boilerplate=`cat conftest.err`
3689 -$rm conftest*
3690 -])# _LT_LINKER_BOILERPLATE
34783691 + lt_compiler_flag="-o out/conftest2.$ac_objext"
34793692 + # Insert the option either (1) after the last *FLAGS variable, or
34803693 + # (2) before a word containing "conftest.", or (3) at the end.
35113724 +])
35123725 +])# AC_LIBTOOL_PROG_CC_C_O
35133726
3514 -# Global variables:
3515 -default_ofile=libtool
3516 -can_build_shared=yes
3517
3518 -# All known linkers require a `.a' archive for static linking (except MSVC,
3519 -# which needs '.lib').
3520 -libext=a
3521 -ltmain="$ac_aux_dir/ltmain.sh"
3522 -ofile="$default_ofile"
3523 -with_gnu_ld="$lt_cv_prog_gnu_ld"
3727
3728 -# _LT_AC_SYS_LIBPATH_AIX
3729 -# ----------------------
3730 -# Links a minimal program and checks the executable
3731 -# for the system default hardcoded library path. In most cases,
3732 -# this is /usr/lib:/lib, but when the MPI compilers are used
3733 -# the location of the communication and MPI libs are included too.
3734 -# If we don't find anything, use the default library path according
3735 -# to the aix ld manual.
3736 -AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
3737 -[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
3738 -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
3739 -}'`
3740 -# Check for a 64-bit object if we didn't find anything.
3741 -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
3742 -}'`; fi],[])
3743 -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3744 -])# _LT_AC_SYS_LIBPATH_AIX
35243745 +# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
35253746 +# -----------------------------------------
35263747 +# Check to see if we can do hard links to lock some files if needed
35273748 +AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
35283749 +[AC_REQUIRE([_LT_AC_LOCK])dnl
35293750
3530 -AC_CHECK_TOOL(AR, ar, false)
3531 -AC_CHECK_TOOL(RANLIB, ranlib, :)
3532 -AC_CHECK_TOOL(STRIP, strip, :)
35333751 +hard_links="nottested"
35343752 +if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
35353753 + # do not overwrite the value of need_locks provided by the user
35503768 +fi
35513769 +])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
35523770
3553 -old_CC="$CC"
3554 -old_CFLAGS="$CFLAGS"
3555
3556 -# Set sane defaults for various variables
3557 -test -z "$AR" && AR=ar
3558 -test -z "$AR_FLAGS" && AR_FLAGS=cru
3559 -test -z "$AS" && AS=as
3560 -test -z "$CC" && CC=cc
3561 -test -z "$LTCC" && LTCC=$CC
3562 -test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
3563 -test -z "$DLLTOOL" && DLLTOOL=dlltool
3564 -test -z "$LD" && LD=ld
3565 -test -z "$LN_S" && LN_S="ln -s"
3566 -test -z "$MAGIC_CMD" && MAGIC_CMD=file
3567 -test -z "$NM" && NM=nm
3568 -test -z "$SED" && SED=sed
3569 -test -z "$OBJDUMP" && OBJDUMP=objdump
3570 -test -z "$RANLIB" && RANLIB=:
3571 -test -z "$STRIP" && STRIP=:
3572 -test -z "$ac_objext" && ac_objext=o
3771 -# _LT_AC_SHELL_INIT(ARG)
3772 -# ----------------------
3773 -AC_DEFUN([_LT_AC_SHELL_INIT],
3774 -[ifdef([AC_DIVERSION_NOTICE],
3775 - [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
3776 - [AC_DIVERT_PUSH(NOTICE)])
3777 -$1
3778 -AC_DIVERT_POP
3779 -])# _LT_AC_SHELL_INIT
3780
35733781 +# AC_LIBTOOL_OBJDIR
35743782 +# -----------------
35753783 +AC_DEFUN([AC_LIBTOOL_OBJDIR],
35863794 +objdir=$lt_cv_objdir
35873795 +])# AC_LIBTOOL_OBJDIR
35883796
3589 -# Determine commands to create old-style static archives.
3590 -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
3591 -old_postinstall_cmds='chmod 644 $oldlib'
3592 -old_postuninstall_cmds=
3593
3594 -if test -n "$RANLIB"; then
3797 -# _LT_AC_PROG_ECHO_BACKSLASH
3798 -# --------------------------
3799 -# Add some code to the start of the generated configure script which
3800 -# will find an echo command which doesn't interpret backslashes.
3801 -AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
3802 -[_LT_AC_SHELL_INIT([
3803 -# Check that we are running under the correct shell.
3804 -SHELL=${CONFIG_SHELL-/bin/sh}
3805
3806 -case X$ECHO in
3807 -X*--fallback-echo)
3808 - # Remove one level of quotation (which was required for Make).
3809 - ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
3810 - ;;
3811 -esac
35953812 +# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
35963813 +# ----------------------------------------------
35973814 +# Check hardcoding attributes.
36013818 +if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
36023819 + test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
36033820 + test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
3604 +
3821
3822 -echo=${ECHO-echo}
3823 -if test "X[$]1" = X--no-reexec; then
3824 - # Discard the --no-reexec flag, and continue.
3825 - shift
3826 -elif test "X[$]1" = X--fallback-echo; then
3827 - # Avoid inline document here, it may be left over
3828 - :
3829 -elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
3830 - # Yippee, $echo works!
3831 - :
36053832 + # We can hardcode non-existant directories.
36063833 + if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
36073834 + # If the only mechanism to avoid hardcoding is shlibpath_var, we
36153842 + # We can link without hardcoding, and we can hardcode nonexisting dirs.
36163843 + _LT_AC_TAGVAR(hardcode_action, $1)=immediate
36173844 + fi
3618 +else
3845 else
3846 - # Restart under the correct shell.
3847 - exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
36193848 + # We cannot hardcode anything, or else we can only hardcode existing
36203849 + # directories.
36213850 + _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
3622 +fi
3851 fi
36233852 +AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
3624 +
3853
3854 -if test "X[$]1" = X--fallback-echo; then
3855 - # used as fallback echo
3856 - shift
3857 - cat <<EOF
3858 -[$]*
3859 -EOF
3860 - exit 0
36253861 +if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
36263862 + # Fast installation is not supported
36273863 + enable_fast_install=no
36293865 + test "$enable_shared" = no; then
36303866 + # Fast installation is not necessary
36313867 + enable_fast_install=needless
3632 +fi
3868 fi
36333869 +])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
3634 +
3635 +
3870
3871 -# The HP-UX ksh and POSIX shell print the target directory to stdout
3872 -# if CDPATH is set.
3873 -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
3874
3875 -if test -z "$ECHO"; then
3876 -if test "X${echo_test_string+set}" != Xset; then
3877 -# find a string as large as possible, as long as the shell can cope with it
3878 - for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
3879 - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
3880 - if (echo_test_string=`eval $cmd`) 2>/dev/null &&
3881 - echo_test_string=`eval $cmd` &&
3882 - (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
3883 - then
3884 - break
3885 - fi
3886 - done
36363887 +# AC_LIBTOOL_SYS_LIB_STRIP
36373888 +# ------------------------
36383889 +AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
36453896 + AC_MSG_RESULT([yes])
36463897 +else
36473898 +# FIXME - insert some real tests, host_os isn't really good enough
3648 case $host_os in
3649 - openbsd*)
3650 - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
3651 - ;;
3652 - *)
3653 - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
3899 + case $host_os in
36543900 + darwin*)
36553901 + if test -n "$STRIP" ; then
36563902 + striplib="$STRIP -x"
36613907 + ;;
36623908 + *)
36633909 + AC_MSG_RESULT([no])
3664 ;;
3665 esac
3666 - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
3910 + ;;
3911 + esac
36673912 fi
36683913 +])# AC_LIBTOOL_SYS_LIB_STRIP
36693914
3670 -_LT_CC_BASENAME([$compiler])
3671
3672 -# Only perform the check for file, if the check method requires it
3673 -case $deplibs_check_method in
3674 -file_magic*)
3675 - if test "$file_magic_cmd" = '$MAGIC_CMD'; then
3676 - AC_PATH_MAGIC
3915 -if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
3916 - echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
3917 - test "X$echo_testing_string" = "X$echo_test_string"; then
3918 - :
3919 -else
3920 - # The Solaris, AIX, and Digital Unix default echo programs unquote
3921 - # backslashes. This makes it impossible to quote backslashes using
3922 - # echo "$something" | sed 's/\\/\\\\/g'
3923 - #
3924 - # So, first we look for a working echo in the user's PATH.
3925
3926 - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
3927 - for dir in $PATH /usr/ucb; do
3928 - IFS="$lt_save_ifs"
3929 - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
3930 - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
3931 - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
3932 - test "X$echo_testing_string" = "X$echo_test_string"; then
3933 - echo="$dir/echo"
3934 - break
3935 - fi
3936 - done
3937 - IFS="$lt_save_ifs"
36773938 +# AC_LIBTOOL_SYS_DYNAMIC_LINKER
36783939 +# -----------------------------
36793940 +# PORTME Fill in your ld.so characteristics
37023963 + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
37033964 + else
37043965 + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
3705 fi
3706 - ;;
3707 -esac
3708 -
3709 -AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
3710 -AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
3711 -enable_win32_dll=yes, enable_win32_dll=no)
3712 -
3713 -AC_ARG_ENABLE([libtool-lock],
3714 - [AC_HELP_STRING([--disable-libtool-lock],
3715 - [avoid locking (might break parallel builds)])])
3716 -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
3966 + fi
37173967 +else
37183968 + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
37193969 +fi
37203970 +need_lib_prefix=unknown
37213971 +hardcode_into_libs=no
37223972
3723 -AC_ARG_WITH([pic],
3724 - [AC_HELP_STRING([--with-pic],
3725 - [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
3726 - [pic_mode="$withval"],
3727 - [pic_mode=default])
3728 -test -z "$pic_mode" && pic_mode=default
3973 - if test "X$echo" = Xecho; then
3974 - # We didn't find a better echo, so look for alternatives.
3975 - if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
3976 - echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
3977 - test "X$echo_testing_string" = "X$echo_test_string"; then
3978 - # This shell has a builtin print -r that does the trick.
3979 - echo='print -r'
3980 - elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
3981 - test "X$CONFIG_SHELL" != X/bin/ksh; then
3982 - # If we have ksh, try running configure again with it.
3983 - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
3984 - export ORIGINAL_CONFIG_SHELL
3985 - CONFIG_SHELL=/bin/ksh
3986 - export CONFIG_SHELL
3987 - exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
3988 - else
3989 - # Try using printf.
3990 - echo='printf %s\n'
3991 - if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
3992 - echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
3993 - test "X$echo_testing_string" = "X$echo_test_string"; then
3994 - # Cool, printf works
3995 - :
3996 - elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
3997 - test "X$echo_testing_string" = 'X\t' &&
3998 - echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
3999 - test "X$echo_testing_string" = "X$echo_test_string"; then
4000 - CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
4001 - export CONFIG_SHELL
4002 - SHELL="$CONFIG_SHELL"
4003 - export SHELL
4004 - echo="$CONFIG_SHELL [$]0 --fallback-echo"
4005 - elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
4006 - test "X$echo_testing_string" = 'X\t' &&
4007 - echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
4008 - test "X$echo_testing_string" = "X$echo_test_string"; then
4009 - echo="$CONFIG_SHELL [$]0 --fallback-echo"
4010 - else
4011 - # maybe with a smaller string...
4012 - prev=:
37294013 +# when you set need_version to no, make sure it does not cause -set_version
37304014 +# flags to be left without arguments
37314015 +need_version=unknown
37324016
3733 -# Use C for the default configuration in the libtool script
3734 -tagname=
3735 -AC_LIBTOOL_LANG_C_CONFIG
3736 -_LT_AC_TAGCONFIG
3737 -])# AC_LIBTOOL_SETUP
4017 - for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
4018 - if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
4019 - then
4020 - break
4021 - fi
4022 - prev="$cmd"
4023 - done
37384024 +case $host_os in
37394025 +aix3*)
37404026 + version_type=linux
37414027 + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
37424028 + shlibpath_var=LIBPATH
37434029
4030 - if test "$prev" != 'sed 50q "[$]0"'; then
4031 - echo_test_string=`eval $prev`
4032 - export echo_test_string
4033 - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
4034 - else
4035 - # Oops. We lost completely, so just stick with echo.
4036 - echo=echo
4037 - fi
37444038 + # AIX 3 has no versioning support, so we append a major version to the name.
37454039 + soname_spec='${libname}${release}${shared_ext}$major'
37464040 + ;;
3747
3748 -# _LT_AC_SYS_COMPILER
3749 -# -------------------
3750 -AC_DEFUN([_LT_AC_SYS_COMPILER],
3751 -[AC_REQUIRE([AC_PROG_CC])dnl
4041 +
37524042 +aix4* | aix5*)
37534043 + version_type=linux
37544044 + need_lib_prefix=no
37724062 + :
37734063 + else
37744064 + can_build_shared=no
3775 + fi
4065 fi
37764066 + ;;
37774067 + esac
37784068 + # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
37884078 + # and later when we are not doing run time linking.
37894079 + library_names_spec='${libname}${release}.a $libname.a'
37904080 + soname_spec='${libname}${release}${shared_ext}$major'
3791 + fi
4081 fi
37924082 + shlibpath_var=LIBPATH
3793 + fi
4083 fi
4084 -fi
4085 -fi
37944086 + ;;
37954087
3796 -# If no C compiler was specified, use CC.
3797 -LTCC=${LTCC-"$CC"}
4088 -# Copy echo and quote the copy suitably for passing to libtool from
4089 -# the Makefile, instead of quoting the original, which is used later.
4090 -ECHO=$echo
4091 -if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
4092 - ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
4093 -fi
37984094 +amigaos*)
37994095 + library_names_spec='$libname.ixlibrary $libname.a'
38004096 + # Create ${libname}_ixlibrary.a entries in /sys/libs.
38014097 + 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'
38024098 + ;;
38034099
3804 -# If no C compiler flags were specified, use CFLAGS.
3805 -LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
4100 -AC_SUBST(ECHO)
4101 -])])# _LT_AC_PROG_ECHO_BACKSLASH
38064102 +beos*)
38074103 + library_names_spec='${libname}${shared_ext}'
38084104 + dynamic_linker="$host_os ld.so"
38094105 + shlibpath_var=LIBRARY_PATH
38104106 + ;;
38114107
3812 -# Allow CC to be a program name with arguments.
3813 -compiler=$CC
3814 -])# _LT_AC_SYS_COMPILER
38154108 +bsdi[[45]]*)
38164109 + version_type=linux
38174110 + need_version=no
38264119 + # libtool to hard-code these into programs
38274120 + ;;
38284121
4122 -# _LT_AC_LOCK
4123 -# -----------
4124 -AC_DEFUN([_LT_AC_LOCK],
4125 -[AC_ARG_ENABLE([libtool-lock],
4126 - [AC_HELP_STRING([--disable-libtool-lock],
4127 - [avoid locking (might break parallel builds)])])
4128 -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
38294129 +cygwin* | mingw* | pw32*)
38304130 + version_type=windows
38314131 + shrext_cmds=".dll"
38324132 + need_version=no
38334133 + need_lib_prefix=no
38344134
3835 -# _LT_CC_BASENAME(CC)
3836 -# -------------------
3837 -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
3838 -AC_DEFUN([_LT_CC_BASENAME],
3839 -[for cc_temp in $1""; do
3840 - case $cc_temp in
3841 - compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
3842 - distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
3843 - \-*) ;;
3844 - *) break;;
3845 - esac
3846 -done
3847 -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
3848 -])
3849 -
3850 -
3851 -# _LT_COMPILER_BOILERPLATE
3852 -# ------------------------
3853 -# Check for compiler boilerplate output or warnings with
3854 -# the simple compiler test code.
3855 -AC_DEFUN([_LT_COMPILER_BOILERPLATE],
3856 -[ac_outfile=conftest.$ac_objext
3857 -printf "$lt_simple_compile_test_code" >conftest.$ac_ext
3858 -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
3859 -_lt_compiler_boilerplate=`cat conftest.err`
3860 -$rm conftest*
3861 -])# _LT_COMPILER_BOILERPLATE
3862 -
4135 -# Some flags need to be propagated to the compiler or linker for good
4136 -# libtool support.
4137 -case $host in
4138 -ia64-*-hpux*)
4139 - # Find out which ABI we are using.
4140 - echo 'int i;' > conftest.$ac_ext
4141 - if AC_TRY_EVAL(ac_compile); then
4142 - case `/usr/bin/file conftest.$ac_objext` in
4143 - *ELF-32*)
4144 - HPUX_IA64_MODE="32"
4145 - ;;
4146 - *ELF-64*)
4147 - HPUX_IA64_MODE="64"
4148 - ;;
4149 - esac
4150 - fi
4151 - rm -rf conftest*
4152 - ;;
4153 -*-*-irix6*)
4154 - # Find out which ABI we are using.
4155 - echo '[#]line __oline__ "configure"' > conftest.$ac_ext
4156 - if AC_TRY_EVAL(ac_compile); then
4157 - if test "$lt_cv_prog_gnu_ld" = yes; then
4158 - case `/usr/bin/file conftest.$ac_objext` in
4159 - *32-bit*)
4160 - LD="${LD-ld} -melf32bsmip"
38634161 + case $GCC,$host_os in
38644162 + yes,cygwin* | yes,mingw* | yes,pw32*)
38654163 + library_names_spec='$libname.dll.a'
38744172 + dlpath=$dir/\$dldll~
38754173 + $rm \$dlpath'
38764174 + shlibpath_overrides_runpath=yes
3877
3878 -# _LT_LINKER_BOILERPLATE
3879 -# ----------------------
3880 -# Check for linker boilerplate output or warnings with
3881 -# the simple link test code.
3882 -AC_DEFUN([_LT_LINKER_BOILERPLATE],
3883 -[ac_outfile=conftest.$ac_objext
3884 -printf "$lt_simple_link_test_code" >conftest.$ac_ext
3885 -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
3886 -_lt_linker_boilerplate=`cat conftest.err`
3887 -$rm conftest*
3888 -])# _LT_LINKER_BOILERPLATE
4175 +
38894176 + case $host_os in
38904177 + cygwin*)
38914178 + # Cygwin DLLs use 'cyg' prefix rather than 'lib'
38924179 + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
38934180 + sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
3894 + ;;
4181 ;;
4182 - *N32*)
4183 - LD="${LD-ld} -melf32bmipn32"
38954184 + mingw*)
38964185 + # MinGW DLLs use traditional 'lib' prefix
38974186 + soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
39074196 + else
39084197 + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
39094198 + fi
3910 + ;;
4199 ;;
4200 - *64-bit*)
4201 - LD="${LD-ld} -melf64bmip"
39114202 + pw32*)
39124203 + # pw32 DLLs use 'pw' prefix rather than 'lib'
39134204 + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
3914 + ;;
3915 + esac
4205 ;;
4206 esac
4207 - else
4208 - case `/usr/bin/file conftest.$ac_objext` in
4209 - *32-bit*)
4210 - LD="${LD-ld} -32"
4211 - ;;
4212 - *N32*)
4213 - LD="${LD-ld} -n32"
4214 - ;;
4215 - *64-bit*)
4216 - LD="${LD-ld} -64"
4217 - ;;
4218 - esac
4219 - fi
4220 - fi
4221 - rm -rf conftest*
39164222 + ;;
3917
4223 +
39184224 + *)
39194225 + library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
39204226 + ;;
39224228 + dynamic_linker='Win32 ld.exe'
39234229 + # FIXME: first we should search . and the directory the executable is in
39244230 + shlibpath_var=PATH
3925 + ;;
3926
3927 -# _LT_AC_SYS_LIBPATH_AIX
3928 -# ----------------------
3929 -# Links a minimal program and checks the executable
3930 -# for the system default hardcoded library path. In most cases,
3931 -# this is /usr/lib:/lib, but when the MPI compilers are used
3932 -# the location of the communication and MPI libs are included too.
3933 -# If we don't find anything, use the default library path according
3934 -# to the aix ld manual.
3935 -AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
3936 -[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
3937 -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
3938 -}'`
3939 -# Check for a 64-bit object if we didn't find anything.
3940 -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
3941 -}'`; fi],[])
3942 -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3943 -])# _LT_AC_SYS_LIBPATH_AIX
4231 ;;
4232
4233 -x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
4234 - # Find out which ABI we are using.
4235 - echo 'int i;' > conftest.$ac_ext
4236 - if AC_TRY_EVAL(ac_compile); then
4237 - case `/usr/bin/file conftest.o` in
4238 - *32-bit*)
4239 - case $host in
4240 - x86_64-*linux*)
4241 - LD="${LD-ld} -m elf_i386"
4242 - ;;
4243 - ppc64-*linux*|powerpc64-*linux*)
4244 - LD="${LD-ld} -m elf32ppclinux"
4245 - ;;
4246 - s390x-*linux*)
4247 - LD="${LD-ld} -m elf_s390"
4248 - ;;
4249 - sparc64-*linux*)
4250 - LD="${LD-ld} -m elf32_sparc"
4251 - ;;
4252 - esac
4253 - ;;
4254 - *64-bit*)
4255 - case $host in
4256 - x86_64-*linux*)
4257 - LD="${LD-ld} -m elf_x86_64"
4258 - ;;
4259 - ppc*-*linux*|powerpc*-*linux*)
4260 - LD="${LD-ld} -m elf64ppc"
4261 - ;;
4262 - s390*-*linux*)
4263 - LD="${LD-ld} -m elf64_s390"
4264 - ;;
4265 - sparc*-*linux*)
4266 - LD="${LD-ld} -m elf64_sparc"
4267 - ;;
4268 - esac
4269 - ;;
4270 - esac
39444271 +darwin* | rhapsody*)
39454272 + dynamic_linker="$host_os dyld"
39464273 + version_type=darwin
39564283 + 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"`
39574284 + else
39584285 + sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
3959 + fi
4286 fi
4287 - rm -rf conftest*
39604288 + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
3961 + ;;
3962
4289 ;;
4290
4291 -*-*-sco3.2v5*)
4292 - # On SCO OpenServer 5, we need -belf to get full-featured binaries.
4293 - SAVE_CFLAGS="$CFLAGS"
4294 - CFLAGS="$CFLAGS -belf"
4295 - AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
4296 - [AC_LANG_PUSH(C)
4297 - AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
4298 - AC_LANG_POP])
4299 - if test x"$lt_cv_cc_needs_belf" != x"yes"; then
4300 - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
4301 - CFLAGS="$SAVE_CFLAGS"
4302 - fi
39634303 +dgux*)
39644304 + version_type=linux
39654305 + need_lib_prefix=no
39674307 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
39684308 + soname_spec='${libname}${release}${shared_ext}$major'
39694309 + shlibpath_var=LD_LIBRARY_PATH
3970 + ;;
3971
3972 -# _LT_AC_SHELL_INIT(ARG)
3973 -# ----------------------
3974 -AC_DEFUN([_LT_AC_SHELL_INIT],
3975 -[ifdef([AC_DIVERSION_NOTICE],
3976 - [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
3977 - [AC_DIVERT_PUSH(NOTICE)])
3978 -$1
3979 -AC_DIVERT_POP
3980 -])# _LT_AC_SHELL_INIT
4310 ;;
4311 -sparc*-*solaris*)
4312 - # Find out which ABI we are using.
4313 - echo 'int i;' > conftest.$ac_ext
4314 - if AC_TRY_EVAL(ac_compile); then
4315 - case `/usr/bin/file conftest.o` in
4316 - *64-bit*)
4317 - case $lt_cv_prog_gnu_ld in
4318 - yes*) LD="${LD-ld} -m elf64_sparc" ;;
4319 - *) LD="${LD-ld} -64" ;;
4320 - esac
4321 - ;;
4322 +
39814323 +freebsd1*)
39824324 + dynamic_linker=no
39834325 + ;;
3984
4326 +
39854327 +freebsd* | dragonfly*)
39864328 + # DragonFly does not have aout. When/if they implement a new
39874329 + # versioning mechanism, adjust this.
39914333 + case $host_os in
39924334 + freebsd[[123]]*) objformat=aout ;;
39934335 + *) objformat=elf ;;
3994 + esac
3995 + fi
4336 esac
4337 fi
4338 - rm -rf conftest*
39964339 + version_type=freebsd-$objformat
39974340 + case $version_type in
39984341 + freebsd-elf*)
40244367 + hardcode_into_libs=yes
40254368 + ;;
40264369 + esac
4027 + ;;
4028
4029 -# _LT_AC_PROG_ECHO_BACKSLASH
4030 -# --------------------------
4031 -# Add some code to the start of the generated configure script which
4032 -# will find an echo command which doesn't interpret backslashes.
4033 -AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
4034 -[_LT_AC_SHELL_INIT([
4035 -# Check that we are running under the correct shell.
4036 -SHELL=${CONFIG_SHELL-/bin/sh}
4370 ;;
4371
4372 -AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
4373 -[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
4374 - AC_CHECK_TOOL(DLLTOOL, dlltool, false)
4375 - AC_CHECK_TOOL(AS, as, false)
4376 - AC_CHECK_TOOL(OBJDUMP, objdump, false)
40374377 +gnu*)
40384378 + version_type=linux
40394379 + need_lib_prefix=no
40424382 + soname_spec='${libname}${release}${shared_ext}$major'
40434383 + shlibpath_var=LD_LIBRARY_PATH
40444384 + hardcode_into_libs=yes
4045 + ;;
4046
4047 -case X$ECHO in
4048 -X*--fallback-echo)
4049 - # Remove one level of quotation (which was required for Make).
4050 - ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
4385 ;;
4386 - ])
4387 -esac
4388 -
4389 -need_locks="$enable_libtool_lock"
4390
4391 -])# _LT_AC_LOCK
40514392 +hpux9* | hpux10* | hpux11*)
40524393 + # Give a soname corresponding to the major version so that dld.sl refuses to
40534394 + # link against other versions.
40924433 + esac
40934434 + # HP-UX runs *really* slowly unless shared libraries are mode 555.
40944435 + postinstall_cmds='chmod 555 $lib'
4095 ;;
4096 -esac
4097
4098 -echo=${ECHO-echo}
4099 -if test "X[$]1" = X--no-reexec; then
4100 - # Discard the --no-reexec flag, and continue.
4101 - shift
4102 -elif test "X[$]1" = X--fallback-echo; then
4103 - # Avoid inline document here, it may be left over
4104 - :
4105 -elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
4106 - # Yippee, $echo works!
4107 - :
4108 -else
4109 - # Restart under the correct shell.
4110 - exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
4111 -fi
4112 -
4113 -if test "X[$]1" = X--fallback-echo; then
4114 - # used as fallback echo
4115 - shift
4116 - cat <<EOF
4117 -[$]*
4118 -EOF
4119 - exit 0
4120 -fi
4436 + ;;
4437
41214438 +interix3*)
41224439 + version_type=linux
41234440 + need_lib_prefix=no
41294446 + shlibpath_overrides_runpath=no
41304447 + hardcode_into_libs=yes
41314448 + ;;
4132
4133 -# The HP-UX ksh and POSIX shell print the target directory to stdout
4134 -# if CDPATH is set.
4135 -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
4136 +irix5* | irix6* | nonstopux*)
4137 + case $host_os in
4138 + nonstopux*) version_type=nonstopux ;;
4139 + *)
4140 + if test "$lt_cv_prog_gnu_ld" = yes; then
4141 + version_type=linux
4142 + else
4143 + version_type=irix
4144 + fi ;;
4145 + esac
4146 + need_lib_prefix=no
4147 + need_version=no
4148 + soname_spec='${libname}${release}${shared_ext}$major'
4149 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
4150 + case $host_os in
4151 + irix5* | nonstopux*)
4152 + libsuff= shlibsuff=
4153 + ;;
4154 + *)
4155 + case $LD in # libtool.m4 will add one of these switches to LD
4156 + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
4157 + libsuff= shlibsuff= libmagic=32-bit;;
4158 + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
4159 + libsuff=32 shlibsuff=N32 libmagic=N32;;
4160 + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
4161 + libsuff=64 shlibsuff=64 libmagic=64-bit;;
4162 + *) libsuff= shlibsuff= libmagic=never-match;;
4163 + esac
4164 + ;;
4165 + esac
4166 + shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
4167 + shlibpath_overrides_runpath=no
4168 + sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
4169 + sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
4170 + hardcode_into_libs=yes
4171 + ;;
4172
4173 -if test -z "$ECHO"; then
4174 -if test "X${echo_test_string+set}" != Xset; then
4175 -# find a string as large as possible, as long as the shell can cope with it
4176 - for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
4177 - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
4178 - if (echo_test_string=`eval $cmd`) 2>/dev/null &&
4179 - echo_test_string=`eval $cmd` &&
4180 - (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
4181 - then
4182 - break
4183 - fi
4184 - done
4185 -fi
4186 +# No shared lib support for Linux oldld, aout, or coff.
4187 +linux*oldld* | linux*aout* | linux*coff*)
4188 + dynamic_linker=no
4189 + ;;
4190
4191 -if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
4192 - echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
4193 - test "X$echo_testing_string" = "X$echo_test_string"; then
4194 - :
4195 -else
4196 - # The Solaris, AIX, and Digital Unix default echo programs unquote
4197 - # backslashes. This makes it impossible to quote backslashes using
4198 - # echo "$something" | sed 's/\\/\\\\/g'
4199 - #
4200 - # So, first we look for a working echo in the user's PATH.
4201 +# This must be Linux ELF.
4202 +linux* | k*bsd*-gnu)
4203 + version_type=linux
4204 + need_lib_prefix=no
4205 + need_version=no
4206 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
4207 + soname_spec='${libname}${release}${shared_ext}$major'
4208 + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
4209 + shlibpath_var=LD_LIBRARY_PATH
4210 + shlibpath_overrides_runpath=no
4211 + # This implies no fast_install, which is unacceptable.
4212 + # Some rework will be needed to allow for fast_install
4213 + # before this can be enabled.
4214 + hardcode_into_libs=yes
4215
4216 - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
4217 - for dir in $PATH /usr/ucb; do
4218 - IFS="$lt_save_ifs"
4219 - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
4220 - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
4221 - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
4222 - test "X$echo_testing_string" = "X$echo_test_string"; then
4223 - echo="$dir/echo"
4224 - break
4225 - fi
4226 - done
4227 - IFS="$lt_save_ifs"
4228 + # Append ld.so.conf contents to the search path
4229 + if test -f /etc/ld.so.conf; then
4230 + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
4231 + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
4232 + fi
4233
4234 - if test "X$echo" = Xecho; then
4235 - # We didn't find a better echo, so look for alternatives.
4236 - if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
4237 - echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
4238 - test "X$echo_testing_string" = "X$echo_test_string"; then
4239 - # This shell has a builtin print -r that does the trick.
4240 - echo='print -r'
4241 - elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
4242 - test "X$CONFIG_SHELL" != X/bin/ksh; then
4243 - # If we have ksh, try running configure again with it.
4244 - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
4245 - export ORIGINAL_CONFIG_SHELL
4246 - CONFIG_SHELL=/bin/ksh
4247 - export CONFIG_SHELL
4248 - exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
4249 - else
4250 - # Try using printf.
4251 - echo='printf %s\n'
4252 - if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
4253 - echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
4254 - test "X$echo_testing_string" = "X$echo_test_string"; then
4255 - # Cool, printf works
4256 - :
4257 - elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
4258 - test "X$echo_testing_string" = 'X\t' &&
4259 - echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
4260 - test "X$echo_testing_string" = "X$echo_test_string"; then
4261 - CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
4262 - export CONFIG_SHELL
4263 - SHELL="$CONFIG_SHELL"
4264 - export SHELL
4265 - echo="$CONFIG_SHELL [$]0 --fallback-echo"
4266 - elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
4267 - test "X$echo_testing_string" = 'X\t' &&
4268 - echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
4269 - test "X$echo_testing_string" = "X$echo_test_string"; then
4270 - echo="$CONFIG_SHELL [$]0 --fallback-echo"
4271 - else
4272 - # maybe with a smaller string...
4273 - prev=:
4274 + # We used to test for /lib/ld.so.1 and disable shared libraries on
4275 + # powerpc, because MkLinux only supported shared libraries with the
4276 + # GNU dynamic linker. Since this was broken with cross compilers,
4277 + # most powerpc-linux boxes support dynamic linking these days and
4278 + # people can always --disable-shared, the test was removed, and we
4279 + # assume the GNU/Linux dynamic linker is in use.
4280 + dynamic_linker='GNU/Linux ld.so'
4281 + ;;
4282
4283 - for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
4284 - if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
4285 - then
4286 - break
4287 - fi
4288 - prev="$cmd"
4289 - done
4290 +netbsdelf*-gnu)
4291 + version_type=linux
4292 + need_lib_prefix=no
4293 + need_version=no
4294 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
4295 + soname_spec='${libname}${release}${shared_ext}$major'
4296 + shlibpath_var=LD_LIBRARY_PATH
4297 + shlibpath_overrides_runpath=no
4298 + hardcode_into_libs=yes
4299 + dynamic_linker='NetBSD ld.elf_so'
4300 + ;;
4301
4302 - if test "$prev" != 'sed 50q "[$]0"'; then
4303 - echo_test_string=`eval $prev`
4304 - export echo_test_string
4305 - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
4306 - else
4307 - # Oops. We lost completely, so just stick with echo.
4308 - echo=echo
4309 - fi
4310 - fi
4311 - fi
4312 +netbsd*)
4313 + version_type=sunos
4314 + need_lib_prefix=no
4315 + need_version=no
4316 + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
4317 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
4318 + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
4319 + dynamic_linker='NetBSD (a.out) ld.so'
4320 + else
4321 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
4322 + soname_spec='${libname}${release}${shared_ext}$major'
4323 + dynamic_linker='NetBSD ld.elf_so'
4324 fi
4325 -fi
4326 -fi
4327 -
4328 -# Copy echo and quote the copy suitably for passing to libtool from
4329 -# the Makefile, instead of quoting the original, which is used later.
4330 -ECHO=$echo
4331 -if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
4332 - ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
4333 -fi
4334 -
4335 -AC_SUBST(ECHO)
4336 -])])# _LT_AC_PROG_ECHO_BACKSLASH
4337 + shlibpath_var=LD_LIBRARY_PATH
4338 + shlibpath_overrides_runpath=yes
4339 + hardcode_into_libs=yes
4340 + ;;
4341
4342 +newsos6)
4343 + version_type=linux
4344 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
4345 + shlibpath_var=LD_LIBRARY_PATH
4346 + shlibpath_overrides_runpath=yes
4347 + ;;
4348
4349 -# _LT_AC_LOCK
4350 -# -----------
4351 -AC_DEFUN([_LT_AC_LOCK],
4352 -[AC_ARG_ENABLE([libtool-lock],
4353 - [AC_HELP_STRING([--disable-libtool-lock],
4354 - [avoid locking (might break parallel builds)])])
4355 -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
4356 +nto-qnx*)
4357 + version_type=linux
4358 + need_lib_prefix=no
4359 + need_version=no
4360 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
4361 + soname_spec='${libname}${release}${shared_ext}$major'
4362 + shlibpath_var=LD_LIBRARY_PATH
4363 + shlibpath_overrides_runpath=yes
4364 + ;;
4365
4366 -# Some flags need to be propagated to the compiler or linker for good
4367 -# libtool support.
4368 -case $host in
4369 -ia64-*-hpux*)
4370 - # Find out which ABI we are using.
4371 - echo 'int i;' > conftest.$ac_ext
4372 - if AC_TRY_EVAL(ac_compile); then
4373 - case `/usr/bin/file conftest.$ac_objext` in
4374 - *ELF-32*)
4375 - HPUX_IA64_MODE="32"
4376 - ;;
4377 - *ELF-64*)
4378 - HPUX_IA64_MODE="64"
4379 - ;;
4380 - esac
4381 +openbsd*)
4382 + version_type=sunos
4383 + sys_lib_dlsearch_path_spec="/usr/lib"
4384 + need_lib_prefix=no
4385 + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
4386 + case $host_os in
4387 + openbsd3.3 | openbsd3.3.*) need_version=yes ;;
4388 + *) need_version=no ;;
4389 + esac
4390 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
4391 + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
4392 + shlibpath_var=LD_LIBRARY_PATH
4393 + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
4394 + case $host_os in
4395 + openbsd2.[[89]] | openbsd2.[[89]].*)
4396 + shlibpath_overrides_runpath=no
4397 + ;;
4398 + *)
4399 + shlibpath_overrides_runpath=yes
4400 + ;;
4401 + esac
4402 + else
4403 + shlibpath_overrides_runpath=yes
4404 fi
4405 - rm -rf conftest*
4406 ;;
4407 -*-*-irix6*)
4408 - # Find out which ABI we are using.
4409 - echo '[#]line __oline__ "configure"' > conftest.$ac_ext
4410 - if AC_TRY_EVAL(ac_compile); then
4411 - if test "$lt_cv_prog_gnu_ld" = yes; then
4412 - case `/usr/bin/file conftest.$ac_objext` in
4413 - *32-bit*)
4414 - LD="${LD-ld} -melf32bsmip"
4415 - ;;
4416 - *N32*)
4417 - LD="${LD-ld} -melf32bmipn32"
4418 - ;;
4419 - *64-bit*)
4420 - LD="${LD-ld} -melf64bmip"
4421 - ;;
4422 - esac
4423 - else
4424 - case `/usr/bin/file conftest.$ac_objext` in
4425 - *32-bit*)
4426 - LD="${LD-ld} -32"
4427 - ;;
4428 - *N32*)
4429 - LD="${LD-ld} -n32"
4430 - ;;
4431 - *64-bit*)
4432 - LD="${LD-ld} -64"
4433 - ;;
4434 - esac
4435 - fi
4436 +
4437 +os2*)
4438 + libname_spec='$name'
4439 + shrext_cmds=".dll"
4440 + need_lib_prefix=no
4441 + library_names_spec='$libname${shared_ext} $libname.a'
4442 + dynamic_linker='OS/2 ld.exe'
4443 + shlibpath_var=LIBPATH
4444 + ;;
4445 +
4446 +osf3* | osf4* | osf5*)
4447 + version_type=osf
4448 + need_lib_prefix=no
4449 + need_version=no
4450 + soname_spec='${libname}${release}${shared_ext}$major'
4451 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
4452 + shlibpath_var=LD_LIBRARY_PATH
4453 + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
4454 + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
4455 + ;;
4456 +
4457 +solaris*)
4458 + version_type=linux
4459 + need_lib_prefix=no
4460 + need_version=no
4461 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
4462 + soname_spec='${libname}${release}${shared_ext}$major'
4463 + shlibpath_var=LD_LIBRARY_PATH
4464 + shlibpath_overrides_runpath=yes
4465 + hardcode_into_libs=yes
4466 + # ldd complains unless libraries are executable
4467 + postinstall_cmds='chmod +x $lib'
4468 + ;;
4469 +
4470 +sunos4*)
4471 + version_type=sunos
4472 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
4473 + finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
4474 + shlibpath_var=LD_LIBRARY_PATH
4475 + shlibpath_overrides_runpath=yes
4476 + if test "$with_gnu_ld" = yes; then
4477 + need_lib_prefix=no
4478 fi
4479 - rm -rf conftest*
4480 + need_version=yes
4481 ;;
4482
4483 -x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
4484 - # Find out which ABI we are using.
4485 - echo 'int i;' > conftest.$ac_ext
4486 - if AC_TRY_EVAL(ac_compile); then
4487 - case `/usr/bin/file conftest.o` in
4488 - *32-bit*)
4489 - case $host in
4490 - x86_64-*linux*)
4491 - LD="${LD-ld} -m elf_i386"
4492 - ;;
4493 - ppc64-*linux*|powerpc64-*linux*)
4494 - LD="${LD-ld} -m elf32ppclinux"
4495 - ;;
4496 - s390x-*linux*)
4497 - LD="${LD-ld} -m elf_s390"
4498 - ;;
4499 - sparc64-*linux*)
4500 - LD="${LD-ld} -m elf32_sparc"
4501 - ;;
4502 - esac
4503 +sysv4 | sysv4.3*)
4504 + version_type=linux
4505 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
4506 + soname_spec='${libname}${release}${shared_ext}$major'
4507 + shlibpath_var=LD_LIBRARY_PATH
4508 + case $host_vendor in
4509 + sni)
4510 + shlibpath_overrides_runpath=no
4511 + need_lib_prefix=no
4512 + export_dynamic_flag_spec='${wl}-Blargedynsym'
4513 + runpath_var=LD_RUN_PATH
4514 ;;
4515 - *64-bit*)
4516 - case $host in
4517 - x86_64-*linux*)
4518 - LD="${LD-ld} -m elf_x86_64"
4519 - ;;
4520 - ppc*-*linux*|powerpc*-*linux*)
4521 - LD="${LD-ld} -m elf64ppc"
4522 - ;;
4523 - s390*-*linux*)
4524 - LD="${LD-ld} -m elf64_s390"
4525 - ;;
4526 - sparc*-*linux*)
4527 - LD="${LD-ld} -m elf64_sparc"
4528 - ;;
4529 - esac
4530 + siemens)
4531 + need_lib_prefix=no
4532 ;;
4533 - esac
4534 - fi
4535 - rm -rf conftest*
4536 + motorola)
4537 + need_lib_prefix=no
4538 + need_version=no
4539 + shlibpath_overrides_runpath=no
4540 + sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
4541 + ;;
4542 + esac
4543 ;;
4544
4545 -*-*-sco3.2v5*)
4546 - # On SCO OpenServer 5, we need -belf to get full-featured binaries.
4547 - SAVE_CFLAGS="$CFLAGS"
4548 - CFLAGS="$CFLAGS -belf"
4549 - AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
4550 - [AC_LANG_PUSH(C)
4551 - AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
4552 - AC_LANG_POP])
4553 - if test x"$lt_cv_cc_needs_belf" != x"yes"; then
4554 - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
4555 - CFLAGS="$SAVE_CFLAGS"
4556 +sysv4*MP*)
4557 + if test -d /usr/nec ;then
4558 + version_type=linux
4559 + library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
4560 + soname_spec='$libname${shared_ext}.$major'
4561 + shlibpath_var=LD_LIBRARY_PATH
4562 fi
4563 ;;
4564 -sparc*-*solaris*)
4565 - # Find out which ABI we are using.
4566 - echo 'int i;' > conftest.$ac_ext
4567 - if AC_TRY_EVAL(ac_compile); then
4568 - case `/usr/bin/file conftest.o` in
4569 - *64-bit*)
4570 - case $lt_cv_prog_gnu_ld in
4571 - yes*) LD="${LD-ld} -m elf64_sparc" ;;
4572 - *) LD="${LD-ld} -64" ;;
4573 - esac
4574 - ;;
4575 +
4576 +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
4577 + version_type=freebsd-elf
4578 + need_lib_prefix=no
4579 + need_version=no
4580 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
4581 + soname_spec='${libname}${release}${shared_ext}$major'
4582 + shlibpath_var=LD_LIBRARY_PATH
4583 + hardcode_into_libs=yes
4584 + if test "$with_gnu_ld" = yes; then
4585 + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
4586 + shlibpath_overrides_runpath=no
4587 + else
4588 + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
4589 + shlibpath_overrides_runpath=yes
4590 + case $host_os in
4591 + sco3.2v5*)
4592 + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
4593 + ;;
4594 esac
4595 fi
4596 - rm -rf conftest*
4597 + sys_lib_dlsearch_path_spec='/usr/lib'
4598 ;;
4599
4600 -AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
4601 -[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
4602 - AC_CHECK_TOOL(DLLTOOL, dlltool, false)
4603 - AC_CHECK_TOOL(AS, as, false)
4604 - AC_CHECK_TOOL(OBJDUMP, objdump, false)
4605 +uts4*)
4606 + version_type=linux
4607 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
4608 + soname_spec='${libname}${release}${shared_ext}$major'
4609 + shlibpath_var=LD_LIBRARY_PATH
4610 + ;;
4611 +
4612 +*)
4613 + dynamic_linker=no
4614 ;;
4615 - ])
4616 esac
4617 +AC_MSG_RESULT([$dynamic_linker])
4618 +test "$dynamic_linker" = no && can_build_shared=no
4619
4620 -need_locks="$enable_libtool_lock"
4621 +variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
4622 +if test "$GCC" = yes; then
4623 + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
4624 +fi
4625 +])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
4626
4627 -])# _LT_AC_LOCK
4628
4629 +# _LT_AC_TAGCONFIG
4630 +# ----------------
4631 +AC_DEFUN([_LT_AC_TAGCONFIG],
4632 +[AC_ARG_WITH([tags],
4633 + [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
4634 + [include additional configurations @<:@automatic@:>@])],
4635 + [tagnames="$withval"])
46364449
46374450 -# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
46384451 -# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
46774490 - ifelse([$6], , :, [$6])
46784491 -fi
46794492 -])# AC_LIBTOOL_COMPILER_OPTION
4680 -
4681 -
4493 +irix5* | irix6* | nonstopux*)
4494 + case $host_os in
4495 + nonstopux*) version_type=nonstopux ;;
4496 + *)
4497 + if test "$lt_cv_prog_gnu_ld" = yes; then
4498 + version_type=linux
4499 + else
4500 + version_type=irix
4501 + fi ;;
4502 + esac
4503 + need_lib_prefix=no
4504 + need_version=no
4505 + soname_spec='${libname}${release}${shared_ext}$major'
4506 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
4507 + case $host_os in
4508 + irix5* | nonstopux*)
4509 + libsuff= shlibsuff=
4510 + ;;
4511 + *)
4512 + case $LD in # libtool.m4 will add one of these switches to LD
4513 + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
4514 + libsuff= shlibsuff= libmagic=32-bit;;
4515 + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
4516 + libsuff=32 shlibsuff=N32 libmagic=N32;;
4517 + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
4518 + libsuff=64 shlibsuff=64 libmagic=64-bit;;
4519 + *) libsuff= shlibsuff= libmagic=never-match;;
4520 + esac
4521 + ;;
4522 + esac
4523 + shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
4524 + shlibpath_overrides_runpath=no
4525 + sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
4526 + sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
4527 + hardcode_into_libs=yes
4528 + ;;
4529
4530 +# No shared lib support for Linux oldld, aout, or coff.
4531 +linux*oldld* | linux*aout* | linux*coff*)
4532 + dynamic_linker=no
4533 + ;;
4534
46824535 -# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
46834536 -# [ACTION-SUCCESS], [ACTION-FAILURE])
46844537 -# ------------------------------------------------------------
47074560 - $rm conftest*
47084561 - LDFLAGS="$save_LDFLAGS"
47094562 -])
4710 +if test -f "$ltmain" && test -n "$tagnames"; then
4711 + if test ! -f "${ofile}"; then
4712 + AC_MSG_WARN([output file `$ofile' does not exist])
4713 + fi
4563 +# This must be Linux ELF.
4564 +linux* | k*bsd*-gnu)
4565 + version_type=linux
4566 + need_lib_prefix=no
4567 + need_version=no
4568 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
4569 + soname_spec='${libname}${release}${shared_ext}$major'
4570 + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
4571 + shlibpath_var=LD_LIBRARY_PATH
4572 + shlibpath_overrides_runpath=no
4573 + # This implies no fast_install, which is unacceptable.
4574 + # Some rework will be needed to allow for fast_install
4575 + # before this can be enabled.
4576 + hardcode_into_libs=yes
47144577
47154578 -if test x"[$]$2" = xyes; then
47164579 - ifelse([$4], , :, [$4])
47184581 - ifelse([$5], , :, [$5])
47194582 -fi
47204583 -])# AC_LIBTOOL_LINKER_OPTION
4721 + if test -z "$LTCC"; then
4722 + eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
4723 + if test -z "$LTCC"; then
4724 + AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
4725 + else
4726 + AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
4727 + fi
4584 + # Append ld.so.conf contents to the search path
4585 + if test -f /etc/ld.so.conf; then
4586 + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
4587 + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
47284588 + fi
4729 + if test -z "$LTCFLAGS"; then
4730 + eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
4731 + fi
4732
4733 + # Extract list of available tagged configurations in $ofile.
4734 + # Note that this assumes the entire list is on one line.
4735 + available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
4589
4590 + # We used to test for /lib/ld.so.1 and disable shared libraries on
4591 + # powerpc, because MkLinux only supported shared libraries with the
4592 + # GNU dynamic linker. Since this was broken with cross compilers,
4593 + # most powerpc-linux boxes support dynamic linking these days and
4594 + # people can always --disable-shared, the test was removed, and we
4595 + # assume the GNU/Linux dynamic linker is in use.
4596 + dynamic_linker='GNU/Linux ld.so'
4597 + ;;
47364598
47374599 -# AC_LIBTOOL_SYS_MAX_CMD_LEN
47384600 -# --------------------------
47424604 -AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
47434605 - i=0
47444606 - teststring="ABCD"
4745 + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
4746 + for tagname in $tagnames; do
4747 + IFS="$lt_save_ifs"
4748 + # Check whether tagname contains only valid characters
4749 + case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
4750 + "") ;;
4751 + *) AC_MSG_ERROR([invalid tag name: $tagname])
4752 + ;;
4753 + esac
4607 +netbsdelf*-gnu)
4608 + version_type=linux
4609 + need_lib_prefix=no
4610 + need_version=no
4611 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
4612 + soname_spec='${libname}${release}${shared_ext}$major'
4613 + shlibpath_var=LD_LIBRARY_PATH
4614 + shlibpath_overrides_runpath=no
4615 + hardcode_into_libs=yes
4616 + dynamic_linker='NetBSD ld.elf_so'
4617 + ;;
47544618
47554619 - case $build_os in
47564620 - msdosdjgpp*)
47604624 - # check would be larger than it should be.
47614625 - lt_cv_sys_max_cmd_len=12288; # 12K is about right
47624626 - ;;
4763 + if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
4764 + then
4765 + AC_MSG_ERROR([tag name \"$tagname\" already exists])
4766 + fi
4627 +netbsd*)
4628 + version_type=sunos
4629 + need_lib_prefix=no
4630 + need_version=no
4631 + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
4632 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
4633 + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
4634 + dynamic_linker='NetBSD (a.out) ld.so'
4635 + else
4636 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
4637 + soname_spec='${libname}${release}${shared_ext}$major'
4638 + dynamic_linker='NetBSD ld.elf_so'
4639 + fi
4640 + shlibpath_var=LD_LIBRARY_PATH
4641 + shlibpath_overrides_runpath=yes
4642 + hardcode_into_libs=yes
4643 + ;;
47674644
47684645 - gnu*)
47694646 - # Under GNU Hurd, this test is not required because there is
47714648 - # Libtool will interpret -1 as no limit whatsoever
47724649 - lt_cv_sys_max_cmd_len=-1;
47734650 - ;;
4774 + # Update the list of available tags.
4775 + if test -n "$tagname"; then
4776 + echo appending configuration tag \"$tagname\" to $ofile
4651 +newsos6)
4652 + version_type=linux
4653 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
4654 + shlibpath_var=LD_LIBRARY_PATH
4655 + shlibpath_overrides_runpath=yes
4656 + ;;
47774657
47784658 - cygwin* | mingw*)
47794659 - # On Win9x/ME, this test blows up -- it succeeds, but takes
47854665 - # all of the supported platforms: 8192 (on NT/2K/XP).
47864666 - lt_cv_sys_max_cmd_len=8192;
47874667 - ;;
4788 + case $tagname in
4789 + CXX)
4790 + if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
4791 + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
4792 + (test "X$CXX" != "Xg++"))) ; then
4793 + AC_LIBTOOL_LANG_CXX_CONFIG
4794 + else
4795 + tagname=""
4796 + fi
4797 + ;;
4668 +nto-qnx*)
4669 + version_type=linux
4670 + need_lib_prefix=no
4671 + need_version=no
4672 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
4673 + soname_spec='${libname}${release}${shared_ext}$major'
4674 + shlibpath_var=LD_LIBRARY_PATH
4675 + shlibpath_overrides_runpath=yes
4676 + ;;
47984677
47994678 - amigaos*)
48004679 - # On AmigaOS with pdksh, this test takes hours, literally.
48014680 - # So we just punt and use a minimum line length of 8192.
48024681 - lt_cv_sys_max_cmd_len=8192;
48034682 - ;;
4804 + F77)
4805 + if test -n "$F77" && test "X$F77" != "Xno"; then
4806 + AC_LIBTOOL_LANG_F77_CONFIG
4807 + else
4808 + tagname=""
4809 + fi
4683 +openbsd*)
4684 + version_type=sunos
4685 + sys_lib_dlsearch_path_spec="/usr/lib"
4686 + need_lib_prefix=no
4687 + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
4688 + case $host_os in
4689 + openbsd3.3 | openbsd3.3.*) need_version=yes ;;
4690 + *) need_version=no ;;
4691 + esac
4692 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
4693 + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
4694 + shlibpath_var=LD_LIBRARY_PATH
4695 + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
4696 + case $host_os in
4697 + openbsd2.[[89]] | openbsd2.[[89]].*)
4698 + shlibpath_overrides_runpath=no
48104699 + ;;
4700 + *)
4701 + shlibpath_overrides_runpath=yes
4702 + ;;
4703 + esac
4704 + else
4705 + shlibpath_overrides_runpath=yes
4706 + fi
4707 + ;;
48114708
48124709 - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
48134710 - # This has been around since 386BSD, at least. Likely further.
48224719 - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
48234720 - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
48244721 - ;;
4825 + GCJ)
4826 + if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
4827 + AC_LIBTOOL_LANG_GCJ_CONFIG
4828 + else
4829 + tagname=""
4830 + fi
4831 + ;;
4722 +os2*)
4723 + libname_spec='$name'
4724 + shrext_cmds=".dll"
4725 + need_lib_prefix=no
4726 + library_names_spec='$libname${shared_ext} $libname.a'
4727 + dynamic_linker='OS/2 ld.exe'
4728 + shlibpath_var=LIBPATH
4729 + ;;
48324730
48334731 - interix*)
48344732 - # We know the value 262144 and hardcode it with a safety zone (like BSD)
48354733 - lt_cv_sys_max_cmd_len=196608
48364734 - ;;
4837 + RC)
4838 + AC_LIBTOOL_LANG_RC_CONFIG
4839 + ;;
4840
4735 -
48414736 - osf*)
48424737 - # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
48434738 - # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
48484743 - if test -x /sbin/sysconfig; then
48494744 - case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
48504745 - *1*) lt_cv_sys_max_cmd_len=-1 ;;
4851 + *)
4852 + AC_MSG_ERROR([Unsupported tag name: $tagname])
4853 + ;;
4854 esac
4855 +
4856 + # Append the new tag name to the list of available tags.
4857 + if test -n "$tagname" ; then
4858 + available_tags="$available_tags $tagname"
4859 fi
4746 - esac
4747 - fi
48604748 - ;;
48614749 - sco3.2v5*)
48624750 - lt_cv_sys_max_cmd_len=102400
48674755 - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'`
48684756 - else
48694757 - lt_cv_sys_max_cmd_len=32768
4870 fi
4758 - fi
48714759 - ;;
48724760 - *)
48734761 - # If test is not a shell built-in, we'll probably end up computing a
48954783 - AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
48964784 -else
48974785 - AC_MSG_RESULT(none)
4898 + done
4899 + IFS="$lt_save_ifs"
4900 +
4901 + # Now substitute the updated list of available tags.
4902 + if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
4903 + mv "${ofile}T" "$ofile"
4904 + chmod +x "$ofile"
4905 + else
4906 + rm -f "${ofile}T"
4907 + AC_MSG_ERROR([unable to update list of available tagged configurations.])
4908 + fi
4909 fi
4786 -fi
49104787 -])# AC_LIBTOOL_SYS_MAX_CMD_LEN
4911 +])# _LT_AC_TAGCONFIG
4912
4788 +osf3* | osf4* | osf5*)
4789 + version_type=osf
4790 + need_lib_prefix=no
4791 + need_version=no
4792 + soname_spec='${libname}${release}${shared_ext}$major'
4793 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
4794 + shlibpath_var=LD_LIBRARY_PATH
4795 + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
4796 + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
4797 + ;;
4798
4799 +solaris*)
4800 + version_type=linux
4801 + need_lib_prefix=no
4802 + need_version=no
4803 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
4804 + soname_spec='${libname}${release}${shared_ext}$major'
4805 + shlibpath_var=LD_LIBRARY_PATH
4806 + shlibpath_overrides_runpath=yes
4807 + hardcode_into_libs=yes
4808 + # ldd complains unless libraries are executable
4809 + postinstall_cmds='chmod +x $lib'
4810 + ;;
49134811
49144812 -# _LT_AC_CHECK_DLFCN
49154813 -# ------------------
49164814 -AC_DEFUN([_LT_AC_CHECK_DLFCN],
49174815 -[AC_CHECK_HEADERS(dlfcn.h)dnl
49184816 -])# _LT_AC_CHECK_DLFCN
4919 +# AC_LIBTOOL_DLOPEN
4920 +# -----------------
4921 +# enable checks for dlopen support
4922 +AC_DEFUN([AC_LIBTOOL_DLOPEN],
4923 + [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
4924 +])# AC_LIBTOOL_DLOPEN
4925
4817 +sunos4*)
4818 + version_type=sunos
4819 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
4820 + finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
4821 + shlibpath_var=LD_LIBRARY_PATH
4822 + shlibpath_overrides_runpath=yes
4823 + if test "$with_gnu_ld" = yes; then
4824 + need_lib_prefix=no
4825 + fi
4826 + need_version=yes
4827 + ;;
4828
4829 +sysv4 | sysv4.3*)
4830 + version_type=linux
4831 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
4832 + soname_spec='${libname}${release}${shared_ext}$major'
4833 + shlibpath_var=LD_LIBRARY_PATH
4834 + case $host_vendor in
4835 + sni)
4836 + shlibpath_overrides_runpath=no
4837 + need_lib_prefix=no
4838 + export_dynamic_flag_spec='${wl}-Blargedynsym'
4839 + runpath_var=LD_RUN_PATH
4840 + ;;
4841 + siemens)
4842 + need_lib_prefix=no
4843 + ;;
4844 + motorola)
4845 + need_lib_prefix=no
4846 + need_version=no
4847 + shlibpath_overrides_runpath=no
4848 + sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
4849 + ;;
4850 + esac
4851 + ;;
49264852
49274853 -# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
49284854 -# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
49374863 - cat > conftest.$ac_ext <<EOF
49384864 -[#line __oline__ "configure"
49394865 -#include "confdefs.h"
4866 +sysv4*MP*)
4867 + if test -d /usr/nec ;then
4868 + version_type=linux
4869 + library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
4870 + soname_spec='$libname${shared_ext}.$major'
4871 + shlibpath_var=LD_LIBRARY_PATH
4872 + fi
4873 + ;;
4874
4875 -#if HAVE_DLFCN_H
4876 -#include <dlfcn.h>
4877 -#endif
4878 +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
4879 + version_type=freebsd-elf
4880 + need_lib_prefix=no
4881 + need_version=no
4882 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
4883 + soname_spec='${libname}${release}${shared_ext}$major'
4884 + shlibpath_var=LD_LIBRARY_PATH
4885 + hardcode_into_libs=yes
4886 + if test "$with_gnu_ld" = yes; then
4887 + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
4888 + shlibpath_overrides_runpath=no
4889 + else
4890 + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
4891 + shlibpath_overrides_runpath=yes
4892 + case $host_os in
4893 + sco3.2v5*)
4894 + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
4895 + ;;
4896 + esac
4897 + fi
4898 + sys_lib_dlsearch_path_spec='/usr/lib'
4899 + ;;
4900
4901 -#include <stdio.h>
4902 +uts4*)
4903 + version_type=linux
4904 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
4905 + soname_spec='${libname}${release}${shared_ext}$major'
4906 + shlibpath_var=LD_LIBRARY_PATH
4907 + ;;
4908
4909 -#ifdef RTLD_GLOBAL
4910 -# define LT_DLGLOBAL RTLD_GLOBAL
4911 -#else
4912 -# ifdef DL_GLOBAL
4913 -# define LT_DLGLOBAL DL_GLOBAL
4914 -# else
4915 -# define LT_DLGLOBAL 0
4916 -# endif
4917 -#endif
4918 +*)
4919 + dynamic_linker=no
4920 + ;;
4921 +esac
4922 +AC_MSG_RESULT([$dynamic_linker])
4923 +test "$dynamic_linker" = no && can_build_shared=no
4924
4925 -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
4926 - find out it does not work in some platform. */
4927 -#ifndef LT_DLLAZY_OR_NOW
4928 -# ifdef RTLD_LAZY
4929 -# define LT_DLLAZY_OR_NOW RTLD_LAZY
4930 -# else
4931 -# ifdef DL_LAZY
4932 -# define LT_DLLAZY_OR_NOW DL_LAZY
4933 -# else
4934 -# ifdef RTLD_NOW
4935 -# define LT_DLLAZY_OR_NOW RTLD_NOW
4936 -# else
4937 -# ifdef DL_NOW
4938 -# define LT_DLLAZY_OR_NOW DL_NOW
4939 -# else
4940 -# define LT_DLLAZY_OR_NOW 0
4941 -# endif
4942 -# endif
4943 -# endif
4944 -# endif
4945 -#endif
4946 +variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
4947 +if test "$GCC" = yes; then
4948 + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
4949 +fi
4950 +])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
4951
4952 -#ifdef __cplusplus
4953 -extern "C" void exit (int);
4954 -#endif
4955
4956 -void fnord() { int i=42;}
4957 -int main ()
4958 -{
4959 - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
4960 - int status = $lt_dlunknown;
4961 +# _LT_AC_TAGCONFIG
4962 +# ----------------
4963 +AC_DEFUN([_LT_AC_TAGCONFIG],
4964 +[AC_ARG_WITH([tags],
4965 + [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
4966 + [include additional configurations @<:@automatic@:>@])],
4967 + [tagnames="$withval"])
4968
4969 - if (self)
4970 - {
4971 - if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
4972 - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
4973 - /* dlclose (self); */
4974 - }
4975 - else
4976 - puts (dlerror ());
4977 +if test -f "$ltmain" && test -n "$tagnames"; then
4978 + if test ! -f "${ofile}"; then
4979 + AC_MSG_WARN([output file `$ofile' does not exist])
4980 + fi
4981
4982 - exit (status);
4983 -}]
4984 -EOF
4985 - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
4986 - (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
4987 - lt_status=$?
4988 - case x$lt_status in
4989 - x$lt_dlno_uscore) $1 ;;
4990 - x$lt_dlneed_uscore) $2 ;;
4991 - x$lt_dlunknown|x*) $3 ;;
4992 - esac
4993 - else :
4994 - # compilation failed
4995 - $3
4996 + if test -z "$LTCC"; then
4997 + eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
4998 + if test -z "$LTCC"; then
4999 + AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
5000 + else
5001 + AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
5002 + fi
5003 + fi
5004 + if test -z "$LTCFLAGS"; then
5005 + eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
5006 fi
5007 -fi
5008 -rm -fr conftest*
5009 -])# _LT_AC_TRY_DLOPEN_SELF
5010
5011 + # Extract list of available tagged configurations in $ofile.
5012 + # Note that this assumes the entire list is on one line.
5013 + available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
5014
5015 -# AC_LIBTOOL_DLOPEN_SELF
5016 -# ----------------------
5017 -AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
5018 -[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
5019 -if test "x$enable_dlopen" != xyes; then
5020 - enable_dlopen=unknown
5021 - enable_dlopen_self=unknown
5022 - enable_dlopen_self_static=unknown
5023 -else
5024 - lt_cv_dlopen=no
5025 - lt_cv_dlopen_libs=
5026 + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
5027 + for tagname in $tagnames; do
5028 + IFS="$lt_save_ifs"
5029 + # Check whether tagname contains only valid characters
5030 + case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
5031 + "") ;;
5032 + *) AC_MSG_ERROR([invalid tag name: $tagname])
5033 + ;;
5034 + esac
5035
5036 - case $host_os in
5037 - beos*)
5038 - lt_cv_dlopen="load_add_on"
5039 - lt_cv_dlopen_libs=
5040 - lt_cv_dlopen_self=yes
5041 - ;;
5042 + if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
5043 + then
5044 + AC_MSG_ERROR([tag name \"$tagname\" already exists])
5045 + fi
5046
5047 - mingw* | pw32*)
5048 - lt_cv_dlopen="LoadLibrary"
5049 - lt_cv_dlopen_libs=
5050 - ;;
5051 + # Update the list of available tags.
5052 + if test -n "$tagname"; then
5053 + echo appending configuration tag \"$tagname\" to $ofile
5054
5055 - cygwin*)
5056 - lt_cv_dlopen="dlopen"
5057 - lt_cv_dlopen_libs=
5058 - ;;
5059 + case $tagname in
5060 + CXX)
5061 + if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
5062 + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
5063 + (test "X$CXX" != "Xg++"))) ; then
5064 + AC_LIBTOOL_LANG_CXX_CONFIG
5065 + else
5066 + tagname=""
5067 + fi
5068 + ;;
5069
5070 - darwin*)
5071 - # if libdl is installed we need to link against it
5072 - AC_CHECK_LIB([dl], [dlopen],
5073 - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
5074 - lt_cv_dlopen="dyld"
5075 - lt_cv_dlopen_libs=
5076 - lt_cv_dlopen_self=yes
5077 - ])
5078 - ;;
5079 + F77)
5080 + if test -n "$F77" && test "X$F77" != "Xno"; then
5081 + AC_LIBTOOL_LANG_F77_CONFIG
5082 + else
5083 + tagname=""
5084 + fi
5085 + ;;
5086
5087 - *)
5088 - AC_CHECK_FUNC([shl_load],
5089 - [lt_cv_dlopen="shl_load"],
5090 - [AC_CHECK_LIB([dld], [shl_load],
5091 - [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
5092 - [AC_CHECK_FUNC([dlopen],
5093 - [lt_cv_dlopen="dlopen"],
5094 - [AC_CHECK_LIB([dl], [dlopen],
5095 - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
5096 - [AC_CHECK_LIB([svld], [dlopen],
5097 - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
5098 - [AC_CHECK_LIB([dld], [dld_link],
5099 - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
5100 - ])
5101 - ])
5102 - ])
5103 - ])
5104 - ])
5105 - ;;
5106 - esac
5107 + GCJ)
5108 + if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
5109 + AC_LIBTOOL_LANG_GCJ_CONFIG
5110 + else
5111 + tagname=""
5112 + fi
5113 + ;;
5114
5115 - if test "x$lt_cv_dlopen" != xno; then
5116 - enable_dlopen=yes
5117 - else
5118 - enable_dlopen=no
5119 - fi
5120 + RC)
5121 + AC_LIBTOOL_LANG_RC_CONFIG
5122 + ;;
5123
5124 - case $lt_cv_dlopen in
5125 - dlopen)
5126 - save_CPPFLAGS="$CPPFLAGS"
5127 - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
5128 + *)
5129 + AC_MSG_ERROR([Unsupported tag name: $tagname])
5130 + ;;
5131 + esac
5132
5133 - save_LDFLAGS="$LDFLAGS"
5134 - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
5135 + # Append the new tag name to the list of available tags.
5136 + if test -n "$tagname" ; then
5137 + available_tags="$available_tags $tagname"
5138 + fi
5139 + fi
5140 + done
5141 + IFS="$lt_save_ifs"
5142
5143 - save_LIBS="$LIBS"
5144 - LIBS="$lt_cv_dlopen_libs $LIBS"
5145 + # Now substitute the updated list of available tags.
5146 + if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
5147 + mv "${ofile}T" "$ofile"
5148 + chmod +x "$ofile"
5149 + else
5150 + rm -f "${ofile}T"
5151 + AC_MSG_ERROR([unable to update list of available tagged configurations.])
5152 + fi
5153 +fi
5154 +])# _LT_AC_TAGCONFIG
5155
5156 - AC_CACHE_CHECK([whether a program can dlopen itself],
5157 - lt_cv_dlopen_self, [dnl
5158 - _LT_AC_TRY_DLOPEN_SELF(
5159 - lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
5160 - lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
5161 - ])
5162
5163 - if test "x$lt_cv_dlopen_self" = xyes; then
5164 - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
5165 - AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
5166 - lt_cv_dlopen_self_static, [dnl
5167 - _LT_AC_TRY_DLOPEN_SELF(
5168 - lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
5169 - lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross)
5170 - ])
5171 - fi
5172 +# AC_LIBTOOL_DLOPEN
5173 +# -----------------
5174 +# enable checks for dlopen support
5175 +AC_DEFUN([AC_LIBTOOL_DLOPEN],
5176 + [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
5177 +])# AC_LIBTOOL_DLOPEN
5178
5179 - CPPFLAGS="$save_CPPFLAGS"
5180 - LDFLAGS="$save_LDFLAGS"
5181 - LIBS="$save_LIBS"
5182 - ;;
5183 - esac
5184
5185 - case $lt_cv_dlopen_self in
5186 - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
5187 - *) enable_dlopen_self=unknown ;;
5188 - esac
49405189 +# AC_LIBTOOL_WIN32_DLL
49415190 +# --------------------
49425191 +# declare package support for building win32 DLLs
49445193 +[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
49455194 +])# AC_LIBTOOL_WIN32_DLL
49465195
4947 -#if HAVE_DLFCN_H
4948 -#include <dlfcn.h>
4949 -#endif
4950
4951 -#include <stdio.h>
5196 - case $lt_cv_dlopen_self_static in
5197 - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
5198 - *) enable_dlopen_self_static=unknown ;;
5199 - esac
5200 -fi
5201 -])# AC_LIBTOOL_DLOPEN_SELF
5202
49525203 +# AC_ENABLE_SHARED([DEFAULT])
49535204 +# ---------------------------
49545205 +# implement the --enable-shared flag
49785229 + [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
49795230 +])# AC_ENABLE_SHARED
49805231
4981 -#ifdef RTLD_GLOBAL
4982 -# define LT_DLGLOBAL RTLD_GLOBAL
4983 -#else
4984 -# ifdef DL_GLOBAL
4985 -# define LT_DLGLOBAL DL_GLOBAL
4986 -# else
4987 -# define LT_DLGLOBAL 0
4988 -# endif
4989 -#endif
4990
4991 -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
4992 - find out it does not work in some platform. */
4993 -#ifndef LT_DLLAZY_OR_NOW
4994 -# ifdef RTLD_LAZY
4995 -# define LT_DLLAZY_OR_NOW RTLD_LAZY
4996 -# else
4997 -# ifdef DL_LAZY
4998 -# define LT_DLLAZY_OR_NOW DL_LAZY
4999 -# else
5000 -# ifdef RTLD_NOW
5001 -# define LT_DLLAZY_OR_NOW RTLD_NOW
5002 -# else
5003 -# ifdef DL_NOW
5004 -# define LT_DLLAZY_OR_NOW DL_NOW
5005 -# else
5006 -# define LT_DLLAZY_OR_NOW 0
5007 -# endif
5008 -# endif
5009 -# endif
5010 -# endif
5011 -#endif
5012 +# AC_DISABLE_SHARED
5013 +# -----------------
5014 +# set the default shared flag to --disable-shared
5015 +AC_DEFUN([AC_DISABLE_SHARED],
5016 +[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
5017 +AC_ENABLE_SHARED(no)
5018 +])# AC_DISABLE_SHARED
5019
5020 -#ifdef __cplusplus
5021 -extern "C" void exit (int);
5022 -#endif
5023
5024 -void fnord() { int i=42;}
5025 -int main ()
5026 -{
5027 - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
5028 - int status = $lt_dlunknown;
5029 +# AC_ENABLE_STATIC([DEFAULT])
5030 +# ---------------------------
5031 +# implement the --enable-static flag
5032 +# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
5033 +AC_DEFUN([AC_ENABLE_STATIC],
5034 +[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
5035 +AC_ARG_ENABLE([static],
5036 + [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
5037 + [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
5038 + [p=${PACKAGE-default}
5039 + case $enableval in
5040 + yes) enable_static=yes ;;
5041 + no) enable_static=no ;;
5042 + *)
5043 + enable_static=no
5044 + # Look at the argument we got. We use all the common list separators.
5045 + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
5046 + for pkg in $enableval; do
5047 + IFS="$lt_save_ifs"
5048 + if test "X$pkg" = "X$p"; then
5049 + enable_static=yes
5050 + fi
5051 + done
5052 + IFS="$lt_save_ifs"
5053 + ;;
5054 + esac],
5055 + [enable_static=]AC_ENABLE_STATIC_DEFAULT)
5056 +])# AC_ENABLE_STATIC
5057
5058 - if (self)
5059 - {
5060 - if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
5061 - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
5062 - /* dlclose (self); */
5063 - }
5064 - else
5065 - puts (dlerror ());
5066
5067 - exit (status);
5068 -}]
5069 -EOF
5070 - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
5071 - (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
5072 - lt_status=$?
5073 - case x$lt_status in
5074 - x$lt_dlno_uscore) $1 ;;
5075 - x$lt_dlneed_uscore) $2 ;;
5076 - x$lt_dlunknown|x*) $3 ;;
5077 - esac
5078 - else :
5079 - # compilation failed
5080 - $3
5081 - fi
5082 -fi
5083 -rm -fr conftest*
5084 -])# _LT_AC_TRY_DLOPEN_SELF
5085 +# AC_DISABLE_STATIC
5086 +# -----------------
5087 +# set the default static flag to --disable-static
5088 +AC_DEFUN([AC_DISABLE_STATIC],
5089 +[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
5090 +AC_ENABLE_STATIC(no)
5091 +])# AC_DISABLE_STATIC
5092
5093
5094 -# AC_LIBTOOL_DLOPEN_SELF
5095 -# ----------------------
5096 -AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
5097 -[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
5098 -if test "x$enable_dlopen" != xyes; then
5099 - enable_dlopen=unknown
5100 - enable_dlopen_self=unknown
5101 - enable_dlopen_self_static=unknown
5102 -else
5103 - lt_cv_dlopen=no
5104 - lt_cv_dlopen_libs=
5105 +# AC_ENABLE_FAST_INSTALL([DEFAULT])
5106 +# ---------------------------------
5107 +# implement the --enable-fast-install flag
5108 +# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
5109 +AC_DEFUN([AC_ENABLE_FAST_INSTALL],
5110 +[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
5111 +AC_ARG_ENABLE([fast-install],
5112 + [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
5113 + [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
5114 + [p=${PACKAGE-default}
5115 + case $enableval in
5116 + yes) enable_fast_install=yes ;;
5117 + no) enable_fast_install=no ;;
5118 + *)
5119 + enable_fast_install=no
5120 + # Look at the argument we got. We use all the common list separators.
5121 + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
5122 + for pkg in $enableval; do
5123 + IFS="$lt_save_ifs"
5124 + if test "X$pkg" = "X$p"; then
5125 + enable_fast_install=yes
5126 + fi
5127 + done
5128 + IFS="$lt_save_ifs"
5129 + ;;
5130 + esac],
5131 + [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
5132 +])# AC_ENABLE_FAST_INSTALL
5133
5134 - case $host_os in
5135 - beos*)
5136 - lt_cv_dlopen="load_add_on"
5137 - lt_cv_dlopen_libs=
5138 - lt_cv_dlopen_self=yes
5139 - ;;
5140
5141 - mingw* | pw32*)
5142 - lt_cv_dlopen="LoadLibrary"
5143 - lt_cv_dlopen_libs=
5144 - ;;
5145 +# AC_DISABLE_FAST_INSTALL
5146 +# -----------------------
5147 +# set the default to --disable-fast-install
5148 +AC_DEFUN([AC_DISABLE_FAST_INSTALL],
5149 +[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
5150 +AC_ENABLE_FAST_INSTALL(no)
5151 +])# AC_DISABLE_FAST_INSTALL
5152
5153 - cygwin*)
5154 - lt_cv_dlopen="dlopen"
5155 - lt_cv_dlopen_libs=
5156 - ;;
5157
5158 - darwin*)
5159 - # if libdl is installed we need to link against it
5160 - AC_CHECK_LIB([dl], [dlopen],
5161 - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
5162 - lt_cv_dlopen="dyld"
5163 - lt_cv_dlopen_libs=
5164 - lt_cv_dlopen_self=yes
5165 - ])
5166 - ;;
5167 +# AC_LIBTOOL_PICMODE([MODE])
5168 +# --------------------------
5169 +# implement the --with-pic flag
5170 +# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
5171 +AC_DEFUN([AC_LIBTOOL_PICMODE],
5172 +[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
5173 +pic_mode=ifelse($#,1,$1,default)
5174 +])# AC_LIBTOOL_PICMODE
5175
5176 - *)
5177 - AC_CHECK_FUNC([shl_load],
5178 - [lt_cv_dlopen="shl_load"],
5179 - [AC_CHECK_LIB([dld], [shl_load],
5180 - [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
5181 - [AC_CHECK_FUNC([dlopen],
5182 - [lt_cv_dlopen="dlopen"],
5183 - [AC_CHECK_LIB([dl], [dlopen],
5184 - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
5185 - [AC_CHECK_LIB([svld], [dlopen],
5186 - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
5187 - [AC_CHECK_LIB([dld], [dld_link],
5188 - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
5189 - ])
5190 - ])
5191 - ])
5192 - ])
5193 - ])
5194 - ;;
5195 - esac
5196
5197 - if test "x$lt_cv_dlopen" != xno; then
5198 - enable_dlopen=yes
5199 - else
5200 - enable_dlopen=no
5201 - fi
5202 -
5203 - case $lt_cv_dlopen in
5204 - dlopen)
5205 - save_CPPFLAGS="$CPPFLAGS"
5206 - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
5207 +# AC_PROG_EGREP
5208 +# -------------
5209 +# This is predefined starting with Autoconf 2.54, so this conditional
5210 +# definition can be removed once we require Autoconf 2.54 or later.
5211 +m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
5212 +[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
5213 + [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
5214 + then ac_cv_prog_egrep='grep -E'
5215 + else ac_cv_prog_egrep='egrep'
5216 + fi])
5217 + EGREP=$ac_cv_prog_egrep
5218 + AC_SUBST([EGREP])
5219 +])])
5220
5221 - save_LDFLAGS="$LDFLAGS"
5222 - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
5223
5224 - save_LIBS="$LIBS"
5225 - LIBS="$lt_cv_dlopen_libs $LIBS"
5226 +# AC_PATH_TOOL_PREFIX
5227 +# -------------------
5228 +# find a file program which can recognise shared library
5229 +AC_DEFUN([AC_PATH_TOOL_PREFIX],
5230 +[AC_REQUIRE([AC_PROG_EGREP])dnl
5231 +AC_MSG_CHECKING([for $1])
5232 +AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
5233 +[case $MAGIC_CMD in
5234 +[[\\/*] | ?:[\\/]*])
5235 + lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
5236 + ;;
5237 +*)
5238 + lt_save_MAGIC_CMD="$MAGIC_CMD"
5239 + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
5240 +dnl $ac_dummy forces splitting on constant user-supplied paths.
5241 +dnl POSIX.2 word splitting is done only on the output of word expansions,
5242 +dnl not every word. This closes a longstanding sh security hole.
5243 + ac_dummy="ifelse([$2], , $PATH, [$2])"
5244 + for ac_dir in $ac_dummy; do
5245 + IFS="$lt_save_ifs"
5246 + test -z "$ac_dir" && ac_dir=.
5247 + if test -f $ac_dir/$1; then
5248 + lt_cv_path_MAGIC_CMD="$ac_dir/$1"
5249 + if test -n "$file_magic_test_file"; then
5250 + case $deplibs_check_method in
5251 + "file_magic "*)
5252 + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
5253 + MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
5254 + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
5255 + $EGREP "$file_magic_regex" > /dev/null; then
5256 + :
5257 + else
5258 + cat <<EOF 1>&2
5259
5260 - AC_CACHE_CHECK([whether a program can dlopen itself],
5261 - lt_cv_dlopen_self, [dnl
5262 - _LT_AC_TRY_DLOPEN_SELF(
5263 - lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
5264 - lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
5265 - ])
5266 +*** Warning: the command libtool uses to detect shared libraries,
5267 +*** $file_magic_cmd, produces output that libtool cannot recognize.
5268 +*** The result is that libtool may fail to recognize shared libraries
5269 +*** as such. This will affect the creation of libtool libraries that
5270 +*** depend on shared libraries, but programs linked with such libtool
5271 +*** libraries will work regardless of this problem. Nevertheless, you
5272 +*** may want to report the problem to your system manager and/or to
5273 +*** bug-libtool@gnu.org
5274
5275 - if test "x$lt_cv_dlopen_self" = xyes; then
5276 - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
5277 - AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
5278 - lt_cv_dlopen_self_static, [dnl
5279 - _LT_AC_TRY_DLOPEN_SELF(
5280 - lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
5281 - lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross)
5282 - ])
5283 +EOF
5284 + fi ;;
5285 + esac
5286 + fi
5287 + break
5288 fi
5289 -
5290 - CPPFLAGS="$save_CPPFLAGS"
5291 - LDFLAGS="$save_LDFLAGS"
5292 - LIBS="$save_LIBS"
5293 - ;;
5294 - esac
5295 -
5296 - case $lt_cv_dlopen_self in
5297 - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
5298 - *) enable_dlopen_self=unknown ;;
5299 - esac
5300 -
5301 - case $lt_cv_dlopen_self_static in
5302 - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
5303 - *) enable_dlopen_self_static=unknown ;;
5304 - esac
5305 -fi
5306 -])# AC_LIBTOOL_DLOPEN_SELF
5307 -
5308 -
53095232 -# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
53105233 -# ---------------------------------
53115234 -# Check to see if options -c and -o are simultaneously supported by compiler
53195242 - cd conftest
53205243 - mkdir out
53215244 - printf "$lt_simple_compile_test_code" > conftest.$ac_ext
5322 -
5245
53235246 - lt_compiler_flag="-o out/conftest2.$ac_objext"
53245247 - # Insert the option either (1) after the last *FLAGS variable, or
53255248 - # (2) before a word containing "conftest.", or (3) at the end.
53555278 - $rm conftest*
53565279 -])
53575280 -])# AC_LIBTOOL_PROG_CC_C_O
5358 -
5359 -
5281 +# AC_DISABLE_SHARED
5282 +# -----------------
5283 +# set the default shared flag to --disable-shared
5284 +AC_DEFUN([AC_DISABLE_SHARED],
5285 +[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
5286 +AC_ENABLE_SHARED(no)
5287 +])# AC_DISABLE_SHARED
5288
5289
53605290 -# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
53615291 -# -----------------------------------------
53625292 -# Check to see if we can do hard links to lock some files if needed
53825312 - need_locks=no
53835313 -fi
53845314 -])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
5385 -
5386 -
5315 +# AC_ENABLE_STATIC([DEFAULT])
5316 +# ---------------------------
5317 +# implement the --enable-static flag
5318 +# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
5319 +AC_DEFUN([AC_ENABLE_STATIC],
5320 +[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
5321 +AC_ARG_ENABLE([static],
5322 + [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
5323 + [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
5324 + [p=${PACKAGE-default}
5325 + case $enableval in
5326 + yes) enable_static=yes ;;
5327 + no) enable_static=no ;;
5328 + *)
5329 + enable_static=no
5330 + # Look at the argument we got. We use all the common list separators.
5331 + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
5332 + for pkg in $enableval; do
5333 + IFS="$lt_save_ifs"
5334 + if test "X$pkg" = "X$p"; then
5335 + enable_static=yes
5336 + fi
5337 + done
5338 + IFS="$lt_save_ifs"
5339 + ;;
5340 + esac],
5341 + [enable_static=]AC_ENABLE_STATIC_DEFAULT)
5342 +])# AC_ENABLE_STATIC
5343
5344
53875345 -# AC_LIBTOOL_OBJDIR
5388 -# -----------------
5346 +# AC_DISABLE_STATIC
5347 # -----------------
53895348 -AC_DEFUN([AC_LIBTOOL_OBJDIR],
53905349 -[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
53915350 -[rm -f .libs 2>/dev/null
53925351 -mkdir .libs 2>/dev/null
53935352 -if test -d .libs; then
53945353 - lt_cv_objdir=.libs
5395 + done
5396 + IFS="$lt_save_ifs"
5397 + MAGIC_CMD="$lt_save_MAGIC_CMD"
5398 + ;;
5399 +esac])
5400 +MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
5401 +if test -n "$MAGIC_CMD"; then
5402 + AC_MSG_RESULT($MAGIC_CMD)
5403 else
5354 -else
54045355 - # MS-DOS does not allow filenames that begin with a dot.
54055356 - lt_cv_objdir=_libs
5406 + AC_MSG_RESULT(no)
5407 fi
5357 -fi
54085358 -rmdir .libs 2>/dev/null])
54095359 -objdir=$lt_cv_objdir
54105360 -])# AC_LIBTOOL_OBJDIR
54115361 -
5412 +])# AC_PATH_TOOL_PREFIX
5362 +# set the default static flag to --disable-static
5363 +AC_DEFUN([AC_DISABLE_STATIC],
5364 +[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
5365 +AC_ENABLE_STATIC(no)
5366 +])# AC_DISABLE_STATIC
54135367
54145368 -# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
54155369 -# ----------------------------------------------
54305384 - test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
54315385 - # Linking always hardcodes the temporary library directory.
54325386 - _LT_AC_TAGVAR(hardcode_action, $1)=relink
5433 +# AC_PATH_MAGIC
5434 +# -------------
5435 +# find a file program which can recognise a shared library
5436 +AC_DEFUN([AC_PATH_MAGIC],
5437 +[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
5438 +if test -z "$lt_cv_path_MAGIC_CMD"; then
5439 + if test -n "$ac_tool_prefix"; then
5440 + AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
5441 else
5387 - else
54425388 - # We can link without hardcoding, and we can hardcode nonexisting dirs.
54435389 - _LT_AC_TAGVAR(hardcode_action, $1)=immediate
5444 + MAGIC_CMD=:
5445 fi
5390 - fi
54465391 -else
54475392 - # We cannot hardcode anything, or else we can only hardcode existing
54485393 - # directories.
54495394 - _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
54505395 -fi
54515396 -AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
5452 -
5397 +# AC_ENABLE_FAST_INSTALL([DEFAULT])
5398 +# ---------------------------------
5399 +# implement the --enable-fast-install flag
5400 +# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
5401 +AC_DEFUN([AC_ENABLE_FAST_INSTALL],
5402 +[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
5403 +AC_ARG_ENABLE([fast-install],
5404 + [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
5405 + [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
5406 + [p=${PACKAGE-default}
5407 + case $enableval in
5408 + yes) enable_fast_install=yes ;;
5409 + no) enable_fast_install=no ;;
5410 + *)
5411 + enable_fast_install=no
5412 + # Look at the argument we got. We use all the common list separators.
5413 + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
5414 + for pkg in $enableval; do
5415 + IFS="$lt_save_ifs"
5416 + if test "X$pkg" = "X$p"; then
5417 + enable_fast_install=yes
5418 + fi
5419 + done
5420 + IFS="$lt_save_ifs"
5421 + ;;
5422 + esac],
5423 + [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
5424 +])# AC_ENABLE_FAST_INSTALL
5425
54535426 -if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
54545427 - # Fast installation is not supported
54555428 - enable_fast_install=no
54575430 - test "$enable_shared" = no; then
54585431 - # Fast installation is not necessary
54595432 - enable_fast_install=needless
5460 fi
5433 -fi
54615434 -])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
5462 +])# AC_PATH_MAGIC
5463
5435
5436 +# AC_DISABLE_FAST_INSTALL
5437 +# -----------------------
5438 +# set the default to --disable-fast-install
5439 +AC_DEFUN([AC_DISABLE_FAST_INSTALL],
5440 +[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
5441 +AC_ENABLE_FAST_INSTALL(no)
5442 +])# AC_DISABLE_FAST_INSTALL
54645443
54655444 -# AC_LIBTOOL_SYS_LIB_STRIP
54665445 -# ------------------------
54855464 - ;;
54865465 - *)
54875466 - AC_MSG_RESULT([no])
5467 - ;;
5468 - esac
5469 -fi
5470 -])# AC_LIBTOOL_SYS_LIB_STRIP
5471
5472 +# AC_LIBTOOL_PICMODE([MODE])
5473 +# --------------------------
5474 +# implement the --with-pic flag
5475 +# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
5476 +AC_DEFUN([AC_LIBTOOL_PICMODE],
5477 +[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
5478 +pic_mode=ifelse($#,1,$1,default)
5479 +])# AC_LIBTOOL_PICMODE
5480
5481 -# AC_LIBTOOL_SYS_DYNAMIC_LINKER
5482 -# -----------------------------
5483 -# PORTME Fill in your ld.so characteristics
5484 -AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
5485 -[AC_MSG_CHECKING([dynamic linker characteristics])
5486 -library_names_spec=
5487 -libname_spec='lib$name'
5488 -soname_spec=
5489 -shrext_cmds=".so"
5490 -postinstall_cmds=
5491 -postuninstall_cmds=
5492 -finish_cmds=
5493 -finish_eval=
5494 -shlibpath_var=
5495 -shlibpath_overrides_runpath=unknown
5496 -version_type=none
5497 -dynamic_linker="$host_os ld.so"
5498 -sys_lib_dlsearch_path_spec="/lib /usr/lib"
5499 -if test "$GCC" = yes; then
5500 - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
5501 - if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
5502 - # if the path contains ";" then we assume it to be the separator
5503 - # otherwise default to the standard path separator (i.e. ":") - it is
5504 - # assumed that no part of a normal pathname contains ";" but that should
5505 - # okay in the real world where ";" in dirpaths is itself problematic.
5506 - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
5507 - else
5508 - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
5509 - fi
5510 -else
5511 - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
5512 -fi
5513 -need_lib_prefix=unknown
5514 -hardcode_into_libs=no
5515
5516 -# when you set need_version to no, make sure it does not cause -set_version
5517 -# flags to be left without arguments
5518 -need_version=unknown
5519 +# AC_PROG_EGREP
5520 +# -------------
5521 +# This is predefined starting with Autoconf 2.54, so this conditional
5522 +# definition can be removed once we require Autoconf 2.54 or later.
5523 +m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
5524 +[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
5525 + [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
5526 + then ac_cv_prog_egrep='grep -E'
5527 + else ac_cv_prog_egrep='egrep'
5528 + fi])
5529 + EGREP=$ac_cv_prog_egrep
5530 + AC_SUBST([EGREP])
5531 +])])
5532
5533 -case $host_os in
5534 -aix3*)
5535 - version_type=linux
5536 - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
5537 - shlibpath_var=LIBPATH
5538
5539 - # AIX 3 has no versioning support, so we append a major version to the name.
5540 - soname_spec='${libname}${release}${shared_ext}$major'
5541 - ;;
5542 -
5543 -aix4* | aix5*)
5544 - version_type=linux
5545 - need_lib_prefix=no
5546 - need_version=no
5547 - hardcode_into_libs=yes
5548 - if test "$host_cpu" = ia64; then
5549 - # AIX 5 supports IA64
5550 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
5551 - shlibpath_var=LD_LIBRARY_PATH
5552 - else
5553 - # With GCC up to 2.95.x, collect2 would create an import file
5554 - # for dependence libraries. The import file would start with
5555 - # the line `#! .'. This would cause the generated library to
5556 - # depend on `.', always an invalid library. This was fixed in
5557 - # development snapshots of GCC prior to 3.0.
5558 - case $host_os in
5559 - aix4 | aix4.[[01]] | aix4.[[01]].*)
5560 - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
5561 - echo ' yes '
5562 - echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
5563 - :
5564 - else
5565 - can_build_shared=no
5566 - fi
5567 - ;;
5568 - esac
5569 - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
5570 - # soname into executable. Probably we can add versioning support to
5571 - # collect2, so additional links can be useful in future.
5572 - if test "$aix_use_runtimelinking" = yes; then
5573 - # If using run time linking (on AIX 4.2 or later) use lib<name>.so
5574 - # instead of lib<name>.a to let people know that these are not
5575 - # typical AIX shared libraries.
5576 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
5577 - else
5578 - # We preserve .a as extension for shared libraries through AIX4.2
5579 - # and later when we are not doing run time linking.
5580 - library_names_spec='${libname}${release}.a $libname.a'
5581 - soname_spec='${libname}${release}${shared_ext}$major'
5582 - fi
5583 - shlibpath_var=LIBPATH
5584 - fi
5585 +# AC_PATH_TOOL_PREFIX
5586 +# -------------------
5587 +# find a file program which can recognise shared library
5588 +AC_DEFUN([AC_PATH_TOOL_PREFIX],
5589 +[AC_REQUIRE([AC_PROG_EGREP])dnl
5590 +AC_MSG_CHECKING([for $1])
5591 +AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
5592 +[case $MAGIC_CMD in
5593 +[[\\/*] | ?:[\\/]*])
5594 + lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
5595 ;;
5596 +*)
5597 + lt_save_MAGIC_CMD="$MAGIC_CMD"
5598 + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
5599 +dnl $ac_dummy forces splitting on constant user-supplied paths.
5600 +dnl POSIX.2 word splitting is done only on the output of word expansions,
5601 +dnl not every word. This closes a longstanding sh security hole.
5602 + ac_dummy="ifelse([$2], , $PATH, [$2])"
5603 + for ac_dir in $ac_dummy; do
5604 + IFS="$lt_save_ifs"
5605 + test -z "$ac_dir" && ac_dir=.
5606 + if test -f $ac_dir/$1; then
5607 + lt_cv_path_MAGIC_CMD="$ac_dir/$1"
5608 + if test -n "$file_magic_test_file"; then
5609 + case $deplibs_check_method in
5610 + "file_magic "*)
5611 + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
5612 + MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
5613 + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
5614 + $EGREP "$file_magic_regex" > /dev/null; then
5615 + :
5616 + else
5617 + cat <<EOF 1>&2
5618
5619 -amigaos*)
5620 - library_names_spec='$libname.ixlibrary $libname.a'
5621 - # Create ${libname}_ixlibrary.a entries in /sys/libs.
5622 - 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'
5623 - ;;
5624 +*** Warning: the command libtool uses to detect shared libraries,
5625 +*** $file_magic_cmd, produces output that libtool cannot recognize.
5626 +*** The result is that libtool may fail to recognize shared libraries
5627 +*** as such. This will affect the creation of libtool libraries that
5628 +*** depend on shared libraries, but programs linked with such libtool
5629 +*** libraries will work regardless of this problem. Nevertheless, you
5630 +*** may want to report the problem to your system manager and/or to
5631 +*** bug-libtool@gnu.org
5632
5633 -beos*)
5634 - library_names_spec='${libname}${shared_ext}'
5635 - dynamic_linker="$host_os ld.so"
5636 - shlibpath_var=LIBRARY_PATH
5637 +EOF
5638 + fi ;;
5639 + esac
5640 + fi
5641 + break
5642 + fi
5643 + done
5644 + IFS="$lt_save_ifs"
5645 + MAGIC_CMD="$lt_save_MAGIC_CMD"
5646 ;;
5647 +esac])
5648 +MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
5649 +if test -n "$MAGIC_CMD"; then
5650 + AC_MSG_RESULT($MAGIC_CMD)
5651 +else
5652 + AC_MSG_RESULT(no)
5653 +fi
5654 +])# AC_PATH_TOOL_PREFIX
5655
5656 -bsdi[[45]]*)
5657 - version_type=linux
5658 - need_version=no
5659 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
5660 - soname_spec='${libname}${release}${shared_ext}$major'
5661 - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
5662 - shlibpath_var=LD_LIBRARY_PATH
5663 - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
5664 - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
5665 - # the default ld.so.conf also contains /usr/contrib/lib and
5666 - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
5667 - # libtool to hard-code these into programs
5668 - ;;
5669
5670 -cygwin* | mingw* | pw32*)
5671 - version_type=windows
5672 - shrext_cmds=".dll"
5673 - need_version=no
5674 - need_lib_prefix=no
5675 +# AC_PATH_MAGIC
5676 +# -------------
5677 +# find a file program which can recognise a shared library
5678 +AC_DEFUN([AC_PATH_MAGIC],
5679 +[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
5680 +if test -z "$lt_cv_path_MAGIC_CMD"; then
5681 + if test -n "$ac_tool_prefix"; then
5682 + AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
5683 + else
5684 + MAGIC_CMD=:
5685 + fi
5686 +fi
5687 +])# AC_PATH_MAGIC
5688
5689 - case $GCC,$host_os in
5690 - yes,cygwin* | yes,mingw* | yes,pw32*)
5691 - library_names_spec='$libname.dll.a'
5692 - # DLL is installed to $(libdir)/../bin by postinstall_cmds
5693 - postinstall_cmds='base_file=`basename \${file}`~
5694 - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
5695 - dldir=$destdir/`dirname \$dlpath`~
5696 - test -d \$dldir || mkdir -p \$dldir~
5697 - $install_prog $dir/$dlname \$dldir/$dlname~
5698 - chmod a+x \$dldir/$dlname'
5699 - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
5700 - dlpath=$dir/\$dldll~
5701 - $rm \$dlpath'
5702 - shlibpath_overrides_runpath=yes
5703
5704 - case $host_os in
5705 - cygwin*)
5706 - # Cygwin DLLs use 'cyg' prefix rather than 'lib'
5707 - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
5708 - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
5709 - ;;
5710 - mingw*)
5711 - # MinGW DLLs use traditional 'lib' prefix
5712 - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
5713 - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
5714 - if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
5715 - # It is most probably a Windows format PATH printed by
5716 - # mingw gcc, but we are running on Cygwin. Gcc prints its search
5717 - # path with ; separators, and with drive letters. We can handle the
5718 - # drive letters (cygwin fileutils understands them), so leave them,
5719 - # especially as we might pass files found there to a mingw objdump,
5720 - # which wouldn't understand a cygwinified path. Ahh.
5721 - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
5722 - else
5723 - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
5724 - fi
5725 - ;;
5726 - pw32*)
5727 - # pw32 DLLs use 'pw' prefix rather than 'lib'
5728 - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
54885729 +# AC_PROG_LD
54895730 +# ----------
54905731 +# find the pathname to the GNU or non-GNU linker
55195760 + ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
55205761 + done
55215762 + test -z "$LD" && LD="$ac_prog"
5522 + ;;
5763 ;;
5764 - esac
55235765 + "")
55245766 + # If it fails, then pretend we aren't using GCC.
55255767 + ac_prog=ld
5526 + ;;
5527 + *)
5768 ;;
5769 -
5770 *)
5771 - library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
55285772 + # If it is relative, then search for the first ld in PATH.
55295773 + with_gnu_ld=unknown
55305774 ;;
55315775 esac
5776 - dynamic_linker='Win32 ld.exe'
5777 - # FIXME: first we should search . and the directory the executable is in
5778 - shlibpath_var=PATH
5779 - ;;
55325780 +elif test "$with_gnu_ld" = yes; then
55335781 + AC_MSG_CHECKING([for GNU ld])
55345782 +else
55355783 + AC_MSG_CHECKING([for non-GNU ld])
5536 fi
5537 -])# AC_LIBTOOL_SYS_LIB_STRIP
5538 -
5539 -
5540 -# AC_LIBTOOL_SYS_DYNAMIC_LINKER
5541 -# -----------------------------
5542 -# PORTME Fill in your ld.so characteristics
5543 -AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
5544 -[AC_MSG_CHECKING([dynamic linker characteristics])
5545 -library_names_spec=
5546 -libname_spec='lib$name'
5547 -soname_spec=
5548 -shrext_cmds=".so"
5549 -postinstall_cmds=
5550 -postuninstall_cmds=
5551 -finish_cmds=
5552 -finish_eval=
5553 -shlibpath_var=
5554 -shlibpath_overrides_runpath=unknown
5555 -version_type=none
5556 -dynamic_linker="$host_os ld.so"
5557 -sys_lib_dlsearch_path_spec="/lib /usr/lib"
5558 -if test "$GCC" = yes; then
5559 - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
5560 - if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
5561 - # if the path contains ";" then we assume it to be the separator
5562 - # otherwise default to the standard path separator (i.e. ":") - it is
5563 - # assumed that no part of a normal pathname contains ";" but that should
5564 - # okay in the real world where ";" in dirpaths is itself problematic.
5565 - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
5566 - else
5567 - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
5568 - fi
5784 +fi
55695785 +AC_CACHE_VAL(lt_cv_path_LD,
55705786 +[if test -z "$LD"; then
55715787 + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
55885804 + fi
55895805 + done
55905806 + IFS="$lt_save_ifs"
5591 else
5592 - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
5807 +else
55935808 + lt_cv_path_LD="$LD" # Let the user override the test with a path.
55945809 +fi])
55955810 +LD="$lt_cv_path_LD"
55975812 + AC_MSG_RESULT($LD)
55985813 +else
55995814 + AC_MSG_RESULT(no)
5600 fi
5601 -need_lib_prefix=unknown
5602 -hardcode_into_libs=no
5603 -
5604 -# when you set need_version to no, make sure it does not cause -set_version
5605 -# flags to be left without arguments
5606 -need_version=unknown
5815 +fi
56075816 +test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
56085817 +AC_PROG_LD_GNU
56095818 +])# AC_PROG_LD
56105819
5611 -case $host_os in
5612 -aix3*)
5613 - version_type=linux
5614 - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
5615 - shlibpath_var=LIBPATH
5616
5617 - # AIX 3 has no versioning support, so we append a major version to the name.
5618 - soname_spec='${libname}${release}${shared_ext}$major'
5820 -darwin* | rhapsody*)
5821 - dynamic_linker="$host_os dyld"
5822 - version_type=darwin
5823 - need_lib_prefix=no
5824 - need_version=no
5825 - library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
5826 - soname_spec='${libname}${release}${major}$shared_ext'
5827 - shlibpath_overrides_runpath=yes
5828 - shlibpath_var=DYLD_LIBRARY_PATH
5829 - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
5830 - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
5831 - if test "$GCC" = yes; then
5832 - 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"`
5833 - else
5834 - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
5835 - fi
5836 - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
5837 +
56195838 +# AC_PROG_LD_GNU
56205839 +# --------------
56215840 +AC_DEFUN([AC_PROG_LD_GNU],
56335852 +with_gnu_ld=$lt_cv_prog_gnu_ld
56345853 +])# AC_PROG_LD_GNU
56355854
5636 -aix4* | aix5*)
5855 -dgux*)
56375856 - version_type=linux
56385857 - need_lib_prefix=no
56395858 - need_version=no
5640 - hardcode_into_libs=yes
5641 - if test "$host_cpu" = ia64; then
5642 - # AIX 5 supports IA64
5643 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
5644 - shlibpath_var=LD_LIBRARY_PATH
5645 - else
5646 - # With GCC up to 2.95.x, collect2 would create an import file
5647 - # for dependence libraries. The import file would start with
5648 - # the line `#! .'. This would cause the generated library to
5649 - # depend on `.', always an invalid library. This was fixed in
5650 - # development snapshots of GCC prior to 3.0.
5651 - case $host_os in
5652 - aix4 | aix4.[[01]] | aix4.[[01]].*)
5653 - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
5654 - echo ' yes '
5655 - echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
5656 - :
5657 - else
5658 - can_build_shared=no
5659 - fi
5660 - ;;
5661 - esac
5662 - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
5663 - # soname into executable. Probably we can add versioning support to
5664 - # collect2, so additional links can be useful in future.
5665 - if test "$aix_use_runtimelinking" = yes; then
5666 - # If using run time linking (on AIX 4.2 or later) use lib<name>.so
5667 - # instead of lib<name>.a to let people know that these are not
5668 - # typical AIX shared libraries.
5669 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
5859 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
5860 - soname_spec='${libname}${release}${shared_ext}$major'
5861 - shlibpath_var=LD_LIBRARY_PATH
56705862 +
56715863 +# AC_PROG_LD_RELOAD_FLAG
56725864 +# ----------------------
56865878 + darwin*)
56875879 + if test "$GCC" = yes; then
56885880 + reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
5689 else
5690 - # We preserve .a as extension for shared libraries through AIX4.2
5691 - # and later when we are not doing run time linking.
5692 - library_names_spec='${libname}${release}.a $libname.a'
5693 - soname_spec='${libname}${release}${shared_ext}$major'
5881 + else
56945882 + reload_cmds='$LD$reload_flag -o $output$reload_objs'
5695 fi
5696 - shlibpath_var=LIBPATH
5697 - fi
5698 - ;;
5883 + fi
56995884 + ;;
57005885 +esac
57015886 +])# AC_PROG_LD_RELOAD_FLAG
5702
5703 -amigaos*)
5704 - library_names_spec='$libname.ixlibrary $libname.a'
5705 - # Create ${libname}_ixlibrary.a entries in /sys/libs.
5706 - 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'
5887 +
57075888 +
57085889 +# AC_DEPLIBS_CHECK_METHOD
57095890 +# -----------------------
57315912 + lt_cv_deplibs_check_method=pass_all
57325913 ;;
57335914
5734 beos*)
5735 - library_names_spec='${libname}${shared_ext}'
5736 - dynamic_linker="$host_os ld.so"
5737 - shlibpath_var=LIBRARY_PATH
5738 + lt_cv_deplibs_check_method=pass_all
5739 ;;
5740
5741 bsdi[[45]]*)
5742 - version_type=linux
5743 - need_version=no
5744 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
5745 - soname_spec='${libname}${release}${shared_ext}$major'
5746 - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
5747 - shlibpath_var=LD_LIBRARY_PATH
5748 - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
5749 - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
5750 - # the default ld.so.conf also contains /usr/contrib/lib and
5751 - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
5752 - # libtool to hard-code these into programs
5753 + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
5754 + lt_cv_file_magic_cmd='/usr/bin/file -L'
5755 + lt_cv_file_magic_test_file=/shlib/libc.so
5756 ;;
5757
5758 -cygwin* | mingw* | pw32*)
5759 - version_type=windows
5760 - shrext_cmds=".dll"
5761 - need_version=no
5762 - need_lib_prefix=no
5763 +cygwin*)
5764 + # func_win32_libid is a shell function defined in ltmain.sh
5765 + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
5766 + lt_cv_file_magic_cmd='func_win32_libid'
5767 + ;;
5768
5769 - case $GCC,$host_os in
5770 - yes,cygwin* | yes,mingw* | yes,pw32*)
5771 - library_names_spec='$libname.dll.a'
5772 - # DLL is installed to $(libdir)/../bin by postinstall_cmds
5773 - postinstall_cmds='base_file=`basename \${file}`~
5774 - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
5775 - dldir=$destdir/`dirname \$dlpath`~
5776 - test -d \$dldir || mkdir -p \$dldir~
5777 - $install_prog $dir/$dlname \$dldir/$dlname~
5778 - chmod a+x \$dldir/$dlname'
5779 - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
5780 - dlpath=$dir/\$dldll~
5781 - $rm \$dlpath'
5782 - shlibpath_overrides_runpath=yes
5783 +mingw* | pw32*)
5784 + # Base MSYS/MinGW do not provide the 'file' command needed by
5785 + # func_win32_libid shell function, so use a weaker test based on 'objdump'.
5786 + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
5787 + lt_cv_file_magic_cmd='$OBJDUMP -f'
5788 + ;;
5789
5790 - case $host_os in
5791 - cygwin*)
5792 - # Cygwin DLLs use 'cyg' prefix rather than 'lib'
5793 - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
5794 - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
5795 - ;;
5796 - mingw*)
5797 - # MinGW DLLs use traditional 'lib' prefix
5798 - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
5799 - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
5800 - if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
5801 - # It is most probably a Windows format PATH printed by
5802 - # mingw gcc, but we are running on Cygwin. Gcc prints its search
5803 - # path with ; separators, and with drive letters. We can handle the
5804 - # drive letters (cygwin fileutils understands them), so leave them,
5805 - # especially as we might pass files found there to a mingw objdump,
5806 - # which wouldn't understand a cygwinified path. Ahh.
5807 - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
5808 - else
5809 - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
5810 - fi
5811 - ;;
5812 - pw32*)
5813 - # pw32 DLLs use 'pw' prefix rather than 'lib'
5814 - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
5815 +darwin* | rhapsody*)
5816 + lt_cv_deplibs_check_method=pass_all
5817 + ;;
5818 +
5819 +freebsd* | dragonfly*)
5820 + if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
5821 + case $host_cpu in
5822 + i*86 )
5823 + # Not sure whether the presence of OpenBSD here was a mistake.
5824 + # Let's accept both of them until this is cleared up.
5825 + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
5826 + lt_cv_file_magic_cmd=/usr/bin/file
5827 + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
5828 ;;
5829 esac
5830 - ;;
5831 + else
5832 + lt_cv_deplibs_check_method=pass_all
5833 + fi
5834 + ;;
5835 +
5836 +gnu*)
5837 + lt_cv_deplibs_check_method=pass_all
5838 + ;;
5839
5840 +hpux10.20* | hpux11*)
5841 + lt_cv_file_magic_cmd=/usr/bin/file
5842 + case $host_cpu in
5843 + ia64*)
5844 + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
5845 + lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
5846 + ;;
5847 + hppa*64*)
5848 + [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
5849 + lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
5850 + ;;
5851 *)
5852 - library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
5853 + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
5854 + lt_cv_file_magic_test_file=/usr/lib/libc.sl
5855 ;;
5856 esac
5857 - dynamic_linker='Win32 ld.exe'
5858 - # FIXME: first we should search . and the directory the executable is in
5859 - shlibpath_var=PATH
5860 ;;
5861
5862 -darwin* | rhapsody*)
5863 - dynamic_linker="$host_os dyld"
5864 - version_type=darwin
5865 - need_lib_prefix=no
5866 - need_version=no
5867 - library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
5868 - soname_spec='${libname}${release}${major}$shared_ext'
5869 - shlibpath_overrides_runpath=yes
5870 - shlibpath_var=DYLD_LIBRARY_PATH
5871 - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
5872 - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
5873 - if test "$GCC" = yes; then
5874 - 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"`
5875 - else
5876 - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
5877 - fi
5878 - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
5879 +interix3*)
5880 + # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
5881 + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
5882 ;;
5883
5884 -dgux*)
5885 - version_type=linux
5886 - need_lib_prefix=no
5887 - need_version=no
5888 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
5889 - soname_spec='${libname}${release}${shared_ext}$major'
5890 - shlibpath_var=LD_LIBRARY_PATH
5891 +irix5* | irix6* | nonstopux*)
5892 + case $LD in
5893 + *-32|*"-32 ") libmagic=32-bit;;
5894 + *-n32|*"-n32 ") libmagic=N32;;
5895 + *-64|*"-64 ") libmagic=64-bit;;
5896 + *) libmagic=never-match;;
5897 + esac
5898 + lt_cv_deplibs_check_method=pass_all
5899 ;;
5900
59015915 -freebsd1*)
59025916 - dynamic_linker=no
5903 +# This must be Linux ELF.
5904 +linux* | k*bsd*-gnu)
5917 +beos*)
59055918 + lt_cv_deplibs_check_method=pass_all
59065919 ;;
59075920
59155928 - shlibpath_overrides_runpath=no
59165929 - hardcode_into_libs=yes
59175930 - dynamic_linker='GNU ld.so'
5918 +netbsd* | netbsdelf*-gnu)
5919 + if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
5920 + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
5921 + else
5922 + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
5923 + fi
5931 +bsdi[[45]]*)
5932 + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
5933 + lt_cv_file_magic_cmd='/usr/bin/file -L'
5934 + lt_cv_file_magic_test_file=/shlib/libc.so
5935 + ;;
5936 +
5937 +cygwin*)
5938 + # func_win32_libid is a shell function defined in ltmain.sh
5939 + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
5940 + lt_cv_file_magic_cmd='func_win32_libid'
5941 + ;;
5942 +
5943 +mingw* | pw32*)
5944 + # Base MSYS/MinGW do not provide the 'file' command needed by
5945 + # func_win32_libid shell function, so use a weaker test based on 'objdump'.
5946 + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
5947 + lt_cv_file_magic_cmd='$OBJDUMP -f'
5948 + ;;
5949 +
5950 +darwin* | rhapsody*)
5951 + lt_cv_deplibs_check_method=pass_all
59245952 ;;
59255953
5926 -freebsd* | dragonfly*)
5954 freebsd* | dragonfly*)
59275955 - # DragonFly does not have aout. When/if they implement a new
59285956 - # versioning mechanism, adjust this.
59295957 - if test -x /usr/bin/objformat; then
59305958 - objformat=`/usr/bin/objformat`
5931 +newos6*)
5932 + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
5933 + lt_cv_file_magic_cmd=/usr/bin/file
5934 + lt_cv_file_magic_test_file=/usr/lib/libnls.so
5935 + ;;
5936 +
5937 +nto-qnx*)
5938 + lt_cv_deplibs_check_method=unknown
5939 + ;;
5940 +
5941 +openbsd*)
5942 + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
5943 + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
5944 else
5959 - else
59455960 - case $host_os in
59465961 - freebsd[[123]]*) objformat=aout ;;
59475962 - *) objformat=elf ;;
5948 - esac
5949 + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
5963 + if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
5964 + case $host_cpu in
5965 + i*86 )
5966 + # Not sure whether the presence of OpenBSD here was a mistake.
5967 + # Let's accept both of them until this is cleared up.
5968 + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
5969 + lt_cv_file_magic_cmd=/usr/bin/file
5970 + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
5971 + ;;
5972 esac
5973 + else
5974 + lt_cv_deplibs_check_method=pass_all
59505975 fi
59515976 - version_type=freebsd-$objformat
59525977 - case $version_type in
59645989 - case $host_os in
59655990 - freebsd2*)
59665991 - shlibpath_overrides_runpath=yes
5967 + ;;
5968 +
5969 +osf3* | osf4* | osf5*)
5970 + lt_cv_deplibs_check_method=pass_all
5971 + ;;
5972 +
5973 +solaris*)
5974 + lt_cv_deplibs_check_method=pass_all
5975 + ;;
5976 +
5977 +sysv4 | sysv4.3*)
5978 + case $host_vendor in
5979 + motorola)
5980 + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
5981 + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
5982 ;;
5992 - ;;
59835993 - freebsd3.[[01]]* | freebsdelf3.[[01]]*)
59845994 - shlibpath_overrides_runpath=yes
59855995 - hardcode_into_libs=yes
5986 + ncr)
5987 + lt_cv_deplibs_check_method=pass_all
5988 ;;
5996 - ;;
59895997 - freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
59905998 - freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
59915999 - shlibpath_overrides_runpath=no
59926000 - hardcode_into_libs=yes
5993 + sequent)
5994 + lt_cv_file_magic_cmd='/bin/file'
5995 + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
5996 ;;
6001 - ;;
59976002 - freebsd*) # from 4.6 on
59986003 - shlibpath_overrides_runpath=yes
59996004 - hardcode_into_libs=yes
6000 + sni)
6001 + lt_cv_file_magic_cmd='/bin/file'
6002 + lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
6003 + lt_cv_file_magic_test_file=/lib/libc.so
6004 + ;;
6005 + siemens)
6006 + lt_cv_deplibs_check_method=pass_all
6007 + ;;
6008 + pc)
6009 + lt_cv_deplibs_check_method=pass_all
6010 ;;
6011 esac
6005 - ;;
6006 - esac
60126007 ;;
60136008
6014 -gnu*)
6009 gnu*)
60156010 - version_type=linux
60166011 - need_lib_prefix=no
60176012 - need_version=no
60196014 - soname_spec='${libname}${release}${shared_ext}$major'
60206015 - shlibpath_var=LD_LIBRARY_PATH
60216016 - hardcode_into_libs=yes
6022 +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
60236017 + lt_cv_deplibs_check_method=pass_all
60246018 ;;
6025 +esac
6026 +])
6027 +file_magic_cmd=$lt_cv_file_magic_cmd
6028 +deplibs_check_method=$lt_cv_deplibs_check_method
6029 +test -z "$deplibs_check_method" && deplibs_check_method=unknown
6030 +])# AC_DEPLIBS_CHECK_METHOD
60316019
60326020 -hpux9* | hpux10* | hpux11*)
60336021 - # Give a soname corresponding to the major version so that dld.sl refuses to
60356023 - version_type=sunos
60366024 - need_lib_prefix=no
60376025 - need_version=no
6038 - case $host_cpu in
6039 - ia64*)
6026 +hpux10.20* | hpux11*)
6027 + lt_cv_file_magic_cmd=/usr/bin/file
6028 case $host_cpu in
6029 ia64*)
60406030 - shrext_cmds='.so'
60416031 - hardcode_into_libs=yes
60426032 - dynamic_linker="$host_os dld.so"
60506040 - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
60516041 - fi
60526042 - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
6053 - ;;
6043 + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
6044 + lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
6045 ;;
60546046 - hppa*64*)
60556047 - shrext_cmds='.sl'
60566048 - hardcode_into_libs=yes
60696061 - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
60706062 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
60716063 - soname_spec='${libname}${release}${shared_ext}$major'
6072 - ;;
6073 - esac
6064 + hppa*64*)
6065 + [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
6066 + lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
6067 + ;;
6068 + *)
6069 + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
6070 + lt_cv_file_magic_test_file=/usr/lib/libc.sl
6071 ;;
6072 esac
60746073 - # HP-UX runs *really* slowly unless shared libraries are mode 555.
60756074 - postinstall_cmds='chmod 555 $lib'
6076 - ;;
6077
6078 -interix3*)
6075 ;;
6076
6077 interix3*)
60796078 - version_type=linux
60806079 - need_lib_prefix=no
60816080 - need_version=no
60856084 - shlibpath_var=LD_LIBRARY_PATH
60866085 - shlibpath_overrides_runpath=no
60876086 - hardcode_into_libs=yes
6087 + # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
6088 + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
6089 ;;
6090
6091 irix5* | irix6* | nonstopux*)
6092 - case $host_os in
6093 - nonstopux*) version_type=nonstopux ;;
6094 - *)
6095 - if test "$lt_cv_prog_gnu_ld" = yes; then
6096 - version_type=linux
6097 - else
6098 - version_type=irix
6099 - fi ;;
6100 + case $LD in
6101 + *-32|*"-32 ") libmagic=32-bit;;
6102 + *-n32|*"-n32 ") libmagic=N32;;
6103 + *-64|*"-64 ") libmagic=64-bit;;
6104 + *) libmagic=never-match;;
6105 esac
6106 - need_lib_prefix=no
6107 - need_version=no
6108 - soname_spec='${libname}${release}${shared_ext}$major'
6109 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
6110 - case $host_os in
6111 - irix5* | nonstopux*)
6112 - libsuff= shlibsuff=
6113 - ;;
6114 - *)
6115 - case $LD in # libtool.m4 will add one of these switches to LD
6116 - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
6117 - libsuff= shlibsuff= libmagic=32-bit;;
6118 - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
6119 - libsuff=32 shlibsuff=N32 libmagic=N32;;
6120 - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
6121 - libsuff=64 shlibsuff=64 libmagic=64-bit;;
6122 - *) libsuff= shlibsuff= libmagic=never-match;;
6123 - esac
6124 - ;;
6125 - esac
6126 - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
6127 - shlibpath_overrides_runpath=no
6128 - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
6129 - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
6130 - hardcode_into_libs=yes
60886131 - ;;
6132 -
6133 -# No shared lib support for Linux oldld, aout, or coff.
6134 -linux*oldld* | linux*aout* | linux*coff*)
6135 - dynamic_linker=no
6136 + lt_cv_deplibs_check_method=pass_all
6137 ;;
6138
6139 # This must be Linux ELF.
6140 -linux*)
6141 - version_type=linux
6142 - need_lib_prefix=no
6143 - need_version=no
6144 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
6145 - soname_spec='${libname}${release}${shared_ext}$major'
6146 - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
6147 - shlibpath_var=LD_LIBRARY_PATH
6148 - shlibpath_overrides_runpath=no
6149 - # This implies no fast_install, which is unacceptable.
6150 - # Some rework will be needed to allow for fast_install
6151 - # before this can be enabled.
6152 - hardcode_into_libs=yes
6153 -
6154 - # find out which ABI we are using
6155 - libsuff=
6156 - case "$host_cpu" in
6157 - x86_64*|s390x*|powerpc64*)
6158 - echo '[#]line __oline__ "configure"' > conftest.$ac_ext
6159 - if AC_TRY_EVAL(ac_compile); then
6160 - case `/usr/bin/file conftest.$ac_objext` in
6161 - *64-bit*)
6162 - libsuff=64
6163 - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
6164 - ;;
6165 - esac
6166 - fi
6167 - rm -rf conftest*
6168 - ;;
6169 - esac
6170 -
6171 - # Append ld.so.conf contents to the search path
6172 - if test -f /etc/ld.so.conf; then
6173 - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
6174 - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
6175 - fi
6176 -
6177 - # We used to test for /lib/ld.so.1 and disable shared libraries on
6178 - # powerpc, because MkLinux only supported shared libraries with the
6179 - # GNU dynamic linker. Since this was broken with cross compilers,
6180 - # most powerpc-linux boxes support dynamic linking these days and
6181 - # people can always --disable-shared, the test was removed, and we
6182 - # assume the GNU/Linux dynamic linker is in use.
6183 - dynamic_linker='GNU/Linux ld.so'
6184 - ;;
6185 -
6186 -knetbsd*-gnu)
6187 - version_type=linux
6188 - need_lib_prefix=no
6189 - need_version=no
6190 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
6191 - soname_spec='${libname}${release}${shared_ext}$major'
6192 - shlibpath_var=LD_LIBRARY_PATH
6193 - shlibpath_overrides_runpath=no
6194 - hardcode_into_libs=yes
6195 - dynamic_linker='GNU ld.so'
6196 +linux* | k*bsd*-gnu)
6197 + lt_cv_deplibs_check_method=pass_all
6198 ;;
6199
6200 -netbsd*)
6201 - version_type=sunos
6202 - need_lib_prefix=no
6203 - need_version=no
6204 - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
6205 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
6206 - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
6207 - dynamic_linker='NetBSD (a.out) ld.so'
6208 +netbsd* | netbsdelf*-gnu)
6209 + if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
6210 + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
6211 else
6212 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
6213 - soname_spec='${libname}${release}${shared_ext}$major'
6214 - dynamic_linker='NetBSD ld.elf_so'
6215 + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
6216 fi
6217 - shlibpath_var=LD_LIBRARY_PATH
6218 - shlibpath_overrides_runpath=yes
6219 - hardcode_into_libs=yes
6220 ;;
6221
6222 -newsos6)
6223 - version_type=linux
6224 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
6225 - shlibpath_var=LD_LIBRARY_PATH
6226 - shlibpath_overrides_runpath=yes
6227 +newos6*)
6228 + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
6229 + lt_cv_file_magic_cmd=/usr/bin/file
6230 + lt_cv_file_magic_test_file=/usr/lib/libnls.so
6231 ;;
6232
6233 nto-qnx*)
6234 - version_type=linux
6235 - need_lib_prefix=no
6236 - need_version=no
6237 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
6238 - soname_spec='${libname}${release}${shared_ext}$major'
6239 - shlibpath_var=LD_LIBRARY_PATH
6240 - shlibpath_overrides_runpath=yes
6241 + lt_cv_deplibs_check_method=unknown
6242 ;;
6243
6244 openbsd*)
6245 - version_type=sunos
6246 - sys_lib_dlsearch_path_spec="/usr/lib"
6247 - need_lib_prefix=no
6248 - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
6249 - case $host_os in
6250 - openbsd3.3 | openbsd3.3.*) need_version=yes ;;
6251 - *) need_version=no ;;
6252 - esac
6253 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
6254 - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
6255 - shlibpath_var=LD_LIBRARY_PATH
6256 if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
6257 - case $host_os in
6258 - openbsd2.[[89]] | openbsd2.[[89]].*)
6259 - shlibpath_overrides_runpath=no
6260 - ;;
6261 - *)
6262 - shlibpath_overrides_runpath=yes
6263 - ;;
6264 - esac
6265 + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
6266 else
6267 - shlibpath_overrides_runpath=yes
6268 + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
6269 fi
6270 ;;
6271
6272 -os2*)
6273 - libname_spec='$name'
6274 - shrext_cmds=".dll"
6275 - need_lib_prefix=no
6276 - library_names_spec='$libname${shared_ext} $libname.a'
6277 - dynamic_linker='OS/2 ld.exe'
6278 - shlibpath_var=LIBPATH
6279 - ;;
6280 -
6281 osf3* | osf4* | osf5*)
6282 - version_type=osf
6283 - need_lib_prefix=no
6284 - need_version=no
6285 - soname_spec='${libname}${release}${shared_ext}$major'
6286 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
6287 - shlibpath_var=LD_LIBRARY_PATH
6288 - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
6289 - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
6290 + lt_cv_deplibs_check_method=pass_all
6291 ;;
6292
6293 solaris*)
6294 - version_type=linux
6295 - need_lib_prefix=no
6296 - need_version=no
6297 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
6298 - soname_spec='${libname}${release}${shared_ext}$major'
6299 - shlibpath_var=LD_LIBRARY_PATH
6300 - shlibpath_overrides_runpath=yes
6301 - hardcode_into_libs=yes
6302 - # ldd complains unless libraries are executable
6303 - postinstall_cmds='chmod +x $lib'
6304 - ;;
6305 -
6306 -sunos4*)
6307 - version_type=sunos
6308 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
6309 - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
6310 - shlibpath_var=LD_LIBRARY_PATH
6311 - shlibpath_overrides_runpath=yes
6312 - if test "$with_gnu_ld" = yes; then
6313 - need_lib_prefix=no
6314 - fi
6315 - need_version=yes
6316 + lt_cv_deplibs_check_method=pass_all
6317 ;;
6318
6319 sysv4 | sysv4.3*)
6320 - version_type=linux
6321 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
6322 - soname_spec='${libname}${release}${shared_ext}$major'
6323 - shlibpath_var=LD_LIBRARY_PATH
6324 case $host_vendor in
6325 - sni)
6326 - shlibpath_overrides_runpath=no
6327 - need_lib_prefix=no
6328 - export_dynamic_flag_spec='${wl}-Blargedynsym'
6329 - runpath_var=LD_RUN_PATH
6330 - ;;
6331 - siemens)
6332 - need_lib_prefix=no
6333 - ;;
6334 - motorola)
6335 - need_lib_prefix=no
6336 - need_version=no
6337 - shlibpath_overrides_runpath=no
6338 - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
6339 - ;;
6340 + motorola)
6341 + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
6342 + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
6343 + ;;
6344 + ncr)
6345 + lt_cv_deplibs_check_method=pass_all
6346 + ;;
6347 + sequent)
6348 + lt_cv_file_magic_cmd='/bin/file'
6349 + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
6350 + ;;
6351 + sni)
6352 + lt_cv_file_magic_cmd='/bin/file'
6353 + lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
6354 + lt_cv_file_magic_test_file=/lib/libc.so
6355 + ;;
6356 + siemens)
6357 + lt_cv_deplibs_check_method=pass_all
6358 + ;;
6359 + pc)
6360 + lt_cv_deplibs_check_method=pass_all
6361 + ;;
6362 esac
6363 ;;
6364
6365 -sysv4*MP*)
6366 - if test -d /usr/nec ;then
6367 - version_type=linux
6368 - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
6369 - soname_spec='$libname${shared_ext}.$major'
6370 - shlibpath_var=LD_LIBRARY_PATH
6371 - fi
6372 - ;;
6373 -
6374 sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
6375 - version_type=freebsd-elf
6376 - need_lib_prefix=no
6377 - need_version=no
6378 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
6379 - soname_spec='${libname}${release}${shared_ext}$major'
6380 - shlibpath_var=LD_LIBRARY_PATH
6381 - hardcode_into_libs=yes
6382 - if test "$with_gnu_ld" = yes; then
6383 - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
6384 - shlibpath_overrides_runpath=no
6385 - else
6386 - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
6387 - shlibpath_overrides_runpath=yes
6388 - case $host_os in
6389 - sco3.2v5*)
6390 - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
6391 - ;;
6392 - esac
6393 - fi
6394 - sys_lib_dlsearch_path_spec='/usr/lib'
6395 - ;;
6396 -
6397 -uts4*)
6398 - version_type=linux
6399 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
6400 - soname_spec='${libname}${release}${shared_ext}$major'
6401 - shlibpath_var=LD_LIBRARY_PATH
6402 - ;;
6403 -
6404 -*)
6405 - dynamic_linker=no
6406 + lt_cv_deplibs_check_method=pass_all
6407 ;;
6408 esac
6409 -AC_MSG_RESULT([$dynamic_linker])
6410 -test "$dynamic_linker" = no && can_build_shared=no
6411 -
6412 -variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
6413 -if test "$GCC" = yes; then
6414 - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
6415 -fi
6416 -])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
6417 +])
6418 +file_magic_cmd=$lt_cv_file_magic_cmd
6419 +deplibs_check_method=$lt_cv_deplibs_check_method
6420 +test -z "$deplibs_check_method" && deplibs_check_method=unknown
6421 +])# AC_DEPLIBS_CHECK_METHOD
6422
6423
6424 -# _LT_AC_TAGCONFIG
6425 -# ----------------
6426 -AC_DEFUN([_LT_AC_TAGCONFIG],
6427 -[AC_ARG_WITH([tags],
6428 - [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
6429 - [include additional configurations @<:@automatic@:>@])],
6430 - [tagnames="$withval"])
6431 -
6432 -if test -f "$ltmain" && test -n "$tagnames"; then
6433 - if test ! -f "${ofile}"; then
6434 - AC_MSG_WARN([output file `$ofile' does not exist])
6435 - fi
6436 -
6437 - if test -z "$LTCC"; then
6438 - eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
6439 - if test -z "$LTCC"; then
6440 - AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
6441 - else
6442 - AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
6443 - fi
6444 - fi
6445 - if test -z "$LTCFLAGS"; then
6446 - eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
60896447 +# AC_PROG_NM
60906448 +# ----------
60916449 +# find the pathname to a BSD-compatible name lister
60986456 + lt_nm_to_check="${ac_tool_prefix}nm"
60996457 + if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
61006458 + lt_nm_to_check="$lt_nm_to_check nm"
6101 + fi
6459 fi
61026460 + for lt_tmp_nm in $lt_nm_to_check; do
61036461 + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
61046462 + for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
61376495 +NM="$lt_cv_path_NM"
61386496 +])# AC_PROG_NM
61396497
6140 -irix5* | irix6* | nonstopux*)
6141 - case $host_os in
6142 - nonstopux*) version_type=nonstopux ;;
6143 - *)
6144 - if test "$lt_cv_prog_gnu_ld" = yes; then
6145 - version_type=linux
6146 - else
6147 - version_type=irix
6148 - fi ;;
6149 - esac
6150 - need_lib_prefix=no
6151 - need_version=no
6152 - soname_spec='${libname}${release}${shared_ext}$major'
6153 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
6154 - case $host_os in
6155 - irix5* | nonstopux*)
6156 - libsuff= shlibsuff=
6157 - ;;
6158 - *)
6159 - case $LD in # libtool.m4 will add one of these switches to LD
6160 - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
6161 - libsuff= shlibsuff= libmagic=32-bit;;
6162 - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
6163 - libsuff=32 shlibsuff=N32 libmagic=N32;;
6164 - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
6165 - libsuff=64 shlibsuff=64 libmagic=64-bit;;
6166 - *) libsuff= shlibsuff= libmagic=never-match;;
6498 - # Extract list of available tagged configurations in $ofile.
6499 - # Note that this assumes the entire list is on one line.
6500 - available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
6501
6502 - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
6503 - for tagname in $tagnames; do
6504 - IFS="$lt_save_ifs"
6505 - # Check whether tagname contains only valid characters
6506 - case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
6507 - "") ;;
6508 - *) AC_MSG_ERROR([invalid tag name: $tagname])
6509 - ;;
61676510 - esac
6168 - ;;
6169 - esac
6170 - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
6171 - shlibpath_overrides_runpath=no
6172 - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
6173 - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
6174 - hardcode_into_libs=yes
6175 - ;;
6176
6177 -# No shared lib support for Linux oldld, aout, or coff.
6178 -linux*oldld* | linux*aout* | linux*coff*)
6179 - dynamic_linker=no
61806511 +# AC_CHECK_LIBM
61816512 +# -------------
61826513 +# check for math library
61936524 + ;;
61946525 +*)
61956526 + AC_CHECK_LIB(m, cos, LIBM="-lm")
6196 ;;
6527 + ;;
61976528 +esac
61986529 +])# AC_CHECK_LIBM
61996530
6200 -# This must be Linux ELF.
6201 -linux*)
6202 - version_type=linux
6203 - need_lib_prefix=no
6204 - need_version=no
6205 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
6206 - soname_spec='${libname}${release}${shared_ext}$major'
6207 - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
6208 - shlibpath_var=LD_LIBRARY_PATH
6209 - shlibpath_overrides_runpath=no
6210 - # This implies no fast_install, which is unacceptable.
6211 - # Some rework will be needed to allow for fast_install
6212 - # before this can be enabled.
6213 - hardcode_into_libs=yes
6214
6215 - # find out which ABI we are using
6216 - libsuff=
6217 - case "$host_cpu" in
6218 - x86_64*|s390x*|powerpc64*)
6219 - echo '[#]line __oline__ "configure"' > conftest.$ac_ext
6220 - if AC_TRY_EVAL(ac_compile); then
6221 - case `/usr/bin/file conftest.$ac_objext` in
6222 - *64-bit*)
6223 - libsuff=64
6224 - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
6225 - ;;
6226 - esac
6531 - if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
6532 - then
6533 - AC_MSG_ERROR([tag name \"$tagname\" already exists])
62276534 - fi
6228 - rm -rf conftest*
6229 - ;;
6535
6536 - # Update the list of available tags.
6537 - if test -n "$tagname"; then
6538 - echo appending configuration tag \"$tagname\" to $ofile
62306539 +# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
62316540 +# -----------------------------------
62326541 +# sets LIBLTDL to the link flags for the libltdl convenience library and
62446553 + no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
62456554 + "") enable_ltdl_convenience=yes
62466555 + ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
6247 esac
6556 + esac
62486557 + LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
62496558 + LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
62506559 + # For backwards non-gettext consistent compatibility...
62516560 + INCLTDL="$LTDLINCL"
62526561 +])# AC_LIBLTDL_CONVENIENCE
62536562
6254 - # Append ld.so.conf contents to the search path
6255 - if test -f /etc/ld.so.conf; then
6256 - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
6257 - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
6258 - fi
6259
6260 - # We used to test for /lib/ld.so.1 and disable shared libraries on
6261 - # powerpc, because MkLinux only supported shared libraries with the
6262 - # GNU dynamic linker. Since this was broken with cross compilers,
6263 - # most powerpc-linux boxes support dynamic linking these days and
6264 - # people can always --disable-shared, the test was removed, and we
6265 - # assume the GNU/Linux dynamic linker is in use.
6266 - dynamic_linker='GNU/Linux ld.so'
6267 - ;;
6563 - case $tagname in
6564 - CXX)
6565 - if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
6566 - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
6567 - (test "X$CXX" != "Xg++"))) ; then
6568 - AC_LIBTOOL_LANG_CXX_CONFIG
6569 - else
6570 - tagname=""
6571 - fi
6572 - ;;
6573
6574 - F77)
6575 - if test -n "$F77" && test "X$F77" != "Xno"; then
6576 - AC_LIBTOOL_LANG_F77_CONFIG
6577 - else
6578 - tagname=""
6579 - fi
6580 - ;;
62686581 +# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
62696582 +# -----------------------------------
62706583 +# sets LIBLTDL to the link flags for the libltdl installable library and
63006613 + INCLTDL="$LTDLINCL"
63016614 +])# AC_LIBLTDL_INSTALLABLE
63026615
6303 -knetbsd*-gnu)
6304 - version_type=linux
6305 - need_lib_prefix=no
6306 - need_version=no
6307 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
6308 - soname_spec='${libname}${release}${shared_ext}$major'
6309 - shlibpath_var=LD_LIBRARY_PATH
6310 - shlibpath_overrides_runpath=no
6311 - hardcode_into_libs=yes
6312 - dynamic_linker='GNU ld.so'
6313 - ;;
6314
6315 -netbsd*)
6316 - version_type=sunos
6317 - need_lib_prefix=no
6318 - need_version=no
6319 - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
6320 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
6321 - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
6322 - dynamic_linker='NetBSD (a.out) ld.so'
6323 - else
6324 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
6325 - soname_spec='${libname}${release}${shared_ext}$major'
6326 - dynamic_linker='NetBSD ld.elf_so'
6327 - fi
6328 - shlibpath_var=LD_LIBRARY_PATH
6329 - shlibpath_overrides_runpath=yes
6330 - hardcode_into_libs=yes
6331 - ;;
6616 - GCJ)
6617 - if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
6618 - AC_LIBTOOL_LANG_GCJ_CONFIG
6619 - else
6620 - tagname=""
6621 - fi
6622 - ;;
6623
6624 - RC)
6625 - AC_LIBTOOL_LANG_RC_CONFIG
6626 - ;;
63326627 +# AC_LIBTOOL_CXX
63336628 +# --------------
63346629 +# enable support for C++ libraries
63366631 +[AC_REQUIRE([_LT_AC_LANG_CXX])
63376632 +])# AC_LIBTOOL_CXX
63386633
6339 -newsos6)
6340 - version_type=linux
6341 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
6342 - shlibpath_var=LD_LIBRARY_PATH
6343 - shlibpath_overrides_runpath=yes
6344 - ;;
6345
6346 -nto-qnx*)
6347 - version_type=linux
6348 - need_lib_prefix=no
6349 - need_version=no
6350 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
6351 - soname_spec='${libname}${release}${shared_ext}$major'
6352 - shlibpath_var=LD_LIBRARY_PATH
6353 - shlibpath_overrides_runpath=yes
6354 - ;;
6634 - *)
6635 - AC_MSG_ERROR([Unsupported tag name: $tagname])
6636 - ;;
6637 - esac
6638
6639 - # Append the new tag name to the list of available tags.
6640 - if test -n "$tagname" ; then
6641 - available_tags="$available_tags $tagname"
6642 - fi
6643 - fi
6644 - done
6645 - IFS="$lt_save_ifs"
63556646 +# _LT_AC_LANG_CXX
63566647 +# ---------------
63576648 +AC_DEFUN([_LT_AC_LANG_CXX],
63606651 +_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
63616652 +])# _LT_AC_LANG_CXX
63626653
6363 -openbsd*)
6364 - version_type=sunos
6365 - sys_lib_dlsearch_path_spec="/usr/lib"
6366 - need_lib_prefix=no
6367 - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
6368 - case $host_os in
6369 - openbsd3.3 | openbsd3.3.*) need_version=yes ;;
6370 - *) need_version=no ;;
6371 - esac
6372 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
6373 - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
6374 - shlibpath_var=LD_LIBRARY_PATH
6375 - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
6376 - case $host_os in
6377 - openbsd2.[[89]] | openbsd2.[[89]].*)
6378 - shlibpath_overrides_runpath=no
6379 - ;;
6380 - *)
6381 - shlibpath_overrides_runpath=yes
6382 - ;;
6383 - esac
6654 - # Now substitute the updated list of available tags.
6655 - if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
6656 - mv "${ofile}T" "$ofile"
6657 - chmod +x "$ofile"
63846658 - else
6385 - shlibpath_overrides_runpath=yes
6659 - rm -f "${ofile}T"
6660 - AC_MSG_ERROR([unable to update list of available tagged configurations.])
63866661 - fi
6387 - ;;
63886662 +# _LT_AC_PROG_CXXCPP
63896663 +# ------------------
63906664 +AC_DEFUN([_LT_AC_PROG_CXXCPP],
63946668 + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
63956669 + (test "X$CXX" != "Xg++"))) ; then
63966670 + AC_PROG_CXXCPP
6397 +fi
6671 fi
6672 -])# _LT_AC_TAGCONFIG
63986673 +])# _LT_AC_PROG_CXXCPP
63996674
6400 -os2*)
6401 - libname_spec='$name'
6402 - shrext_cmds=".dll"
6403 - need_lib_prefix=no
6404 - library_names_spec='$libname${shared_ext} $libname.a'
6405 - dynamic_linker='OS/2 ld.exe'
6406 - shlibpath_var=LIBPATH
6407 - ;;
64086675 +# AC_LIBTOOL_F77
64096676 +# --------------
64106677 +# enable support for Fortran 77 libraries
64126679 +[AC_REQUIRE([_LT_AC_LANG_F77])
64136680 +])# AC_LIBTOOL_F77
64146681
6415 -osf3* | osf4* | osf5*)
6416 - version_type=osf
6417 - need_lib_prefix=no
6418 - need_version=no
6419 - soname_spec='${libname}${release}${shared_ext}$major'
6420 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
6421 - shlibpath_var=LD_LIBRARY_PATH
6422 - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
6423 - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
6424 - ;;
6425
6426 -solaris*)
6427 - version_type=linux
6428 - need_lib_prefix=no
6429 - need_version=no
6430 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
6431 - soname_spec='${libname}${release}${shared_ext}$major'
6432 - shlibpath_var=LD_LIBRARY_PATH
6433 - shlibpath_overrides_runpath=yes
6434 - hardcode_into_libs=yes
6435 - # ldd complains unless libraries are executable
6436 - postinstall_cmds='chmod +x $lib'
6437 - ;;
6682 -# AC_LIBTOOL_DLOPEN
6683 -# -----------------
6684 -# enable checks for dlopen support
6685 -AC_DEFUN([AC_LIBTOOL_DLOPEN],
6686 - [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
6687 -])# AC_LIBTOOL_DLOPEN
6688
6689 -
6690 -# AC_LIBTOOL_WIN32_DLL
6691 -# --------------------
6692 -# declare package support for building win32 DLLs
6693 -AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
6694 -[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
6695 -])# AC_LIBTOOL_WIN32_DLL
64386696 +# _LT_AC_LANG_F77
64396697 +# ---------------
64406698 +AC_DEFUN([_LT_AC_LANG_F77],
64426700 +_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
64436701 +])# _LT_AC_LANG_F77
64446702
6445 -sunos4*)
6446 - version_type=sunos
6447 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
6448 - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
6449 - shlibpath_var=LD_LIBRARY_PATH
6450 - shlibpath_overrides_runpath=yes
6451 - if test "$with_gnu_ld" = yes; then
6452 - need_lib_prefix=no
6453 - fi
6454 - need_version=yes
6455 - ;;
6456
6457 -sysv4 | sysv4.3*)
6458 - version_type=linux
6459 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
6460 - soname_spec='${libname}${release}${shared_ext}$major'
6461 - shlibpath_var=LD_LIBRARY_PATH
6462 - case $host_vendor in
6463 - sni)
6464 - shlibpath_overrides_runpath=no
6465 - need_lib_prefix=no
6466 - export_dynamic_flag_spec='${wl}-Blargedynsym'
6467 - runpath_var=LD_RUN_PATH
6468 - ;;
6469 - siemens)
6470 - need_lib_prefix=no
6471 - ;;
6472 - motorola)
6473 - need_lib_prefix=no
6474 - need_version=no
6475 - shlibpath_overrides_runpath=no
6476 - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
6477 - ;;
6478 - esac
6479 - ;;
6480 +# AC_LIBTOOL_GCJ
6481 +# --------------
6482 +# enable support for GCJ libraries
6483 +AC_DEFUN([AC_LIBTOOL_GCJ],
6484 +[AC_REQUIRE([_LT_AC_LANG_GCJ])
6485 +])# AC_LIBTOOL_GCJ
6486
6487 -sysv4*MP*)
6488 - if test -d /usr/nec ;then
6489 - version_type=linux
6490 - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
6491 - soname_spec='$libname${shared_ext}.$major'
6492 - shlibpath_var=LD_LIBRARY_PATH
6493 - fi
6494 - ;;
6495
6496 -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
6497 - version_type=freebsd-elf
6498 - need_lib_prefix=no
6499 - need_version=no
6500 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
6501 - soname_spec='${libname}${release}${shared_ext}$major'
6502 - shlibpath_var=LD_LIBRARY_PATH
6503 - hardcode_into_libs=yes
6504 - if test "$with_gnu_ld" = yes; then
6505 - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
6506 - shlibpath_overrides_runpath=no
6507 - else
6508 - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
6509 - shlibpath_overrides_runpath=yes
6510 - case $host_os in
6511 - sco3.2v5*)
6512 - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
6513 - ;;
6514 - esac
6515 - fi
6516 - sys_lib_dlsearch_path_spec='/usr/lib'
6517 - ;;
6518 +# _LT_AC_LANG_GCJ
6519 +# ---------------
6520 +AC_DEFUN([_LT_AC_LANG_GCJ],
6521 +[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
6522 + [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
6523 + [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
6524 + [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
6525 + [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
6526 + [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
6527 +_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
6528 +])# _LT_AC_LANG_GCJ
6529
6530 -uts4*)
6531 - version_type=linux
6532 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
6533 - soname_spec='${libname}${release}${shared_ext}$major'
6534 - shlibpath_var=LD_LIBRARY_PATH
6535 - ;;
6536
6537 -*)
6538 - dynamic_linker=no
6539 - ;;
6540 -esac
6541 -AC_MSG_RESULT([$dynamic_linker])
6542 -test "$dynamic_linker" = no && can_build_shared=no
6543 +# AC_LIBTOOL_RC
6544 +# -------------
6545 +# enable support for Windows resource files
6546 +AC_DEFUN([AC_LIBTOOL_RC],
6547 +[AC_REQUIRE([LT_AC_PROG_RC])
6548 +_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
6549 +])# AC_LIBTOOL_RC
6550
6551 -variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
6552 -if test "$GCC" = yes; then
6553 - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
6554 -fi
6555 -])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
6556
6557 +# AC_LIBTOOL_LANG_C_CONFIG
6558 +# ------------------------
6559 +# Ensure that the configuration vars for the C compiler are
6560 +# suitably defined. Those variables are subsequently used by
6561 +# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
6562 +AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
6563 +AC_DEFUN([_LT_AC_LANG_C_CONFIG],
6564 +[lt_save_CC="$CC"
6565 +AC_LANG_PUSH(C)
6566
6567 -# _LT_AC_TAGCONFIG
6568 -# ----------------
6569 -AC_DEFUN([_LT_AC_TAGCONFIG],
6570 -[AC_ARG_WITH([tags],
6571 - [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
6572 - [include additional configurations @<:@automatic@:>@])],
6573 - [tagnames="$withval"])
6574 +# Source file extension for C test sources.
6575 +ac_ext=c
6576
6577 -if test -f "$ltmain" && test -n "$tagnames"; then
6578 - if test ! -f "${ofile}"; then
6579 - AC_MSG_WARN([output file `$ofile' does not exist])
6580 - fi
6581 +# Object file extension for compiled C test sources.
6582 +objext=o
6583 +_LT_AC_TAGVAR(objext, $1)=$objext
6584
6585 - if test -z "$LTCC"; then
6586 - eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
6587 - if test -z "$LTCC"; then
6588 - AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
6589 - else
6590 - AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
6591 - fi
6592 - fi
6593 - if test -z "$LTCFLAGS"; then
6594 - eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
6595 - fi
6596 -
6597 - # Extract list of available tagged configurations in $ofile.
6598 - # Note that this assumes the entire list is on one line.
6599 - available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
6600 -
6601 - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
6602 - for tagname in $tagnames; do
6603 - IFS="$lt_save_ifs"
6604 - # Check whether tagname contains only valid characters
6605 - case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
6606 - "") ;;
6607 - *) AC_MSG_ERROR([invalid tag name: $tagname])
6608 - ;;
6609 - esac
6610 -
6611 - if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
6612 - then
6613 - AC_MSG_ERROR([tag name \"$tagname\" already exists])
6614 - fi
6615 +# Code to be used in simple compile tests
6616 +lt_simple_compile_test_code="int some_variable = 0;\n"
6617
6618 - # Update the list of available tags.
6619 - if test -n "$tagname"; then
6620 - echo appending configuration tag \"$tagname\" to $ofile
6621 +# Code to be used in simple link tests
6622 +lt_simple_link_test_code='int main(){return(0);}\n'
6623
6624 - case $tagname in
6625 - CXX)
6626 - if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
6627 - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
6628 - (test "X$CXX" != "Xg++"))) ; then
6629 - AC_LIBTOOL_LANG_CXX_CONFIG
6630 - else
6631 - tagname=""
6632 - fi
6633 - ;;
6634 +_LT_AC_SYS_COMPILER
6635
6636 - F77)
6637 - if test -n "$F77" && test "X$F77" != "Xno"; then
6638 - AC_LIBTOOL_LANG_F77_CONFIG
6639 - else
6640 - tagname=""
6641 - fi
6642 - ;;
6643 +# save warnings/boilerplate of simple test code
6644 +_LT_COMPILER_BOILERPLATE
6645 +_LT_LINKER_BOILERPLATE
6646
6647 - GCJ)
6648 - if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
6649 - AC_LIBTOOL_LANG_GCJ_CONFIG
6650 - else
6651 - tagname=""
6652 - fi
6653 - ;;
6654 +AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
6655 +AC_LIBTOOL_PROG_COMPILER_PIC($1)
6656 +AC_LIBTOOL_PROG_CC_C_O($1)
6657 +AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
6658 +AC_LIBTOOL_PROG_LD_SHLIBS($1)
6659 +AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
6660 +AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
6661 +AC_LIBTOOL_SYS_LIB_STRIP
6662 +AC_LIBTOOL_DLOPEN_SELF
6663
6664 - RC)
6665 - AC_LIBTOOL_LANG_RC_CONFIG
6666 - ;;
6667 +# Report which library types will actually be built
6668 +AC_MSG_CHECKING([if libtool supports shared libraries])
6669 +AC_MSG_RESULT([$can_build_shared])
6670
6671 - *)
6672 - AC_MSG_ERROR([Unsupported tag name: $tagname])
6673 - ;;
6674 - esac
6675 +AC_MSG_CHECKING([whether to build shared libraries])
6676 +test "$can_build_shared" = "no" && enable_shared=no
6677
6678 - # Append the new tag name to the list of available tags.
6679 - if test -n "$tagname" ; then
6680 - available_tags="$available_tags $tagname"
6681 - fi
6682 - fi
6683 - done
6684 - IFS="$lt_save_ifs"
6685 +# On AIX, shared libraries and static libraries use the same namespace, and
6686 +# are all built from PIC.
6687 +case $host_os in
6688 +aix3*)
6689 + test "$enable_shared" = yes && enable_static=no
6690 + if test -n "$RANLIB"; then
6691 + archive_cmds="$archive_cmds~\$RANLIB \$lib"
6692 + postinstall_cmds='$RANLIB $lib'
6693 + fi
6694 + ;;
6695
6696 - # Now substitute the updated list of available tags.
6697 - if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
6698 - mv "${ofile}T" "$ofile"
6699 - chmod +x "$ofile"
6700 - else
6701 - rm -f "${ofile}T"
6702 - AC_MSG_ERROR([unable to update list of available tagged configurations.])
6703 +aix4* | aix5*)
6704 + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
6705 + test "$enable_shared" = yes && enable_static=no
6706 fi
6707 -fi
6708 -])# _LT_AC_TAGCONFIG
6709 + ;;
6710 +esac
6711 +AC_MSG_RESULT([$enable_shared])
6712
6713 +AC_MSG_CHECKING([whether to build static libraries])
6714 +# Make sure either enable_shared or enable_static is yes.
6715 +test "$enable_shared" = yes || enable_static=yes
6716 +AC_MSG_RESULT([$enable_static])
6717
6718 -# AC_LIBTOOL_DLOPEN
6719 -# -----------------
6720 -# enable checks for dlopen support
6721 -AC_DEFUN([AC_LIBTOOL_DLOPEN],
6722 - [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
6723 -])# AC_LIBTOOL_DLOPEN
6724 +AC_LIBTOOL_CONFIG($1)
6725
6726 +AC_LANG_POP
6727 +CC="$lt_save_CC"
6728 +])# AC_LIBTOOL_LANG_C_CONFIG
6729
6730 -# AC_LIBTOOL_WIN32_DLL
6731 -# --------------------
6732 -# declare package support for building win32 DLLs
6733 -AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
6734 -[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
6735 -])# AC_LIBTOOL_WIN32_DLL
6736
6737 +# AC_LIBTOOL_LANG_CXX_CONFIG
6738 +# --------------------------
6739 +# Ensure that the configuration vars for the C compiler are
6740 +# suitably defined. Those variables are subsequently used by
6741 +# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
6742 +AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
6743 +AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
6744 +[AC_LANG_PUSH(C++)
6745 +AC_REQUIRE([AC_PROG_CXX])
6746 +AC_REQUIRE([_LT_AC_PROG_CXXCPP])
67476703
67486704 -# AC_ENABLE_SHARED([DEFAULT])
67496705 -# ---------------------------
67736729 - esac],
67746730 - [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
67756731 -])# AC_ENABLE_SHARED
6776 +_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
6777 +_LT_AC_TAGVAR(allow_undefined_flag, $1)=
6778 +_LT_AC_TAGVAR(always_export_symbols, $1)=no
6779 +_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
6780 +_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
6781 +_LT_AC_TAGVAR(hardcode_direct, $1)=no
6782 +_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
6783 +_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
6784 +_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
6785 +_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
6786 +_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
6787 +_LT_AC_TAGVAR(hardcode_automatic, $1)=no
6788 +_LT_AC_TAGVAR(module_cmds, $1)=
6789 +_LT_AC_TAGVAR(module_expsym_cmds, $1)=
6790 +_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
6791 +_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
6792 +_LT_AC_TAGVAR(no_undefined_flag, $1)=
6793 +_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
6794 +_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
6795
6796 +# Dependencies to place before and after the object being linked:
6797 +_LT_AC_TAGVAR(predep_objects, $1)=
6798 +_LT_AC_TAGVAR(postdep_objects, $1)=
6799 +_LT_AC_TAGVAR(predeps, $1)=
6800 +_LT_AC_TAGVAR(postdeps, $1)=
6801 +_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
6732 +# AC_LIBTOOL_GCJ
6733 +# --------------
6734 +# enable support for GCJ libraries
6735 +AC_DEFUN([AC_LIBTOOL_GCJ],
6736 +[AC_REQUIRE([_LT_AC_LANG_GCJ])
6737 +])# AC_LIBTOOL_GCJ
6738
68026739
68036740 -# AC_DISABLE_SHARED
68046741 -# -----------------
68076744 -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
68086745 -AC_ENABLE_SHARED(no)
68096746 -])# AC_DISABLE_SHARED
6810 +# Source file extension for C++ test sources.
6811 +ac_ext=cpp
6812
6813 +# Object file extension for compiled C++ test sources.
6814 +objext=o
6815 +_LT_AC_TAGVAR(objext, $1)=$objext
6747 +# _LT_AC_LANG_GCJ
6748 +# ---------------
6749 +AC_DEFUN([_LT_AC_LANG_GCJ],
6750 +[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
6751 + [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
6752 + [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
6753 + [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
6754 + [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
6755 + [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
6756 +_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
6757 +])# _LT_AC_LANG_GCJ
6758
68166759
68176760 -# AC_ENABLE_STATIC([DEFAULT])
68186761 -# ---------------------------
68426785 - esac],
68436786 - [enable_static=]AC_ENABLE_STATIC_DEFAULT)
68446787 -])# AC_ENABLE_STATIC
6845 +# Code to be used in simple compile tests
6846 +lt_simple_compile_test_code="int some_variable = 0;\n"
6847
6848 +# Code to be used in simple link tests
6849 +lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
6788 +# AC_LIBTOOL_RC
6789 +# -------------
6790 +# enable support for Windows resource files
6791 +AC_DEFUN([AC_LIBTOOL_RC],
6792 +[AC_REQUIRE([LT_AC_PROG_RC])
6793 +_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
6794 +])# AC_LIBTOOL_RC
6795
68506796
68516797 -# AC_DISABLE_STATIC
68526798 -# -----------------
68556801 -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
68566802 -AC_ENABLE_STATIC(no)
68576803 -])# AC_DISABLE_STATIC
6858 +# ltmain only uses $CC for tagged configurations so make sure $CC is set.
6859 +_LT_AC_SYS_COMPILER
6860
6861 +# save warnings/boilerplate of simple test code
6862 +_LT_COMPILER_BOILERPLATE
6863 +_LT_LINKER_BOILERPLATE
6804 +# AC_LIBTOOL_LANG_C_CONFIG
6805 +# ------------------------
6806 +# Ensure that the configuration vars for the C compiler are
6807 +# suitably defined. Those variables are subsequently used by
6808 +# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
6809 +AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
6810 +AC_DEFUN([_LT_AC_LANG_C_CONFIG],
6811 +[lt_save_CC="$CC"
6812 +AC_LANG_PUSH(C)
6813
6814 +# Source file extension for C test sources.
6815 +ac_ext=c
68646816
68656817 -# AC_ENABLE_FAST_INSTALL([DEFAULT])
68666818 -# ---------------------------------
68906842 - esac],
68916843 - [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
68926844 -])# AC_ENABLE_FAST_INSTALL
6893 +# Allow CC to be a program name with arguments.
6894 +lt_save_CC=$CC
6895 +lt_save_LD=$LD
6896 +lt_save_GCC=$GCC
6897 +GCC=$GXX
6898 +lt_save_with_gnu_ld=$with_gnu_ld
6899 +lt_save_path_LD=$lt_cv_path_LD
6900 +if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
6901 + lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
6902 +else
6903 + $as_unset lt_cv_prog_gnu_ld
6904 +fi
6905 +if test -n "${lt_cv_path_LDCXX+set}"; then
6906 + lt_cv_path_LD=$lt_cv_path_LDCXX
6907 +else
6908 + $as_unset lt_cv_path_LD
6909 +fi
6910 +test -z "${LDCXX+set}" || LD=$LDCXX
6911 +CC=${CXX-"c++"}
6912 +compiler=$CC
6913 +_LT_AC_TAGVAR(compiler, $1)=$CC
6914 +_LT_CC_BASENAME([$compiler])
6915
6916 +# We don't want -fno-exception wen compiling C++ code, so set the
6917 +# no_builtin_flag separately
6918 +if test "$GXX" = yes; then
6919 + _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
6920 +else
6921 + _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
6922 +fi
6845 +# Object file extension for compiled C test sources.
6846 +objext=o
6847 +_LT_AC_TAGVAR(objext, $1)=$objext
6848
6849 +# Code to be used in simple compile tests
6850 +lt_simple_compile_test_code="int some_variable = 0;\n"
69236851
69246852 -# AC_DISABLE_FAST_INSTALL
69256853 -# -----------------------
69286856 -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
69296857 -AC_ENABLE_FAST_INSTALL(no)
69306858 -])# AC_DISABLE_FAST_INSTALL
6931 +if test "$GXX" = yes; then
6932 + # Set up default GNU C++ configuration
6933
6934 + AC_PROG_LD
6859 +# Code to be used in simple link tests
6860 +lt_simple_link_test_code='int main(){return(0);}\n'
6861
6862 +_LT_AC_SYS_COMPILER
69356863
69366864 -# AC_LIBTOOL_PICMODE([MODE])
69376865 -# --------------------------
69416869 -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
69426870 -pic_mode=ifelse($#,1,$1,default)
69436871 -])# AC_LIBTOOL_PICMODE
6944 + # Check if GNU C++ uses GNU ld as the underlying linker, since the
6945 + # archiving commands below assume that GNU ld is being used.
6946 + if test "$with_gnu_ld" = yes; then
6947 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
6948 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6949
6950 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
6951 + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
6872 +# save warnings/boilerplate of simple test code
6873 +_LT_COMPILER_BOILERPLATE
6874 +_LT_LINKER_BOILERPLATE
6875
6876 +AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
6877 +AC_LIBTOOL_PROG_COMPILER_PIC($1)
6878 +AC_LIBTOOL_PROG_CC_C_O($1)
6879 +AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
6880 +AC_LIBTOOL_PROG_LD_SHLIBS($1)
6881 +AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
6882 +AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
6883 +AC_LIBTOOL_SYS_LIB_STRIP
6884 +AC_LIBTOOL_DLOPEN_SELF
69526885
69536886 -# AC_PROG_EGREP
69546887 -# -------------
69636896 - EGREP=$ac_cv_prog_egrep
69646897 - AC_SUBST([EGREP])
69656898 -])])
6966 + # If archive_cmds runs LD, not CC, wlarc should be empty
6967 + # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
6968 + # investigate it a little bit more. (MM)
6969 + wlarc='${wl}'
6970
6971 + # ancient GNU ld didn't support --whole-archive et. al.
6972 + if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
6973 + grep 'no-whole-archive' > /dev/null; then
6974 + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
6975 + else
6976 + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
6977 + fi
6978 + else
6979 + with_gnu_ld=no
6980 + wlarc=
6899 +# Report which library types will actually be built
6900 +AC_MSG_CHECKING([if libtool supports shared libraries])
6901 +AC_MSG_RESULT([$can_build_shared])
6902
6903 +AC_MSG_CHECKING([whether to build shared libraries])
6904 +test "$can_build_shared" = "no" && enable_shared=no
69816905
69826906 -# AC_PATH_TOOL_PREFIX
69836907 -# -------------------
69896913 -[case $MAGIC_CMD in
69906914 -[[\\/*] | ?:[\\/]*])
69916915 - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
6992 - ;;
6916 +# On AIX, shared libraries and static libraries use the same namespace, and
6917 +# are all built from PIC.
6918 +case $host_os in
6919 +aix3*)
6920 + test "$enable_shared" = yes && enable_static=no
6921 + if test -n "$RANLIB"; then
6922 + archive_cmds="$archive_cmds~\$RANLIB \$lib"
6923 + postinstall_cmds='$RANLIB $lib'
6924 + fi
6925 ;;
69936926 -*)
69946927 - lt_save_MAGIC_CMD="$MAGIC_CMD"
69956928 - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
70126945 - :
70136946 - else
70146947 - cat <<EOF 1>&2
7015 + # A generic and very simple default shared library creation
7016 + # command for GNU C++ for the case where it uses the native
7017 + # linker, instead of GNU ld. If possible, this setting should
7018 + # overridden to take advantage of the native linker features on
7019 + # the platform it is being used on.
7020 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
7021 + fi
70226948
70236949 -*** Warning: the command libtool uses to detect shared libraries,
70246950 -*** $file_magic_cmd, produces output that libtool cannot recognize.
70286954 -*** libraries will work regardless of this problem. Nevertheless, you
70296955 -*** may want to report the problem to your system manager and/or to
70306956 -*** bug-libtool@gnu.org
7031 + # Commands to make compiler produce verbose output that lists
7032 + # what "hidden" libraries, object files and flags are used when
7033 + # linking a shared library.
7034 + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
6957 +aix4* | aix5*)
6958 + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
6959 + test "$enable_shared" = yes && enable_static=no
6960 + fi
6961 + ;;
6962 +esac
6963 +AC_MSG_RESULT([$enable_shared])
70356964
70366965 -EOF
70376966 - fi ;;
70476976 -MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
70486977 -if test -n "$MAGIC_CMD"; then
70496978 - AC_MSG_RESULT($MAGIC_CMD)
7050 else
6979 -else
70516980 - AC_MSG_RESULT(no)
7052 + GXX=no
7053 + with_gnu_ld=no
7054 + wlarc=
7055 fi
6981 -fi
70566982 -])# AC_PATH_TOOL_PREFIX
7057
7058 +# PORTME: fill in a description of your system's C++ link characteristics
7059 +AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
7060 +_LT_AC_TAGVAR(ld_shlibs, $1)=yes
7061 +case $host_os in
7062 + aix3*)
7063 + # FIXME: insert proper C++ library support
7064 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
7065 + ;;
7066 + aix4* | aix5*)
7067 + if test "$host_cpu" = ia64; then
7068 + # On IA64, the linker does run time linking by default, so we don't
7069 + # have to do anything special.
7070 + aix_use_runtimelinking=no
7071 + exp_sym_flag='-Bexport'
7072 + no_entry_flag=""
7073 + else
7074 + aix_use_runtimelinking=no
6983 +AC_MSG_CHECKING([whether to build static libraries])
6984 +# Make sure either enable_shared or enable_static is yes.
6985 +test "$enable_shared" = yes || enable_static=yes
6986 +AC_MSG_RESULT([$enable_static])
6987
6988 +AC_LIBTOOL_CONFIG($1)
70756989
70766990 -# AC_PATH_MAGIC
70776991 -# -------------
70867000 - fi
70877001 -fi
70887002 -])# AC_PATH_MAGIC
7089 + # Test if we are trying to use run time linking or normal
7090 + # AIX style linking. If -brtl is somewhere in LDFLAGS, we
7091 + # need to do runtime linking.
7092 + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
7093 + for ld_flag in $LDFLAGS; do
7094 + case $ld_flag in
7095 + *-brtl*)
7096 + aix_use_runtimelinking=yes
7097 + break
7098 + ;;
7099 + esac
7100 + done
7101 + ;;
7102 + esac
7103
7104 + exp_sym_flag='-bexport'
7105 + no_entry_flag='-bnoentry'
7106 + fi
7003 +AC_LANG_POP
7004 +CC="$lt_save_CC"
7005 +])# AC_LIBTOOL_LANG_C_CONFIG
7006
71077007
71087008 -# AC_PROG_LD
71097009 -# ----------
71517051 - esac
71527052 -elif test "$with_gnu_ld" = yes; then
71537053 - AC_MSG_CHECKING([for GNU ld])
7154 -else
7054 +# AC_LIBTOOL_LANG_CXX_CONFIG
7055 +# --------------------------
7056 +# Ensure that the configuration vars for the C compiler are
7057 +# suitably defined. Those variables are subsequently used by
7058 +# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
7059 +AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
7060 +AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
7061 +[AC_LANG_PUSH(C++)
7062 +AC_REQUIRE([AC_PROG_CXX])
7063 +AC_REQUIRE([_LT_AC_PROG_CXXCPP])
7064 +
7065 +_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
7066 +_LT_AC_TAGVAR(allow_undefined_flag, $1)=
7067 +_LT_AC_TAGVAR(always_export_symbols, $1)=no
7068 +_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
7069 +_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
7070 +_LT_AC_TAGVAR(hardcode_direct, $1)=no
7071 +_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
7072 +_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
7073 +_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
7074 +_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
7075 +_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
7076 +_LT_AC_TAGVAR(hardcode_automatic, $1)=no
7077 +_LT_AC_TAGVAR(module_cmds, $1)=
7078 +_LT_AC_TAGVAR(module_expsym_cmds, $1)=
7079 +_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
7080 +_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
7081 +_LT_AC_TAGVAR(no_undefined_flag, $1)=
7082 +_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
7083 +_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
7084 +
7085 +# Dependencies to place before and after the object being linked:
7086 +_LT_AC_TAGVAR(predep_objects, $1)=
7087 +_LT_AC_TAGVAR(postdep_objects, $1)=
7088 +_LT_AC_TAGVAR(predeps, $1)=
7089 +_LT_AC_TAGVAR(postdeps, $1)=
7090 +_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
7091 +
7092 +# Source file extension for C++ test sources.
7093 +ac_ext=cpp
7094 +
7095 +# Object file extension for compiled C++ test sources.
7096 +objext=o
7097 +_LT_AC_TAGVAR(objext, $1)=$objext
7098 +
7099 +# Code to be used in simple compile tests
7100 +lt_simple_compile_test_code="int some_variable = 0;\n"
7101 +
7102 +# Code to be used in simple link tests
7103 +lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
7104 +
7105 +# ltmain only uses $CC for tagged configurations so make sure $CC is set.
7106 +_LT_AC_SYS_COMPILER
7107 +
7108 +# save warnings/boilerplate of simple test code
7109 +_LT_COMPILER_BOILERPLATE
7110 +_LT_LINKER_BOILERPLATE
7111 +
7112 +# Allow CC to be a program name with arguments.
7113 +lt_save_CC=$CC
7114 +lt_save_LD=$LD
7115 +lt_save_GCC=$GCC
7116 +GCC=$GXX
7117 +lt_save_with_gnu_ld=$with_gnu_ld
7118 +lt_save_path_LD=$lt_cv_path_LD
7119 +if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
7120 + lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
7121 else
71557122 - AC_MSG_CHECKING([for non-GNU ld])
7156 -fi
7123 + $as_unset lt_cv_prog_gnu_ld
7124 fi
71577125 -AC_CACHE_VAL(lt_cv_path_LD,
71587126 -[if test -z "$LD"; then
71597127 - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
71717139 - ;;
71727140 - *)
71737141 - test "$with_gnu_ld" != yes && break
7142 - ;;
7143 - esac
7144 - fi
7145 - done
7146 - IFS="$lt_save_ifs"
7147 +if test -n "${lt_cv_path_LDCXX+set}"; then
7148 + lt_cv_path_LD=$lt_cv_path_LDCXX
7149 else
7150 - lt_cv_path_LD="$LD" # Let the user override the test with a path.
7151 -fi])
7152 -LD="$lt_cv_path_LD"
7153 -if test -n "$LD"; then
7154 - AC_MSG_RESULT($LD)
7155 + $as_unset lt_cv_path_LD
7156 +fi
7157 +test -z "${LDCXX+set}" || LD=$LDCXX
7158 +CC=${CXX-"c++"}
7159 +compiler=$CC
7160 +_LT_AC_TAGVAR(compiler, $1)=$CC
7161 +_LT_CC_BASENAME([$compiler])
7162 +
7163 +# We don't want -fno-exception wen compiling C++ code, so set the
7164 +# no_builtin_flag separately
7165 +if test "$GXX" = yes; then
7166 + _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
7167 else
7168 - AC_MSG_RESULT(no)
7169 + _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
7170 fi
7171 -test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
7172 -AC_PROG_LD_GNU
7173 -])# AC_PROG_LD
7174
7175 +if test "$GXX" = yes; then
7176 + # Set up default GNU C++ configuration
7177
7178 -# AC_PROG_LD_GNU
7179 -# --------------
7180 -AC_DEFUN([AC_PROG_LD_GNU],
7181 -[AC_REQUIRE([AC_PROG_EGREP])dnl
7182 -AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
7183 -[# I'd rather use --version here, but apparently some GNU lds only accept -v.
7184 -case `$LD -v 2>&1 </dev/null` in
7185 -*GNU* | *'with BFD'*)
7186 - lt_cv_prog_gnu_ld=yes
7187 - ;;
7188 -*)
7189 - lt_cv_prog_gnu_ld=no
7190 - ;;
7191 -esac])
7192 -with_gnu_ld=$lt_cv_prog_gnu_ld
7193 -])# AC_PROG_LD_GNU
7194 + AC_PROG_LD
7195
7196 + # Check if GNU C++ uses GNU ld as the underlying linker, since the
7197 + # archiving commands below assume that GNU ld is being used.
7198 + if test "$with_gnu_ld" = yes; then
7199 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
7200 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
7201
7202 -# AC_PROG_LD_RELOAD_FLAG
7203 -# ----------------------
7204 -# find reload flag for linker
7205 -# -- PORTME Some linkers may need a different reload flag.
7206 -AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
7207 -[AC_CACHE_CHECK([for $LD option to reload object files],
7208 - lt_cv_ld_reload_flag,
7209 - [lt_cv_ld_reload_flag='-r'])
7210 -reload_flag=$lt_cv_ld_reload_flag
7211 -case $reload_flag in
7212 -"" | " "*) ;;
7213 -*) reload_flag=" $reload_flag" ;;
7214 -esac
7215 -reload_cmds='$LD$reload_flag -o $output$reload_objs'
7216 -case $host_os in
7217 - darwin*)
7218 - if test "$GCC" = yes; then
7219 - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
7220 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
7221 + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
7222 +
7223 + # If archive_cmds runs LD, not CC, wlarc should be empty
7224 + # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
7225 + # investigate it a little bit more. (MM)
7226 + wlarc='${wl}'
7227 +
7228 + # ancient GNU ld didn't support --whole-archive et. al.
7229 + if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
7230 + grep 'no-whole-archive' > /dev/null; then
7231 + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
7232 else
7233 - reload_cmds='$LD$reload_flag -o $output$reload_objs'
7234 + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
7235 fi
7236 - ;;
7237 -esac
7238 -])# AC_PROG_LD_RELOAD_FLAG
7239 -
7240 + else
7241 + with_gnu_ld=no
7242 + wlarc=
7243
7244 -# AC_DEPLIBS_CHECK_METHOD
7245 -# -----------------------
7246 -# how to check for library dependencies
7247 -# -- PORTME fill in with the dynamic library characteristics
7248 -AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
7249 -[AC_CACHE_CHECK([how to recognise dependent libraries],
7250 -lt_cv_deplibs_check_method,
7251 -[lt_cv_file_magic_cmd='$MAGIC_CMD'
7252 -lt_cv_file_magic_test_file=
7253 -lt_cv_deplibs_check_method='unknown'
7254 -# Need to set the preceding variable on all platforms that support
7255 -# interlibrary dependencies.
7256 -# 'none' -- dependencies not supported.
7257 -# `unknown' -- same as none, but documents that we really don't know.
7258 -# 'pass_all' -- all dependencies passed with no checks.
7259 -# 'test_compile' -- check by making test program.
7260 -# 'file_magic [[regex]]' -- check by looking for files in library path
7261 -# which responds to the $file_magic_cmd with a given extended regex.
7262 -# If you have `file' or equivalent on your system and you're not sure
7263 -# whether `pass_all' will *always* work, you probably want this one.
7264 + # A generic and very simple default shared library creation
7265 + # command for GNU C++ for the case where it uses the native
7266 + # linker, instead of GNU ld. If possible, this setting should
7267 + # overridden to take advantage of the native linker features on
7268 + # the platform it is being used on.
7269 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
7270 + fi
7271
7272 -case $host_os in
7273 -aix4* | aix5*)
7274 - lt_cv_deplibs_check_method=pass_all
7275 - ;;
7276 + # Commands to make compiler produce verbose output that lists
7277 + # what "hidden" libraries, object files and flags are used when
7278 + # linking a shared library.
7279 + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
7280
7281 -beos*)
7282 - lt_cv_deplibs_check_method=pass_all
7283 - ;;
7284 +else
7285 + GXX=no
7286 + with_gnu_ld=no
7287 + wlarc=
7288 +fi
7289
7290 -bsdi[[45]]*)
7291 - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
7292 - lt_cv_file_magic_cmd='/usr/bin/file -L'
7293 - lt_cv_file_magic_test_file=/shlib/libc.so
7294 - ;;
7295 +# PORTME: fill in a description of your system's C++ link characteristics
7296 +AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
7297 +_LT_AC_TAGVAR(ld_shlibs, $1)=yes
7298 +case $host_os in
7299 + aix3*)
7300 + # FIXME: insert proper C++ library support
7301 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
7302 + ;;
7303 + aix4* | aix5*)
7304 + if test "$host_cpu" = ia64; then
7305 + # On IA64, the linker does run time linking by default, so we don't
7306 + # have to do anything special.
7307 + aix_use_runtimelinking=no
7308 + exp_sym_flag='-Bexport'
7309 + no_entry_flag=""
7310 + else
7311 + aix_use_runtimelinking=no
7312
7313 -cygwin*)
7314 - # func_win32_libid is a shell function defined in ltmain.sh
7315 - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
7316 - lt_cv_file_magic_cmd='func_win32_libid'
7317 - ;;
7318 + # Test if we are trying to use run time linking or normal
7319 + # AIX style linking. If -brtl is somewhere in LDFLAGS, we
7320 + # need to do runtime linking.
7321 + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
7322 + for ld_flag in $LDFLAGS; do
7323 + case $ld_flag in
7324 + *-brtl*)
7325 + aix_use_runtimelinking=yes
7326 + break
7327 + ;;
7328 + esac
7329 + done
7330 + ;;
7331 + esac
7332
7333 -mingw* | pw32*)
7334 - # Base MSYS/MinGW do not provide the 'file' command needed by
7335 - # func_win32_libid shell function, so use a weaker test based on 'objdump'.
7336 - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
7337 - lt_cv_file_magic_cmd='$OBJDUMP -f'
7338 - ;;
7339 + exp_sym_flag='-bexport'
7340 + no_entry_flag='-bnoentry'
7341 + fi
7342
7343 -darwin* | rhapsody*)
7344 - lt_cv_deplibs_check_method=pass_all
7345 - ;;
71747346 + # When large executables or shared objects are built, AIX ld can
71757347 + # have problems creating the table of contents. If linking a library
71767348 + # or program results in "error TOC overflow" add -mminimal-toc to
71777349 + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
71787350 + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
7179 +
7351
7352 -freebsd* | kfreebsd*-gnu | dragonfly*)
7353 - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
7354 - case $host_cpu in
7355 - i*86 )
7356 - # Not sure whether the presence of OpenBSD here was a mistake.
7357 - # Let's accept both of them until this is cleared up.
7358 - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
7359 - lt_cv_file_magic_cmd=/usr/bin/file
7360 - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
7361 - ;;
7362 - esac
7363 - else
7364 - lt_cv_deplibs_check_method=pass_all
7365 - fi
7366 - ;;
71807367 + _LT_AC_TAGVAR(archive_cmds, $1)=''
71817368 + _LT_AC_TAGVAR(hardcode_direct, $1)=yes
71827369 + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
71837370 + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
7184 +
7371
7372 -gnu*)
7373 - lt_cv_deplibs_check_method=pass_all
7374 - ;;
71857375 + if test "$GXX" = yes; then
71867376 + case $host_os in aix4.[[012]]|aix4.[[012]].*)
71877377 + # We only want to do this on AIX 4.2 and lower, the check
72027392 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
72037393 + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
72047394 + fi
7205 ;;
7206 esac
7395 + ;;
7396 + esac
72077397 + shared_flag='-shared'
72087398 + if test "$aix_use_runtimelinking" = yes; then
72097399 + shared_flag="$shared_flag "'${wl}-G'
72217411 + shared_flag='${wl}-bM:SRE'
72227412 + fi
72237413 + fi
7224 fi
7225 - done
7226 - IFS="$lt_save_ifs"
7227 -else
7228 - lt_cv_path_LD="$LD" # Let the user override the test with a path.
7229 -fi])
7230 -LD="$lt_cv_path_LD"
7231 -if test -n "$LD"; then
7232 - AC_MSG_RESULT($LD)
7233 -else
7234 - AC_MSG_RESULT(no)
7235 -fi
7236 -test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
7237 -AC_PROG_LD_GNU
7238 -])# AC_PROG_LD
7239 -
7240
7241 -# AC_PROG_LD_GNU
7242 -# --------------
7243 -AC_DEFUN([AC_PROG_LD_GNU],
7244 -[AC_REQUIRE([AC_PROG_EGREP])dnl
7245 -AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
7246 -[# I'd rather use --version here, but apparently some GNU lds only accept -v.
7247 -case `$LD -v 2>&1 </dev/null` in
7248 -*GNU* | *'with BFD'*)
7249 - lt_cv_prog_gnu_ld=yes
7250 - ;;
7251 -*)
7252 - lt_cv_prog_gnu_ld=no
7253 - ;;
7254 -esac])
7255 -with_gnu_ld=$lt_cv_prog_gnu_ld
7256 -])# AC_PROG_LD_GNU
7414 + fi
7415
7416 -hpux10.20* | hpux11*)
7417 - lt_cv_file_magic_cmd=/usr/bin/file
7418 - case $host_cpu in
7419 - ia64*)
7420 - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
7421 - lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
72577422 + # It seems that -bexpall does not export symbols beginning with
72587423 + # underscore (_), so it is better to generate a list of symbols to export.
72597424 + _LT_AC_TAGVAR(always_export_symbols, $1)=yes
72647429 + # Determine the default libpath from the value encoded in an empty executable.
72657430 + _LT_AC_SYS_LIBPATH_AIX
72667431 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
7267
7432 +
72687433 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
72697434 + else
72707435 + if test "$host_cpu" = ia64; then
72867451 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
72877452 + fi
72887453 + fi
7289 + ;;
7290
7291 -# AC_PROG_LD_RELOAD_FLAG
7292 -# ----------------------
7293 -# find reload flag for linker
7294 -# -- PORTME Some linkers may need a different reload flag.
7295 -AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
7296 -[AC_CACHE_CHECK([for $LD option to reload object files],
7297 - lt_cv_ld_reload_flag,
7298 - [lt_cv_ld_reload_flag='-r'])
7299 -reload_flag=$lt_cv_ld_reload_flag
7300 -case $reload_flag in
7301 -"" | " "*) ;;
7302 -*) reload_flag=" $reload_flag" ;;
7303 -esac
7304 -reload_cmds='$LD$reload_flag -o $output$reload_objs'
7305 -case $host_os in
7306 - darwin*)
7307 - if test "$GCC" = yes; then
7308 - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
7454 ;;
7455 - hppa*64*)
7456 - [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
7457 - lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
7458 +
73097459 + beos*)
73107460 + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
73117461 + _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
73127462 + # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
73137463 + # support --undefined. This deserves some investigation. FIXME
73147464 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
7315 else
7316 - reload_cmds='$LD$reload_flag -o $output$reload_objs'
7465 + else
73177466 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
7318 fi
7467 + fi
73197468 ;;
7320 -esac
7321 -])# AC_PROG_LD_RELOAD_FLAG
7322
7469 - *)
7470 - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
7471 - lt_cv_file_magic_test_file=/usr/lib/libc.sl
7472 +
73237473 + chorus*)
73247474 + case $cc_basename in
73257475 + *)
73277477 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
73287478 + ;;
73297479 + esac
7330 + ;;
7331
7332 -# AC_DEPLIBS_CHECK_METHOD
7333 -# -----------------------
7334 -# how to check for library dependencies
7335 -# -- PORTME fill in with the dynamic library characteristics
7336 -AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
7337 -[AC_CACHE_CHECK([how to recognise dependent libraries],
7338 -lt_cv_deplibs_check_method,
7339 -[lt_cv_file_magic_cmd='$MAGIC_CMD'
7340 -lt_cv_file_magic_test_file=
7341 -lt_cv_deplibs_check_method='unknown'
7342 -# Need to set the preceding variable on all platforms that support
7343 -# interlibrary dependencies.
7344 -# 'none' -- dependencies not supported.
7345 -# `unknown' -- same as none, but documents that we really don't know.
7346 -# 'pass_all' -- all dependencies passed with no checks.
7347 -# 'test_compile' -- check by making test program.
7348 -# 'file_magic [[regex]]' -- check by looking for files in library path
7349 -# which responds to the $file_magic_cmd with a given extended regex.
7350 -# If you have `file' or equivalent on your system and you're not sure
7351 -# whether `pass_all' will *always* work, you probably want this one.
7352 -
7353 -case $host_os in
7354 -aix4* | aix5*)
7355 - lt_cv_deplibs_check_method=pass_all
7480 ;;
7481 - esac
7482 - ;;
7483
7484 -interix3*)
7485 - # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
7486 - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
73567487 - ;;
73577488 + cygwin* | mingw* | pw32*)
73587489 + # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
73627493 + _LT_AC_TAGVAR(always_export_symbols, $1)=no
73637494 + _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
73647495
7365 -beos*)
7496 -irix5* | irix6* | nonstopux*)
7497 - case $LD in
7498 - *-32|*"-32 ") libmagic=32-bit;;
7499 - *-n32|*"-n32 ") libmagic=N32;;
7500 - *-64|*"-64 ") libmagic=64-bit;;
7501 - *) libmagic=never-match;;
7502 - esac
7503 - lt_cv_deplibs_check_method=pass_all
7504 - ;;
7505 -
7506 -# This must be Linux ELF.
7507 -linux*)
7508 - lt_cv_deplibs_check_method=pass_all
7509 - ;;
7510 -
7511 -netbsd*)
7512 - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
7513 - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
7514 - else
7515 - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
7516 - fi
7517 - ;;
7518 -
7519 -newos6*)
7520 - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
7521 - lt_cv_file_magic_cmd=/usr/bin/file
7522 - lt_cv_file_magic_test_file=/usr/lib/libnls.so
7523 - ;;
7524 -
7525 -nto-qnx*)
7526 - lt_cv_deplibs_check_method=unknown
7527 - ;;
7528 -
7529 -openbsd*)
7530 - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
7531 - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
7532 - else
7533 - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
7534 - fi
7535 - ;;
7536 -
7537 -osf3* | osf4* | osf5*)
73667538 - lt_cv_deplibs_check_method=pass_all
73677539 + if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
73687540 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
74067578 + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
74077579 + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
74087580
7409 -bsdi[[45]]*)
7410 - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
7411 - lt_cv_file_magic_cmd='/usr/bin/file -L'
7412 - lt_cv_file_magic_test_file=/shlib/libc.so
7413 - ;;
7414 -
7415 -cygwin*)
7416 - # func_win32_libid is a shell function defined in ltmain.sh
7417 - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
7418 - lt_cv_file_magic_cmd='func_win32_libid'
7581 -solaris*)
7582 - lt_cv_deplibs_check_method=pass_all
74197583 - ;;
74207584 + if test "$GXX" = yes ; then
74217585 + lt_int_apple_cc_single_mod=no
74537617 + fi
74547618 + ;;
74557619
7456 -mingw* | pw32*)
7457 - # Base MSYS/MinGW do not provide the 'file' command needed by
7458 - # func_win32_libid shell function, so use a weaker test based on 'objdump'.
7459 - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
7460 - lt_cv_file_magic_cmd='$OBJDUMP -f'
7461 - ;;
7620 -sysv4 | sysv4.3*)
7621 - case $host_vendor in
7622 - motorola)
7623 - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
7624 - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
7625 - ;;
7626 - ncr)
7627 - lt_cv_deplibs_check_method=pass_all
74627628 + dgux*)
74637629 + case $cc_basename in
74647630 + ec++*)
74757641 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
74767642 + ;;
74777643 + esac
7478 + ;;
7644 ;;
7645 - sequent)
7646 - lt_cv_file_magic_cmd='/bin/file'
7647 - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
74797648 + freebsd[[12]]*)
74807649 + # C++ shared libraries reported to be fairly broken before switch to ELF
74817650 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
7482 + ;;
7651 ;;
7652 - sni)
7653 - lt_cv_file_magic_cmd='/bin/file'
7654 - lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
7655 - lt_cv_file_magic_test_file=/lib/libc.so
74837656 + freebsd-elf*)
74847657 + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
7485 + ;;
7658 ;;
7659 - siemens)
7660 - lt_cv_deplibs_check_method=pass_all
74867661 + freebsd* | dragonfly*)
74877662 + # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
74887663 + # conventions
74897664 + _LT_AC_TAGVAR(ld_shlibs, $1)=yes
7490 + ;;
7665 ;;
7666 - pc)
7667 - lt_cv_deplibs_check_method=pass_all
74917668 + gnu*)
7492 + ;;
7669 ;;
7670 - esac
7671 - ;;
74937672 + hpux9*)
74947673 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
74957674 + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
74997678 + # but as the default
75007679 + # location of the library.
75017680
7502 -darwin* | rhapsody*)
7681 -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
75037682 - lt_cv_deplibs_check_method=pass_all
75047683 - ;;
7684 -esac
7685 -])
7686 -file_magic_cmd=$lt_cv_file_magic_cmd
7687 -deplibs_check_method=$lt_cv_deplibs_check_method
7688 -test -z "$deplibs_check_method" && deplibs_check_method=unknown
7689 -])# AC_DEPLIBS_CHECK_METHOD
75057690 + case $cc_basename in
75067691 + CC*)
75077692 + # FIXME: insert proper C++ library support
75347719 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
75357720 + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
75367721
7537 -freebsd* | kfreebsd*-gnu | dragonfly*)
7538 - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
75397722 + case $host_cpu in
75407723 + hppa*64*|ia64*)
75417724 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
75457728 + ;;
75467729 + esac
75477730 + fi
7548 case $host_cpu in
7549 - i*86 )
7550 - # Not sure whether the presence of OpenBSD here was a mistake.
7551 - # Let's accept both of them until this is cleared up.
7552 - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
7553 - lt_cv_file_magic_cmd=/usr/bin/file
7554 - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
7731 + case $host_cpu in
75557732 + hppa*64*|ia64*)
75567733 + _LT_AC_TAGVAR(hardcode_direct, $1)=no
75577734 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
75617738 + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
75627739 + # but as the default
75637740 + # location of the library.
7564 ;;
7565 esac
7566 - else
7567 - lt_cv_deplibs_check_method=pass_all
7568 - fi
7569 - ;;
7570 -
7571 -gnu*)
7572 - lt_cv_deplibs_check_method=pass_all
7573 - ;;
7574
7575 -hpux10.20* | hpux11*)
7576 - lt_cv_file_magic_cmd=/usr/bin/file
7577 - case $host_cpu in
7578 - ia64*)
7579 - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
7580 - lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
7581 - ;;
7582 - hppa*64*)
7583 - [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
7584 - lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
7585 + case $cc_basename in
7586 + CC*)
7587 + # FIXME: insert proper C++ library support
7588 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
7589 + ;;
7590 + aCC*)
7591 + case $host_cpu in
7592 + hppa*64*)
7593 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
7594 + ;;
7595 + ia64*)
7596 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
7597 + ;;
7598 + *)
7599 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
7600 + ;;
7601 + esac
7602 + # Commands to make compiler produce verbose output that lists
7603 + # what "hidden" libraries, object files and flags are used when
7604 + # linking a shared library.
7605 + #
7606 + # There doesn't appear to be a way to prevent this compiler from
7607 + # explicitly linking system object files so we need to strip them
7608 + # from the output so that they don't get included in the library
7609 + # dependencies.
7610 + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
7611 + ;;
7612 + *)
7613 + if test "$GXX" = yes; then
7614 + if test $with_gnu_ld = no; then
7615 + case $host_cpu in
7616 + hppa*64*)
7617 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
7618 + ;;
7619 + ia64*)
7620 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
7621 + ;;
7622 + *)
7623 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
7624 + ;;
7625 + esac
7626 + fi
7627 + else
7628 + # FIXME: insert proper C++ library support
7629 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
7630 + fi
7631 + ;;
7741 + ;;
76327742 + esac
7633 ;;
7634 - *)
7635 - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
7636 - lt_cv_file_magic_test_file=/usr/lib/libc.sl
7637 + interix3*)
7638 + _LT_AC_TAGVAR(hardcode_direct, $1)=no
7639 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
7640 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
7641 + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
7642 + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
7643 + # Instead, shared libraries are loaded at an image base (0x10000000 by
7644 + # default) and relocated if they conflict, which is a slow very memory
7645 + # consuming and fragmenting process. To avoid this, we pick a random,
7646 + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
7647 + # time. Moving up from 0x10000000 also allows more sbrk(2) space.
7648 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
7649 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
7650 ;;
7651 - esac
7652 - ;;
7653 -
7654 -interix3*)
7655 - # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
7656 - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
7657 - ;;
7658 -
7659 -irix5* | irix6* | nonstopux*)
7660 - case $LD in
7661 - *-32|*"-32 ") libmagic=32-bit;;
7662 - *-n32|*"-n32 ") libmagic=N32;;
7663 - *-64|*"-64 ") libmagic=64-bit;;
7664 - *) libmagic=never-match;;
7665 - esac
7666 - lt_cv_deplibs_check_method=pass_all
7667 - ;;
7668 -
7669 -# This must be Linux ELF.
7670 -linux*)
7671 - lt_cv_deplibs_check_method=pass_all
7672 - ;;
7673 + irix5* | irix6*)
7674 + case $cc_basename in
7675 + CC*)
7676 + # SGI C++
7677 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
7678
7679 -netbsd*)
7680 - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
7681 - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
7682 - else
7683 - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
7684 - fi
7685 - ;;
7686 + # Archives containing C++ object files must be created using
7687 + # "CC -ar", where "CC" is the IRIX C++ compiler. This is
7688 + # necessary to make sure instantiated templates are included
7689 + # in the archive.
7690 + _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
7691 + ;;
7692 + *)
7693 + if test "$GXX" = yes; then
7694 + if test "$with_gnu_ld" = no; then
7695 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
7696 + else
7697 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
7698 + fi
7699 + fi
7700 + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
7701 + ;;
7702 + esac
7703 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
7704 + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
7705 + ;;
7706 + linux* | k*bsd*-gnu)
7707 + case $cc_basename in
7708 + KCC*)
7709 + # Kuck and Associates, Inc. (KAI) C++ Compiler
7710
7711 -newos6*)
7712 - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
7713 - lt_cv_file_magic_cmd=/usr/bin/file
7714 - lt_cv_file_magic_test_file=/usr/lib/libnls.so
7715 - ;;
7716 + # KCC will only create a shared library if the output file
7717 + # ends with ".so" (or ".sl" for HP-UX), so rename the library
7718 + # to its proper name (with version) after linking.
7719 + _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
7720 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
7721 + # Commands to make compiler produce verbose output that lists
7722 + # what "hidden" libraries, object files and flags are used when
7723 + # linking a shared library.
7724 + #
7725 + # There doesn't appear to be a way to prevent this compiler from
7726 + # explicitly linking system object files so we need to strip them
7727 + # from the output so that they don't get included in the library
7728 + # dependencies.
7729 + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
7730
7731 -nto-qnx*)
7732 - lt_cv_deplibs_check_method=unknown
7733 - ;;
7734 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
7735 + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
7736
7737 -openbsd*)
7738 - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
7739 - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
7740 - else
7741 - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
7742 - fi
7743 - ;;
7744 + # Archives containing C++ object files must be created using
7745 + # "CC -Bstatic", where "CC" is the KAI C++ compiler.
7746 + _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
7747 + ;;
7748 + icpc*)
7749 + # Intel C++
7750 + with_gnu_ld=yes
7751 + # version 8.0 and above of icpc choke on multiply defined symbols
7752 + # if we add $predep_objects and $postdep_objects, however 7.1 and
7753 + # earlier do not add the objects themselves.
7754 + case `$CC -V 2>&1` in
7755 + *"Version 7."*)
7756 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
7757 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
7758 + ;;
7759 + *) # Version 8.0 or newer
7760 + tmp_idyn=
7761 + case $host_cpu in
7762 + ia64*) tmp_idyn=' -i_dynamic';;
7763 + esac
7764 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
7765 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
7766 + ;;
7767 + esac
7768 + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
7769 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
7770 + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
7771 + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
7772 + ;;
7773 + pgCC*)
7774 + # Portland Group C++ compiler
7775 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
7776 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
7777
7778 -osf3* | osf4* | osf5*)
7779 - lt_cv_deplibs_check_method=pass_all
7780 - ;;
7781 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
7782 + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
7783 + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
7784 + ;;
7785 + cxx*)
7786 + # Compaq C++
7787 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
7788 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
7789
7790 -solaris*)
7791 - lt_cv_deplibs_check_method=pass_all
7792 - ;;
7793 + runpath_var=LD_RUN_PATH
7794 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
7795 + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
7796
7797 -sysv4 | sysv4.3*)
7798 - case $host_vendor in
7799 - motorola)
7800 - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
7801 - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
7802 + # Commands to make compiler produce verbose output that lists
7803 + # what "hidden" libraries, object files and flags are used when
7804 + # linking a shared library.
7805 + #
7806 + # There doesn't appear to be a way to prevent this compiler from
7807 + # explicitly linking system object files so we need to strip them
7808 + # from the output so that they don't get included in the library
7809 + # dependencies.
7810 + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
7811 + ;;
7812 + esac
7813 ;;
7814 - ncr)
7815 - lt_cv_deplibs_check_method=pass_all
7816 + lynxos*)
7817 + # FIXME: insert proper C++ library support
7818 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
7819 ;;
7820 - sequent)
7821 - lt_cv_file_magic_cmd='/bin/file'
7822 - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
7823 + m88k*)
7824 + # FIXME: insert proper C++ library support
7825 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
7826 ;;
7827 - sni)
7828 - lt_cv_file_magic_cmd='/bin/file'
7829 - lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
7830 - lt_cv_file_magic_test_file=/lib/libc.so
7831 + mvs*)
7832 + case $cc_basename in
7833 + cxx*)
7834 + # FIXME: insert proper C++ library support
7835 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
7836 + ;;
7837 + *)
7838 + # FIXME: insert proper C++ library support
7839 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
7840 + ;;
7841 + esac
7842 ;;
7843 - siemens)
7844 - lt_cv_deplibs_check_method=pass_all
7845 + netbsd* | netbsdelf*-gnu)
7846 + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
7847 + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
7848 + wlarc=
7849 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
7850 + _LT_AC_TAGVAR(hardcode_direct, $1)=yes
7851 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
7852 + fi
7853 + # Workaround some broken pre-1.5 toolchains
7854 + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
7855 ;;
7856 - pc)
7857 - lt_cv_deplibs_check_method=pass_all
7858 + openbsd2*)
7859 + # C++ shared libraries are fairly broken
7860 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
7861 ;;
7862 - esac
7863 - ;;
7864 -
7865 -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
7866 - lt_cv_deplibs_check_method=pass_all
7867 - ;;
7868 -esac
7869 -])
7870 -file_magic_cmd=$lt_cv_file_magic_cmd
7871 -deplibs_check_method=$lt_cv_deplibs_check_method
7872 -test -z "$deplibs_check_method" && deplibs_check_method=unknown
7873 -])# AC_DEPLIBS_CHECK_METHOD
7874 + openbsd*)
7875 + _LT_AC_TAGVAR(hardcode_direct, $1)=yes
7876 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
7877 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
7878 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
7879 + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
7880 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
7881 + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
7882 + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
7883 + fi
7884 + output_verbose_link_cmd='echo'
7885 + ;;
7886 + osf3*)
7887 + case $cc_basename in
7888 + KCC*)
7889 + # Kuck and Associates, Inc. (KAI) C++ Compiler
7890
7891 + # KCC will only create a shared library if the output file
7892 + # ends with ".so" (or ".sl" for HP-UX), so rename the library
7893 + # to its proper name (with version) after linking.
7894 + _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
78957743
78967744 -# AC_PROG_NM
78977745 -# ----------
79217769 - */dev/null* | *'Invalid file or object type'*)
79227770 - lt_cv_path_NM="$tmp_nm -B"
79237771 - break
7924 - ;;
7925 - *)
7772 + case $cc_basename in
7773 + CC*)
7774 + # FIXME: insert proper C++ library support
7775 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
7776 + ;;
7777 + aCC*)
7778 + case $host_cpu in
7779 + hppa*64*)
7780 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
7781 + ;;
7782 + ia64*)
7783 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
7784 ;;
7785 *)
79267786 - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
79277787 - */dev/null*)
79287788 - lt_cv_path_NM="$tmp_nm -p"
79337793 - continue # so that we can try to find one that supports BSD flags
79347794 - ;;
79357795 - esac
7936 - ;;
7937 - esac
7796 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
7797 ;;
7798 esac
79387799 - fi
79397800 - done
79407801 - IFS="$lt_save_ifs"
79437804 -fi])
79447805 -NM="$lt_cv_path_NM"
79457806 -])# AC_PROG_NM
7946 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
7947 + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
7948
7949 + # Archives containing C++ object files must be created using
7950 + # "CC -Bstatic", where "CC" is the KAI C++ compiler.
7951 + _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
7952
7807 -
7808 -
79537809 -# AC_CHECK_LIBM
79547810 -# -------------
79557811 -# check for math library
79957851 - INCLTDL="$LTDLINCL"
79967852 -])# AC_LIBLTDL_CONVENIENCE
79977853 -
7998 -
7854 + # Commands to make compiler produce verbose output that lists
7855 + # what "hidden" libraries, object files and flags are used when
7856 + # linking a shared library.
7857 + #
7858 + # There doesn't appear to be a way to prevent this compiler from
7859 + # explicitly linking system object files so we need to strip them
7860 + # from the output so that they don't get included in the library
7861 + # dependencies.
7862 + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
7863 + ;;
7864 + *)
7865 + if test "$GXX" = yes; then
7866 + if test $with_gnu_ld = no; then
7867 + case $host_cpu in
7868 + hppa*64*)
7869 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
7870 + ;;
7871 + ia64*)
7872 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
7873 + ;;
7874 + *)
7875 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
7876 + ;;
7877 + esac
7878 + fi
7879 + else
7880 + # FIXME: insert proper C++ library support
7881 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
7882 + fi
7883 + ;;
7884 + esac
7885 + ;;
7886 + interix3*)
7887 + _LT_AC_TAGVAR(hardcode_direct, $1)=no
7888 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
7889 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
7890 + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
7891 + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
7892 + # Instead, shared libraries are loaded at an image base (0x10000000 by
7893 + # default) and relocated if they conflict, which is a slow very memory
7894 + # consuming and fragmenting process. To avoid this, we pick a random,
7895 + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
7896 + # time. Moving up from 0x10000000 also allows more sbrk(2) space.
7897 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
7898 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
7899 + ;;
7900 + irix5* | irix6*)
7901 + case $cc_basename in
7902 + CC*)
7903 + # SGI C++
7904 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
7905
79997906 -# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
80007907 -# -----------------------------------
80017908 -# sets LIBLTDL to the link flags for the libltdl installable library and
80307937 - # For backwards non-gettext consistent compatibility...
80317938 - INCLTDL="$LTDLINCL"
80327939 -])# AC_LIBLTDL_INSTALLABLE
7940 + # Archives containing C++ object files must be created using
7941 + # "CC -ar", where "CC" is the IRIX C++ compiler. This is
7942 + # necessary to make sure instantiated templates are included
7943 + # in the archive.
7944 + _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
7945 + ;;
7946 + *)
7947 + if test "$GXX" = yes; then
7948 + if test "$with_gnu_ld" = no; then
7949 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
7950 + else
7951 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
7952 + fi
7953 + fi
7954 + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
7955 + ;;
7956 + esac
7957 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
7958 + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
7959 + ;;
7960 + linux* | k*bsd*-gnu)
7961 + case $cc_basename in
7962 + KCC*)
7963 + # Kuck and Associates, Inc. (KAI) C++ Compiler
7964
7965 + # KCC will only create a shared library if the output file
7966 + # ends with ".so" (or ".sl" for HP-UX), so rename the library
7967 + # to its proper name (with version) after linking.
7968 + _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
7969 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
7970 + # Commands to make compiler produce verbose output that lists
7971 + # what "hidden" libraries, object files and flags are used when
7972 + # linking a shared library.
7973 + #
7974 + # There doesn't appear to be a way to prevent this compiler from
7975 + # explicitly linking system object files so we need to strip them
7976 + # from the output so that they don't get included in the library
7977 + # dependencies.
7978 + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
7979
7980 -# AC_LIBTOOL_CXX
7981 -# --------------
7982 -# enable support for C++ libraries
7983 -AC_DEFUN([AC_LIBTOOL_CXX],
7984 -[AC_REQUIRE([_LT_AC_LANG_CXX])
7985 -])# AC_LIBTOOL_CXX
7986 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
7987 + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
7988
7989 + # Archives containing C++ object files must be created using
7990 + # "CC -Bstatic", where "CC" is the KAI C++ compiler.
7991 + _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
7992 + ;;
7993 + icpc*)
7994 + # Intel C++
7995 + with_gnu_ld=yes
7996 + # version 8.0 and above of icpc choke on multiply defined symbols
7997 + # if we add $predep_objects and $postdep_objects, however 7.1 and
7998 + # earlier do not add the objects themselves.
7999 + case `$CC -V 2>&1` in
8000 + *"Version 7."*)
8001 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
8002 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8003 + ;;
8004 + *) # Version 8.0 or newer
8005 + tmp_idyn=
8006 + case $host_cpu in
8007 + ia64*) tmp_idyn=' -i_dynamic';;
8008 + esac
8009 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8010 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8011 + ;;
8012 + esac
8013 + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
8014 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
8015 + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
8016 + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
8017 + ;;
8018 + pgCC*)
8019 + # Portland Group C++ compiler
8020 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
8021 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
8022
8023 -# _LT_AC_LANG_CXX
8024 -# ---------------
8025 -AC_DEFUN([_LT_AC_LANG_CXX],
8026 -[AC_REQUIRE([AC_PROG_CXX])
8027 -AC_REQUIRE([_LT_AC_PROG_CXXCPP])
8028 -_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
8029 -])# _LT_AC_LANG_CXX
8030 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
8031 + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
8032 + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
8033 + ;;
8034 + cxx*)
8035 + # Compaq C++
8036 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
8037 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
8038
8039 -# _LT_AC_PROG_CXXCPP
8040 -# ------------------
8041 -AC_DEFUN([_LT_AC_PROG_CXXCPP],
8042 -[
8043 -AC_REQUIRE([AC_PROG_CXX])
8044 -if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
8045 - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
8046 - (test "X$CXX" != "Xg++"))) ; then
8047 - AC_PROG_CXXCPP
8048 -fi
8049 -])# _LT_AC_PROG_CXXCPP
8050 + runpath_var=LD_RUN_PATH
8051 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
8052 + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
8053
8054 -# AC_LIBTOOL_F77
8055 -# --------------
8056 -# enable support for Fortran 77 libraries
8057 -AC_DEFUN([AC_LIBTOOL_F77],
8058 -[AC_REQUIRE([_LT_AC_LANG_F77])
8059 -])# AC_LIBTOOL_F77
8060 -
8061 -
8062 -# _LT_AC_LANG_F77
8063 -# ---------------
8064 -AC_DEFUN([_LT_AC_LANG_F77],
8065 -[AC_REQUIRE([AC_PROG_F77])
8066 -_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
8067 -])# _LT_AC_LANG_F77
8068 -
8069 -
8070 -# AC_LIBTOOL_GCJ
8071 -# --------------
8072 -# enable support for GCJ libraries
8073 -AC_DEFUN([AC_LIBTOOL_GCJ],
8074 -[AC_REQUIRE([_LT_AC_LANG_GCJ])
8075 -])# AC_LIBTOOL_GCJ
8076 + # Commands to make compiler produce verbose output that lists
8077 + # what "hidden" libraries, object files and flags are used when
8078 + # linking a shared library.
8079 + #
8080 + # There doesn't appear to be a way to prevent this compiler from
8081 + # explicitly linking system object files so we need to strip them
8082 + # from the output so that they don't get included in the library
8083 + # dependencies.
8084 + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
8085 + ;;
8086 + esac
8087 + ;;
8088 + lynxos*)
8089 + # FIXME: insert proper C++ library support
8090 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
8091 + ;;
8092 + m88k*)
8093 + # FIXME: insert proper C++ library support
8094 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
8095 + ;;
8096 + mvs*)
8097 + case $cc_basename in
8098 + cxx*)
8099 + # FIXME: insert proper C++ library support
8100 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
8101 + ;;
8102 + *)
8103 + # FIXME: insert proper C++ library support
8104 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
8105 + ;;
8106 + esac
8107 + ;;
8108 + netbsd* | netbsdelf*-gnu)
8109 + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
8110 + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
8111 + wlarc=
8112 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
8113 + _LT_AC_TAGVAR(hardcode_direct, $1)=yes
8114 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
8115 + fi
8116 + # Workaround some broken pre-1.5 toolchains
8117 + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
8118 + ;;
8119 + openbsd2*)
8120 + # C++ shared libraries are fairly broken
8121 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
8122 + ;;
8123 + openbsd*)
8124 + _LT_AC_TAGVAR(hardcode_direct, $1)=yes
8125 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
8126 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
8127 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
8128 + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
8129 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
8130 + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
8131 + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
8132 + fi
8133 + output_verbose_link_cmd='echo'
8134 + ;;
8135 + osf3*)
8136 + case $cc_basename in
8137 + KCC*)
8138 + # Kuck and Associates, Inc. (KAI) C++ Compiler
8139
8140 + # KCC will only create a shared library if the output file
8141 + # ends with ".so" (or ".sl" for HP-UX), so rename the library
8142 + # to its proper name (with version) after linking.
8143 + _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
8144
8145 -# _LT_AC_LANG_GCJ
8146 -# ---------------
8147 -AC_DEFUN([_LT_AC_LANG_GCJ],
8148 -[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
8149 - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
8150 - [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
8151 - [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
8152 - [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
8153 - [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
8154 -_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
8155 -])# _LT_AC_LANG_GCJ
8156 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
8157 + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
8158
8159 + # Archives containing C++ object files must be created using
8160 + # "CC -Bstatic", where "CC" is the KAI C++ compiler.
8161 + _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
8162
8163 -# AC_LIBTOOL_RC
8164 -# -------------
8165 -# enable support for Windows resource files
8166 -AC_DEFUN([AC_LIBTOOL_RC],
8167 -[AC_REQUIRE([LT_AC_PROG_RC])
8168 -_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
8169 -])# AC_LIBTOOL_RC
80338170 + ;;
80348171 + RCC*)
80358172 + # Rational C++ 2.4.1
80438180 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
80448181 + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
80458182
8046 -# AC_LIBTOOL_CXX
8047 -# --------------
8048 -# enable support for C++ libraries
8049 -AC_DEFUN([AC_LIBTOOL_CXX],
8050 -[AC_REQUIRE([_LT_AC_LANG_CXX])
8051 -])# AC_LIBTOOL_CXX
8183 -# AC_LIBTOOL_LANG_C_CONFIG
8184 -# ------------------------
8185 -# Ensure that the configuration vars for the C compiler are
8186 -# suitably defined. Those variables are subsequently used by
8187 -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
8188 -AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
8189 -AC_DEFUN([_LT_AC_LANG_C_CONFIG],
8190 -[lt_save_CC="$CC"
8191 -AC_LANG_PUSH(C)
80528192 + # Commands to make compiler produce verbose output that lists
80538193 + # what "hidden" libraries, object files and flags are used when
80548194 + # linking a shared library.
80648204 + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
80658205 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
80668206
8207 -# Source file extension for C test sources.
8208 -ac_ext=c
80678209 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
80688210 + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
80698211
8070 -# _LT_AC_LANG_CXX
8071 -# ---------------
8072 -AC_DEFUN([_LT_AC_LANG_CXX],
8073 -[AC_REQUIRE([AC_PROG_CXX])
8074 -AC_REQUIRE([_LT_AC_PROG_CXXCPP])
8075 -_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
8076 -])# _LT_AC_LANG_CXX
8212 -# Object file extension for compiled C test sources.
8213 -objext=o
8214 -_LT_AC_TAGVAR(objext, $1)=$objext
80778215 + # Commands to make compiler produce verbose output that lists
80788216 + # what "hidden" libraries, object files and flags are used when
80798217 + # linking a shared library.
80808218 + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
80818219
8082 -# _LT_AC_PROG_CXXCPP
8083 -# ------------------
8084 -AC_DEFUN([_LT_AC_PROG_CXXCPP],
8085 -[
8086 -AC_REQUIRE([AC_PROG_CXX])
8087 -if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
8088 - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
8089 - (test "X$CXX" != "Xg++"))) ; then
8090 - AC_PROG_CXXCPP
8091 -fi
8092 -])# _LT_AC_PROG_CXXCPP
8220 -# Code to be used in simple compile tests
8221 -lt_simple_compile_test_code="int some_variable = 0;\n"
80938222 + else
80948223 + # FIXME: insert proper C++ library support
80958224 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
81028231 + KCC*)
81038232 + # Kuck and Associates, Inc. (KAI) C++ Compiler
81048233
8105 -# AC_LIBTOOL_F77
8106 -# --------------
8107 -# enable support for Fortran 77 libraries
8108 -AC_DEFUN([AC_LIBTOOL_F77],
8109 -[AC_REQUIRE([_LT_AC_LANG_F77])
8110 -])# AC_LIBTOOL_F77
8234 -# Code to be used in simple link tests
8235 -lt_simple_link_test_code='int main(){return(0);}\n'
81118236 + # KCC will only create a shared library if the output file
81128237 + # ends with ".so" (or ".sl" for HP-UX), so rename the library
81138238 + # to its proper name (with version) after linking.
81148239 + _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
81158240
8241 -_LT_AC_SYS_COMPILER
81168242 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
81178243 + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
81188244
8119 -# _LT_AC_LANG_F77
8120 -# ---------------
8121 -AC_DEFUN([_LT_AC_LANG_F77],
8122 -[AC_REQUIRE([AC_PROG_F77])
8123 -_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
8124 -])# _LT_AC_LANG_F77
8245 -# save warnings/boilerplate of simple test code
8246 -_LT_COMPILER_BOILERPLATE
8247 -_LT_LINKER_BOILERPLATE
81258248 + # Archives containing C++ object files must be created using
81268249 + # the KAI C++ compiler.
81278250 + _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
81398262 + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~
81408263 + $rm $lib.exp'
81418264
8265 -AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
8266 -AC_LIBTOOL_PROG_COMPILER_PIC($1)
8267 -AC_LIBTOOL_PROG_CC_C_O($1)
8268 -AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
8269 -AC_LIBTOOL_PROG_LD_SHLIBS($1)
8270 -AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
8271 -AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
8272 -AC_LIBTOOL_SYS_LIB_STRIP
8273 -AC_LIBTOOL_DLOPEN_SELF
81428274 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
81438275 + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
81448276
8145 -# AC_LIBTOOL_GCJ
8146 -# --------------
8147 -# enable support for GCJ libraries
8148 -AC_DEFUN([AC_LIBTOOL_GCJ],
8149 -[AC_REQUIRE([_LT_AC_LANG_GCJ])
8150 -])# AC_LIBTOOL_GCJ
8277 -# Report which library types will actually be built
8278 -AC_MSG_CHECKING([if libtool supports shared libraries])
8279 -AC_MSG_RESULT([$can_build_shared])
81518280 + # Commands to make compiler produce verbose output that lists
81528281 + # what "hidden" libraries, object files and flags are used when
81538282 + # linking a shared library.
81638292 + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
81648293 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
81658294
8295 -AC_MSG_CHECKING([whether to build shared libraries])
8296 -test "$can_build_shared" = "no" && enable_shared=no
81668297 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
81678298 + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
81688299
8169 -# _LT_AC_LANG_GCJ
8170 -# ---------------
8171 -AC_DEFUN([_LT_AC_LANG_GCJ],
8172 -[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
8173 - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
8174 - [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
8175 - [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
8176 - [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
8177 - [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
8178 -_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
8179 -])# _LT_AC_LANG_GCJ
8300 -# On AIX, shared libraries and static libraries use the same namespace, and
8301 -# are all built from PIC.
8302 -case $host_os in
8303 -aix3*)
8304 - test "$enable_shared" = yes && enable_static=no
8305 - if test -n "$RANLIB"; then
8306 - archive_cmds="$archive_cmds~\$RANLIB \$lib"
8307 - postinstall_cmds='$RANLIB $lib'
8308 - fi
8309 - ;;
81808310 + # Commands to make compiler produce verbose output that lists
81818311 + # what "hidden" libraries, object files and flags are used when
81828312 + # linking a shared library.
81838313 + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
81848314
8315 -aix4* | aix5*)
8316 - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
8317 - test "$enable_shared" = yes && enable_static=no
8318 - fi
81858319 + else
81868320 + # FIXME: insert proper C++ library support
81878321 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
81888322 + fi
81898323 + ;;
81908324 + esac
8191 + ;;
8325 ;;
8326 -esac
8327 -AC_MSG_RESULT([$enable_shared])
8328 -
8329 -AC_MSG_CHECKING([whether to build static libraries])
8330 -# Make sure either enable_shared or enable_static is yes.
8331 -test "$enable_shared" = yes || enable_static=yes
8332 -AC_MSG_RESULT([$enable_static])
8333 -
8334 -AC_LIBTOOL_CONFIG($1)
81928335 + psos*)
81938336 + # FIXME: insert proper C++ library support
81948337 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
82218364 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
82228365 + $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
82238366
8224 -# AC_LIBTOOL_RC
8225 -# -------------
8226 -# enable support for Windows resource files
8227 -AC_DEFUN([AC_LIBTOOL_RC],
8228 -[AC_REQUIRE([LT_AC_PROG_RC])
8229 -_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
8230 -])# AC_LIBTOOL_RC
8367 -AC_LANG_POP
8368 -CC="$lt_save_CC"
8369 -])# AC_LIBTOOL_LANG_C_CONFIG
82318370 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
82328371 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
82338372 + case $host_os in
82488387
82498388 + output_verbose_link_cmd='echo'
82508389
8251 -# AC_LIBTOOL_LANG_C_CONFIG
8252 -# ------------------------
8390 -# AC_LIBTOOL_LANG_CXX_CONFIG
8391 -# --------------------------
82538392 -# Ensure that the configuration vars for the C compiler are
82548393 -# suitably defined. Those variables are subsequently used by
82558394 -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
8256 -AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
8257 -AC_DEFUN([_LT_AC_LANG_C_CONFIG],
8258 -[lt_save_CC="$CC"
8259 -AC_LANG_PUSH(C)
8395 -AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
8396 -AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
8397 -[AC_LANG_PUSH(C++)
8398 -AC_REQUIRE([AC_PROG_CXX])
8399 -AC_REQUIRE([_LT_AC_PROG_CXXCPP])
82608400 + # Archives containing C++ object files must be created using
82618401 + # "CC -xar", where "CC" is the Sun C++ compiler. This is
82628402 + # necessary to make sure instantiated templates are included
82678407 + # Green Hills C++ Compiler
82688408 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
82698409
8270 -# Source file extension for C test sources.
8271 -ac_ext=c
8410 -_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
8411 -_LT_AC_TAGVAR(allow_undefined_flag, $1)=
8412 -_LT_AC_TAGVAR(always_export_symbols, $1)=no
8413 -_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
8414 -_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
8415 -_LT_AC_TAGVAR(hardcode_direct, $1)=no
8416 -_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
8417 -_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
8418 -_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
8419 -_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
8420 -_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
8421 -_LT_AC_TAGVAR(hardcode_automatic, $1)=no
8422 -_LT_AC_TAGVAR(module_cmds, $1)=
8423 -_LT_AC_TAGVAR(module_expsym_cmds, $1)=
8424 -_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
8425 -_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
8426 -_LT_AC_TAGVAR(no_undefined_flag, $1)=
8427 -_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
8428 -_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
82728429 + # The C++ compiler must be used to create the archive.
82738430 + _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
82748431 + ;;
82818438 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
82828439 + $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
82838440
8284 -# Object file extension for compiled C test sources.
8285 -objext=o
8286 -_LT_AC_TAGVAR(objext, $1)=$objext
8441 -# Dependencies to place before and after the object being linked:
8442 -_LT_AC_TAGVAR(predep_objects, $1)=
8443 -_LT_AC_TAGVAR(postdep_objects, $1)=
8444 -_LT_AC_TAGVAR(predeps, $1)=
8445 -_LT_AC_TAGVAR(postdeps, $1)=
8446 -_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
82878447 + # Commands to make compiler produce verbose output that lists
82888448 + # what "hidden" libraries, object files and flags are used when
82898449 + # linking a shared library.
82958455 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
82968456 + $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
82978457
8298 -# Code to be used in simple compile tests
8299 -lt_simple_compile_test_code="int some_variable = 0;\n"
8458 -# Source file extension for C++ test sources.
8459 -ac_ext=cpp
83008460 + # Commands to make compiler produce verbose output that lists
83018461 + # what "hidden" libraries, object files and flags are used when
83028462 + # linking a shared library.
83038463 + output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
83048464 + fi
83058465
8306 -# Code to be used in simple link tests
8307 -lt_simple_link_test_code='int main(){return(0);}\n'
8466 -# Object file extension for compiled C++ test sources.
8467 -objext=o
8468 -_LT_AC_TAGVAR(objext, $1)=$objext
83088469 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
83098470 + fi
83108471 + ;;
83168477 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
83178478 + runpath_var='LD_RUN_PATH'
83188479
8319 -_LT_AC_SYS_COMPILER
8480 -# Code to be used in simple compile tests
8481 -lt_simple_compile_test_code="int some_variable = 0;\n"
83208482 + case $cc_basename in
83218483 + CC*)
83228484 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
83548516 + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
83558517 + runpath_var='LD_RUN_PATH'
83568518
8357 -# save warnings/boilerplate of simple test code
8358 -_LT_COMPILER_BOILERPLATE
8359 -_LT_LINKER_BOILERPLATE
8519 -# Code to be used in simple link tests
8520 -lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
83608521 + case $cc_basename in
83618522 + CC*)
83628523 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
83938554 +AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
83948555 +test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
83958556
8396 -AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
8557 -# ltmain only uses $CC for tagged configurations so make sure $CC is set.
8558 -_LT_AC_SYS_COMPILER
83978559 +_LT_AC_TAGVAR(GCC, $1)="$GXX"
83988560 +_LT_AC_TAGVAR(LD, $1)="$LD"
8399 +
8561
8562 -# save warnings/boilerplate of simple test code
8563 -_LT_COMPILER_BOILERPLATE
8564 -_LT_LINKER_BOILERPLATE
84008565 +AC_LIBTOOL_POSTDEP_PREDEP($1)
8401 AC_LIBTOOL_PROG_COMPILER_PIC($1)
8402 AC_LIBTOOL_PROG_CC_C_O($1)
8403 AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
8404 AC_LIBTOOL_PROG_LD_SHLIBS($1)
8405 AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
8406 AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
8407 -AC_LIBTOOL_SYS_LIB_STRIP
8408 -AC_LIBTOOL_DLOPEN_SELF
8409 -
8410 -# Report which library types will actually be built
8411 -AC_MSG_CHECKING([if libtool supports shared libraries])
8412 -AC_MSG_RESULT([$can_build_shared])
8413 -
8414 -AC_MSG_CHECKING([whether to build shared libraries])
8415 -test "$can_build_shared" = "no" && enable_shared=no
8416 -
8417 -# On AIX, shared libraries and static libraries use the same namespace, and
8418 -# are all built from PIC.
8419 -case $host_os in
8420 -aix3*)
8421 - test "$enable_shared" = yes && enable_static=no
8422 - if test -n "$RANLIB"; then
8423 - archive_cmds="$archive_cmds~\$RANLIB \$lib"
8424 - postinstall_cmds='$RANLIB $lib'
8425 - fi
8426 - ;;
8427 -
8428 -aix4* | aix5*)
8429 - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
8430 - test "$enable_shared" = yes && enable_static=no
8431 - fi
8432 - ;;
8433 -esac
8434 -AC_MSG_RESULT([$enable_shared])
8435 -
8436 -AC_MSG_CHECKING([whether to build static libraries])
8437 -# Make sure either enable_shared or enable_static is yes.
8438 -test "$enable_shared" = yes || enable_static=yes
8439 -AC_MSG_RESULT([$enable_static])
8440
8441 AC_LIBTOOL_CONFIG($1)
8442
8443 AC_LANG_POP
8444 -CC="$lt_save_CC"
8445 -])# AC_LIBTOOL_LANG_C_CONFIG
8446 -
8447 -
8448 -# AC_LIBTOOL_LANG_CXX_CONFIG
8449 -# --------------------------
8450 -# Ensure that the configuration vars for the C compiler are
8451 -# suitably defined. Those variables are subsequently used by
8452 -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
8453 -AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
8454 -AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
8455 -[AC_LANG_PUSH(C++)
8456 -AC_REQUIRE([AC_PROG_CXX])
8457 -AC_REQUIRE([_LT_AC_PROG_CXXCPP])
8458 -
8459 -_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
8460 -_LT_AC_TAGVAR(allow_undefined_flag, $1)=
8461 -_LT_AC_TAGVAR(always_export_symbols, $1)=no
8462 -_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
8463 -_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
8464 -_LT_AC_TAGVAR(hardcode_direct, $1)=no
8465 -_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
8466 -_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
8467 -_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
8468 -_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
8469 -_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
8470 -_LT_AC_TAGVAR(hardcode_automatic, $1)=no
8471 -_LT_AC_TAGVAR(module_cmds, $1)=
8472 -_LT_AC_TAGVAR(module_expsym_cmds, $1)=
8473 -_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
8474 -_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
8475 -_LT_AC_TAGVAR(no_undefined_flag, $1)=
8476 -_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
8477 -_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
8478 -
8479 -# Dependencies to place before and after the object being linked:
8480 -_LT_AC_TAGVAR(predep_objects, $1)=
8481 -_LT_AC_TAGVAR(postdep_objects, $1)=
8482 -_LT_AC_TAGVAR(predeps, $1)=
8483 -_LT_AC_TAGVAR(postdeps, $1)=
8484 -_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
8485 -
8486 -# Source file extension for C++ test sources.
8487 -ac_ext=cpp
8566 +AC_LIBTOOL_PROG_COMPILER_PIC($1)
8567 +AC_LIBTOOL_PROG_CC_C_O($1)
8568 +AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
8569 +AC_LIBTOOL_PROG_LD_SHLIBS($1)
8570 +AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
8571 +AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
8572
8573 -# Allow CC to be a program name with arguments.
8574 -lt_save_CC=$CC
8575 -lt_save_LD=$LD
8576 -lt_save_GCC=$GCC
8577 -GCC=$GXX
8578 -lt_save_with_gnu_ld=$with_gnu_ld
8579 -lt_save_path_LD=$lt_cv_path_LD
8580 -if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
8581 - lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
8582 -else
8583 - $as_unset lt_cv_prog_gnu_ld
8584 -fi
8585 -if test -n "${lt_cv_path_LDCXX+set}"; then
8586 - lt_cv_path_LD=$lt_cv_path_LDCXX
8587 -else
8588 - $as_unset lt_cv_path_LD
8589 -fi
8590 -test -z "${LDCXX+set}" || LD=$LDCXX
8591 -CC=${CXX-"c++"}
8592 -compiler=$CC
8593 -_LT_AC_TAGVAR(compiler, $1)=$CC
8594 -_LT_CC_BASENAME([$compiler])
8595 +AC_LIBTOOL_CONFIG($1)
8596
8597 -# We don't want -fno-exception wen compiling C++ code, so set the
8598 -# no_builtin_flag separately
8599 -if test "$GXX" = yes; then
8600 - _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
8601 -else
8602 - _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
8603 -fi
8604 +AC_LANG_POP
84888605 +CC=$lt_save_CC
84898606 +LDCXX=$LD
84908607 +LD=$lt_save_LD
84978614 +lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
84988615 +])# AC_LIBTOOL_LANG_CXX_CONFIG
84998616
8500 -# Object file extension for compiled C++ test sources.
8617 -if test "$GXX" = yes; then
8618 - # Set up default GNU C++ configuration
85018619 +# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
85028620 +# ------------------------------------
85038621 +# Figure out "hidden" library dependencies from verbose
85458663 +if AC_TRY_EVAL(ac_compile); then
85468664 + # Parse the compiler output and extract the necessary
85478665 + # objects, libraries and library flags.
8548 +
8666
8667 - AC_PROG_LD
85498668 + # Sentinel used to keep track of whether or not we are before
85508669 + # the conftest object file.
85518670 + pre_test_object_deps_done=no
8552 +
8671
8672 - # Check if GNU C++ uses GNU ld as the underlying linker, since the
8673 - # archiving commands below assume that GNU ld is being used.
8674 - if test "$with_gnu_ld" = yes; then
8675 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
8676 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
85538677 + # The `*' in the case matches for architectures that use `case' in
85548678 + # $output_verbose_cmd can trigger glob expansion during the loop
85558679 + # eval without this substitution.
85568680 + output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
8557 +
8681
8682 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
8683 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
85588684 + for p in `eval $output_verbose_link_cmd`; do
85598685 + case $p in
8560 +
8686
8687 - # If archive_cmds runs LD, not CC, wlarc should be empty
8688 - # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
8689 - # investigate it a little bit more. (MM)
8690 - wlarc='${wl}'
85618691 + -L* | -R* | -l*)
85628692 + # Some compilers place space between "-{L,R}" and the path.
85638693 + # Remove the space.
85688698 + else
85698699 + prev=
85708700 + fi
8571 +
8701
8702 - # ancient GNU ld didn't support --whole-archive et. al.
8703 - if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
8704 - grep 'no-whole-archive' > /dev/null; then
8705 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
8706 - else
8707 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
8708 - fi
8709 - else
8710 - with_gnu_ld=no
8711 - wlarc=
85728712 + if test "$pre_test_object_deps_done" = no; then
85738713 + case $p in
85748714 + -L* | -R*)
85928732 + fi
85938733 + fi
85948734 + ;;
8595 +
8735
8736 - # A generic and very simple default shared library creation
8737 - # command for GNU C++ for the case where it uses the native
8738 - # linker, instead of GNU ld. If possible, this setting should
8739 - # overridden to take advantage of the native linker features on
8740 - # the platform it is being used on.
8741 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
8742 - fi
85968743 + *.$objext)
85978744 + # This assumes that the test object file only shows up
85988745 + # once in the compiler output.
86008747 + pre_test_object_deps_done=yes
86018748 + continue
86028749 + fi
8603 +
8750
8751 - # Commands to make compiler produce verbose output that lists
8752 - # what "hidden" libraries, object files and flags are used when
8753 - # linking a shared library.
8754 - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
86048755 + if test "$pre_test_object_deps_done" = no; then
86058756 + if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
86068757 + _LT_AC_TAGVAR(predep_objects, $1)="$p"
86158766 + fi
86168767 + fi
86178768 + ;;
8618 +
8769
86198770 + *) ;; # Ignore the rest.
86208771 +
86218772 + esac
86238774 +
86248775 + # Clean up.
86258776 + rm -f a.out a.exe
8626 +else
8627 + echo "libtool.m4: error: problem compiling $1 test program"
8628 +fi
8629 +
8630 +$rm -f confest.$objext
8631 +
8632 +# PORTME: override above test on systems where it is broken
8633 +ifelse([$1],[CXX],
8634 +[case $host_os in
8635 +interix3*)
8636 + # Interix 3.5 installs completely hosed .la files for C++, so rather than
8637 + # hack all around it, let's just trust "g++" to DTRT.
8638 + _LT_AC_TAGVAR(predep_objects,$1)=
8639 + _LT_AC_TAGVAR(postdep_objects,$1)=
8640 + _LT_AC_TAGVAR(postdeps,$1)=
8641 + ;;
8642 +
8643 +solaris*)
8644 + case $cc_basename in
8645 + CC*)
8646 + # Adding this requires a known-good setup of shared libraries for
8647 + # Sun compiler versions before 5.6, else PIC objects from an old
8648 + # archive will be linked into the output, leading to subtle bugs.
8649 + _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
8650 + ;;
8651 + esac
8652 + ;;
8653 +esac
8654 +])
8655 +
8656 +case " $_LT_AC_TAGVAR(postdeps, $1) " in
8657 +*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
8658 +esac
8659 +])# AC_LIBTOOL_POSTDEP_PREDEP
8660 +
8661 +# AC_LIBTOOL_LANG_F77_CONFIG
8662 +# --------------------------
8663 +# Ensure that the configuration vars for the C compiler are
8664 +# suitably defined. Those variables are subsequently used by
8665 +# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
8666 +AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
8667 +AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
8668 +[AC_REQUIRE([AC_PROG_F77])
8669 +AC_LANG_PUSH(Fortran 77)
8670 +
8671 +_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
8672 +_LT_AC_TAGVAR(allow_undefined_flag, $1)=
8673 +_LT_AC_TAGVAR(always_export_symbols, $1)=no
8674 +_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
8675 +_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
8676 +_LT_AC_TAGVAR(hardcode_direct, $1)=no
8677 +_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
8678 +_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
8679 +_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
8680 +_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
8681 +_LT_AC_TAGVAR(hardcode_automatic, $1)=no
8682 +_LT_AC_TAGVAR(module_cmds, $1)=
8683 +_LT_AC_TAGVAR(module_expsym_cmds, $1)=
8684 +_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
8685 +_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
8686 +_LT_AC_TAGVAR(no_undefined_flag, $1)=
8687 +_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
8688 +_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
8689 +
8690 +# Source file extension for f77 test sources.
8691 +ac_ext=f
8692 +
8693 +# Object file extension for compiled f77 test sources.
8694 objext=o
8695 _LT_AC_TAGVAR(objext, $1)=$objext
8696
8697 # Code to be used in simple compile tests
8698 -lt_simple_compile_test_code="int some_variable = 0;\n"
8699 +lt_simple_compile_test_code=" subroutine t\n return\n end\n"
8700
8701 # Code to be used in simple link tests
8702 -lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
8703 +lt_simple_link_test_code=" program t\n end\n"
8704
8705 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
8706 _LT_AC_SYS_COMPILER
8707 @@ -4583,3765 +4649,3674 @@
8708 _LT_LINKER_BOILERPLATE
8709
8710 # Allow CC to be a program name with arguments.
8711 -lt_save_CC=$CC
8712 -lt_save_LD=$LD
8713 -lt_save_GCC=$GCC
8714 -GCC=$GXX
8715 -lt_save_with_gnu_ld=$with_gnu_ld
8716 -lt_save_path_LD=$lt_cv_path_LD
8717 -if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
8718 - lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
8719 -else
8720 - $as_unset lt_cv_prog_gnu_ld
8721 -fi
8722 -if test -n "${lt_cv_path_LDCXX+set}"; then
8723 - lt_cv_path_LD=$lt_cv_path_LDCXX
8724 -else
8725 - $as_unset lt_cv_path_LD
8726 -fi
8727 -test -z "${LDCXX+set}" || LD=$LDCXX
8728 -CC=${CXX-"c++"}
8729 +lt_save_CC="$CC"
8730 +CC=${F77-"f77"}
8731 compiler=$CC
8732 _LT_AC_TAGVAR(compiler, $1)=$CC
8733 _LT_CC_BASENAME([$compiler])
8734
8735 -# We don't want -fno-exception wen compiling C++ code, so set the
8736 -# no_builtin_flag separately
8737 -if test "$GXX" = yes; then
8738 - _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
8739 -else
8740 - _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
8741 -fi
8742 -
8743 -if test "$GXX" = yes; then
8744 - # Set up default GNU C++ configuration
8745 +AC_MSG_CHECKING([if libtool supports shared libraries])
8746 +AC_MSG_RESULT([$can_build_shared])
8747
8748 - AC_PROG_LD
8749 +AC_MSG_CHECKING([whether to build shared libraries])
8750 +test "$can_build_shared" = "no" && enable_shared=no
8751
8752 - # Check if GNU C++ uses GNU ld as the underlying linker, since the
8753 - # archiving commands below assume that GNU ld is being used.
8754 - if test "$with_gnu_ld" = yes; then
8755 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
8756 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8757 +# On AIX, shared libraries and static libraries use the same namespace, and
8758 +# are all built from PIC.
8759 +case $host_os in
8760 +aix3*)
8761 + test "$enable_shared" = yes && enable_static=no
8762 + if test -n "$RANLIB"; then
8763 + archive_cmds="$archive_cmds~\$RANLIB \$lib"
8764 + postinstall_cmds='$RANLIB $lib'
8765 + fi
8766 + ;;
8767 +aix4* | aix5*)
8768 + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
8769 + test "$enable_shared" = yes && enable_static=no
8770 + fi
8771 + ;;
8772 +esac
8773 +AC_MSG_RESULT([$enable_shared])
8774
8775 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
8776 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
8777 +AC_MSG_CHECKING([whether to build static libraries])
8778 +# Make sure either enable_shared or enable_static is yes.
8779 +test "$enable_shared" = yes || enable_static=yes
8780 +AC_MSG_RESULT([$enable_static])
8781
8782 - # If archive_cmds runs LD, not CC, wlarc should be empty
8783 - # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
8784 - # investigate it a little bit more. (MM)
8785 - wlarc='${wl}'
8786 +_LT_AC_TAGVAR(GCC, $1)="$G77"
8787 +_LT_AC_TAGVAR(LD, $1)="$LD"
8788
8789 - # ancient GNU ld didn't support --whole-archive et. al.
8790 - if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
8791 - grep 'no-whole-archive' > /dev/null; then
8792 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
8793 - else
8794 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
8795 - fi
8796 - else
8797 - with_gnu_ld=no
8798 - wlarc=
8799 +AC_LIBTOOL_PROG_COMPILER_PIC($1)
8800 +AC_LIBTOOL_PROG_CC_C_O($1)
8801 +AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
8802 +AC_LIBTOOL_PROG_LD_SHLIBS($1)
8803 +AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
8804 +AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
8805
8806 - # A generic and very simple default shared library creation
8807 - # command for GNU C++ for the case where it uses the native
8808 - # linker, instead of GNU ld. If possible, this setting should
8809 - # overridden to take advantage of the native linker features on
8810 - # the platform it is being used on.
8811 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
8812 - fi
8813 +AC_LIBTOOL_CONFIG($1)
8814
8815 - # Commands to make compiler produce verbose output that lists
8816 - # what "hidden" libraries, object files and flags are used when
8817 - # linking a shared library.
8818 - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
8819 +AC_LANG_POP
8820 +CC="$lt_save_CC"
8821 +])# AC_LIBTOOL_LANG_F77_CONFIG
8822
8823 -else
8777 else
88248778 - GXX=no
88258779 - with_gnu_ld=no
88268780 - wlarc=
8827 -fi
8781 + echo "libtool.m4: error: problem compiling $1 test program"
8782 fi
88288783
88298784 -# PORTME: fill in a description of your system's C++ link characteristics
88308785 -AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
88438798 - no_entry_flag=""
88448799 - else
88458800 - aix_use_runtimelinking=no
8846 +# AC_LIBTOOL_LANG_GCJ_CONFIG
8847 +# --------------------------
8848 +# Ensure that the configuration vars for the C compiler are
8849 +# suitably defined. Those variables are subsequently used by
8850 +# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
8851 +AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
8852 +AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
8853 +[AC_LANG_SAVE
8801 +$rm -f confest.$objext
88548802
88558803 - # Test if we are trying to use run time linking or normal
88568804 - # AIX style linking. If -brtl is somewhere in LDFLAGS, we
88668814 - done
88678815 - ;;
88688816 - esac
8869 +# Source file extension for Java test sources.
8870 +ac_ext=java
8817 +# PORTME: override above test on systems where it is broken
8818 +ifelse([$1],[CXX],
8819 +[case $host_os in
8820 +interix3*)
8821 + # Interix 3.5 installs completely hosed .la files for C++, so rather than
8822 + # hack all around it, let's just trust "g++" to DTRT.
8823 + _LT_AC_TAGVAR(predep_objects,$1)=
8824 + _LT_AC_TAGVAR(postdep_objects,$1)=
8825 + _LT_AC_TAGVAR(postdeps,$1)=
8826 + ;;
88718827
88728828 - exp_sym_flag='-bexport'
88738829 - no_entry_flag='-bnoentry'
88748830 - fi
8875 +# Object file extension for compiled Java test sources.
8876 +objext=o
8877 +_LT_AC_TAGVAR(objext, $1)=$objext
8831 +solaris*)
8832 + case $cc_basename in
8833 + CC*)
8834 + # Adding this requires a known-good setup of shared libraries for
8835 + # Sun compiler versions before 5.6, else PIC objects from an old
8836 + # archive will be linked into the output, leading to subtle bugs.
8837 + _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
8838 + ;;
8839 + esac
8840 + ;;
8841 +esac
8842 +])
88788843
88798844 - # When large executables or shared objects are built, AIX ld can
88808845 - # have problems creating the table of contents. If linking a library
88818846 - # or program results in "error TOC overflow" add -mminimal-toc to
88828847 - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
88838848 - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
8884 +# Code to be used in simple compile tests
8885 +lt_simple_compile_test_code="class foo {}\n"
8849 +case " $_LT_AC_TAGVAR(postdeps, $1) " in
8850 +*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
8851 +esac
8852 +])# AC_LIBTOOL_POSTDEP_PREDEP
88868853
88878854 - _LT_AC_TAGVAR(archive_cmds, $1)=''
88888855 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
88898856 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
88908857 - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
8891 +# Code to be used in simple link tests
8892 +lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
8858 +# AC_LIBTOOL_LANG_F77_CONFIG
8859 +# --------------------------
8860 +# Ensure that the configuration vars for the C compiler are
8861 +# suitably defined. Those variables are subsequently used by
8862 +# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
8863 +AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
8864 +AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
8865 +[AC_REQUIRE([AC_PROG_F77])
8866 +AC_LANG_PUSH(Fortran 77)
88938867
88948868 - if test "$GXX" = yes; then
88958869 - case $host_os in aix4.[[012]]|aix4.[[012]].*)
89318905 - fi
89328906 - fi
89338907 - fi
8934 +# ltmain only uses $CC for tagged configurations so make sure $CC is set.
8935 +_LT_AC_SYS_COMPILER
8908 +_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
8909 +_LT_AC_TAGVAR(allow_undefined_flag, $1)=
8910 +_LT_AC_TAGVAR(always_export_symbols, $1)=no
8911 +_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
8912 +_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
8913 +_LT_AC_TAGVAR(hardcode_direct, $1)=no
8914 +_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
8915 +_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
8916 +_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
8917 +_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
8918 +_LT_AC_TAGVAR(hardcode_automatic, $1)=no
8919 +_LT_AC_TAGVAR(module_cmds, $1)=
8920 +_LT_AC_TAGVAR(module_expsym_cmds, $1)=
8921 +_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
8922 +_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
8923 +_LT_AC_TAGVAR(no_undefined_flag, $1)=
8924 +_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
8925 +_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
89368926
89378927 - # It seems that -bexpall does not export symbols beginning with
89388928 - # underscore (_), so it is better to generate a list of symbols to export.
89448934 - # Determine the default libpath from the value encoded in an empty executable.
89458935 - _LT_AC_SYS_LIBPATH_AIX
89468936 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
8947 +# save warnings/boilerplate of simple test code
8948 +_LT_COMPILER_BOILERPLATE
8949 +_LT_LINKER_BOILERPLATE
8937 +# Source file extension for f77 test sources.
8938 +ac_ext=f
89508939
89518940 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
89528941 - else
89708959 - fi
89718960 - fi
89728961 - ;;
8973 +# Allow CC to be a program name with arguments.
8974 +lt_save_CC="$CC"
8975 +CC=${GCJ-"gcj"}
8976 +compiler=$CC
8977 +_LT_AC_TAGVAR(compiler, $1)=$CC
8978 +_LT_CC_BASENAME([$compiler])
8962 +# Object file extension for compiled f77 test sources.
8963 +objext=o
8964 +_LT_AC_TAGVAR(objext, $1)=$objext
89798965
89808966 - beos*)
89818967 - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
89878973 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
89888974 - fi
89898975 - ;;
8990 +# GCJ did not exist at the time GCC didn't implicitly link libc in.
8991 +_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
8976 +# Code to be used in simple compile tests
8977 +lt_simple_compile_test_code=" subroutine t\n return\n end\n"
89928978
89938979 - chorus*)
89948980 - case $cc_basename in
89988984 - ;;
89998985 - esac
90008986 - ;;
9001 +_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
8987 +# Code to be used in simple link tests
8988 +lt_simple_link_test_code=" program t\n end\n"
90028989
90038990 - cygwin* | mingw* | pw32*)
90048991 - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
90078994 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
90088995 - _LT_AC_TAGVAR(always_export_symbols, $1)=no
90098996 - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
9010 +AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
9011 +AC_LIBTOOL_PROG_COMPILER_PIC($1)
9012 +AC_LIBTOOL_PROG_CC_C_O($1)
9013 +AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
9014 +AC_LIBTOOL_PROG_LD_SHLIBS($1)
9015 +AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
9016 +AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
8997 +# ltmain only uses $CC for tagged configurations so make sure $CC is set.
8998 +_LT_AC_SYS_COMPILER
90178999
90189000 - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
90199001 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
90569038 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
90579039 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
90589040 - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
9059 +AC_LIBTOOL_CONFIG($1)
9041 +# save warnings/boilerplate of simple test code
9042 +_LT_COMPILER_BOILERPLATE
9043 +_LT_LINKER_BOILERPLATE
90609044
90619045 - if test "$GXX" = yes ; then
90629046 - lt_int_apple_cc_single_mod=no
90939077 - esac
90949078 - fi
90959079 - ;;
9096 +AC_LANG_RESTORE
9097 +CC="$lt_save_CC"
9098 +])# AC_LIBTOOL_LANG_GCJ_CONFIG
9080 +# Allow CC to be a program name with arguments.
9081 +lt_save_CC="$CC"
9082 +CC=${F77-"f77"}
9083 +compiler=$CC
9084 +_LT_AC_TAGVAR(compiler, $1)=$CC
9085 +_LT_CC_BASENAME([$compiler])
90999086
91009087 - dgux*)
91019088 - case $cc_basename in
91369123 - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
91379124 - # but as the default
91389125 - # location of the library.
9126 +AC_MSG_CHECKING([if libtool supports shared libraries])
9127 +AC_MSG_RESULT([$can_build_shared])
91399128
91409129 - case $cc_basename in
91419130 - CC*)
91539142 - # from the output so that they don't get included in the library
91549143 - # dependencies.
91559144 - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
9156 +# AC_LIBTOOL_LANG_RC_CONFIG
9157 +# -------------------------
9158 +# Ensure that the configuration vars for the Windows resource compiler are
9159 +# suitably defined. Those variables are subsequently used by
9160 +# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
9161 +AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
9162 +AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
9163 +[AC_LANG_SAVE
9164 +
9165 +# Source file extension for RC test sources.
9166 +ac_ext=rc
9167 +
9168 +# Object file extension for compiled RC test sources.
9169 +objext=o
9170 +_LT_AC_TAGVAR(objext, $1)=$objext
9171 +
9172 +# Code to be used in simple compile tests
9173 +lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
9174 +
9175 +# Code to be used in simple link tests
9176 +lt_simple_link_test_code="$lt_simple_compile_test_code"
9177 +
9178 +# ltmain only uses $CC for tagged configurations so make sure $CC is set.
9179 +_LT_AC_SYS_COMPILER
9180 +
9181 +# save warnings/boilerplate of simple test code
9182 +_LT_COMPILER_BOILERPLATE
9183 +_LT_LINKER_BOILERPLATE
9184 +
9185 +# Allow CC to be a program name with arguments.
9186 +lt_save_CC="$CC"
9187 +CC=${RC-"windres"}
9188 +compiler=$CC
9189 +_LT_AC_TAGVAR(compiler, $1)=$CC
9190 +_LT_CC_BASENAME([$compiler])
9191 +_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
9192 +
9193 +AC_LIBTOOL_CONFIG($1)
9194 +
9195 +AC_LANG_RESTORE
9196 +CC="$lt_save_CC"
9197 +])# AC_LIBTOOL_LANG_RC_CONFIG
9198 +
9199 +
9200 +# AC_LIBTOOL_CONFIG([TAGNAME])
9201 +# ----------------------------
9202 +# If TAGNAME is not passed, then create an initial libtool script
9203 +# with a default configuration from the untagged config vars. Otherwise
9204 +# add code to config.status for appending the configuration named by
9205 +# TAGNAME from the matching tagged config vars.
9206 +AC_DEFUN([AC_LIBTOOL_CONFIG],
9207 +[# The else clause should only fire when bootstrapping the
9208 +# libtool distribution, otherwise you forgot to ship ltmain.sh
9209 +# with your package, and you will get complaints that there are
9210 +# no rules to generate ltmain.sh.
9211 +if test -f "$ltmain"; then
9212 + # See if we are running on zsh, and set the options which allow our commands through
9213 + # without removal of \ escapes.
9214 + if test -n "${ZSH_VERSION+set}" ; then
9215 + setopt NO_GLOB_SUBST
9216 + fi
9217 + # Now quote all the things that may contain metacharacters while being
9218 + # careful not to overquote the AC_SUBSTed values. We take copies of the
9219 + # variables and quote the copies for generation of the libtool script.
9220 + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
9221 + SED SHELL STRIP \
9222 + libname_spec library_names_spec soname_spec extract_expsyms_cmds \
9223 + old_striplib striplib file_magic_cmd finish_cmds finish_eval \
9224 + deplibs_check_method reload_flag reload_cmds need_locks \
9225 + lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
9226 + lt_cv_sys_global_symbol_to_c_name_address \
9227 + sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
9228 + old_postinstall_cmds old_postuninstall_cmds \
9229 + _LT_AC_TAGVAR(compiler, $1) \
9230 + _LT_AC_TAGVAR(CC, $1) \
9231 + _LT_AC_TAGVAR(LD, $1) \
9232 + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
9233 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
9234 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
9235 + _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
9236 + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
9237 + _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
9238 + _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
9239 + _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
9240 + _LT_AC_TAGVAR(old_archive_cmds, $1) \
9241 + _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
9242 + _LT_AC_TAGVAR(predep_objects, $1) \
9243 + _LT_AC_TAGVAR(postdep_objects, $1) \
9244 + _LT_AC_TAGVAR(predeps, $1) \
9245 + _LT_AC_TAGVAR(postdeps, $1) \
9246 + _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
9247 + _LT_AC_TAGVAR(archive_cmds, $1) \
9248 + _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
9249 + _LT_AC_TAGVAR(postinstall_cmds, $1) \
9250 + _LT_AC_TAGVAR(postuninstall_cmds, $1) \
9251 + _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
9252 + _LT_AC_TAGVAR(allow_undefined_flag, $1) \
9253 + _LT_AC_TAGVAR(no_undefined_flag, $1) \
9254 + _LT_AC_TAGVAR(export_symbols_cmds, $1) \
9255 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
9256 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
9257 + _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
9258 + _LT_AC_TAGVAR(hardcode_automatic, $1) \
9259 + _LT_AC_TAGVAR(module_cmds, $1) \
9260 + _LT_AC_TAGVAR(module_expsym_cmds, $1) \
9261 + _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
9262 + _LT_AC_TAGVAR(exclude_expsyms, $1) \
9263 + _LT_AC_TAGVAR(include_expsyms, $1); do
9264 +
9265 + case $var in
9266 + _LT_AC_TAGVAR(old_archive_cmds, $1) | \
9267 + _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
9268 + _LT_AC_TAGVAR(archive_cmds, $1) | \
9269 + _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
9270 + _LT_AC_TAGVAR(module_cmds, $1) | \
9271 + _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
9272 + _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
9273 + _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
9274 + extract_expsyms_cmds | reload_cmds | finish_cmds | \
9275 + postinstall_cmds | postuninstall_cmds | \
9276 + old_postinstall_cmds | old_postuninstall_cmds | \
9277 + sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
9278 + # Double-quote double-evaled strings.
9279 + eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
9280 ;;
9281 *)
9145 - ;;
9146 - *)
92829147 - if test "$GXX" = yes; then
92839148 - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
92849149 - else
92859150 - # FIXME: insert proper C++ library support
92869151 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
92879152 - fi
9288 + eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
9289 ;;
9290 esac
9291 + done
9292 +
9293 + case $lt_echo in
9294 + *'\[$]0 --fallback-echo"')
9295 + lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
9296 ;;
9153 - ;;
9154 - esac
9155 - ;;
92979156 - hpux10*|hpux11*)
92989157 - if test $with_gnu_ld = no; then
92999158 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
93009159 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
9301 + esac
9160 +AC_MSG_CHECKING([whether to build shared libraries])
9161 +test "$can_build_shared" = "no" && enable_shared=no
93029162
93039163 - case $host_cpu in
93049164 - hppa*64*|ia64*)
93219181 - # location of the library.
93229182 - ;;
93239183 - esac
9324 +ifelse([$1], [],
9325 + [cfgfile="${ofile}T"
9326 + trap "$rm \"$cfgfile\"; exit 1" 1 2 15
9327 + $rm -f "$cfgfile"
9328 + AC_MSG_NOTICE([creating $ofile])],
9329 + [cfgfile="$ofile"])
9184 +# On AIX, shared libraries and static libraries use the same namespace, and
9185 +# are all built from PIC.
9186 +case $host_os in
9187 +aix3*)
9188 + test "$enable_shared" = yes && enable_static=no
9189 + if test -n "$RANLIB"; then
9190 + archive_cmds="$archive_cmds~\$RANLIB \$lib"
9191 + postinstall_cmds='$RANLIB $lib'
9192 + fi
9193 + ;;
9194 +aix4* | aix5*)
9195 + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
9196 + test "$enable_shared" = yes && enable_static=no
9197 + fi
9198 + ;;
9199 +esac
9200 +AC_MSG_RESULT([$enable_shared])
93309201
93319202 - case $cc_basename in
93329203 - CC*)
93969267 - CC*)
93979268 - # SGI C++
93989269 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
9399 + cat <<__EOF__ >> "$cfgfile"
9400 +ifelse([$1], [],
9401 +[#! $SHELL
9270 +AC_MSG_CHECKING([whether to build static libraries])
9271 +# Make sure either enable_shared or enable_static is yes.
9272 +test "$enable_shared" = yes || enable_static=yes
9273 +AC_MSG_RESULT([$enable_static])
94029274
94039275 - # Archives containing C++ object files must be created using
94049276 - # "CC -ar", where "CC" is the IRIX C++ compiler. This is
94249296 - case $cc_basename in
94259297 - KCC*)
94269298 - # Kuck and Associates, Inc. (KAI) C++ Compiler
9427 +# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
9428 +# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
9429 +# NOTE: Changes made to this file will be lost: look at ltmain.sh.
9430 +#
9431 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
9432 +# Free Software Foundation, Inc.
9433 +#
9434 +# This file is part of GNU Libtool:
9435 +# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
9436 +#
9437 +# This program is free software; you can redistribute it and/or modify
9438 +# it under the terms of the GNU General Public License as published by
9439 +# the Free Software Foundation; either version 2 of the License, or
9440 +# (at your option) any later version.
9441 +#
9442 +# This program is distributed in the hope that it will be useful, but
9443 +# WITHOUT ANY WARRANTY; without even the implied warranty of
9444 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
9445 +# General Public License for more details.
9446 +#
9447 +# You should have received a copy of the GNU General Public License
9448 +# along with this program; if not, write to the Free Software
9449 +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
9450 +#
9451 +# As a special exception to the GNU General Public License, if you
9452 +# distribute this file as part of a program that contains a
9453 +# configuration script generated by Autoconf, you may include it under
9454 +# the same distribution terms that you use for the rest of that program.
9299 +_LT_AC_TAGVAR(GCC, $1)="$G77"
9300 +_LT_AC_TAGVAR(LD, $1)="$LD"
94559301
94569302 - # KCC will only create a shared library if the output file
94579303 - # ends with ".so" (or ".sl" for HP-UX), so rename the library
94679313 - # from the output so that they don't get included in the library
94689314 - # dependencies.
94699315 - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
9470 +# A sed program that does not truncate output.
9471 +SED=$lt_SED
9316 +AC_LIBTOOL_PROG_COMPILER_PIC($1)
9317 +AC_LIBTOOL_PROG_CC_C_O($1)
9318 +AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
9319 +AC_LIBTOOL_PROG_LD_SHLIBS($1)
9320 +AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
9321 +AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
94729322
94739323 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
94749324 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
9475 +# Sed that helps us avoid accidentally triggering echo(1) options like -n.
9476 +Xsed="$SED -e 1s/^X//"
9325 +AC_LIBTOOL_CONFIG($1)
94779326
94789327 - # Archives containing C++ object files must be created using
94799328 - # "CC -Bstatic", where "CC" is the KAI C++ compiler.
95089357 - # Portland Group C++ compiler
95099358 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
95109359 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
9511 +# The HP-UX ksh and POSIX shell print the target directory to stdout
9512 +# if CDPATH is set.
9513 +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
9360 +AC_LANG_POP
9361 +CC="$lt_save_CC"
9362 +])# AC_LIBTOOL_LANG_F77_CONFIG
95149363
95159364 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
95169365 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
95209369 - # Compaq C++
95219370 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
95229371 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
9523 +# The names of the tagged configurations supported by this script.
9524 +available_tags=
95259372
95269373 - runpath_var=LD_RUN_PATH
95279374 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
95289375 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
9529 +# ### BEGIN LIBTOOL CONFIG],
9530 +[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
9376 +# AC_LIBTOOL_LANG_GCJ_CONFIG
9377 +# --------------------------
9378 +# Ensure that the configuration vars for the C compiler are
9379 +# suitably defined. Those variables are subsequently used by
9380 +# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
9381 +AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
9382 +AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
9383 +[AC_LANG_SAVE
95319384
95329385 - # Commands to make compiler produce verbose output that lists
95339386 - # what "hidden" libraries, object files and flags are used when
95929445 - case $cc_basename in
95939446 - KCC*)
95949447 - # Kuck and Associates, Inc. (KAI) C++ Compiler
9595 +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
9448 +# Source file extension for Java test sources.
9449 +ac_ext=java
95969450
95979451 - # KCC will only create a shared library if the output file
95989452 - # ends with ".so" (or ".sl" for HP-UX), so rename the library
95999453 - # to its proper name (with version) after linking.
96009454 - _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
9601 +# Shell to use when invoking shell scripts.
9602 +SHELL=$lt_SHELL
9455 +# Object file extension for compiled Java test sources.
9456 +objext=o
9457 +_LT_AC_TAGVAR(objext, $1)=$objext
96039458
96049459 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
96059460 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
9606 +# Whether or not to build shared libraries.
9607 +build_libtool_libs=$enable_shared
9461 +# Code to be used in simple compile tests
9462 +lt_simple_compile_test_code="class foo {}\n"
96089463
96099464 - # Archives containing C++ object files must be created using
96109465 - # "CC -Bstatic", where "CC" is the KAI C++ compiler.
96119466 - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
9612 +# Whether or not to build static libraries.
9613 +build_old_libs=$enable_static
9467 +# Code to be used in simple link tests
9468 +lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
96149469
96159470 - ;;
96169471 - RCC*)
96219476 - cxx*)
96229477 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
96239478 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
9624 +# Whether or not to add -lc for building shared libraries.
9625 +build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
9479 +# ltmain only uses $CC for tagged configurations so make sure $CC is set.
9480 +_LT_AC_SYS_COMPILER
96269481
96279482 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
96289483 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
9629 +# Whether or not to disallow shared libs when runtime libs are static
9630 +allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
9484 +# save warnings/boilerplate of simple test code
9485 +_LT_COMPILER_BOILERPLATE
9486 +_LT_LINKER_BOILERPLATE
96319487
96329488 - # Commands to make compiler produce verbose output that lists
96339489 - # what "hidden" libraries, object files and flags are used when
96439499 - if test "$GXX" = yes && test "$with_gnu_ld" = no; then
96449500 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
96459501 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
9646 +# Whether or not to optimize for fast installation.
9647 +fast_install=$enable_fast_install
9502 +# Allow CC to be a program name with arguments.
9503 +lt_save_CC="$CC"
9504 +CC=${GCJ-"gcj"}
9505 +compiler=$CC
9506 +_LT_AC_TAGVAR(compiler, $1)=$CC
9507 +_LT_CC_BASENAME([$compiler])
96489508
96499509 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
96509510 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
9651 +# The host system.
9652 +host_alias=$host_alias
9653 +host=$host
9654 +host_os=$host_os
9511 +# GCJ did not exist at the time GCC didn't implicitly link libc in.
9512 +_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
96559513
96569514 - # Commands to make compiler produce verbose output that lists
96579515 - # what "hidden" libraries, object files and flags are used when
96589516 - # linking a shared library.
96599517 - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
9660 +# The build system.
9661 +build_alias=$build_alias
9662 +build=$build
9663 +build_os=$build_os
9518 +_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
96649519
96659520 - else
96669521 - # FIXME: insert proper C++ library support
96739528 - case $cc_basename in
96749529 - KCC*)
96759530 - # Kuck and Associates, Inc. (KAI) C++ Compiler
9676 +# An echo program that does not interpret backslashes.
9677 +echo=$lt_echo
9531 +AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
9532 +AC_LIBTOOL_PROG_COMPILER_PIC($1)
9533 +AC_LIBTOOL_PROG_CC_C_O($1)
9534 +AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
9535 +AC_LIBTOOL_PROG_LD_SHLIBS($1)
9536 +AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
9537 +AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
96789538
96799539 - # KCC will only create a shared library if the output file
96809540 - # ends with ".so" (or ".sl" for HP-UX), so rename the library
96819541 - # to its proper name (with version) after linking.
96829542 - _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
9683 +# The archiver.
9684 +AR=$lt_AR
9685 +AR_FLAGS=$lt_AR_FLAGS
9543 +AC_LIBTOOL_CONFIG($1)
96869544
96879545 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
96889546 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
9689 +# A C compiler.
9690 +LTCC=$lt_LTCC
9547 +AC_LANG_RESTORE
9548 +CC="$lt_save_CC"
9549 +])# AC_LIBTOOL_LANG_GCJ_CONFIG
96919550
96929551 - # Archives containing C++ object files must be created using
96939552 - # the KAI C++ compiler.
97059564 - echo "-hidden">> $lib.exp~
97069565 - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~
97079566 - $rm $lib.exp'
9708 +# LTCC compiler flags.
9709 +LTCFLAGS=$lt_LTCFLAGS
97109567
97119568 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
97129569 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
9713 +# A language-specific compiler.
9714 +CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
9570 +# AC_LIBTOOL_LANG_RC_CONFIG
9571 +# -------------------------
9572 +# Ensure that the configuration vars for the Windows resource compiler are
9573 +# suitably defined. Those variables are subsequently used by
9574 +# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
9575 +AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
9576 +AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
9577 +[AC_LANG_SAVE
97159578
97169579 - # Commands to make compiler produce verbose output that lists
97179580 - # what "hidden" libraries, object files and flags are used when
97279590 - if test "$GXX" = yes && test "$with_gnu_ld" = no; then
97289591 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
97299592 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
9730 +# Is the compiler the GNU C compiler?
9731 +with_gcc=$_LT_AC_TAGVAR(GCC, $1)
9593 +# Source file extension for RC test sources.
9594 +ac_ext=rc
97329595
97339596 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
97349597 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
9735 +# An ERE matcher.
9736 +EGREP=$lt_EGREP
9598 +# Object file extension for compiled RC test sources.
9599 +objext=o
9600 +_LT_AC_TAGVAR(objext, $1)=$objext
97379601
97389602 - # Commands to make compiler produce verbose output that lists
97399603 - # what "hidden" libraries, object files and flags are used when
97409604 - # linking a shared library.
97419605 - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
9742 +# The linker used to build libraries.
9743 +LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
9606 +# Code to be used in simple compile tests
9607 +lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
97449608
97459609 - else
97469610 - # FIXME: insert proper C++ library support
97809644 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
97819645 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
97829646 - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
9783 +# Whether we need hard or soft links.
9784 +LN_S=$lt_LN_S
9647 +# Code to be used in simple link tests
9648 +lt_simple_link_test_code="$lt_simple_compile_test_code"
97859649
97869650 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
97879651 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
98009664 - ;;
98019665 - esac
98029666 - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
9803 +# A BSD-compatible nm program.
9804 +NM=$lt_NM
9667 +# ltmain only uses $CC for tagged configurations so make sure $CC is set.
9668 +_LT_AC_SYS_COMPILER
98059669
98069670 - output_verbose_link_cmd='echo'
9807 +# A symbol stripping program
9808 +STRIP=$lt_STRIP
9671 +# save warnings/boilerplate of simple test code
9672 +_LT_COMPILER_BOILERPLATE
9673 +_LT_LINKER_BOILERPLATE
98099674
98109675 - # Archives containing C++ object files must be created using
98119676 - # "CC -xar", where "CC" is the Sun C++ compiler. This is
98169681 - gcx*)
98179682 - # Green Hills C++ Compiler
98189683 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
9819 +# Used to examine libraries when file_magic_cmd begins "file"
9820 +MAGIC_CMD=$MAGIC_CMD
9684 +# Allow CC to be a program name with arguments.
9685 +lt_save_CC="$CC"
9686 +CC=${RC-"windres"}
9687 +compiler=$CC
9688 +_LT_AC_TAGVAR(compiler, $1)=$CC
9689 +_LT_CC_BASENAME([$compiler])
9690 +_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
98219691
98229692 - # The C++ compiler must be used to create the archive.
98239693 - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
98309700 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
98319701 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
98329702 - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
9833 +# Used on cygwin: DLL creation program.
9834 +DLLTOOL="$DLLTOOL"
9703 +AC_LIBTOOL_CONFIG($1)
98359704
98369705 - # Commands to make compiler produce verbose output that lists
98379706 - # what "hidden" libraries, object files and flags are used when
98439712 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
98449713 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
98459714 - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
9846 +# Used on cygwin: object dumper.
9847 +OBJDUMP="$OBJDUMP"
9715 +AC_LANG_RESTORE
9716 +CC="$lt_save_CC"
9717 +])# AC_LIBTOOL_LANG_RC_CONFIG
98489718
98499719 - # Commands to make compiler produce verbose output that lists
98509720 - # what "hidden" libraries, object files and flags are used when
98519721 - # linking a shared library.
98529722 - output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
98539723 - fi
9854 +# Used on cygwin: assembler.
9855 +AS="$AS"
98569724
98579725 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
98589726 - fi
98649732 - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
98659733 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
98669734 - runpath_var='LD_RUN_PATH'
9867 +# The name of the directory that contains temporary libtool files.
9868 +objdir=$objdir
9735 +# AC_LIBTOOL_CONFIG([TAGNAME])
9736 +# ----------------------------
9737 +# If TAGNAME is not passed, then create an initial libtool script
9738 +# with a default configuration from the untagged config vars. Otherwise
9739 +# add code to config.status for appending the configuration named by
9740 +# TAGNAME from the matching tagged config vars.
9741 +AC_DEFUN([AC_LIBTOOL_CONFIG],
9742 +[# The else clause should only fire when bootstrapping the
9743 +# libtool distribution, otherwise you forgot to ship ltmain.sh
9744 +# with your package, and you will get complaints that there are
9745 +# no rules to generate ltmain.sh.
9746 +if test -f "$ltmain"; then
9747 + # See if we are running on zsh, and set the options which allow our commands through
9748 + # without removal of \ escapes.
9749 + if test -n "${ZSH_VERSION+set}" ; then
9750 + setopt NO_GLOB_SUBST
9751 + fi
9752 + # Now quote all the things that may contain metacharacters while being
9753 + # careful not to overquote the AC_SUBSTed values. We take copies of the
9754 + # variables and quote the copies for generation of the libtool script.
9755 + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
9756 + SED SHELL STRIP \
9757 + libname_spec library_names_spec soname_spec extract_expsyms_cmds \
9758 + old_striplib striplib file_magic_cmd finish_cmds finish_eval \
9759 + deplibs_check_method reload_flag reload_cmds need_locks \
9760 + lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
9761 + lt_cv_sys_global_symbol_to_c_name_address \
9762 + sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
9763 + old_postinstall_cmds old_postuninstall_cmds \
9764 + _LT_AC_TAGVAR(compiler, $1) \
9765 + _LT_AC_TAGVAR(CC, $1) \
9766 + _LT_AC_TAGVAR(LD, $1) \
9767 + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
9768 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
9769 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
9770 + _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
9771 + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
9772 + _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
9773 + _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
9774 + _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
9775 + _LT_AC_TAGVAR(old_archive_cmds, $1) \
9776 + _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
9777 + _LT_AC_TAGVAR(predep_objects, $1) \
9778 + _LT_AC_TAGVAR(postdep_objects, $1) \
9779 + _LT_AC_TAGVAR(predeps, $1) \
9780 + _LT_AC_TAGVAR(postdeps, $1) \
9781 + _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
9782 + _LT_AC_TAGVAR(archive_cmds, $1) \
9783 + _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
9784 + _LT_AC_TAGVAR(postinstall_cmds, $1) \
9785 + _LT_AC_TAGVAR(postuninstall_cmds, $1) \
9786 + _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
9787 + _LT_AC_TAGVAR(allow_undefined_flag, $1) \
9788 + _LT_AC_TAGVAR(no_undefined_flag, $1) \
9789 + _LT_AC_TAGVAR(export_symbols_cmds, $1) \
9790 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
9791 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
9792 + _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
9793 + _LT_AC_TAGVAR(hardcode_automatic, $1) \
9794 + _LT_AC_TAGVAR(module_cmds, $1) \
9795 + _LT_AC_TAGVAR(module_expsym_cmds, $1) \
9796 + _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
9797 + _LT_AC_TAGVAR(exclude_expsyms, $1) \
9798 + _LT_AC_TAGVAR(include_expsyms, $1); do
98699799
98709800 - case $cc_basename in
98719801 - CC*)
98769806 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
98779807 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
98789808 - ;;
9879 - esac
9809 + case $var in
9810 + _LT_AC_TAGVAR(old_archive_cmds, $1) | \
9811 + _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
9812 + _LT_AC_TAGVAR(archive_cmds, $1) | \
9813 + _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
9814 + _LT_AC_TAGVAR(module_cmds, $1) | \
9815 + _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
9816 + _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
9817 + _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
9818 + extract_expsyms_cmds | reload_cmds | finish_cmds | \
9819 + postinstall_cmds | postuninstall_cmds | \
9820 + old_postinstall_cmds | old_postuninstall_cmds | \
9821 + sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
9822 + # Double-quote double-evaled strings.
9823 + eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
9824 + ;;
9825 + *)
9826 + eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
9827 + ;;
9828 esac
98809829 - ;;
98819830 - sysv5* | sco3.2v5* | sco5v6*)
98829831 - # Note: We can NOT use -z defs as we might desire, because we do not
99039852 - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
99049853 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
99059854 - runpath_var='LD_RUN_PATH'
9906 +# How to create reloadable object files.
9907 +reload_flag=$lt_reload_flag
9908 +reload_cmds=$lt_reload_cmds
9855 + done
99099856
99109857 - case $cc_basename in
99119858 - CC*)
99389885 - *)
99399886 - # FIXME: insert proper C++ library support
99409887 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
9941 - ;;
9888 + case $lt_echo in
9889 + *'\[$]0 --fallback-echo"')
9890 + lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
9891 ;;
99429892 -esac
99439893 -AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
99449894 -test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
9945 +# How to pass a linker flag through the compiler.
9946 +wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
9895 + esac
99479896
99489897 -_LT_AC_TAGVAR(GCC, $1)="$GXX"
99499898 -_LT_AC_TAGVAR(LD, $1)="$LD"
9950 +# Object file suffix (normally "o").
9951 +objext="$ac_objext"
9899 +ifelse([$1], [],
9900 + [cfgfile="${ofile}T"
9901 + trap "$rm \"$cfgfile\"; exit 1" 1 2 15
9902 + $rm -f "$cfgfile"
9903 + AC_MSG_NOTICE([creating $ofile])],
9904 + [cfgfile="$ofile"])
99529905
99539906 -AC_LIBTOOL_POSTDEP_PREDEP($1)
99549907 -AC_LIBTOOL_PROG_COMPILER_PIC($1)
99579910 -AC_LIBTOOL_PROG_LD_SHLIBS($1)
99589911 -AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
99599912 -AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
9960 +# Old archive suffix (normally "a").
9961 +libext="$libext"
9913 + cat <<__EOF__ >> "$cfgfile"
9914 +ifelse([$1], [],
9915 +[#! $SHELL
99629916
99639917 -AC_LIBTOOL_CONFIG($1)
9964 +# Shared library suffix (normally ".so").
9965 +shrext_cmds='$shrext_cmds'
9918 +# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
9919 +# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
9920 +# NOTE: Changes made to this file will be lost: look at ltmain.sh.
9921 +#
9922 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
9923 +# Free Software Foundation, Inc.
9924 +#
9925 +# This file is part of GNU Libtool:
9926 +# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
9927 +#
9928 +# This program is free software; you can redistribute it and/or modify
9929 +# it under the terms of the GNU General Public License as published by
9930 +# the Free Software Foundation; either version 2 of the License, or
9931 +# (at your option) any later version.
9932 +#
9933 +# This program is distributed in the hope that it will be useful, but
9934 +# WITHOUT ANY WARRANTY; without even the implied warranty of
9935 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
9936 +# General Public License for more details.
9937 +#
9938 +# You should have received a copy of the GNU General Public License
9939 +# along with this program; if not, write to the Free Software
9940 +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
9941 +#
9942 +# As a special exception to the GNU General Public License, if you
9943 +# distribute this file as part of a program that contains a
9944 +# configuration script generated by Autoconf, you may include it under
9945 +# the same distribution terms that you use for the rest of that program.
99669946
99679947 -AC_LANG_POP
99689948 -CC=$lt_save_CC
99769956 -lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
99779957 -lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
99789958 -])# AC_LIBTOOL_LANG_CXX_CONFIG
9979 +# Executable file suffix (normally "").
9980 +exeext="$exeext"
9959 +# A sed program that does not truncate output.
9960 +SED=$lt_SED
99819961
99829962 -# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
99839963 -# ------------------------------------
1002610006 -if AC_TRY_EVAL(ac_compile); then
1002710007 - # Parse the compiler output and extract the necessary
1002810008 - # objects, libraries and library flags.
10029 +# Additional compiler flags for building library objects.
10030 +pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
10031 +pic_mode=$pic_mode
10009 +# Sed that helps us avoid accidentally triggering echo(1) options like -n.
10010 +Xsed="$SED -e 1s/^X//"
1003210011
1003310012 - # Sentinel used to keep track of whether or not we are before
1003410013 - # the conftest object file.
1003510014 - pre_test_object_deps_done=no
10036 +# What is the maximum length of a command?
10037 +max_cmd_len=$lt_cv_sys_max_cmd_len
10015 +# The HP-UX ksh and POSIX shell print the target directory to stdout
10016 +# if CDPATH is set.
10017 +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
1003810018
1003910019 - # The `*' in the case matches for architectures that use `case' in
1004010020 - # $output_verbose_cmd can trigger glob expansion during the loop
1004110021 - # eval without this substitution.
1004210022 - output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
10043 +# Does compiler simultaneously support -c and -o options?
10044 +compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
10023 +# The names of the tagged configurations supported by this script.
10024 +available_tags=
1004510025
1004610026 - for p in `eval $output_verbose_link_cmd`; do
1004710027 - case $p in
10048 +# Must we lock files when doing compilation?
10049 +need_locks=$lt_need_locks
10028 +# ### BEGIN LIBTOOL CONFIG],
10029 +[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
1005010030
1005110031 - -L* | -R* | -l*)
1005210032 - # Some compilers place space between "-{L,R}" and the path.
1005810038 - else
1005910039 - prev=
1006010040 - fi
10061 +# Do we need the lib prefix for modules?
10062 +need_lib_prefix=$need_lib_prefix
10041 +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
1006310042
1006410043 - if test "$pre_test_object_deps_done" = no; then
1006510044 - case $p in
1008410063 - fi
1008510064 - fi
1008610065 - ;;
10087 +# Do we need a version for libraries?
10088 +need_version=$need_version
10066 +# Shell to use when invoking shell scripts.
10067 +SHELL=$lt_SHELL
1008910068
1009010069 - *.$objext)
1009110070 - # This assumes that the test object file only shows up
1009410073 - pre_test_object_deps_done=yes
1009510074 - continue
1009610075 - fi
10097 +# Whether dlopen is supported.
10098 +dlopen_support=$enable_dlopen
10076 +# Whether or not to build shared libraries.
10077 +build_libtool_libs=$enable_shared
1009910078
1010010079 - if test "$pre_test_object_deps_done" = no; then
1010110080 - if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
1011110090 - fi
1011210091 - fi
1011310092 - ;;
10114 +# Whether dlopen of programs is supported.
10115 +dlopen_self=$enable_dlopen_self
10093 +# Whether or not to build static libraries.
10094 +build_old_libs=$enable_static
1011610095
1011710096 - *) ;; # Ignore the rest.
10118 +# Whether dlopen of statically linked programs is supported.
10119 +dlopen_self_static=$enable_dlopen_self_static
10097 +# Whether or not to add -lc for building shared libraries.
10098 +build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
1012010099
1012110100 - esac
1012210101 - done
10123 +# Compiler flag to prevent dynamic linking.
10124 +link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
10102 +# Whether or not to disallow shared libs when runtime libs are static
10103 +allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
1012510104
1012610105 - # Clean up.
1012710106 - rm -f a.out a.exe
1012810107 -else
1012910108 - echo "libtool.m4: error: problem compiling $1 test program"
1013010109 -fi
10131 +# Compiler flag to turn off builtin functions.
10132 +no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
10110 +# Whether or not to optimize for fast installation.
10111 +fast_install=$enable_fast_install
1013310112
1013410113 -$rm -f confest.$objext
10135 -
10114 +# The host system.
10115 +host_alias=$host_alias
10116 +host=$host
10117 +host_os=$host_os
10118
1013610119 -# PORTME: override above test on systems where it is broken
1013710120 -ifelse([$1],[CXX],
1013810121 -[case $host_os in
1014310126 - _LT_AC_TAGVAR(postdep_objects,$1)=
1014410127 - _LT_AC_TAGVAR(postdeps,$1)=
1014510128 - ;;
10146 +# Compiler flag to allow reflexive dlopens.
10147 +export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
10129 +# The build system.
10130 +build_alias=$build_alias
10131 +build=$build
10132 +build_os=$build_os
1014810133
1014910134 -solaris*)
1015010135 - case $cc_basename in
1015810143 - ;;
1015910144 -esac
1016010145 -])
10161 +# Compiler flag to generate shared objects directly from archives.
10162 +whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
10146 +# An echo program that does not interpret backslashes.
10147 +echo=$lt_echo
1016310148
1016410149 -case " $_LT_AC_TAGVAR(postdeps, $1) " in
1016510150 -*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
1016610151 -esac
1016710152 -])# AC_LIBTOOL_POSTDEP_PREDEP
10168 +# Compiler flag to generate thread-safe objects.
10169 +thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
10153 +# The archiver.
10154 +AR=$lt_AR
10155 +AR_FLAGS=$lt_AR_FLAGS
1017010156
1017110157 -# AC_LIBTOOL_LANG_F77_CONFIG
1017210158 -# --------------------------
1017710163 -AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
1017810164 -[AC_REQUIRE([AC_PROG_F77])
1017910165 -AC_LANG_PUSH(Fortran 77)
10180 +# Library versioning type.
10181 +version_type=$version_type
10166 +# A C compiler.
10167 +LTCC=$lt_LTCC
1018210168
1018310169 -_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
1018410170 -_LT_AC_TAGVAR(allow_undefined_flag, $1)=
1019810184 -_LT_AC_TAGVAR(no_undefined_flag, $1)=
1019910185 -_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
1020010186 -_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
10201 +# Format of library name prefix.
10202 +libname_spec=$lt_libname_spec
10187 +# LTCC compiler flags.
10188 +LTCFLAGS=$lt_LTCFLAGS
1020310189
1020410190 -# Source file extension for f77 test sources.
1020510191 -ac_ext=f
10206 +# List of archive names. First name is the real one, the rest are links.
10207 +# The last name is the one that the linker finds with -lNAME.
10208 +library_names_spec=$lt_library_names_spec
10192 +# A language-specific compiler.
10193 +CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
1020910194
1021010195 -# Object file extension for compiled f77 test sources.
1021110196 -objext=o
1021210197 -_LT_AC_TAGVAR(objext, $1)=$objext
10213 +# The coded name of the library, if different from the real name.
10214 +soname_spec=$lt_soname_spec
10198 +# Is the compiler the GNU C compiler?
10199 +with_gcc=$_LT_AC_TAGVAR(GCC, $1)
1021510200
1021610201 -# Code to be used in simple compile tests
1021710202 -lt_simple_compile_test_code=" subroutine t\n return\n end\n"
10218 +# Commands used to build and install an old-style archive.
10219 +RANLIB=$lt_RANLIB
10220 +old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
10221 +old_postinstall_cmds=$lt_old_postinstall_cmds
10222 +old_postuninstall_cmds=$lt_old_postuninstall_cmds
10203 +# An ERE matcher.
10204 +EGREP=$lt_EGREP
1022310205
1022410206 -# Code to be used in simple link tests
1022510207 -lt_simple_link_test_code=" program t\n end\n"
10226 +# Create an old-style archive from a shared archive.
10227 +old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
10208 +# The linker used to build libraries.
10209 +LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
1022810210
1022910211 -# ltmain only uses $CC for tagged configurations so make sure $CC is set.
1023010212 -_LT_AC_SYS_COMPILER
10231 +# Create a temporary old-style archive to link instead of a shared archive.
10232 +old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
10213 +# Whether we need hard or soft links.
10214 +LN_S=$lt_LN_S
1023310215
1023410216 -# save warnings/boilerplate of simple test code
1023510217 -_LT_COMPILER_BOILERPLATE
1023610218 -_LT_LINKER_BOILERPLATE
10237 +# Commands used to build and install a shared archive.
10238 +archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
10239 +archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
10240 +postinstall_cmds=$lt_postinstall_cmds
10241 +postuninstall_cmds=$lt_postuninstall_cmds
10219 +# A BSD-compatible nm program.
10220 +NM=$lt_NM
1024210221
1024310222 -# Allow CC to be a program name with arguments.
1024410223 -lt_save_CC="$CC"
1024610225 -compiler=$CC
1024710226 -_LT_AC_TAGVAR(compiler, $1)=$CC
1024810227 -_LT_CC_BASENAME([$compiler])
10249 +# Commands used to build a loadable module (assumed same as above if empty)
10250 +module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
10251 +module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
10228 +# A symbol stripping program
10229 +STRIP=$lt_STRIP
1025210230
1025310231 -AC_MSG_CHECKING([if libtool supports shared libraries])
1025410232 -AC_MSG_RESULT([$can_build_shared])
10255 +# Commands to strip libraries.
10256 +old_striplib=$lt_old_striplib
10257 +striplib=$lt_striplib
10233 +# Used to examine libraries when file_magic_cmd begins "file"
10234 +MAGIC_CMD=$MAGIC_CMD
1025810235
1025910236 -AC_MSG_CHECKING([whether to build shared libraries])
1026010237 -test "$can_build_shared" = "no" && enable_shared=no
10261 +# Dependencies to place before the objects being linked to create a
10262 +# shared library.
10263 +predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
10238 +# Used on cygwin: DLL creation program.
10239 +DLLTOOL="$DLLTOOL"
1026410240
1026510241 -# On AIX, shared libraries and static libraries use the same namespace, and
1026610242 -# are all built from PIC.
1027910255 - ;;
1028010256 -esac
1028110257 -AC_MSG_RESULT([$enable_shared])
10282 +# Dependencies to place after the objects being linked to create a
10283 +# shared library.
10284 +postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
10258 +# Used on cygwin: object dumper.
10259 +OBJDUMP="$OBJDUMP"
1028510260
1028610261 -AC_MSG_CHECKING([whether to build static libraries])
1028710262 -# Make sure either enable_shared or enable_static is yes.
1028810263 -test "$enable_shared" = yes || enable_static=yes
1028910264 -AC_MSG_RESULT([$enable_static])
10290 +# Dependencies to place before the objects being linked to create a
10291 +# shared library.
10292 +predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
10265 +# Used on cygwin: assembler.
10266 +AS="$AS"
1029310267
1029410268 -_LT_AC_TAGVAR(GCC, $1)="$G77"
1029510269 -_LT_AC_TAGVAR(LD, $1)="$LD"
10296 +# Dependencies to place after the objects being linked to create a
10297 +# shared library.
10298 +postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
10270 +# The name of the directory that contains temporary libtool files.
10271 +objdir=$objdir
1029910272
1030010273 -AC_LIBTOOL_PROG_COMPILER_PIC($1)
1030110274 -AC_LIBTOOL_PROG_CC_C_O($1)
1030310276 -AC_LIBTOOL_PROG_LD_SHLIBS($1)
1030410277 -AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
1030510278 -AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
10306 +# The library search path used internally by the compiler when linking
10307 +# a shared library.
10308 +compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
10279 +# How to create reloadable object files.
10280 +reload_flag=$lt_reload_flag
10281 +reload_cmds=$lt_reload_cmds
1030910282
1031010283 -AC_LIBTOOL_CONFIG($1)
10311 +# Method to check whether dependent libraries are shared objects.
10312 +deplibs_check_method=$lt_deplibs_check_method
10284 +# How to pass a linker flag through the compiler.
10285 +wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
1031310286
1031410287 -AC_LANG_POP
1031510288 -CC="$lt_save_CC"
1031610289 -])# AC_LIBTOOL_LANG_F77_CONFIG
10317 +# Command to use when deplibs_check_method == file_magic.
10318 +file_magic_cmd=$lt_file_magic_cmd
10319
10320 +# Flag that allows shared libraries with undefined symbols to be built.
10321 +allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
10290 +# Object file suffix (normally "o").
10291 +objext="$ac_objext"
10292
10293 +# Old archive suffix (normally "a").
10294 +libext="$libext"
1032210295
1032310296 -# AC_LIBTOOL_LANG_GCJ_CONFIG
1032410297 -# --------------------------
1032810301 -AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
1032910302 -AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
1033010303 -[AC_LANG_SAVE
10331 +# Flag that forces no undefined symbols.
10332 +no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
10304 +# Shared library suffix (normally ".so").
10305 +shrext_cmds='$shrext_cmds'
1033310306
1033410307 -# Source file extension for Java test sources.
1033510308 -ac_ext=java
10336 +# Commands used to finish a libtool library installation in a directory.
10337 +finish_cmds=$lt_finish_cmds
10309 +# Executable file suffix (normally "").
10310 +exeext="$exeext"
1033810311
1033910312 -# Object file extension for compiled Java test sources.
1034010313 -objext=o
1034110314 -_LT_AC_TAGVAR(objext, $1)=$objext
10342 +# Same as above, but a single script fragment to be evaled but not shown.
10343 +finish_eval=$lt_finish_eval
10315 +# Additional compiler flags for building library objects.
10316 +pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
10317 +pic_mode=$pic_mode
1034410318
1034510319 -# Code to be used in simple compile tests
1034610320 -lt_simple_compile_test_code="class foo {}\n"
10347 +# Take the output of nm and produce a listing of raw symbols and C names.
10348 +global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
10321 +# What is the maximum length of a command?
10322 +max_cmd_len=$lt_cv_sys_max_cmd_len
1034910323
1035010324 -# Code to be used in simple link tests
1035110325 -lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
10352 +# Transform the output of nm in a proper C declaration
10353 +global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
10326 +# Does compiler simultaneously support -c and -o options?
10327 +compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
1035410328
1035510329 -# ltmain only uses $CC for tagged configurations so make sure $CC is set.
1035610330 -_LT_AC_SYS_COMPILER
10357 +# Transform the output of nm in a C name address pair
10358 +global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
10331 +# Must we lock files when doing compilation?
10332 +need_locks=$lt_need_locks
1035910333
1036010334 -# save warnings/boilerplate of simple test code
1036110335 -_LT_COMPILER_BOILERPLATE
1036210336 -_LT_LINKER_BOILERPLATE
10363 +# This is the shared library runtime path variable.
10364 +runpath_var=$runpath_var
10337 +# Do we need the lib prefix for modules?
10338 +need_lib_prefix=$need_lib_prefix
1036510339
1036610340 -# Allow CC to be a program name with arguments.
1036710341 -lt_save_CC="$CC"
1036910343 -compiler=$CC
1037010344 -_LT_AC_TAGVAR(compiler, $1)=$CC
1037110345 -_LT_CC_BASENAME([$compiler])
10372 +# This is the shared library path variable.
10373 +shlibpath_var=$shlibpath_var
10346 +# Do we need a version for libraries?
10347 +need_version=$need_version
1037410348
1037510349 -# GCJ did not exist at the time GCC didn't implicitly link libc in.
1037610350 -_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
10377 +# Is shlibpath searched before the hard-coded library search path?
10378 +shlibpath_overrides_runpath=$shlibpath_overrides_runpath
10351 +# Whether dlopen is supported.
10352 +dlopen_support=$enable_dlopen
1037910353
1038010354 -_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
10381 +# How to hardcode a shared library path into an executable.
10382 +hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
10355 +# Whether dlopen of programs is supported.
10356 +dlopen_self=$enable_dlopen_self
1038310357
1038410358 -AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
1038510359 -AC_LIBTOOL_PROG_COMPILER_PIC($1)
1038810362 -AC_LIBTOOL_PROG_LD_SHLIBS($1)
1038910363 -AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
1039010364 -AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
10391 +# Whether we should hardcode library paths into libraries.
10392 +hardcode_into_libs=$hardcode_into_libs
10365 +# Whether dlopen of statically linked programs is supported.
10366 +dlopen_self_static=$enable_dlopen_self_static
1039310367
1039410368 -AC_LIBTOOL_CONFIG($1)
10395 +# Flag to hardcode \$libdir into a binary during linking.
10396 +# This must work even if \$libdir does not exist.
10397 +hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
10369 +# Compiler flag to prevent dynamic linking.
10370 +link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
1039810371
1039910372 -AC_LANG_RESTORE
1040010373 -CC="$lt_save_CC"
1040110374 -])# AC_LIBTOOL_LANG_GCJ_CONFIG
10402 +# If ld is used when linking, flag to hardcode \$libdir into
10403 +# a binary during linking. This must work even if \$libdir does
10404 +# not exist.
10405 +hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
10406
10407 +# Whether we need a single -rpath flag with a separated argument.
10408 +hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
10375 +# Compiler flag to turn off builtin functions.
10376 +no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
10377
10378 +# Compiler flag to allow reflexive dlopens.
10379 +export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
1040910380
1041010381 -# AC_LIBTOOL_LANG_RC_CONFIG
1041110382 -# -------------------------
1041510386 -AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
1041610387 -AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
1041710388 -[AC_LANG_SAVE
10418 +# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
10419 +# resulting binary.
10420 +hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
10389 +# Compiler flag to generate shared objects directly from archives.
10390 +whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
1042110391
1042210392 -# Source file extension for RC test sources.
1042310393 -ac_ext=rc
10424 +# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
10425 +# resulting binary.
10426 +hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
10394 +# Compiler flag to generate thread-safe objects.
10395 +thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
1042710396
1042810397 -# Object file extension for compiled RC test sources.
1042910398 -objext=o
1043010399 -_LT_AC_TAGVAR(objext, $1)=$objext
10431 -
10400 +# Library versioning type.
10401 +version_type=$version_type
10402
1043210403 -# Code to be used in simple compile tests
1043310404 -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
10434 -
10405 +# Format of library name prefix.
10406 +libname_spec=$lt_libname_spec
10407
1043510408 -# Code to be used in simple link tests
1043610409 -lt_simple_link_test_code="$lt_simple_compile_test_code"
10437 -
10410 +# List of archive names. First name is the real one, the rest are links.
10411 +# The last name is the one that the linker finds with -lNAME.
10412 +library_names_spec=$lt_library_names_spec
10413
1043810414 -# ltmain only uses $CC for tagged configurations so make sure $CC is set.
1043910415 -_LT_AC_SYS_COMPILER
10440 +# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
10441 +# the resulting binary.
10442 +hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
10416 +# The coded name of the library, if different from the real name.
10417 +soname_spec=$lt_soname_spec
1044310418
1044410419 -# save warnings/boilerplate of simple test code
1044510420 -_LT_COMPILER_BOILERPLATE
1044610421 -_LT_LINKER_BOILERPLATE
10447 +# Set to yes if building a shared library automatically hardcodes DIR into the library
10448 +# and all subsequent libraries and executables linked against it.
10449 +hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
10422 +# Commands used to build and install an old-style archive.
10423 +RANLIB=$lt_RANLIB
10424 +old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
10425 +old_postinstall_cmds=$lt_old_postinstall_cmds
10426 +old_postuninstall_cmds=$lt_old_postuninstall_cmds
1045010427
1045110428 -# Allow CC to be a program name with arguments.
1045210429 -lt_save_CC="$CC"
1045510432 -_LT_AC_TAGVAR(compiler, $1)=$CC
1045610433 -_LT_CC_BASENAME([$compiler])
1045710434 -_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
10458 +# Variables whose values should be saved in libtool wrapper scripts and
10459 +# restored at relink time.
10460 +variables_saved_for_relink="$variables_saved_for_relink"
10435 +# Create an old-style archive from a shared archive.
10436 +old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
1046110437
1046210438 -AC_LIBTOOL_CONFIG($1)
10463 +# Whether libtool must link a program against all its dependency libraries.
10464 +link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
10439 +# Create a temporary old-style archive to link instead of a shared archive.
10440 +old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
1046510441
1046610442 -AC_LANG_RESTORE
1046710443 -CC="$lt_save_CC"
1046810444 -])# AC_LIBTOOL_LANG_RC_CONFIG
10469 +# Compile-time system search path for libraries
10470 +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
10471
10472 +# Run-time system search path for libraries
10473 +sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
10445 +# Commands used to build and install a shared archive.
10446 +archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
10447 +archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
10448 +postinstall_cmds=$lt_postinstall_cmds
10449 +postuninstall_cmds=$lt_postuninstall_cmds
10450
10451 +# Commands used to build a loadable module (assumed same as above if empty)
10452 +module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
10453 +module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
1047410454
1047510455 -# AC_LIBTOOL_CONFIG([TAGNAME])
1047610456 -# ----------------------------
1053610516 - _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
1053710517 - _LT_AC_TAGVAR(exclude_expsyms, $1) \
1053810518 - _LT_AC_TAGVAR(include_expsyms, $1); do
10539 +# Fix the shell variable \$srcfile for the compiler.
10540 +fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
10519 +# Commands to strip libraries.
10520 +old_striplib=$lt_old_striplib
10521 +striplib=$lt_striplib
1054110522
1054210523 - case $var in
1054310524 - _LT_AC_TAGVAR(old_archive_cmds, $1) | \
1056010541 - ;;
1056110542 - esac
1056210543 - done
10563 +# Set to yes if exported symbols are required.
10564 +always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
10565
10544 -
1056610545 - case $lt_echo in
1056710546 - *'\[$]0 --fallback-echo"')
1056810547 - lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
1056910548 - ;;
1057010549 - esac
10571 +# The commands to list exported symbols.
10572 +export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
10573
10550 -
1057410551 -ifelse([$1], [],
1057510552 - [cfgfile="${ofile}T"
1057610553 - trap "$rm \"$cfgfile\"; exit 1" 1 2 15
1057710554 - $rm -f "$cfgfile"
1057810555 - AC_MSG_NOTICE([creating $ofile])],
1057910556 - [cfgfile="$ofile"])
10580 +# The commands to extract the exported symbol list from a shared archive.
10581 +extract_expsyms_cmds=$lt_extract_expsyms_cmds
10557 +# Dependencies to place before the objects being linked to create a
10558 +# shared library.
10559 +predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
1058210560
1058310561 - cat <<__EOF__ >> "$cfgfile"
1058410562 -ifelse([$1], [],
1058510563 -[#! $SHELL
10586 +# Symbols that should not be listed in the preloaded symbols.
10587 +exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
10564 +# Dependencies to place after the objects being linked to create a
10565 +# shared library.
10566 +postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
1058810567
1058910568 -# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
1059010569 -# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
1061410593 -# distribute this file as part of a program that contains a
1061510594 -# configuration script generated by Autoconf, you may include it under
1061610595 -# the same distribution terms that you use for the rest of that program.
10596 +# Dependencies to place before the objects being linked to create a
10597 +# shared library.
10598 +predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
10599
10600 -# A sed program that does not truncate output.
10601 -SED=$lt_SED
10602 +# Dependencies to place after the objects being linked to create a
10603 +# shared library.
10604 +postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
10605
10606 -# Sed that helps us avoid accidentally triggering echo(1) options like -n.
10607 -Xsed="$SED -e 1s/^X//"
10608 +# The library search path used internally by the compiler when linking
10609 +# a shared library.
10610 +compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
10611
10612 -# The HP-UX ksh and POSIX shell print the target directory to stdout
10613 -# if CDPATH is set.
10614 -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
10615 +# Method to check whether dependent libraries are shared objects.
10616 +deplibs_check_method=$lt_deplibs_check_method
10617
10618 -# The names of the tagged configurations supported by this script.
10619 -available_tags=
10620 +# Command to use when deplibs_check_method == file_magic.
10621 +file_magic_cmd=$lt_file_magic_cmd
10622
10623 -# ### BEGIN LIBTOOL CONFIG],
10624 -[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
10625 +# Flag that allows shared libraries with undefined symbols to be built.
10626 +allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
10627
10628 -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
10629 +# Flag that forces no undefined symbols.
10630 +no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
10631
10632 -# Shell to use when invoking shell scripts.
10633 -SHELL=$lt_SHELL
10634 +# Commands used to finish a libtool library installation in a directory.
10635 +finish_cmds=$lt_finish_cmds
10636
10637 -# Whether or not to build shared libraries.
10638 -build_libtool_libs=$enable_shared
10639 +# Same as above, but a single script fragment to be evaled but not shown.
10640 +finish_eval=$lt_finish_eval
10641
10642 -# Whether or not to build static libraries.
10643 -build_old_libs=$enable_static
10644 +# Take the output of nm and produce a listing of raw symbols and C names.
10645 +global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
10646
10647 -# Whether or not to add -lc for building shared libraries.
10648 -build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
10649 +# Transform the output of nm in a proper C declaration
10650 +global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
10651
10652 -# Whether or not to disallow shared libs when runtime libs are static
10653 -allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
10654 +# Transform the output of nm in a C name address pair
10655 +global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
10656
10657 -# Whether or not to optimize for fast installation.
10658 -fast_install=$enable_fast_install
10659 +# This is the shared library runtime path variable.
10660 +runpath_var=$runpath_var
10661
10662 -# The host system.
10663 -host_alias=$host_alias
10664 -host=$host
10665 -host_os=$host_os
10666 +# This is the shared library path variable.
10667 +shlibpath_var=$shlibpath_var
10668
10669 -# The build system.
10670 -build_alias=$build_alias
10671 -build=$build
10672 -build_os=$build_os
10673 +# Is shlibpath searched before the hard-coded library search path?
10674 +shlibpath_overrides_runpath=$shlibpath_overrides_runpath
10675
10676 -# An echo program that does not interpret backslashes.
10677 -echo=$lt_echo
10678 +# How to hardcode a shared library path into an executable.
10679 +hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
10680
10681 -# The archiver.
10682 -AR=$lt_AR
10683 -AR_FLAGS=$lt_AR_FLAGS
10684 +# Whether we should hardcode library paths into libraries.
10685 +hardcode_into_libs=$hardcode_into_libs
10686
10687 -# A C compiler.
10688 -LTCC=$lt_LTCC
10689 +# Flag to hardcode \$libdir into a binary during linking.
10690 +# This must work even if \$libdir does not exist.
10691 +hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
10692
10693 -# LTCC compiler flags.
10694 -LTCFLAGS=$lt_LTCFLAGS
10695 +# If ld is used when linking, flag to hardcode \$libdir into
10696 +# a binary during linking. This must work even if \$libdir does
10697 +# not exist.
10698 +hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
10699
10700 -# A language-specific compiler.
10701 -CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
10702 +# Whether we need a single -rpath flag with a separated argument.
10703 +hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
10704
10705 -# Is the compiler the GNU C compiler?
10706 -with_gcc=$_LT_AC_TAGVAR(GCC, $1)
10707 +# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
10708 +# resulting binary.
10709 +hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
10710
10711 -# An ERE matcher.
10712 -EGREP=$lt_EGREP
10713 +# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
10714 +# resulting binary.
10715 +hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
10716
10717 -# The linker used to build libraries.
10718 -LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
10719 +# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
10720 +# the resulting binary.
10721 +hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
10722
10723 -# Whether we need hard or soft links.
10724 -LN_S=$lt_LN_S
10725 +# Set to yes if building a shared library automatically hardcodes DIR into the library
10726 +# and all subsequent libraries and executables linked against it.
10727 +hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
10728
10729 -# A BSD-compatible nm program.
10730 -NM=$lt_NM
10731 +# Variables whose values should be saved in libtool wrapper scripts and
10732 +# restored at relink time.
10733 +variables_saved_for_relink="$variables_saved_for_relink"
10734
10735 -# A symbol stripping program
10736 -STRIP=$lt_STRIP
10737 +# Whether libtool must link a program against all its dependency libraries.
10738 +link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
10739
10740 -# Used to examine libraries when file_magic_cmd begins "file"
10741 -MAGIC_CMD=$MAGIC_CMD
10742 +# Compile-time system search path for libraries
10743 +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
10744
10745 -# Used on cygwin: DLL creation program.
10746 -DLLTOOL="$DLLTOOL"
10747 +# Run-time system search path for libraries
10748 +sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
10749
10750 -# Used on cygwin: object dumper.
10751 -OBJDUMP="$OBJDUMP"
10752 +# Fix the shell variable \$srcfile for the compiler.
10753 +fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
10754
10755 -# Used on cygwin: assembler.
10756 -AS="$AS"
10757 +# Set to yes if exported symbols are required.
10758 +always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
10759
10760 -# The name of the directory that contains temporary libtool files.
10761 -objdir=$objdir
10762 +# The commands to list exported symbols.
10763 +export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
10764
10765 -# How to create reloadable object files.
10766 -reload_flag=$lt_reload_flag
10767 -reload_cmds=$lt_reload_cmds
10768 +# The commands to extract the exported symbol list from a shared archive.
10769 +extract_expsyms_cmds=$lt_extract_expsyms_cmds
10770
10771 -# How to pass a linker flag through the compiler.
10772 -wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
10773 +# Symbols that should not be listed in the preloaded symbols.
10774 +exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
10775
10776 -# Object file suffix (normally "o").
10777 -objext="$ac_objext"
1061710778 +# Symbols that must always be exported.
1061810779 +include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
1061910780
10620 -# A sed program that does not truncate output.
10621 -SED=$lt_SED
10781 -# Old archive suffix (normally "a").
10782 -libext="$libext"
1062210783 +ifelse([$1],[],
1062310784 +[# ### END LIBTOOL CONFIG],
1062410785 +[# ### END LIBTOOL TAG CONFIG: $tagname])
1062510786
10626 -# Sed that helps us avoid accidentally triggering echo(1) options like -n.
10627 -Xsed="$SED -e 1s/^X//"
10787 -# Shared library suffix (normally ".so").
10788 -shrext_cmds='$shrext_cmds'
1062810789 +__EOF__
1062910790
10630 -# The HP-UX ksh and POSIX shell print the target directory to stdout
10631 -# if CDPATH is set.
10632 -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
10791 -# Executable file suffix (normally "").
10792 -exeext="$exeext"
1063310793 +ifelse([$1],[], [
1063410794 + case $host_os in
1063510795 + aix3*)
1063610796 + cat <<\EOF >> "$cfgfile"
1063710797
10638 -# The names of the tagged configurations supported by this script.
10639 -available_tags=
10798 -# Additional compiler flags for building library objects.
10799 -pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
10800 -pic_mode=$pic_mode
1064010801 +# AIX sometimes has problems with the GCC collect2 program. For some
1064110802 +# reason, if we set the COLLECT_NAMES environment variable, the problems
1064210803 +# vanish in a puff of smoke.
1064810809 + ;;
1064910810 + esac
1065010811
10651 -# ### BEGIN LIBTOOL CONFIG],
10652 -[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
10653 + # We use sed instead of cat because bash on DJGPP gets confused if
10654 + # if finds mixed CR/LF and LF-only lines. Since sed operates in
10655 + # text mode, it properly converts lines to CR/LF. This bash problem
10656 + # is reportedly fixed, but why not run on old versions too?
10657 + sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
10658
10659 -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
10660 + mv -f "$cfgfile" "$ofile" || \
10661 + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
10662 + chmod +x "$ofile"
10663 +])
10664 +else
10665 + # If there is no Makefile yet, we rely on a make rule to execute
10666 + # `config.status --recheck' to rerun these tests and create the
10667 + # libtool script then.
10668 + ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
10669 + if test -f "$ltmain_in"; then
10670 + test -f Makefile && make "$ltmain"
10671 + fi
10672 +fi
10673 +])# AC_LIBTOOL_CONFIG
10674
10675 -# Shell to use when invoking shell scripts.
10676 -SHELL=$lt_SHELL
10677
10678 -# Whether or not to build shared libraries.
10679 -build_libtool_libs=$enable_shared
10680 +# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
10681 +# -------------------------------------------
10682 +AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
10683 +[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
10684
10685 -# Whether or not to build static libraries.
10686 -build_old_libs=$enable_static
10687 +_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
10688
10689 -# Whether or not to add -lc for building shared libraries.
10690 -build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
10691 +if test "$GCC" = yes; then
10692 + _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
10693
10694 -# Whether or not to disallow shared libs when runtime libs are static
10695 -allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
10696 + AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
10697 + lt_cv_prog_compiler_rtti_exceptions,
10698 + [-fno-rtti -fno-exceptions], [],
10699 + [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
10700 +fi
10701 +])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
10702
10703 -# Whether or not to optimize for fast installation.
10704 -fast_install=$enable_fast_install
10705
10706 -# The host system.
10707 -host_alias=$host_alias
10708 -host=$host
10709 -host_os=$host_os
10710 -
10711 -# The build system.
10712 -build_alias=$build_alias
10713 -build=$build
10714 -build_os=$build_os
10715 -
10716 -# An echo program that does not interpret backslashes.
10717 -echo=$lt_echo
10718 -
10719 -# The archiver.
10720 -AR=$lt_AR
10721 -AR_FLAGS=$lt_AR_FLAGS
10722 -
10723 -# A C compiler.
10724 -LTCC=$lt_LTCC
10725 +# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
10726 +# ---------------------------------
10727 +AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
10728 +[AC_REQUIRE([AC_CANONICAL_HOST])
10729 +AC_REQUIRE([AC_PROG_NM])
10730 +AC_REQUIRE([AC_OBJEXT])
10731 +# Check for command to grab the raw symbol name followed by C symbol from nm.
10732 +AC_MSG_CHECKING([command to parse $NM output from $compiler object])
10733 +AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
10734 +[
10735 +# These are sane defaults that work on at least a few old systems.
10736 +# [They come from Ultrix. What could be older than Ultrix?!! ;)]
10737
10738 -# LTCC compiler flags.
10739 -LTCFLAGS=$lt_LTCFLAGS
10740 +# Character class describing NM global symbol codes.
10741 +symcode='[[BCDEGRST]]'
10742
10743 -# A language-specific compiler.
10744 -CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
10745 +# Regexp to match symbols that can be accessed directly from C.
10746 +sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
10747
10748 -# Is the compiler the GNU C compiler?
10749 -with_gcc=$_LT_AC_TAGVAR(GCC, $1)
10750 +# Transform an extracted symbol line into a proper C declaration
10751 +lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
10752
10753 -# An ERE matcher.
10754 -EGREP=$lt_EGREP
10755 +# Transform an extracted symbol line into symbol name and symbol address
10756 +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
10757
10758 -# The linker used to build libraries.
10759 -LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
10760 +# Define system-specific variables.
10761 +case $host_os in
10762 +aix*)
10763 + symcode='[[BCDT]]'
10764 + ;;
10765 +cygwin* | mingw* | pw32*)
10766 + symcode='[[ABCDGISTW]]'
10767 + ;;
10768 +hpux*) # Its linker distinguishes data from code symbols
10769 + if test "$host_cpu" = ia64; then
10770 + symcode='[[ABCDEGRST]]'
10771 + fi
10772 + lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
10773 + lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
10774 + ;;
10775 +linux* | k*bsd*-gnu)
10776 + if test "$host_cpu" = ia64; then
10777 + symcode='[[ABCDGIRSTW]]'
10778 + lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
10779 + lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
10780 + fi
10781 + ;;
10782 +irix* | nonstopux*)
10783 + symcode='[[BCDEGRST]]'
10784 + ;;
10785 +osf*)
10786 + symcode='[[BCDEGQRST]]'
10787 + ;;
10788 +solaris*)
10789 + symcode='[[BDRT]]'
10790 + ;;
10791 +sco3.2v5*)
10792 + symcode='[[DT]]'
10793 + ;;
10794 +sysv4.2uw2*)
10795 + symcode='[[DT]]'
10796 + ;;
10797 +sysv5* | sco5v6* | unixware* | OpenUNIX*)
10798 + symcode='[[ABDT]]'
10799 + ;;
10800 +sysv4)
10801 + symcode='[[DFNSTU]]'
10802 + ;;
10803 +esac
10804
10805 -# Whether we need hard or soft links.
10806 -LN_S=$lt_LN_S
10807 +# Handle CRLF in mingw tool chain
10808 +opt_cr=
10809 +case $build_os in
10810 +mingw*)
10811 + opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
10812 + ;;
10813 +esac
10814
10815 -# A BSD-compatible nm program.
10816 -NM=$lt_NM
10817 +# If we're using GNU nm, then use its standard symbol codes.
10818 +case `$NM -V 2>&1` in
10819 +*GNU* | *'with BFD'*)
10820 + symcode='[[ABCDGIRSTW]]' ;;
10821 +esac
10822
10823 -# A symbol stripping program
10824 -STRIP=$lt_STRIP
10825 +# Try without a prefix undercore, then with it.
10826 +for ac_symprfx in "" "_"; do
10827
10828 -# Used to examine libraries when file_magic_cmd begins "file"
10829 -MAGIC_CMD=$MAGIC_CMD
10830 + # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
10831 + symxfrm="\\1 $ac_symprfx\\2 \\2"
10832
10833 -# Used on cygwin: DLL creation program.
10834 -DLLTOOL="$DLLTOOL"
10835 + # Write the raw and C identifiers.
10836 + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
10837
10838 -# Used on cygwin: object dumper.
10839 -OBJDUMP="$OBJDUMP"
10840 + # Check to see that the pipe works correctly.
10841 + pipe_works=no
10842
10843 -# Used on cygwin: assembler.
10844 -AS="$AS"
10845 + rm -f conftest*
10846 + cat > conftest.$ac_ext <<EOF
10847 +#ifdef __cplusplus
10848 +extern "C" {
10849 +#endif
10850 +char nm_test_var;
10851 +void nm_test_func(){}
10852 +#ifdef __cplusplus
10853 +}
10854 +#endif
10855 +int main(){nm_test_var='a';nm_test_func();return(0);}
10856 +EOF
10857
10858 -# The name of the directory that contains temporary libtool files.
10859 -objdir=$objdir
10860 + if AC_TRY_EVAL(ac_compile); then
10861 + # Now try to grab the symbols.
10862 + nlist=conftest.nm
10863 + if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
10864 + # Try sorting and uniquifying the output.
10865 + if sort "$nlist" | uniq > "$nlist"T; then
10866 + mv -f "$nlist"T "$nlist"
10867 + else
10868 + rm -f "$nlist"T
10869 + fi
10870
10871 -# How to create reloadable object files.
10872 -reload_flag=$lt_reload_flag
10873 -reload_cmds=$lt_reload_cmds
10874 + # Make sure that we snagged all the symbols we need.
10875 + if grep ' nm_test_var$' "$nlist" >/dev/null; then
10876 + if grep ' nm_test_func$' "$nlist" >/dev/null; then
10877 + cat <<EOF > conftest.$ac_ext
10878 +#ifdef __cplusplus
10879 +extern "C" {
10880 +#endif
10881
10882 -# How to pass a linker flag through the compiler.
10883 -wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
10884 +EOF
10885 + # Now generate the symbol file.
10886 + eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
10887
10888 -# Object file suffix (normally "o").
10889 -objext="$ac_objext"
10890 + cat <<EOF >> conftest.$ac_ext
10891 +#if defined (__STDC__) && __STDC__
10892 +# define lt_ptr_t void *
10893 +#else
10894 +# define lt_ptr_t char *
10895 +# define const
10896 +#endif
10897
10898 -# Old archive suffix (normally "a").
10899 -libext="$libext"
10900 +/* The mapping between symbol names and symbols. */
10901 +const struct {
10902 + const char *name;
10903 + lt_ptr_t address;
10904 +}
10905 +lt_preloaded_symbols[[]] =
10906 +{
10907 +EOF
10908 + $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
10909 + cat <<\EOF >> conftest.$ac_ext
10910 + {0, (lt_ptr_t) 0}
10911 +};
10912
10913 -# Shared library suffix (normally ".so").
10914 -shrext_cmds='$shrext_cmds'
10915 +#ifdef __cplusplus
10916 +}
10917 +#endif
10918 +EOF
10919 + # Now try linking the two files.
10920 + mv conftest.$ac_objext conftstm.$ac_objext
10921 + lt_save_LIBS="$LIBS"
10922 + lt_save_CFLAGS="$CFLAGS"
10923 + LIBS="conftstm.$ac_objext"
10924 + CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
10925 + if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
10926 + pipe_works=yes
10927 + fi
10928 + LIBS="$lt_save_LIBS"
10929 + CFLAGS="$lt_save_CFLAGS"
10930 + else
10931 + echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
10932 + fi
10933 + else
10934 + echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
10935 + fi
10936 + else
10937 + echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
10938 + fi
10939 + else
10940 + echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
10941 + cat conftest.$ac_ext >&5
10942 + fi
10943 + rm -f conftest* conftst*
10944
10945 -# Executable file suffix (normally "").
10946 -exeext="$exeext"
10947 + # Do not use the global_symbol_pipe unless it works.
10948 + if test "$pipe_works" = yes; then
10949 + break
10950 + else
10951 + lt_cv_sys_global_symbol_pipe=
10952 + fi
10953 +done
10954 +])
10955 +if test -z "$lt_cv_sys_global_symbol_pipe"; then
10956 + lt_cv_sys_global_symbol_to_cdecl=
10957 +fi
10958 +if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
10959 + AC_MSG_RESULT(failed)
10960 +else
10961 + AC_MSG_RESULT(ok)
10962 +fi
10963 +]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
10964
10965 -# Additional compiler flags for building library objects.
10966 -pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
10967 -pic_mode=$pic_mode
10968
1096910812 -# What is the maximum length of a command?
1097010813 -max_cmd_len=$lt_cv_sys_max_cmd_len
10971 +# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
10972 +# ---------------------------------------
10973 +AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],
10974 +[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
10975 +_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
10976 +_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
10977
10814 -
1097810815 -# Does compiler simultaneously support -c and -o options?
1097910816 -compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
10980 +AC_MSG_CHECKING([for $compiler option to produce PIC])
10981 + ifelse([$1],[CXX],[
10982 + # C++ specific cases for pic, static, wl, etc.
10983 + if test "$GXX" = yes; then
10984 + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
10985 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
10986
10817 -
1098710818 -# Must we lock files when doing compilation?
1098810819 -need_locks=$lt_need_locks
1098910820 -
1102610857 -# List of archive names. First name is the real one, the rest are links.
1102710858 -# The last name is the one that the linker finds with -lNAME.
1102810859 -library_names_spec=$lt_library_names_spec
11029 + case $host_os in
11030 + aix*)
11031 + # All AIX code is PIC.
11032 + if test "$host_cpu" = ia64; then
11033 + # AIX 5 now supports IA64 processor
11034 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
11035 + fi
11036 + ;;
10860 -
10861 -# The coded name of the library, if different from the real name.
10862 -soname_spec=$lt_soname_spec
10863 -
10864 -# Commands used to build and install an old-style archive.
10865 -RANLIB=$lt_RANLIB
10866 -old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
10867 -old_postinstall_cmds=$lt_old_postinstall_cmds
10868 -old_postuninstall_cmds=$lt_old_postuninstall_cmds
10869 -
10870 -# Create an old-style archive from a shared archive.
10871 -old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
10872 -
10873 -# Create a temporary old-style archive to link instead of a shared archive.
10874 -old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
10875 -
10876 -# Commands used to build and install a shared archive.
10877 -archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
10878 -archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
10879 -postinstall_cmds=$lt_postinstall_cmds
10880 -postuninstall_cmds=$lt_postuninstall_cmds
10881 -
10882 -# Commands used to build a loadable module (assumed same as above if empty)
10883 -module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
10884 -module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
10885 -
10886 -# Commands to strip libraries.
10887 -old_striplib=$lt_old_striplib
10888 -striplib=$lt_striplib
10889 -
10890 -# Dependencies to place before the objects being linked to create a
10891 -# shared library.
10892 -predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
10893 -
10894 -# Dependencies to place after the objects being linked to create a
10895 -# shared library.
10896 -postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
10897 -
10898 -# Dependencies to place before the objects being linked to create a
10899 -# shared library.
10900 -predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
10901 -
10902 -# Dependencies to place after the objects being linked to create a
10903 -# shared library.
10904 -postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
10905 -
10906 -# The library search path used internally by the compiler when linking
10907 -# a shared library.
10908 -compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
10909 -
10910 -# Method to check whether dependent libraries are shared objects.
10911 -deplibs_check_method=$lt_deplibs_check_method
10912 -
10913 -# Command to use when deplibs_check_method == file_magic.
10914 -file_magic_cmd=$lt_file_magic_cmd
10915 -
10916 -# Flag that allows shared libraries with undefined symbols to be built.
10917 -allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
10918 -
10919 -# Flag that forces no undefined symbols.
10920 -no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
10921 -
10922 -# Commands used to finish a libtool library installation in a directory.
10923 -finish_cmds=$lt_finish_cmds
10924 -
10925 -# Same as above, but a single script fragment to be evaled but not shown.
10926 -finish_eval=$lt_finish_eval
10927 -
10928 -# Take the output of nm and produce a listing of raw symbols and C names.
10929 -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
10930 -
10931 -# Transform the output of nm in a proper C declaration
10932 -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
10933 -
10934 -# Transform the output of nm in a C name address pair
10935 -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
10936 -
10937 -# This is the shared library runtime path variable.
10938 -runpath_var=$runpath_var
10939 -
10940 -# This is the shared library path variable.
10941 -shlibpath_var=$shlibpath_var
10942 -
10943 -# Is shlibpath searched before the hard-coded library search path?
10944 -shlibpath_overrides_runpath=$shlibpath_overrides_runpath
10945 -
10946 -# How to hardcode a shared library path into an executable.
10947 -hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
10948 -
10949 -# Whether we should hardcode library paths into libraries.
10950 -hardcode_into_libs=$hardcode_into_libs
10951 -
10952 -# Flag to hardcode \$libdir into a binary during linking.
10953 -# This must work even if \$libdir does not exist.
10954 -hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
10955 -
10956 -# If ld is used when linking, flag to hardcode \$libdir into
10957 -# a binary during linking. This must work even if \$libdir does
10958 -# not exist.
10959 -hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
10960 -
10961 -# Whether we need a single -rpath flag with a separated argument.
10962 -hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
10963 -
10964 -# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
10965 -# resulting binary.
10966 -hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
10967 -
10968 -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
10969 -# resulting binary.
10970 -hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
10971 -
10972 -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
10973 -# the resulting binary.
10974 -hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
10975 -
10976 -# Set to yes if building a shared library automatically hardcodes DIR into the library
10977 -# and all subsequent libraries and executables linked against it.
10978 -hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
10979 -
10980 -# Variables whose values should be saved in libtool wrapper scripts and
10981 -# restored at relink time.
10982 -variables_saved_for_relink="$variables_saved_for_relink"
10983 -
10984 -# Whether libtool must link a program against all its dependency libraries.
10985 -link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
10986 -
10987 -# Compile-time system search path for libraries
10988 -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
10989 -
10990 -# Run-time system search path for libraries
10991 -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
10992 -
10993 -# Fix the shell variable \$srcfile for the compiler.
10994 -fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
10995 -
10996 -# Set to yes if exported symbols are required.
10997 -always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
10998 -
10999 -# The commands to list exported symbols.
11000 -export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
11001 -
11002 -# The commands to extract the exported symbol list from a shared archive.
11003 -extract_expsyms_cmds=$lt_extract_expsyms_cmds
11004 -
11005 -# Symbols that should not be listed in the preloaded symbols.
11006 -exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
11007 -
11008 -# Symbols that must always be exported.
11009 -include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
11010 -
11011 -ifelse([$1],[],
11012 -[# ### END LIBTOOL CONFIG],
11013 -[# ### END LIBTOOL TAG CONFIG: $tagname])
11014 -
11015 -__EOF__
11016 -
11017 -ifelse([$1],[], [
11018 - case $host_os in
11019 - aix3*)
11020 - cat <<\EOF >> "$cfgfile"
11021 -
11022 -# AIX sometimes has problems with the GCC collect2 program. For some
11023 -# reason, if we set the COLLECT_NAMES environment variable, the problems
11024 -# vanish in a puff of smoke.
11025 -if test "X${COLLECT_NAMES+set}" != Xset; then
11026 - COLLECT_NAMES=
11027 - export COLLECT_NAMES
11028 -fi
11029 -EOF
11030 - ;;
11031 - esac
11032 -
11033 - # We use sed instead of cat because bash on DJGPP gets confused if
11034 - # if finds mixed CR/LF and LF-only lines. Since sed operates in
11035 - # text mode, it properly converts lines to CR/LF. This bash problem
11036 - # is reportedly fixed, but why not run on old versions too?
11037 - sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
11038 + # We use sed instead of cat because bash on DJGPP gets confused if
11039 + # if finds mixed CR/LF and LF-only lines. Since sed operates in
11040 + # text mode, it properly converts lines to CR/LF. This bash problem
11041 + # is reportedly fixed, but why not run on old versions too?
11042 + sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
11043
11044 mv -f "$cfgfile" "$ofile" || \
11045 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
11046 @@ -6468,7 +5416,7 @@
11047 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
11048 lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
11049 ;;
11050 -linux*)
11051 +linux* | k*bsd*-gnu)
11052 if test "$host_cpu" = ia64; then
11053 symcode='[[ABCDGIRSTW]]'
11054 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
11055 @@ -6741,7 +5689,7 @@
11056 ;;
11057 esac
11058 ;;
11059 - freebsd* | kfreebsd*-gnu | dragonfly*)
11060 + freebsd* | dragonfly*)
11061 # FreeBSD uses GNU C++
11062 ;;
11063 hpux9* | hpux10* | hpux11*)
11064 @@ -6784,7 +5732,7 @@
11065 ;;
11066 esac
11067 ;;
11068 - linux*)
11069 + linux* | k*bsd*-gnu)
11070 case $cc_basename in
11071 KCC*)
11072 # KAI C++ Compiler
11073 @@ -6827,7 +5775,7 @@
11074 ;;
11075 esac
11076 ;;
11077 - netbsd*)
11078 + netbsd* | netbsdelf*-gnu)
11079 ;;
11080 osf3* | osf4* | osf5*)
11081 case $cc_basename in
11082 @@ -6924,1451 +5872,2522 @@
11083 fi
11084 ;;
11085
11086 - amigaos*)
11087 - # FIXME: we need at least 68020 code to build shared libraries, but
11088 - # adding the `-m68020' flag to GCC prevents building anything better,
11089 - # like `-m68040'.
11090 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
1103711091 + amigaos*)
1103811092 + # FIXME: we need at least 68020 code to build shared libraries, but
1103911093 + # adding the `-m68020' flag to GCC prevents building anything better,
1104011094 + # like `-m68040'.
1104111095 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
1104211096 + ;;
11097 +
1104311098 + beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
1104411099 + # PIC is the default for these OSes.
1104511100 + ;;
11046 + mingw* | os2* | pw32*)
11101 +
11102 + mingw* | pw32* | os2*)
1104711103 + # This hack is so that the source file can tell whether it is being
1104811104 + # built for inclusion in a dll (and should export symbols for example).
1104911105 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
1105011106 + ;;
11107 +
1105111108 + darwin* | rhapsody*)
1105211109 + # PIC is the default on this platform
1105311110 + # Common symbols not allowed in MH_DYLIB files
1105411111 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
1105511112 + ;;
11056 + *djgpp*)
11057 + # DJGPP does not support shared libraries at all
11058 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
11059 + ;;
11113 +
1106011114 + interix3*)
1106111115 + # Interix 3.x gcc -fpic/-fPIC options generate broken code.
1106211116 + # Instead, we relocate shared libraries at runtime.
1106311117 + ;;
11064 + sysv4*MP*)
11065 + if test -d /usr/nec; then
11066 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
11067 + fi
11068 + ;;
11069 + hpux*)
11070 + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
11071 + # not for PA HP-UX.
11072 + case $host_cpu in
11073 + hppa*64*|ia64*)
11074 + ;;
11075 + *)
11076 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
11077 + ;;
11078 + esac
11079 + ;;
11080 + *)
11081 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
11082 + ;;
11083 + esac
11084 + else
11085 + case $host_os in
11086 + aix4* | aix5*)
11087 + # All AIX code is PIC.
11088 + if test "$host_cpu" = ia64; then
11089 + # AIX 5 now supports IA64 processor
11090 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
11091 + else
11092 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
11093 + fi
11094 + ;;
11095 + chorus*)
11096 + case $cc_basename in
11097 + cxch68*)
11098 + # Green Hills C++ Compiler
11099 + # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
11100 + ;;
11101 + esac
11102 + ;;
11103 + darwin*)
11104 + # PIC is the default on this platform
11105 + # Common symbols not allowed in MH_DYLIB files
11106 + case $cc_basename in
11107 + xlc*)
11108 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
11109 + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
11110 + ;;
11111 + esac
11112 + ;;
11113 + dgux*)
11114 + case $cc_basename in
11115 + ec++*)
11116 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
11117 + ;;
11118 + ghcx*)
11119 + # Green Hills C++ Compiler
11120 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
11121 + ;;
11122 + *)
11123 + ;;
11124 + esac
11125 + ;;
11126 + freebsd* | dragonfly*)
11127 + # FreeBSD uses GNU C++
11128 + ;;
11129 + hpux9* | hpux10* | hpux11*)
11130 + case $cc_basename in
11131 + CC*)
11132 + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
11133 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
11134 + if test "$host_cpu" != ia64; then
11135 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
11136 + fi
11137 + ;;
11138 + aCC*)
11139 + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
11140 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
11141 + case $host_cpu in
11142 + hppa*64*|ia64*)
11143 + # +Z the default
11144 + ;;
11145 + *)
11146 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
11147 + ;;
11148 + esac
11149 + ;;
11150 + *)
11151 + ;;
11152 + esac
11153 + ;;
11154 + interix*)
11155 + # This is c89, which is MS Visual C++ (no shared libs)
11156 + # Anyone wants to do a port?
11157 + ;;
11158 + irix5* | irix6* | nonstopux*)
11159 + case $cc_basename in
11160 + CC*)
11161 + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
11162 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
11163 + # CC pic flag -KPIC is the default.
11164 + ;;
11165 + *)
11166 + ;;
11167 + esac
11168 + ;;
11169 + linux* | k*bsd*-gnu)
11170 + case $cc_basename in
11171 + KCC*)
11172 + # KAI C++ Compiler
11173 + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
11174 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
11175 + ;;
11176 + icpc* | ecpc*)
11177 + # Intel C++
11178 + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
11179 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
11180 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
11181 + ;;
11182 + pgCC*)
11183 + # Portland Group C++ compiler.
11184 + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
11185 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
11186 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
11187 + ;;
11188 + cxx*)
11189 + # Compaq C++
11190 + # Make sure the PIC flag is empty. It appears that all Alpha
11191 + # Linux and Compaq Tru64 Unix objects are PIC.
11192 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
11193 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
11194 + ;;
11195 + *)
11196 + ;;
11197 + esac
11198 + ;;
11199 + lynxos*)
11200 + ;;
11201 + m88k*)
11202 + ;;
11203 + mvs*)
11204 + case $cc_basename in
11205 + cxx*)
11206 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
11207 + ;;
11208 + *)
11209 + ;;
11210 + esac
11211 + ;;
11212 + netbsd* | netbsdelf*-gnu)
11213 + ;;
11214 + osf3* | osf4* | osf5*)
11215 + case $cc_basename in
11216 + KCC*)
11217 + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
11218 + ;;
11219 + RCC*)
11220 + # Rational C++ 2.4.1
11221 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
11222 + ;;
11223 + cxx*)
11224 + # Digital/Compaq C++
11225 + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
11226 + # Make sure the PIC flag is empty. It appears that all Alpha
11227 + # Linux and Compaq Tru64 Unix objects are PIC.
11228 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
11229 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
11230 + ;;
11231 + *)
11232 + ;;
11233 + esac
11234 + ;;
11235 + psos*)
11236 + ;;
11237 + solaris*)
11238 + case $cc_basename in
11239 + CC*)
11240 + # Sun C++ 4.2, 5.x and Centerline C++
11241 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
11242 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
11243 + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
11244 + ;;
11245 + gcx*)
11246 + # Green Hills C++ Compiler
11247 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
11248 + ;;
11249 + *)
11250 + ;;
11251 + esac
11252 + ;;
11253 + sunos4*)
11254 + case $cc_basename in
11255 + CC*)
11256 + # Sun C++ 4.x
11257 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
11258 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
11259 + ;;
11260 + lcc*)
11261 + # Lucid
11262 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
11263 + ;;
11264 + *)
11265 + ;;
11266 + esac
11267 + ;;
11268 + tandem*)
11269 + case $cc_basename in
11270 + NCC*)
11271 + # NonStop-UX NCC 3.20
11272 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
11273 + ;;
11274 + *)
11275 + ;;
11276 + esac
11277 + ;;
11278 + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
11279 + case $cc_basename in
11280 + CC*)
11281 + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
11282 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
11283 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
11284 + ;;
11285 + esac
11286 + ;;
11287 + vxworks*)
11288 + ;;
11289 + *)
11290 + _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
11291 + ;;
11292 + esac
11293 + fi
11294 +],
11295 +[
11296 + if test "$GCC" = yes; then
11297 + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
11298 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
11299
11300 -# The coded name of the library, if different from the real name.
11301 -soname_spec=$lt_soname_spec
11302 + case $host_os in
11303 + aix*)
11304 + # All AIX code is PIC.
11305 + if test "$host_cpu" = ia64; then
11306 + # AIX 5 now supports IA64 processor
11307 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
11308 + fi
11309 + ;;
11310
11311 -# Commands used to build and install an old-style archive.
11312 -RANLIB=$lt_RANLIB
11313 -old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
11314 -old_postinstall_cmds=$lt_old_postinstall_cmds
11315 -old_postuninstall_cmds=$lt_old_postuninstall_cmds
11316 + amigaos*)
11317 + # FIXME: we need at least 68020 code to build shared libraries, but
11318 + # adding the `-m68020' flag to GCC prevents building anything better,
11319 + # like `-m68040'.
11320 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
11321 + ;;
11322
11323 -# Create an old-style archive from a shared archive.
11324 -old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
11325 + beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
11326 + # PIC is the default for these OSes.
11327 + ;;
11328
11329 -# Create a temporary old-style archive to link instead of a shared archive.
11330 -old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
11331 + mingw* | pw32* | os2*)
11332 + # This hack is so that the source file can tell whether it is being
11333 + # built for inclusion in a dll (and should export symbols for example).
11334 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
11335 + ;;
11336
11337 -# Commands used to build and install a shared archive.
11338 -archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
11339 -archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
11340 -postinstall_cmds=$lt_postinstall_cmds
11341 -postuninstall_cmds=$lt_postuninstall_cmds
11342 + darwin* | rhapsody*)
11343 + # PIC is the default on this platform
11344 + # Common symbols not allowed in MH_DYLIB files
11345 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
11346 + ;;
11347
11348 -# Commands used to build a loadable module (assumed same as above if empty)
11349 -module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
11350 -module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
11351 + interix3*)
11352 + # Interix 3.x gcc -fpic/-fPIC options generate broken code.
11353 + # Instead, we relocate shared libraries at runtime.
11354 + ;;
11355
11356 -# Commands to strip libraries.
11357 -old_striplib=$lt_old_striplib
11358 -striplib=$lt_striplib
11118 +
1135911119 + msdosdjgpp*)
1136011120 + # Just because we use GCC doesn't mean we suddenly get shared libraries
1136111121 + # on systems that don't support them.
1136211122 + _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
1136311123 + enable_shared=no
1136411124 + ;;
11365
11366 -# Dependencies to place before the objects being linked to create a
11367 -# shared library.
11368 -predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
11125 +
1136911126 + sysv4*MP*)
1137011127 + if test -d /usr/nec; then
1137111128 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
1137211129 + fi
1137311130 + ;;
11374
11375 -# Dependencies to place after the objects being linked to create a
11376 -# shared library.
11377 -postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
11131 +
1137811132 + hpux*)
1137911133 + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
1138011134 + # not for PA HP-UX.
1138711141 + ;;
1138811142 + esac
1138911143 + ;;
11390
11391 -# Dependencies to place before the objects being linked to create a
11392 -# shared library.
11393 -predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
11144 +
1139411145 + *)
1139511146 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
1139611147 + ;;
1141711168 + ;;
1141811169 + esac
1141911170 + ;;
11420
11421 -# Dependencies to place after the objects being linked to create a
11422 -# shared library.
11423 -postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
11171 +
1142411172 + mingw* | pw32* | os2*)
1142511173 + # This hack is so that the source file can tell whether it is being
1142611174 + # built for inclusion in a dll (and should export symbols for example).
1142711175 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
1142811176 + ;;
11429
11430 -# The library search path used internally by the compiler when linking
11431 -# a shared library.
11432 -compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
11177 +
1143311178 + hpux9* | hpux10* | hpux11*)
1143411179 + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
1143511180 + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
1144511190 + # Is there a better lt_prog_compiler_static that works with the bundled CC?
1144611191 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
1144711192 + ;;
11448
11449 -# Method to check whether dependent libraries are shared objects.
11450 -deplibs_check_method=$lt_deplibs_check_method
11193 +
1145111194 + irix5* | irix6* | nonstopux*)
1145211195 + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
1145311196 + # PIC (with -KPIC) is the default.
1145411197 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
1145511198 + ;;
11456
11457 -# Command to use when deplibs_check_method == file_magic.
11458 -file_magic_cmd=$lt_file_magic_cmd
11199 +
1145911200 + newsos6)
1146011201 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
1146111202 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
1146211203 + ;;
11463
11464 -# Flag that allows shared libraries with undefined symbols to be built.
11465 -allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
11204 +
1146611205 + linux* | k*bsd*-gnu)
1146711206 + case $cc_basename in
1146811207 + icc* | ecc*)
1148411223 + ;;
1148511224 + esac
1148611225 + ;;
11487
11488 -# Flag that forces no undefined symbols.
11489 -no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
11226 +
1149011227 + osf3* | osf4* | osf5*)
1149111228 + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
1149211229 + # All OSF/1 code is PIC.
1149311230 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
1149411231 + ;;
11495
11496 -# Commands used to finish a libtool library installation in a directory.
11497 -finish_cmds=$lt_finish_cmds
11232 +
1149811233 + solaris*)
1149911234 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
1150011235 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
1150511240 + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
1150611241 + esac
1150711242 + ;;
11508
11509 -# Same as above, but a single script fragment to be evaled but not shown.
11510 -finish_eval=$lt_finish_eval
11243 +
1151111244 + sunos4*)
1151211245 + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
1151311246 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
1151411247 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
1151511248 + ;;
11516
11517 -# Take the output of nm and produce a listing of raw symbols and C names.
11518 -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
11249 +
1151911250 + sysv4 | sysv4.2uw2* | sysv4.3*)
1152011251 + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
1152111252 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
1152211253 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
1152311254 + ;;
11524
11525 -# Transform the output of nm in a proper C declaration
11526 -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
11255 +
1152711256 + sysv4*MP*)
1152811257 + if test -d /usr/nec ;then
1152911258 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
1153011259 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
1153111260 + fi
1153211261 + ;;
11533
11534 -# Transform the output of nm in a C name address pair
11535 -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
11262 +
1153611263 + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
1153711264 + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
1153811265 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
1153911266 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
1154011267 + ;;
11541
11542 -# This is the shared library runtime path variable.
11543 -runpath_var=$runpath_var
11268 +
1154411269 + unicos*)
1154511270 + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
1154611271 + _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
1154711272 + ;;
11548
11549 -# This is the shared library path variable.
11550 -shlibpath_var=$shlibpath_var
11273 +
1155111274 + uts4*)
1155211275 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
1155311276 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
1155411277 + ;;
11555
11556 -# Is shlibpath searched before the hard-coded library search path?
11557 -shlibpath_overrides_runpath=$shlibpath_overrides_runpath
11278 +
1155811279 + *)
1155911280 + _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
1156011281 + ;;
1156211283 + fi
1156311284 +])
1156411285 +AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
11565
11566 -# How to hardcode a shared library path into an executable.
11567 -hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
11286 +
1156811287 +#
1156911288 +# Check to make sure the PIC flag actually works.
1157011289 +#
1158811307 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
1158911308 + ;;
1159011309 +esac
11591
11592 -# Whether we should hardcode library paths into libraries.
11593 -hardcode_into_libs=$hardcode_into_libs
11310 +
1159411311 +#
1159511312 +# Check to make sure the static flag actually works.
1159611313 +#
1160111318 + [],
1160211319 + [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
1160311320 +])
11604
11605 -# Flag to hardcode \$libdir into a binary during linking.
11606 -# This must work even if \$libdir does not exist.
11607 -hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
11608
11609 -# If ld is used when linking, flag to hardcode \$libdir into
11610 -# a binary during linking. This must work even if \$libdir does
11611 -# not exist.
11612 -hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
11321 +
11322 +
1161311323 +# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
1161411324 +# ------------------------------------
1161511325 +# See if the linker supports building shared libraries.
1169611406 + with_gnu_ld=no
1169711407 + ;;
1169811408 + esac
11699
11700 -# Whether we need a single -rpath flag with a separated argument.
11701 -hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
11409 +
1170211410 + _LT_AC_TAGVAR(ld_shlibs, $1)=yes
1170311411 + if test "$with_gnu_ld" = yes; then
1170411412 + # If archive_cmds runs LD, not CC, wlarc should be empty
1170511413 + wlarc='${wl}'
11706
11707 -# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
11708 -# resulting binary.
11709 -hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
11414 +
1171011415 + # Set some defaults for GNU ld with shared library support. These
1171111416 + # are reset later if shared libraries are not supported. Putting them
1171211417 + # here allows them to be overridden if necessary.
1172711432 + *\ 2.11.*) ;; # other 2.11 versions
1172811433 + *) supports_anon_versioning=yes ;;
1172911434 + esac
11730
11731 -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
11732 -# resulting binary.
11733 -hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
11435 +
1173411436 + # See if GNU ld supports shared libraries.
1173511437 + case $host_os in
1173611438 + aix3* | aix4* | aix5*)
1173811440 + if test "$host_cpu" != ia64; then
1173911441 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
1174011442 + cat <<EOF 1>&2
11741
11742 -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
11743 -# the resulting binary.
11744 -hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
11443 +
1174511444 +*** Warning: the GNU linker, at least up to release 2.9.1, is reported
1174611445 +*** to be unable to reliably create shared libraries on AIX.
1174711446 +*** Therefore, libtool is disabling shared libraries support. If you
1174811447 +*** really care for shared libraries, you may want to modify your PATH
1174911448 +*** so that a non-GNU linker is found, and then restart.
11750
11751 -# Set to yes if building a shared library automatically hardcodes DIR into the library
11752 -# and all subsequent libraries and executables linked against it.
11753 -hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
11449 +
1175411450 +EOF
1175511451 + fi
1175611452 + ;;
11757
11758 -# Variables whose values should be saved in libtool wrapper scripts and
11759 -# restored at relink time.
11760 -variables_saved_for_relink="$variables_saved_for_relink"
11453 +
1176111454 + amigaos*)
1176211455 + _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
1176311456 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
1176411457 + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
11765
11766 -# Whether libtool must link a program against all its dependency libraries.
11767 -link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
11458 +
1176811459 + # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
1176911460 + # that the semantics of dynamic libraries on AmigaOS, at least up
1177011461 + # to version 4, is to share data among multiple programs linked
1177311464 + # them.
1177411465 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
1177511466 + ;;
11776
11777 -# Compile-time system search path for libraries
11778 -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
11467 +
1177911468 + beos*)
1178011469 + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
1178111470 + _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
1178611475 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
1178711476 + fi
1178811477 + ;;
11789
11790 -# Run-time system search path for libraries
11791 -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
11478 +
1179211479 + cygwin* | mingw* | pw32*)
1179311480 + # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
1179411481 + # as there is no search path for DLLs.
1179711484 + _LT_AC_TAGVAR(always_export_symbols, $1)=no
1179811485 + _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
1179911486 + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
11800
11801 -# Fix the shell variable \$srcfile for the compiler.
11802 -fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
11487 +
1180311488 + if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
1180411489 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
1180511490 + # If the export-symbols file already is a .def file (1st line
1181511500 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
1181611501 + fi
1181711502 + ;;
11818
11819 -# Set to yes if exported symbols are required.
11820 -always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
11503 +
1182111504 + interix3*)
1182211505 + _LT_AC_TAGVAR(hardcode_direct, $1)=no
1182311506 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
1183211515 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
1183311516 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
1183411517 + ;;
11835
11836 -# The commands to list exported symbols.
11837 -export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
11518 +
1183811519 + linux* | k*bsd*-gnu)
1183911520 + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
1184011521 + tmp_addflag=
1185411535 + tmp_addflag=' -nofor_main' ;;
1185511536 + esac
1185611537 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11857
11858 -# The commands to extract the exported symbol list from a shared archive.
11859 -extract_expsyms_cmds=$lt_extract_expsyms_cmds
11538 +
1186011539 + if test $supports_anon_versioning = yes; then
1186111540 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
1186211541 + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
1186811547 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
1186911548 + fi
1187011549 + ;;
11871
11872 -# Symbols that should not be listed in the preloaded symbols.
11873 -exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
11550 +
1187411551 + netbsd* | netbsdelf*-gnu)
1187511552 + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
1187611553 + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
1188011557 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
1188111558 + fi
1188211559 + ;;
11883
11884 -# Symbols that must always be exported.
11885 -include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
11560 +
1188611561 + solaris*)
1188711562 + if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
1188811563 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
1188911564 + cat <<EOF 1>&2
11890
11891 -ifelse([$1],[],
11892 -[# ### END LIBTOOL CONFIG],
11893 -[# ### END LIBTOOL TAG CONFIG: $tagname])
11565 +
1189411566 +*** Warning: The releases 2.8.* of the GNU linker cannot reliably
1189511567 +*** create shared libraries on Solaris systems. Therefore, libtool
1189611568 +*** is disabling shared libraries support. We urge you to upgrade GNU
1189711569 +*** binutils to release 2.9.1 or newer. Another option is to modify
1189811570 +*** your PATH or compiler configuration so that the native linker is
1189911571 +*** used, and then restart.
11900
11901 -__EOF__
11572 +
1190211573 +EOF
1190311574 + elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
1190411575 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
1190711578 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
1190811579 + fi
1190911580 + ;;
11910
11911 -ifelse([$1],[], [
11912 - case $host_os in
11913 - aix3*)
11914 - cat <<\EOF >> "$cfgfile"
11581 +
1191511582 + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
1191611583 + case `$LD -v 2>&1` in
1191711584 + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
1191811585 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
1191911586 + cat <<_LT_EOF 1>&2
11920
11921 -# AIX sometimes has problems with the GCC collect2 program. For some
11922 -# reason, if we set the COLLECT_NAMES environment variable, the problems
11923 -# vanish in a puff of smoke.
11924 -if test "X${COLLECT_NAMES+set}" != Xset; then
11925 - COLLECT_NAMES=
11926 - export COLLECT_NAMES
11927 -fi
11928 -EOF
11929 - ;;
11930 - esac
11587 +
1193111588 +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
1193211589 +*** reliably create shared libraries on SCO systems. Therefore, libtool
1193311590 +*** is disabling shared libraries support. We urge you to upgrade GNU
1193411591 +*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
1193511592 +*** your PATH or compiler configuration so that the native linker is
1193611593 +*** used, and then restart.
11937
11938 - # We use sed instead of cat because bash on DJGPP gets confused if
11939 - # if finds mixed CR/LF and LF-only lines. Since sed operates in
11940 - # text mode, it properly converts lines to CR/LF. This bash problem
11941 - # is reportedly fixed, but why not run on old versions too?
11942 - sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
11594 +
1194311595 +_LT_EOF
1194411596 + ;;
1194511597 + *)
1195311605 + ;;
1195411606 + esac
1195511607 + ;;
11956
11957 - mv -f "$cfgfile" "$ofile" || \
11958 - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
11959 - chmod +x "$ofile"
11960 -])
11961 -else
11962 - # If there is no Makefile yet, we rely on a make rule to execute
11963 - # `config.status --recheck' to rerun these tests and create the
11964 - # libtool script then.
11965 - ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
11966 - if test -f "$ltmain_in"; then
11967 - test -f Makefile && make "$ltmain"
11968 - fi
11969 -fi
11970 -])# AC_LIBTOOL_CONFIG
11608 +
1197111609 + sunos4*)
1197211610 + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
1197311611 + wlarc=
1197411612 + _LT_AC_TAGVAR(hardcode_direct, $1)=yes
1197511613 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
1197611614 + ;;
11977
11615 +
1197811616 + *)
1197911617 + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
1198011618 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
1198411622 + fi
1198511623 + ;;
1198611624 + esac
11987
11988 -# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
11989 -# -------------------------------------------
11990 -AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
11991 -[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
11625 +
1199211626 + if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
1199311627 + runpath_var=
1199411628 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
1201111645 + _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
1201211646 + fi
1201311647 + ;;
12014
12015 -_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
11648 +
1201611649 + aix4* | aix5*)
1201711650 + if test "$host_cpu" = ia64; then
1201811651 + # On IA64, the linker does run time linking by default, so we don't
1202911662 + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
1203011663 + fi
1203111664 + aix_use_runtimelinking=no
12032
12033 -if test "$GCC" = yes; then
12034 - _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
11665 +
1203511666 + # Test if we are trying to use run time linking or normal
1203611667 + # AIX style linking. If -brtl is somewhere in LDFLAGS, we
1203711668 + # need to do runtime linking.
1204411675 + done
1204511676 + ;;
1204611677 + esac
12047
12048 - AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
12049 - lt_cv_prog_compiler_rtti_exceptions,
12050 - [-fno-rtti -fno-exceptions], [],
12051 - [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
12052 -fi
12053 -])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
11678 +
1205411679 + exp_sym_flag='-bexport'
1205511680 + no_entry_flag='-bnoentry'
1205611681 + fi
12057
11682 +
1205811683 + # When large executables or shared objects are built, AIX ld can
1205911684 + # have problems creating the table of contents. If linking a library
1206011685 + # or program results in "error TOC overflow" add -mminimal-toc to
1206111686 + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
1206211687 + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
12063
12064 -# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
12065 -# ---------------------------------
12066 -AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
12067 -[AC_REQUIRE([AC_CANONICAL_HOST])
12068 -AC_REQUIRE([AC_PROG_NM])
12069 -AC_REQUIRE([AC_OBJEXT])
12070 -# Check for command to grab the raw symbol name followed by C symbol from nm.
12071 -AC_MSG_CHECKING([command to parse $NM output from $compiler object])
12072 -AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
12073 -[
12074 -# These are sane defaults that work on at least a few old systems.
12075 -# [They come from Ultrix. What could be older than Ultrix?!! ;)]
11688 +
1207611689 + _LT_AC_TAGVAR(archive_cmds, $1)=''
1207711690 + _LT_AC_TAGVAR(hardcode_direct, $1)=yes
1207811691 + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
1207911692 + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
12080
12081 -# Character class describing NM global symbol codes.
12082 -symcode='[[BCDEGRST]]'
11693 +
1208311694 + if test "$GCC" = yes; then
1208411695 + case $host_os in aix4.[[012]]|aix4.[[012]].*)
1208511696 + # We only want to do this on AIX 4.2 and lower, the check
1212011731 + fi
1212111732 + fi
1212211733 + fi
12123
12124 -# Regexp to match symbols that can be accessed directly from C.
12125 -sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
11734 +
1212611735 + # It seems that -bexpall does not export symbols beginning with
1212711736 + # underscore (_), so it is better to generate a list of symbols to export.
1212811737 + _LT_AC_TAGVAR(always_export_symbols, $1)=yes
1215511764 + fi
1215611765 + fi
1215711766 + ;;
12158
12159 -# Transform an extracted symbol line into a proper C declaration
12160 -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
11767 +
1216111768 + amigaos*)
1216211769 + _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
1216311770 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
1216511772 + # see comment about different semantics on the GNU ld section
1216611773 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
1216711774 + ;;
12168
12169 -# Transform an extracted symbol line into symbol name and symbol address
12170 -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
11775 +
1217111776 + bsdi[[45]]*)
1217211777 + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
1217311778 + ;;
12174
12175 -# Define system-specific variables.
12176 -case $host_os in
12177 -aix*)
12178 - symcode='[[BCDT]]'
12179 - ;;
12180 -cygwin* | mingw* | pw32*)
12181 - symcode='[[ABCDGISTW]]'
12182 - ;;
12183 -hpux*) # Its linker distinguishes data from code symbols
12184 - if test "$host_cpu" = ia64; then
12185 - symcode='[[ABCDEGRST]]'
12186 - fi
12187 - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
12188 - lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
12189 - ;;
12190 -linux*)
12191 - if test "$host_cpu" = ia64; then
12192 - symcode='[[ABCDGIRSTW]]'
12193 - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
12194 - lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
12195 - fi
12196 - ;;
12197 -irix* | nonstopux*)
12198 - symcode='[[BCDEGRST]]'
12199 - ;;
12200 -osf*)
12201 - symcode='[[BCDEGQRST]]'
12202 - ;;
12203 -solaris*)
12204 - symcode='[[BDRT]]'
12205 - ;;
12206 -sco3.2v5*)
12207 - symcode='[[DT]]'
12208 - ;;
12209 -sysv4.2uw2*)
12210 - symcode='[[DT]]'
12211 - ;;
12212 -sysv5* | sco5v6* | unixware* | OpenUNIX*)
12213 - symcode='[[ABDT]]'
12214 - ;;
12215 -sysv4)
12216 - symcode='[[DFNSTU]]'
12217 - ;;
12218 -esac
11779 +
1221911780 + cygwin* | mingw* | pw32*)
1222011781 + # When not using gcc, we currently assume that we are using
1222111782 + # Microsoft Visual C++.
1223611797 + _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
1223711798 + _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
1223811799 + ;;
12239
12240 -# Handle CRLF in mingw tool chain
12241 -opt_cr=
12242 -case $build_os in
12243 -mingw*)
12244 - opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
12245 - ;;
12246 -esac
11800 +
1224711801 + darwin* | rhapsody*)
1224811802 + case $host_os in
1224911803 + rhapsody* | darwin1.[[012]])
1229311847 + esac
1229411848 + fi
1229511849 + ;;
12296
12297 -# If we're using GNU nm, then use its standard symbol codes.
12298 -case `$NM -V 2>&1` in
12299 -*GNU* | *'with BFD'*)
12300 - symcode='[[ABCDGIRSTW]]' ;;
12301 -esac
11850 +
1230211851 + dgux*)
1230311852 + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
1230411853 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
1230511854 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
1230611855 + ;;
12307
12308 -# Try without a prefix undercore, then with it.
12309 -for ac_symprfx in "" "_"; do
11856 +
1231011857 + freebsd1*)
1231111858 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
1231211859 + ;;
12313
12314 - # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
12315 - symxfrm="\\1 $ac_symprfx\\2 \\2"
11860 +
1231611861 + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
1231711862 + # support. Future versions do this automatically, but an explicit c++rt0.o
1231811863 + # does not break anything, and helps significantly (at the cost of a little
1232311868 + _LT_AC_TAGVAR(hardcode_direct, $1)=yes
1232411869 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
1232511870 + ;;
12326
12327 - # Write the raw and C identifiers.
12328 - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
11871 +
1232911872 + # Unfortunately, older versions of FreeBSD 2 do not have this feature.
1233011873 + freebsd2*)
1233111874 + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
1233311876 + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
1233411877 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
1233511878 + ;;
12336
12337 - # Check to see that the pipe works correctly.
12338 - pipe_works=no
11879 +
1233911880 + # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
1234011881 + freebsd* | dragonfly*)
1234111882 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
1234311884 + _LT_AC_TAGVAR(hardcode_direct, $1)=yes
1234411885 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
1234511886 + ;;
12346
12347 - rm -f conftest*
12348 - cat > conftest.$ac_ext <<EOF
12349 -#ifdef __cplusplus
12350 -extern "C" {
12351 -#endif
12352 -char nm_test_var;
12353 -void nm_test_func(){}
12354 -#ifdef __cplusplus
12355 -}
12356 -#endif
12357 -int main(){nm_test_var='a';nm_test_func();return(0);}
12358 -EOF
11887 +
1235911888 + hpux9*)
1236011889 + if test "$GCC" = yes; then
1236111890 + _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
1236511894 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
1236611895 + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
1236711896 + _LT_AC_TAGVAR(hardcode_direct, $1)=yes
12368
12369 - if AC_TRY_EVAL(ac_compile); then
12370 - # Now try to grab the symbols.
12371 - nlist=conftest.nm
12372 - if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
12373 - # Try sorting and uniquifying the output.
12374 - if sort "$nlist" | uniq > "$nlist"T; then
12375 - mv -f "$nlist"T "$nlist"
11897 +
1237611898 + # hardcode_minus_L: Not really in the search PATH,
1237711899 + # but as the default location of the library.
1237811900 + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
1238211904 + hpux10*)
1238311905 + if test "$GCC" = yes -a "$with_gnu_ld" = no; then
1238411906 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
12385 else
12386 - rm -f "$nlist"T
11907 + else
1238711908 + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
12388 fi
11909 + fi
1238911910 + if test "$with_gnu_ld" = no; then
1239011911 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
1239111912 + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
12392
12393 - # Make sure that we snagged all the symbols we need.
12394 - if grep ' nm_test_var$' "$nlist" >/dev/null; then
12395 - if grep ' nm_test_func$' "$nlist" >/dev/null; then
12396 - cat <<EOF > conftest.$ac_ext
12397 -#ifdef __cplusplus
12398 -extern "C" {
12399 -#endif
11913 +
1240011914 + _LT_AC_TAGVAR(hardcode_direct, $1)=yes
1240111915 + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
12402
12403 -EOF
12404 - # Now generate the symbol file.
12405 - eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
11916 +
1240611917 + # hardcode_minus_L: Not really in the search PATH,
1240711918 + # but as the default location of the library.
1240811919 + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
1240911920 + fi
1241011921 + ;;
12411
12412 - cat <<EOF >> conftest.$ac_ext
12413 -#if defined (__STDC__) && __STDC__
12414 -# define lt_ptr_t void *
12415 -#else
12416 -# define lt_ptr_t char *
12417 -# define const
12418 -#endif
11922 +
1241911923 + hpux11*)
1242011924 + if test "$GCC" = yes -a "$with_gnu_ld" = no; then
1242111925 + case $host_cpu in
1244511949 + if test "$with_gnu_ld" = no; then
1244611950 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
1244711951 + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
12448
12449 -/* The mapping between symbol names and symbols. */
12450 -const struct {
12451 - const char *name;
12452 - lt_ptr_t address;
12453 -}
12454 -lt_preloaded_symbols[[]] =
12455 -{
12456 -EOF
12457 - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
12458 - cat <<\EOF >> conftest.$ac_ext
12459 - {0, (lt_ptr_t) 0}
12460 -};
11952 +
1246111953 + case $host_cpu in
1246211954 + hppa*64*|ia64*)
1246311955 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
1246711959 + *)
1246811960 + _LT_AC_TAGVAR(hardcode_direct, $1)=yes
1246911961 + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
12470
12471 -#ifdef __cplusplus
12472 -}
12473 -#endif
12474 -EOF
12475 - # Now try linking the two files.
12476 - mv conftest.$ac_objext conftstm.$ac_objext
12477 - lt_save_LIBS="$LIBS"
12478 - lt_save_CFLAGS="$CFLAGS"
12479 - LIBS="conftstm.$ac_objext"
12480 - CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
12481 - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
12482 - pipe_works=yes
12483 - fi
12484 - LIBS="$lt_save_LIBS"
12485 - CFLAGS="$lt_save_CFLAGS"
12486 - else
12487 - echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
12488 - fi
11962 +
1248911963 + # hardcode_minus_L: Not really in the search PATH,
1249011964 + # but as the default location of the library.
1249111965 + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
1249711971 + irix5* | irix6* | nonstopux*)
1249811972 + if test "$GCC" = yes; then
1249911973 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
12500 else
12501 - echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
11974 + else
1250211975 + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
1250311976 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
12504 fi
12505 - else
12506 - echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
12507 - fi
12508 - else
12509 - echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
12510 - cat conftest.$ac_ext >&5
12511 - fi
12512 - rm -f conftest* conftst*
11977 + fi
1251311978 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
1251411979 + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
1251511980 + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
1251611981 + ;;
12517
12518 - # Do not use the global_symbol_pipe unless it works.
12519 - if test "$pipe_works" = yes; then
12520 - break
12521 - else
12522 - lt_cv_sys_global_symbol_pipe=
12523 - fi
12524 -done
12525 -])
12526 -if test -z "$lt_cv_sys_global_symbol_pipe"; then
12527 - lt_cv_sys_global_symbol_to_cdecl=
12528 -fi
12529 -if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
12530 - AC_MSG_RESULT(failed)
12531 -else
12532 - AC_MSG_RESULT(ok)
12533 -fi
12534 -]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
11982 +
1253511983 + netbsd* | netbsdelf*-gnu)
1253611984 + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
1253711985 + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
1254211990 + _LT_AC_TAGVAR(hardcode_direct, $1)=yes
1254311991 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
1254411992 + ;;
12545
11993 +
1254611994 + newsos6)
1254711995 + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
1254811996 + _LT_AC_TAGVAR(hardcode_direct, $1)=yes
1255011998 + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
1255111999 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
1255212000 + ;;
12553
12554 -# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
12555 -# ---------------------------------------
12556 -AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],
12557 -[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
12558 -_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
12559 -_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
12001 +
1256012002 + openbsd*)
1256112003 + _LT_AC_TAGVAR(hardcode_direct, $1)=yes
1256212004 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
1257812020 + esac
1257912021 + fi
1258012022 + ;;
12581
12582 -AC_MSG_CHECKING([for $compiler option to produce PIC])
12583 - ifelse([$1],[CXX],[
12584 - # C++ specific cases for pic, static, wl, etc.
12585 - if test "$GXX" = yes; then
12586 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
12587 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
12023 +
1258812024 + os2*)
1258912025 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
1259012026 + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
1259212028 + _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
1259312029 + _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
1259412030 + ;;
12595
12596 - case $host_os in
12597 - aix*)
12598 - # All AIX code is PIC.
12599 - if test "$host_cpu" = ia64; then
12600 - # AIX 5 now supports IA64 processor
12601 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
12031 +
1260212032 + osf3*)
1260312033 + if test "$GCC" = yes; then
1260412034 + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
1260612036 + else
1260712037 + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
1260812038 + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
12609 fi
12039 + fi
1261012040 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
1261112041 + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
12612 ;;
12613 - amigaos*)
12614 - # FIXME: we need at least 68020 code to build shared libraries, but
12615 - # adding the `-m68020' flag to GCC prevents building anything better,
12616 - # like `-m68040'.
12617 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
12618 - ;;
12619 - beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
12620 - # PIC is the default for these OSes.
12042 + ;;
1262112043 +
1262212044 + osf4* | osf5*) # as osf3* with the addition of -msym flag
1262312045 + if test "$GCC" = yes; then
1263412056 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
1263512057 + fi
1263612058 + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
12637 ;;
12638 - mingw* | os2* | pw32*)
12639 - # This hack is so that the source file can tell whether it is being
12640 - # built for inclusion in a dll (and should export symbols for example).
12641 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
12059 + ;;
1264212060 +
1264312061 + solaris*)
1264412062 + _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
1267112089 + esac ;;
1267212090 + esac
1267312091 + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
12674 ;;
12675 - darwin* | rhapsody*)
12676 - # PIC is the default on this platform
12677 - # Common symbols not allowed in MH_DYLIB files
12678 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
12092 + ;;
1267912093 +
1268012094 + sunos4*)
1268112095 + if test "x$host_vendor" = xsequent; then
1268912103 + _LT_AC_TAGVAR(hardcode_direct, $1)=yes
1269012104 + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
1269112105 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
12692 ;;
12693 - *djgpp*)
12694 - # DJGPP does not support shared libraries at all
12695 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
12106 + ;;
1269612107 +
1269712108 + sysv4)
1269812109 + case $host_vendor in
1271412125 + esac
1271512126 + runpath_var='LD_RUN_PATH'
1271612127 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
12717 ;;
12718 - interix3*)
12719 - # Interix 3.x gcc -fpic/-fPIC options generate broken code.
12720 - # Instead, we relocate shared libraries at runtime.
12128 + ;;
1272112129 +
1272212130 + sysv4.3*)
1272312131 + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
1272412132 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
1272512133 + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
12726 ;;
12727 +
12728 sysv4*MP*)
12729 if test -d /usr/nec; then
12730 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
12134 + ;;
12135 +
12136 + sysv4*MP*)
12137 + if test -d /usr/nec; then
1273112138 + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
1273212139 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
1273312140 + runpath_var=LD_RUN_PATH
1273412141 + hardcode_runpath_var=yes
1273512142 + _LT_AC_TAGVAR(ld_shlibs, $1)=yes
1273612143 + fi
12737 + ;;
12738 +
12144 ;;
12145
12146 - beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
12147 - # PIC is the default for these OSes.
1273912148 + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
1274012149 + _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
1274112150 + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
1274912158 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
1275012159 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
1275112160 + fi
12752 + ;;
12753 +
12161 ;;
12162
12163 - mingw* | pw32* | os2*)
12164 - # This hack is so that the source file can tell whether it is being
12165 - # built for inclusion in a dll (and should export symbols for example).
12166 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
1275412167 + sysv5* | sco3.2v5* | sco5v6*)
1275512168 + # Note: We can NOT use -z defs as we might desire, because we do not
1275612169 + # link with -lc, and that would cause any symbols used from libc to
1277412187 + else
1277512188 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
1277612189 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
12777 fi
12190 + fi
1277812191 ;;
12779 - hpux*)
12780 - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
12781 - # not for PA HP-UX.
12782 - case $host_cpu in
12783 - hppa*64*|ia64*)
12784 - ;;
12785 - *)
12786 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
12787 - ;;
12788 - esac
12789 +
12192
12193 - darwin* | rhapsody*)
12194 - # PIC is the default on this platform
12195 - # Common symbols not allowed in MH_DYLIB files
12196 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
1279012197 + uts4*)
1279112198 + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
1279212199 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
1279312200 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
1279412201 ;;
12795 +
12796 *)
12797 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
12202
12203 - interix3*)
12204 - # Interix 3.x gcc -fpic/-fPIC options generate broken code.
12205 - # Instead, we relocate shared libraries at runtime.
12206 + *)
1279812207 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
1279912208 ;;
12800 esac
12801 - else
12802 - case $host_os in
12803 - aix4* | aix5*)
12804 - # All AIX code is PIC.
12805 - if test "$host_cpu" = ia64; then
12806 - # AIX 5 now supports IA64 processor
12807 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
12808 - else
12809 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
12810 - fi
12811 - ;;
12812 - chorus*)
12813 - case $cc_basename in
12814 - cxch68*)
12815 - # Green Hills C++ Compiler
12816 - # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
12817 - ;;
12818 - esac
12819 - ;;
12820 - darwin*)
12821 - # PIC is the default on this platform
12822 - # Common symbols not allowed in MH_DYLIB files
12823 - case $cc_basename in
12824 - xlc*)
12825 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
12826 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
12827 - ;;
12828 - esac
12829 - ;;
12830 - dgux*)
12831 - case $cc_basename in
12832 - ec++*)
12833 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
12834 - ;;
12835 - ghcx*)
12836 - # Green Hills C++ Compiler
12837 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
12838 - ;;
12839 - *)
12840 - ;;
12841 - esac
12842 - ;;
12843 - freebsd* | kfreebsd*-gnu | dragonfly*)
12844 - # FreeBSD uses GNU C++
12845 - ;;
12846 - hpux9* | hpux10* | hpux11*)
12847 - case $cc_basename in
12848 - CC*)
12849 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
12850 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
12851 - if test "$host_cpu" != ia64; then
12852 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
12853 - fi
12854 - ;;
12855 - aCC*)
12856 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
12857 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
12858 - case $host_cpu in
12859 - hppa*64*|ia64*)
12860 - # +Z the default
12861 - ;;
12862 - *)
12863 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
12864 - ;;
12865 - esac
12866 - ;;
12867 - *)
12868 - ;;
12869 - esac
12870 - ;;
12871 - interix*)
12872 - # This is c89, which is MS Visual C++ (no shared libs)
12873 - # Anyone wants to do a port?
12874 - ;;
12875 - irix5* | irix6* | nonstopux*)
12876 - case $cc_basename in
12877 - CC*)
12878 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
12879 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
12880 - # CC pic flag -KPIC is the default.
12881 - ;;
12882 - *)
12883 - ;;
12884 - esac
12885 - ;;
12886 - linux*)
12887 - case $cc_basename in
12888 - KCC*)
12889 - # KAI C++ Compiler
12890 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
12891 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
12892 - ;;
12893 - icpc* | ecpc*)
12894 - # Intel C++
12895 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
12896 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
12897 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
12898 - ;;
12899 - pgCC*)
12900 - # Portland Group C++ compiler.
12901 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
12902 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
12903 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
12904 - ;;
12905 - cxx*)
12906 - # Compaq C++
12907 - # Make sure the PIC flag is empty. It appears that all Alpha
12908 - # Linux and Compaq Tru64 Unix objects are PIC.
12909 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
12910 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
12911 - ;;
12912 - *)
12913 - ;;
12914 - esac
12915 - ;;
12916 - lynxos*)
12917 - ;;
12918 - m88k*)
12919 - ;;
12920 - mvs*)
12921 - case $cc_basename in
12922 - cxx*)
12923 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
12924 - ;;
12925 - *)
12926 - ;;
12927 - esac
12928 - ;;
12929 - netbsd*)
12930 - ;;
12931 - osf3* | osf4* | osf5*)
12932 - case $cc_basename in
12933 - KCC*)
12934 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
12935 - ;;
12936 - RCC*)
12937 - # Rational C++ 2.4.1
12938 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
12939 - ;;
12940 - cxx*)
12941 - # Digital/Compaq C++
12942 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
12943 - # Make sure the PIC flag is empty. It appears that all Alpha
12944 - # Linux and Compaq Tru64 Unix objects are PIC.
12945 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
12946 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
12947 - ;;
12948 - *)
12949 - ;;
12950 - esac
12951 - ;;
12952 - psos*)
12953 - ;;
12954 - solaris*)
12955 - case $cc_basename in
12956 - CC*)
12957 - # Sun C++ 4.2, 5.x and Centerline C++
12958 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
12959 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
12960 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
12961 - ;;
12962 - gcx*)
12963 - # Green Hills C++ Compiler
12964 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
12965 - ;;
12966 - *)
12967 - ;;
12968 - esac
12969 - ;;
12970 - sunos4*)
12971 - case $cc_basename in
12972 - CC*)
12973 - # Sun C++ 4.x
12974 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
12975 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
12976 - ;;
12977 - lcc*)
12978 - # Lucid
12979 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
12980 - ;;
12981 - *)
12982 - ;;
12983 - esac
12984 - ;;
12985 - tandem*)
12986 - case $cc_basename in
12987 - NCC*)
12988 - # NonStop-UX NCC 3.20
12989 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
12990 - ;;
12991 - *)
12992 - ;;
12993 - esac
12994 - ;;
12995 - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
12996 - case $cc_basename in
12997 - CC*)
12998 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
12999 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
13000 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
13001 - ;;
13002 - esac
13003 - ;;
13004 - vxworks*)
13005 - ;;
13006 - *)
13007 - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
13008 - ;;
12209 + esac
1300912210 + fi
1301012211 +])
1301112212 +AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
1301212213 +test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
13013 +
12214
12215 - msdosdjgpp*)
12216 - # Just because we use GCC doesn't mean we suddenly get shared libraries
12217 - # on systems that don't support them.
12218 - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
12219 - enable_shared=no
1301412220 +#
1301512221 +# Do we need to explicitly link libc?
1301612222 +#
1302312229 + case $_LT_AC_TAGVAR(archive_cmds, $1) in
1302412230 + *'~'*)
1302512231 + # FIXME: we may have to deal with multi-command sequences.
13026 + ;;
12232 ;;
1302712233 + '$CC '*)
1302812234 + # Test whether the compiler implicitly links with -lc since on some
1302912235 + # systems, -lgcc has to come before -lc. If gcc already passes -lc
1303112237 + AC_MSG_CHECKING([whether -lc should be explicitly linked in])
1303212238 + $rm conftest*
1303312239 + printf "$lt_simple_compile_test_code" > conftest.$ac_ext
13034 +
12240
12241 - sysv4*MP*)
12242 - if test -d /usr/nec; then
12243 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
1303512244 + if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
1303612245 + soname=conftest
1303712246 + lib=conftest
1305512264 + _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
1305612265 + else
1305712266 + cat conftest.err 1>&5
13058 + fi
12267 fi
1305912268 + $rm conftest*
1306012269 + AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
13061 + ;;
13062 esac
13063 fi
13064 -],
13065 -[
13066 - if test "$GCC" = yes; then
13067 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
13068 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
12270 ;;
12271 + esac
12272 + fi
1306912273 + ;;
1307012274 +esac
1307112275 +])# AC_LIBTOOL_PROG_LD_SHLIBS
1307212276
12277 - hpux*)
12278 - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
12279 - # not for PA HP-UX.
12280 - case $host_cpu in
12281 - hppa*64*|ia64*)
12282 - # +Z the default
12283 - ;;
12284 - *)
12285 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
12286 - ;;
12287 - esac
12288 - ;;
12289
12290 - *)
12291 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
12292 - ;;
12293 - esac
12294 - else
12295 - # PORTME Check for flag to pass linker flags through the system compiler.
1307312296 - case $host_os in
13074 - aix*)
13075 - # All AIX code is PIC.
12297 - aix*)
12298 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
1307612299 - if test "$host_cpu" = ia64; then
1307712300 - # AIX 5 now supports IA64 processor
1307812301 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
13079 +
12302 - else
12303 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
12304 - fi
12305 - ;;
12306 - darwin*)
12307 - # PIC is the default on this platform
12308 - # Common symbols not allowed in MH_DYLIB files
12309 - case $cc_basename in
12310 - xlc*)
12311 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
12312 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
12313 - ;;
12314 - esac
12315 - ;;
1308012316 +# _LT_AC_FILE_LTDLL_C
1308112317 +# -------------------
1308212318 +# Be careful that the start marker always follows a newline.
1316612402 + for ac_exec_ext in '' $ac_executable_extensions; do
1316712403 + if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
1316812404 + lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
13169 fi
13170 - ;;
12405 + fi
1317112406 + done
1317212407 + done
1317312408 +done
1320512440 +SED=$lt_cv_path_SED
1320612441 +AC_MSG_RESULT([$SED])
1320712442 +])
13208
13209 - amigaos*)
13210 - # FIXME: we need at least 68020 code to build shared libraries, but
13211 - # adding the `-m68020' flag to GCC prevents building anything better,
13212 - # like `-m68040'.
13213 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
13214 - ;;
12443 +
1321512444 +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
1321612445 +#
1321712446 +# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
1323512464 +# configuration script generated by Autoconf, you may include it under
1323612465 +# the same distribution terms that you use for the rest of that program.
1323712466
13238 - beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
13239 - # PIC is the default for these OSes.
12467 - mingw* | pw32* | os2*)
12468 - # This hack is so that the source file can tell whether it is being
12469 - # built for inclusion in a dll (and should export symbols for example).
12470 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
1324012471 - ;;
1324112472 +# PKG_PROG_PKG_CONFIG([MIN-VERSION])
1324212473 +# ----------------------------------
1326012491 +fi[]dnl
1326112492 +])# PKG_PROG_PKG_CONFIG
1326212493
13263 - mingw* | pw32* | os2*)
13264 - # This hack is so that the source file can tell whether it is being
13265 - # built for inclusion in a dll (and should export symbols for example).
13266 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
12494 - hpux9* | hpux10* | hpux11*)
12495 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
12496 - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
12497 - # not for PA HP-UX.
12498 - case $host_cpu in
12499 - hppa*64*|ia64*)
12500 - # +Z the default
12501 - ;;
12502 - *)
12503 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
12504 - ;;
12505 - esac
12506 - # Is there a better lt_prog_compiler_static that works with the bundled CC?
12507 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
1326712508 - ;;
1326812509 +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
1326912510 +#
1328412525 + $3])dnl
1328512526 +fi])
1328612527
13287 - darwin* | rhapsody*)
13288 - # PIC is the default on this platform
13289 - # Common symbols not allowed in MH_DYLIB files
13290 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
12528 - irix5* | irix6* | nonstopux*)
12529 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
12530 - # PIC (with -KPIC) is the default.
12531 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
1329112532 - ;;
1329212533
13293 - interix3*)
13294 - # Interix 3.x gcc -fpic/-fPIC options generate broken code.
13295 - # Instead, we relocate shared libraries at runtime.
12534 - newsos6)
12535 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
12536 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
1329612537 - ;;
1329712538 +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
1329812539 +# ---------------------------------------------
1330912550 + pkg_failed=untried
1331012551 +fi[]dnl
1331112552 +])# _PKG_CONFIG
13312
13313 - msdosdjgpp*)
13314 - # Just because we use GCC doesn't mean we suddenly get shared libraries
13315 - # on systems that don't support them.
13316 - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
13317 - enable_shared=no
13318 - ;;
13319 +# _PKG_SHORT_ERRORS_SUPPORTED
13320 +# -----------------------------
13321 +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
13322 +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
13323 +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
13324 + _pkg_short_errors_supported=yes
13325 +else
13326 + _pkg_short_errors_supported=no
13327 +fi[]dnl
13328 +])# _PKG_SHORT_ERRORS_SUPPORTED
13329
13330 - sysv4*MP*)
13331 - if test -d /usr/nec; then
13332 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
13333 - fi
13334 - ;;
13335
13336 - hpux*)
13337 - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
13338 - # not for PA HP-UX.
13339 - case $host_cpu in
13340 - hppa*64*|ia64*)
13341 - # +Z the default
13342 - ;;
13343 - *)
13344 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
13345 - ;;
13346 - esac
13347 - ;;
13348 +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
13349 +# [ACTION-IF-NOT-FOUND])
13350 +#
13351 +#
13352 +# Note that if there is a possibility the first call to
13353 +# PKG_CHECK_MODULES might not happen, you should be sure to include an
13354 +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
13355 +#
13356 +#
13357 +# --------------------------------------------------------------
13358 +AC_DEFUN([PKG_CHECK_MODULES],
13359 +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
13360 +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
13361 +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
13362
13363 - *)
13364 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
13365 - ;;
13366 - esac
13367 - else
13368 - # PORTME Check for flag to pass linker flags through the system compiler.
13369 - case $host_os in
13370 - aix*)
13371 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
13372 - if test "$host_cpu" = ia64; then
13373 - # AIX 5 now supports IA64 processor
13374 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
13375 - else
13376 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
13377 - fi
13378 - ;;
13379 - darwin*)
13380 - # PIC is the default on this platform
13381 - # Common symbols not allowed in MH_DYLIB files
13382 - case $cc_basename in
13383 - xlc*)
13384 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
13385 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
13386 - ;;
13387 - esac
13388 - ;;
13389 +pkg_failed=no
13390 +AC_MSG_CHECKING([for $1])
13391
13392 - mingw* | pw32* | os2*)
13393 - # This hack is so that the source file can tell whether it is being
13394 - # built for inclusion in a dll (and should export symbols for example).
13395 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
13396 - ;;
13397 +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
13398 +_PKG_CONFIG([$1][_LIBS], [libs], [$2])
13399
13400 - hpux9* | hpux10* | hpux11*)
13401 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
13402 - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
13403 - # not for PA HP-UX.
13404 - case $host_cpu in
13405 - hppa*64*|ia64*)
13406 - # +Z the default
13407 - ;;
13408 - *)
13409 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
13410 - ;;
13411 - esac
13412 - # Is there a better lt_prog_compiler_static that works with the bundled CC?
13413 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
13414 - ;;
13415 +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
13416 +and $1[]_LIBS to avoid the need to call pkg-config.
13417 +See the pkg-config man page for more details.])
13418
13419 - irix5* | irix6* | nonstopux*)
13420 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
13421 - # PIC (with -KPIC) is the default.
13422 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
13423 - ;;
13424 +if test $pkg_failed = yes; then
13425 + _PKG_SHORT_ERRORS_SUPPORTED
13426 + if test $_pkg_short_errors_supported = yes; then
13427 + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
13428 + else
13429 + $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
13430 + fi
13431 + # Put the nasty error message in config.log where it belongs
13432 + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
13433
13434 - newsos6)
13435 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
13436 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
13437 - ;;
13438 + ifelse([$4], , [AC_MSG_ERROR(dnl
13439 +[Package requirements ($2) were not met:
1344012553
1344112554 - linux*)
1344212555 - case $cc_basename in
1345912572 - ;;
1346012573 - esac
1346112574 - ;;
13462 +$$1_PKG_ERRORS
12575 +# _PKG_SHORT_ERRORS_SUPPORTED
12576 +# -----------------------------
12577 +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
12578 +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
12579 +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
12580 + _pkg_short_errors_supported=yes
12581 +else
12582 + _pkg_short_errors_supported=no
12583 +fi[]dnl
12584 +])# _PKG_SHORT_ERRORS_SUPPORTED
1346312585
1346412586 - osf3* | osf4* | osf5*)
1346512587 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
1346612588 - # All OSF/1 code is PIC.
1346712589 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
1346812590 - ;;
13469 +Consider adjusting the PKG_CONFIG_PATH environment variable if you
13470 +installed software in a non-standard prefix.
1347112591
1347212592 - solaris*)
1347312593 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
1347912599 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
1348012600 - esac
1348112601 - ;;
13482 +_PKG_TEXT
13483 +])],
13484 + [$4])
13485 +elif test $pkg_failed = untried; then
13486 + ifelse([$4], , [AC_MSG_FAILURE(dnl
13487 +[The pkg-config script could not be found or is too old. Make sure it
13488 +is in your PATH or set the PKG_CONFIG environment variable to the full
13489 +path to pkg-config.
12602 +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
12603 +# [ACTION-IF-NOT-FOUND])
12604 +#
12605 +#
12606 +# Note that if there is a possibility the first call to
12607 +# PKG_CHECK_MODULES might not happen, you should be sure to include an
12608 +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
12609 +#
12610 +#
12611 +# --------------------------------------------------------------
12612 +AC_DEFUN([PKG_CHECK_MODULES],
12613 +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
12614 +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
12615 +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
1349012616
1349112617 - sunos4*)
1349212618 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
1349312619 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
1349412620 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
1349512621 - ;;
13496 +_PKG_TEXT
12622 +pkg_failed=no
12623 +AC_MSG_CHECKING([for $1])
1349712624
1349812625 - sysv4 | sysv4.2uw2* | sysv4.3*)
1349912626 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
1350012627 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
1350112628 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
1350212629 - ;;
13503 +To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
13504 + [$4])
13505 +else
13506 + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
13507 + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
13508 + AC_MSG_RESULT([yes])
13509 + ifelse([$3], , :, [$3])
13510 +fi[]dnl
13511 +])# PKG_CHECK_MODULES
12630 +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
12631 +_PKG_CONFIG([$1][_LIBS], [libs], [$2])
1351212632
1351312633 - sysv4*MP*)
1351412634 - if test -d /usr/nec ;then
1351612636 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
1351712637 - fi
1351812638 - ;;
13519 +# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
13520 +#
13521 +# This file is free software; the Free Software Foundation
13522 +# gives unlimited permission to copy and/or distribute it,
13523 +# with or without modifications, as long as this notice is preserved.
12639 +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
12640 +and $1[]_LIBS to avoid the need to call pkg-config.
12641 +See the pkg-config man page for more details.])
1352412642
1352512643 - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
1352612644 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
1352712645 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
1352812646 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
1352912647 - ;;
13530 +# AM_AUTOMAKE_VERSION(VERSION)
13531 +# ----------------------------
13532 +# Automake X.Y traces this macro to ensure aclocal.m4 has been
13533 +# generated from the m4 files accompanying Automake X.Y.
13534 +AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
12648 +if test $pkg_failed = yes; then
12649 + _PKG_SHORT_ERRORS_SUPPORTED
12650 + if test $_pkg_short_errors_supported = yes; then
12651 + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
12652 + else
12653 + $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
12654 + fi
12655 + # Put the nasty error message in config.log where it belongs
12656 + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
1353512657
1353612658 - unicos*)
1353712659 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
1353812660 - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
1353912661 - ;;
13540 +# AM_SET_CURRENT_AUTOMAKE_VERSION
13541 +# -------------------------------
13542 +# Call AM_AUTOMAKE_VERSION so it can be traced.
13543 +# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
13544 +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
13545 + [AM_AUTOMAKE_VERSION([1.9.6])])
12662 + ifelse([$4], , [AC_MSG_ERROR(dnl
12663 +[Package requirements ($2) were not met:
1354612664
1354712665 - uts4*)
1354812666 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
1354912667 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
1355012668 - ;;
13551 +# AM_AUX_DIR_EXPAND -*- Autoconf -*-
12669 +$$1_PKG_ERRORS
1355212670
1355312671 - *)
1355412672 - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
1355712675 - fi
1355812676 -])
1355912677 -AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
13560 +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
13561 +#
13562 +# This file is free software; the Free Software Foundation
13563 +# gives unlimited permission to copy and/or distribute it,
13564 +# with or without modifications, as long as this notice is preserved.
13565
13566 +# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
13567 +# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
13568 +# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
13569 +#
13570 +# Of course, Automake must honor this variable whenever it calls a
13571 +# tool from the auxiliary directory. The problem is that $srcdir (and
13572 +# therefore $ac_aux_dir as well) can be either absolute or relative,
13573 +# depending on how configure is run. This is pretty annoying, since
13574 +# it makes $ac_aux_dir quite unusable in subdirectories: in the top
13575 +# source directory, any form will work fine, but in subdirectories a
13576 +# relative path needs to be adjusted first.
13577 #
12678 +Consider adjusting the PKG_CONFIG_PATH environment variable if you
12679 +installed software in a non-standard prefix.
12680
12681 -#
1357812682 -# Check to make sure the PIC flag actually works.
13579 +# $ac_aux_dir/missing
13580 +# fails when called from a subdirectory if $ac_aux_dir is relative
13581 +# $top_srcdir/$ac_aux_dir/missing
13582 +# fails if $ac_aux_dir is absolute,
13583 +# fails when called from a subdirectory in a VPATH build with
13584 +# a relative $ac_aux_dir
13585 #
12683 -#
1358612684 -if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
1358712685 - AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
1358812686 - _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
1360312701 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
1360412702 - ;;
1360512703 -esac
13606 -
13607 +# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
13608 +# are both prefixed by $srcdir. In an in-source build this is usually
13609 +# harmless because $srcdir is `.', but things will broke when you
13610 +# start a VPATH build or use an absolute $srcdir.
13611 #
12704 +_PKG_TEXT
12705 +])],
12706 + [AC_MSG_RESULT([no])
12707 + $4])
12708 +elif test $pkg_failed = untried; then
12709 + ifelse([$4], , [AC_MSG_FAILURE(dnl
12710 +[The pkg-config script could not be found or is too old. Make sure it
12711 +is in your PATH or set the PKG_CONFIG environment variable to the full
12712 +path to pkg-config.
12713
12714 -#
1361212715 -# Check to make sure the static flag actually works.
13613 +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
13614 +# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
13615 +# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
13616 +# and then we would define $MISSING as
13617 +# MISSING="\${SHELL} $am_aux_dir/missing"
13618 +# This will work as long as MISSING is not called from configure, because
13619 +# unfortunately $(top_srcdir) has no meaning in configure.
13620 +# However there are other variables, like CC, which are often used in
13621 +# configure, and could therefore not use this "fixed" $ac_aux_dir.
13622 #
12716 -#
1362312717 -wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
1362412718 -AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
1362512719 - _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
1362612720 - $lt_tmp_static_flag,
1362712721 - [],
1362812722 - [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
13629 +# Another solution, used here, is to always expand $ac_aux_dir to an
13630 +# absolute PATH. The drawback is that using absolute paths prevent a
13631 +# configured tree to be moved without reconfiguration.
13632 +
13633 +AC_DEFUN([AM_AUX_DIR_EXPAND],
13634 +[dnl Rely on autoconf to set up CDPATH properly.
13635 +AC_PREREQ([2.50])dnl
13636 +# expand $ac_aux_dir to an absolute path
13637 +am_aux_dir=`cd $ac_aux_dir && pwd`
13638 ])
13639
13640 +# AM_CONDITIONAL -*- Autoconf -*-
12723 -])
12724 +_PKG_TEXT
12725
12726 +To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
12727 + [$4])
12728 +else
12729 + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
12730 + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
12731 + AC_MSG_RESULT([yes])
12732 + ifelse([$3], , :, [$3])
12733 +fi[]dnl
12734 +])# PKG_CHECK_MODULES
1364112735
1364212736 -# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
1364312737 -# ------------------------------------
1372212816 - with_gnu_ld=no
1372312817 - ;;
1372412818 - esac
13725 +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
13726 +# Free Software Foundation, Inc.
12819 +# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
1372712820 +#
1372812821 +# This file is free software; the Free Software Foundation
1372912822 +# gives unlimited permission to copy and/or distribute it,
1373312826 - if test "$with_gnu_ld" = yes; then
1373412827 - # If archive_cmds runs LD, not CC, wlarc should be empty
1373512828 - wlarc='${wl}'
13736 +# serial 7
12829 +# AM_AUTOMAKE_VERSION(VERSION)
12830 +# ----------------------------
12831 +# Automake X.Y traces this macro to ensure aclocal.m4 has been
12832 +# generated from the m4 files accompanying Automake X.Y.
12833 +# (This private macro should not be called outside this file.)
12834 +AC_DEFUN([AM_AUTOMAKE_VERSION],
12835 +[am__api_version='1.10'
12836 +dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
12837 +dnl require some minimum version. Point them to the right macro.
12838 +m4_if([$1], [1.10], [],
12839 + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
12840 +])
1373712841
1373812842 - # Set some defaults for GNU ld with shared library support. These
1373912843 - # are reset later if shared libraries are not supported. Putting them
1375512859 - *\ 2.11.*) ;; # other 2.11 versions
1375612860 - *) supports_anon_versioning=yes ;;
1375712861 - esac
12862 +# _AM_AUTOCONF_VERSION(VERSION)
12863 +# -----------------------------
12864 +# aclocal traces this macro to find the Autoconf version.
12865 +# This is a private macro too. Using m4_define simplifies
12866 +# the logic in aclocal, which can simply ignore this definition.
12867 +m4_define([_AM_AUTOCONF_VERSION], [])
12868
12869 - # See if GNU ld supports shared libraries.
12870 - case $host_os in
12871 - aix3* | aix4* | aix5*)
12872 - # On AIX/PPC, the GNU linker is very broken
12873 - if test "$host_cpu" != ia64; then
12874 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
12875 - cat <<EOF 1>&2
12876 +# AM_SET_CURRENT_AUTOMAKE_VERSION
12877 +# -------------------------------
12878 +# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
12879 +# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
12880 +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
12881 +[AM_AUTOMAKE_VERSION([1.10])dnl
12882 +_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
12883
12884 -*** Warning: the GNU linker, at least up to release 2.9.1, is reported
12885 -*** to be unable to reliably create shared libraries on AIX.
12886 -*** Therefore, libtool is disabling shared libraries support. If you
12887 -*** really care for shared libraries, you may want to modify your PATH
12888 -*** so that a non-GNU linker is found, and then restart.
12889 +# AM_AUX_DIR_EXPAND -*- Autoconf -*-
12890
12891 -EOF
12892 - fi
12893 - ;;
12894 +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
12895 +#
12896 +# This file is free software; the Free Software Foundation
12897 +# gives unlimited permission to copy and/or distribute it,
12898 +# with or without modifications, as long as this notice is preserved.
12899
12900 - amigaos*)
12901 - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
12902 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
12903 - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
12904 +# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
12905 +# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
12906 +# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
12907 +#
12908 +# Of course, Automake must honor this variable whenever it calls a
12909 +# tool from the auxiliary directory. The problem is that $srcdir (and
12910 +# therefore $ac_aux_dir as well) can be either absolute or relative,
12911 +# depending on how configure is run. This is pretty annoying, since
12912 +# it makes $ac_aux_dir quite unusable in subdirectories: in the top
12913 +# source directory, any form will work fine, but in subdirectories a
12914 +# relative path needs to be adjusted first.
12915 +#
12916 +# $ac_aux_dir/missing
12917 +# fails when called from a subdirectory if $ac_aux_dir is relative
12918 +# $top_srcdir/$ac_aux_dir/missing
12919 +# fails if $ac_aux_dir is absolute,
12920 +# fails when called from a subdirectory in a VPATH build with
12921 +# a relative $ac_aux_dir
12922 +#
12923 +# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
12924 +# are both prefixed by $srcdir. In an in-source build this is usually
12925 +# harmless because $srcdir is `.', but things will broke when you
12926 +# start a VPATH build or use an absolute $srcdir.
12927 +#
12928 +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
12929 +# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
12930 +# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
12931 +# and then we would define $MISSING as
12932 +# MISSING="\${SHELL} $am_aux_dir/missing"
12933 +# This will work as long as MISSING is not called from configure, because
12934 +# unfortunately $(top_srcdir) has no meaning in configure.
12935 +# However there are other variables, like CC, which are often used in
12936 +# configure, and could therefore not use this "fixed" $ac_aux_dir.
12937 +#
12938 +# Another solution, used here, is to always expand $ac_aux_dir to an
12939 +# absolute PATH. The drawback is that using absolute paths prevent a
12940 +# configured tree to be moved without reconfiguration.
12941
12942 - # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
12943 - # that the semantics of dynamic libraries on AmigaOS, at least up
12944 - # to version 4, is to share data among multiple programs linked
12945 - # with the same dynamic library. Since this doesn't match the
12946 - # behavior of shared libraries on other platforms, we can't use
12947 - # them.
12948 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
12949 - ;;
12950 +AC_DEFUN([AM_AUX_DIR_EXPAND],
12951 +[dnl Rely on autoconf to set up CDPATH properly.
12952 +AC_PREREQ([2.50])dnl
12953 +# expand $ac_aux_dir to an absolute path
12954 +am_aux_dir=`cd $ac_aux_dir && pwd`
12955 +])
12956
12957 - beos*)
12958 - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
12959 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
12960 - # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
12961 - # support --undefined. This deserves some investigation. FIXME
12962 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
12963 - else
12964 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
12965 - fi
12966 - ;;
12967 +# AM_CONDITIONAL -*- Autoconf -*-
12968
12969 - cygwin* | mingw* | pw32*)
12970 - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
12971 - # as there is no search path for DLLs.
12972 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
12973 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
12974 - _LT_AC_TAGVAR(always_export_symbols, $1)=no
12975 - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
12976 - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
12977 +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
12978 +# Free Software Foundation, Inc.
12979 +#
12980 +# This file is free software; the Free Software Foundation
12981 +# gives unlimited permission to copy and/or distribute it,
12982 +# with or without modifications, as long as this notice is preserved.
12983
12984 - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
12985 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
12986 - # If the export-symbols file already is a .def file (1st line
12987 - # is EXPORTS), use it as is; otherwise, prepend...
12988 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
12989 - cp $export_symbols $output_objdir/$soname.def;
12990 - else
12991 - echo EXPORTS > $output_objdir/$soname.def;
12992 - cat $export_symbols >> $output_objdir/$soname.def;
12993 - fi~
12994 - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
12995 - else
12996 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
12997 - fi
12998 - ;;
12999 +# serial 8
13000
13001 - interix3*)
13002 - _LT_AC_TAGVAR(hardcode_direct, $1)=no
13003 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
13004 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
13005 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
13006 - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
13007 - # Instead, shared libraries are loaded at an image base (0x10000000 by
13008 - # default) and relocated if they conflict, which is a slow very memory
13009 - # consuming and fragmenting process. To avoid this, we pick a random,
13010 - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
13011 - # time. Moving up from 0x10000000 also allows more sbrk(2) space.
13012 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
13013 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
13014 - ;;
1375813015 +# AM_CONDITIONAL(NAME, SHELL-CONDITION)
1375913016 +# -------------------------------------
1376013017 +# Define a conditional.
1376213019 +[AC_PREREQ(2.52)dnl
1376313020 + ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
1376413021 + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
13765 +AC_SUBST([$1_TRUE])
13766 +AC_SUBST([$1_FALSE])
13022 +AC_SUBST([$1_TRUE])dnl
13023 +AC_SUBST([$1_FALSE])dnl
13024 +_AM_SUBST_NOTMAKE([$1_TRUE])dnl
13025 +_AM_SUBST_NOTMAKE([$1_FALSE])dnl
1376713026 +if $2; then
1376813027 + $1_TRUE=
1376913028 + $1_FALSE='#'
1377713036 +Usually this means the macro was only invoked conditionally.]])
1377813037 +fi])])
1377913038
13780 - # See if GNU ld supports shared libraries.
13781 - case $host_os in
13782 - aix3* | aix4* | aix5*)
13783 - # On AIX/PPC, the GNU linker is very broken
13784 - if test "$host_cpu" != ia64; then
13785 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
13786 - cat <<EOF 1>&2
13787
13788 -*** Warning: the GNU linker, at least up to release 2.9.1, is reported
13789 -*** to be unable to reliably create shared libraries on AIX.
13790 -*** Therefore, libtool is disabling shared libraries support. If you
13791 -*** really care for shared libraries, you may want to modify your PATH
13792 -*** so that a non-GNU linker is found, and then restart.
13793 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
13039 - linux*)
13040 - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
13041 - tmp_addflag=
13042 - case $cc_basename,$host_cpu in
13043 - pgcc*) # Portland Group C compiler
13044 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
13045 - tmp_addflag=' $pic_flag'
13046 - ;;
13047 - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
13048 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
13049 - tmp_addflag=' $pic_flag -Mnomain' ;;
13050 - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
13051 - tmp_addflag=' -i_dynamic' ;;
13052 - efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
13053 - tmp_addflag=' -i_dynamic -nofor_main' ;;
13054 - ifc* | ifort*) # Intel Fortran compiler
13055 - tmp_addflag=' -nofor_main' ;;
13056 - esac
13057 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
13058 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
1379413059 +# Free Software Foundation, Inc.
1379513060 +#
1379613061 +# This file is free software; the Free Software Foundation
1379713062 +# gives unlimited permission to copy and/or distribute it,
1379813063 +# with or without modifications, as long as this notice is preserved.
1379913064
13800 -EOF
13065 - if test $supports_anon_versioning = yes; then
13066 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
13067 - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
13068 - $echo "local: *; };" >> $output_objdir/$libname.ver~
13069 - $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
13070 - fi
13071 - else
13072 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
1380113073 - fi
1380213074 - ;;
13803 +# serial 8
13804
13805 - amigaos*)
13806 - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
13807 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
13808 - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
13075 +# serial 9
13076
13077 - netbsd*)
13078 - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
13079 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
13080 - wlarc=
13081 - else
13082 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
13083 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
13084 - fi
13085 - ;;
1380913086 +# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
1381013087 +# written in clear, in which case automake, when reading aclocal.m4,
1381113088 +# will think it sees a *use*, and therefore will trigger all it's
1381213089 +# C support machinery. Also note that it means that autoscan, seeing
1381313090 +# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
1381413091
13815 - # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
13816 - # that the semantics of dynamic libraries on AmigaOS, at least up
13817 - # to version 4, is to share data among multiple programs linked
13818 - # with the same dynamic library. Since this doesn't match the
13819 - # behavior of shared libraries on other platforms, we can't use
13820 - # them.
13821 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
13822 - ;;
13823
13824 - beos*)
13825 - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
13826 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
13827 - # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
13828 - # support --undefined. This deserves some investigation. FIXME
13829 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
13830 - else
13092 - solaris*)
13093 - if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
1383113094 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
13832 - fi
13833 - ;;
13095 - cat <<EOF 1>&2
13096
13097 -*** Warning: The releases 2.8.* of the GNU linker cannot reliably
13098 -*** create shared libraries on Solaris systems. Therefore, libtool
13099 -*** is disabling shared libraries support. We urge you to upgrade GNU
13100 -*** binutils to release 2.9.1 or newer. Another option is to modify
13101 -*** your PATH or compiler configuration so that the native linker is
13102 -*** used, and then restart.
1383413103 +# _AM_DEPENDENCIES(NAME)
1383513104 +# ----------------------
1383613105 +# See how the compiler implements dependency checking.
1384613115 +AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
1384713116 +AC_REQUIRE([AM_MAKE_INCLUDE])dnl
1384813117 +AC_REQUIRE([AM_DEP_TRACK])dnl
13849 +
13118
13119 -EOF
13120 - elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
13121 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
13122 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
13123 - else
13124 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
13125 - fi
13126 - ;;
1385013127 +ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
1385113128 + [$1], CXX, [depcc="$CXX" am_compiler_list=],
1385213129 + [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
13130 + [$1], UPC, [depcc="$UPC" am_compiler_list=],
1385313131 + [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
1385413132 + [depcc="$$1" am_compiler_list=])
13855 +
13133
13134 - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
13135 - case `$LD -v 2>&1` in
13136 - *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
13137 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
13138 - cat <<_LT_EOF 1>&2
1385613139 +AC_CACHE_CHECK([dependency style of $depcc],
1385713140 + [am_cv_$1_dependencies_compiler_type],
1385813141 +[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
1387413157 + # directory.
1387513158 + mkdir sub
1387613159
13877 - cygwin* | mingw* | pw32*)
13878 - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
13879 - # as there is no search path for DLLs.
13880 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
13881 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
13882 - _LT_AC_TAGVAR(always_export_symbols, $1)=no
13883 - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
13884 - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
13160 -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
13161 -*** reliably create shared libraries on SCO systems. Therefore, libtool
13162 -*** is disabling shared libraries support. We urge you to upgrade GNU
13163 -*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
13164 -*** your PATH or compiler configuration so that the native linker is
13165 -*** used, and then restart.
1388513166 + am_cv_$1_dependencies_compiler_type=none
1388613167 + if test "$am_compiler_list" = ""; then
1388713168 + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
1390313184 + done
1390413185 + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
1390513186
13906 - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
13907 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
13908 - # If the export-symbols file already is a .def file (1st line
13909 - # is EXPORTS), use it as is; otherwise, prepend...
13910 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
13911 - cp $export_symbols $output_objdir/$soname.def;
13912 - else
13913 - echo EXPORTS > $output_objdir/$soname.def;
13914 - cat $export_symbols >> $output_objdir/$soname.def;
13915 - fi~
13916 - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
13187 -_LT_EOF
13188 - ;;
13189 - *)
13190 - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
13191 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
13192 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
13193 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
13194 - else
13195 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
13196 - fi
13197 - ;;
13198 - esac
1391713199 + case $depmode in
1391813200 + nosideeffect)
1391913201 + # after this tag, mechanisms are not by side-effect, so they'll
1392013202 + # only be used when explicitly requested
1392113203 + if test "x$enable_dependency_tracking" = xyes; then
1392213204 + continue
13923 else
13924 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
13205 + else
1392513206 + break
13926 fi
13207 + fi
1392713208 ;;
1392813209 + none) break ;;
1392913210 + esac
1393513216 + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
1393613217 + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
1393713218 + >/dev/null 2>conftest.err &&
13219 + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
1393813220 + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
1393913221 + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
1394013222 + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
1395313235 + fi
1395413236 + done
1395513237
13956 - interix3*)
13957 - _LT_AC_TAGVAR(hardcode_direct, $1)=no
13238 - sunos4*)
13239 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
13240 - wlarc=
13241 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
1395813242 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
13959 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
13960 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
13961 - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
13962 - # Instead, shared libraries are loaded at an image base (0x10000000 by
13963 - # default) and relocated if they conflict, which is a slow very memory
13964 - # consuming and fragmenting process. To avoid this, we pick a random,
13965 - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
13966 - # time. Moving up from 0x10000000 also allows more sbrk(2) space.
13967 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
13968 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
1396913243 - ;;
13970 -
13971 - linux*)
13972 - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
13973 - tmp_addflag=
13974 - case $cc_basename,$host_cpu in
13975 - pgcc*) # Portland Group C compiler
13976 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
13977 - tmp_addflag=' $pic_flag'
13978 - ;;
13979 - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
13980 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
13981 - tmp_addflag=' $pic_flag -Mnomain' ;;
13982 - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
13983 - tmp_addflag=' -i_dynamic' ;;
13984 - efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
13985 - tmp_addflag=' -i_dynamic -nofor_main' ;;
13986 - ifc* | ifort*) # Intel Fortran compiler
13987 - tmp_addflag=' -nofor_main' ;;
13988 - esac
13989 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
1399013244 + cd ..
1399113245 + rm -rf conftest.dir
1399213246 +else
1399913253 + && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
1400013254 +])
1400113255
14002 - if test $supports_anon_versioning = yes; then
14003 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
14004 - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
14005 - $echo "local: *; };" >> $output_objdir/$libname.ver~
14006 - $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
14007 - fi
14008 - else
14009 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
14010 - fi
14011 - ;;
14012
14013 - netbsd*)
14014 - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
14015 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
14016 - wlarc=
14017 - else
14018 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
14019 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
14020 - fi
14021 - ;;
14022 +# AM_SET_DEPDIR
14023 +# -------------
14024 +# Choose a directory name for dependency files.
14025 +# This macro is AC_REQUIREd in _AM_DEPENDENCIES
14026 +AC_DEFUN([AM_SET_DEPDIR],
14027 +[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
14028 +AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
14029 +])
14030
14031 - solaris*)
14032 - if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
14033 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
14034 - cat <<EOF 1>&2
14035
14036 -*** Warning: The releases 2.8.* of the GNU linker cannot reliably
14037 -*** create shared libraries on Solaris systems. Therefore, libtool
14038 -*** is disabling shared libraries support. We urge you to upgrade GNU
14039 -*** binutils to release 2.9.1 or newer. Another option is to modify
14040 -*** your PATH or compiler configuration so that the native linker is
14041 -*** used, and then restart.
14042 +# AM_DEP_TRACK
14043 +# ------------
14044 +AC_DEFUN([AM_DEP_TRACK],
14045 +[AC_ARG_ENABLE(dependency-tracking,
14046 +[ --disable-dependency-tracking speeds up one-time build
14047 + --enable-dependency-tracking do not reject slow dependency extractors])
14048 +if test "x$enable_dependency_tracking" != xno; then
14049 + am_depcomp="$ac_aux_dir/depcomp"
14050 + AMDEPBACKSLASH='\'
14051 +fi
14052 +AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
14053 +AC_SUBST([AMDEPBACKSLASH])
14054 +])
14055
14056 -EOF
14057 - elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
14058 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
14059 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
14060 - else
14061 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
14062 - fi
14063 - ;;
14064 +# Generate code to set up dependency tracking. -*- Autoconf -*-
14065
14066 - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
14067 - case `$LD -v 2>&1` in
14068 - *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
14069 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
14070 - cat <<_LT_EOF 1>&2
14071 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
14072 +# Free Software Foundation, Inc.
14073 +#
14074 +# This file is free software; the Free Software Foundation
14075 +# gives unlimited permission to copy and/or distribute it,
14076 +# with or without modifications, as long as this notice is preserved.
14077
14078 -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
14079 -*** reliably create shared libraries on SCO systems. Therefore, libtool
14080 -*** is disabling shared libraries support. We urge you to upgrade GNU
14081 -*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
14082 -*** your PATH or compiler configuration so that the native linker is
14083 -*** used, and then restart.
14084 +#serial 3
14085
14086 -_LT_EOF
14087 - ;;
14088 - *)
14089 - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
14090 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
14091 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
14092 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
14093 - else
14094 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
14095 - fi
14096 - ;;
14097 - esac
14098 - ;;
14099 +# _AM_OUTPUT_DEPENDENCY_COMMANDS
14100 +# ------------------------------
14101 +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
14102 +[for mf in $CONFIG_FILES; do
14103 + # Strip MF so we end up with the name of the file.
14104 + mf=`echo "$mf" | sed -e 's/:.*$//'`
14105 + # Check whether this is an Automake generated Makefile or not.
14106 + # We used to match only the files named `Makefile.in', but
14107 + # some people rename them; so instead we look at the file content.
14108 + # Grep'ing the first line is not enough: some people post-process
14109 + # each Makefile.in and add a new line on top of each file to say so.
14110 + # So let's grep whole file.
14111 + if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
14112 + dirpart=`AS_DIRNAME("$mf")`
14113 + else
14114 + continue
14115 + fi
14116 + # Extract the definition of DEPDIR, am__include, and am__quote
14117 + # from the Makefile without running `make'.
14118 + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
14119 + test -z "$DEPDIR" && continue
14120 + am__include=`sed -n 's/^am__include = //p' < "$mf"`
14121 + test -z "am__include" && continue
14122 + am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
14123 + # When using ansi2knr, U may be empty or an underscore; expand it
14124 + U=`sed -n 's/^U = //p' < "$mf"`
14125 + # Find all dependency output files, they are included files with
14126 + # $(DEPDIR) in their names. We invoke sed twice because it is the
14127 + # simplest approach to changing $(DEPDIR) to its actual value in the
14128 + # expansion.
14129 + for file in `sed -n "
14130 + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
14131 + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
14132 + # Make sure the directory exists.
14133 + test -f "$dirpart/$file" && continue
14134 + fdir=`AS_DIRNAME(["$file"])`
14135 + AS_MKDIR_P([$dirpart/$fdir])
14136 + # echo "creating $dirpart/$file"
14137 + echo '# dummy' > "$dirpart/$file"
14138 + done
14139 +done
14140 +])# _AM_OUTPUT_DEPENDENCY_COMMANDS
14141
14142 - sunos4*)
14143 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
14144 - wlarc=
14145 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
14146 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
14147 - ;;
14148
1414913256 - *)
1415013257 - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
1415113258 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
1415513262 - fi
1415613263 - ;;
1415713264 - esac
14158 +# AM_OUTPUT_DEPENDENCY_COMMANDS
14159 +# -----------------------------
14160 +# This macro should only be invoked once -- use via AC_REQUIRE.
14161 +#
14162 +# This code is only required when automatic dependency tracking
14163 +# is enabled. FIXME. This creates each `.P' file that we will
14164 +# need in order to bootstrap the dependency handling code.
14165 +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
14166 +[AC_CONFIG_COMMANDS([depfiles],
14167 + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
14168 + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
14169 +])
1417013265
1417113266 - if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
1417213267 - runpath_var=
1419013285 - _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
1419113286 - fi
1419213287 - ;;
14193 +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
14194 +# Free Software Foundation, Inc.
14195 +#
14196 +# This file is free software; the Free Software Foundation
14197 +# gives unlimited permission to copy and/or distribute it,
14198 +# with or without modifications, as long as this notice is preserved.
13288 +# AM_SET_DEPDIR
13289 +# -------------
13290 +# Choose a directory name for dependency files.
13291 +# This macro is AC_REQUIREd in _AM_DEPENDENCIES
13292 +AC_DEFUN([AM_SET_DEPDIR],
13293 +[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
13294 +AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
13295 +])
1419913296
1420013297 - aix4* | aix5*)
1420113298 - if test "$host_cpu" = ia64; then
1421313310 - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
1421413311 - fi
1421513312 - aix_use_runtimelinking=no
14216 +# serial 8
1421713313
1421813314 - # Test if we are trying to use run time linking or normal
1421913315 - # AIX style linking. If -brtl is somewhere in LDFLAGS, we
1422713323 - done
1422813324 - ;;
1422913325 - esac
14230 +# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
14231 +AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
13326 +# AM_DEP_TRACK
13327 +# ------------
13328 +AC_DEFUN([AM_DEP_TRACK],
13329 +[AC_ARG_ENABLE(dependency-tracking,
13330 +[ --disable-dependency-tracking speeds up one-time build
13331 + --enable-dependency-tracking do not reject slow dependency extractors])
13332 +if test "x$enable_dependency_tracking" != xno; then
13333 + am_depcomp="$ac_aux_dir/depcomp"
13334 + AMDEPBACKSLASH='\'
13335 +fi
13336 +AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
13337 +AC_SUBST([AMDEPBACKSLASH])dnl
13338 +_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
13339 +])
1423213340
1423313341 - exp_sym_flag='-bexport'
1423413342 - no_entry_flag='-bnoentry'
1423513343 - fi
14236 +# Do all the work for Automake. -*- Autoconf -*-
13344 +# Generate code to set up dependency tracking. -*- Autoconf -*-
1423713345
1423813346 - # When large executables or shared objects are built, AIX ld can
1423913347 - # have problems creating the table of contents. If linking a library
1424013348 - # or program results in "error TOC overflow" add -mminimal-toc to
1424113349 - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
1424213350 - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
14243 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
13351 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
1424413352 +# Free Software Foundation, Inc.
1424513353 +#
1424613354 +# This file is free software; the Free Software Foundation
1425113359 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
1425213360 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
1425313361 - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
14254 +# serial 12
13362 +#serial 3
1425513363
1425613364 - if test "$GCC" = yes; then
1425713365 - case $host_os in aix4.[[012]]|aix4.[[012]].*)
1429313401 - fi
1429413402 - fi
1429513403 - fi
14296 +# This macro actually does too much. Some checks are only needed if
14297 +# your package does certain things. But this isn't really a big deal.
13404 +# _AM_OUTPUT_DEPENDENCY_COMMANDS
13405 +# ------------------------------
13406 +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
13407 +[for mf in $CONFIG_FILES; do
13408 + # Strip MF so we end up with the name of the file.
13409 + mf=`echo "$mf" | sed -e 's/:.*$//'`
13410 + # Check whether this is an Automake generated Makefile or not.
13411 + # We used to match only the files named `Makefile.in', but
13412 + # some people rename them; so instead we look at the file content.
13413 + # Grep'ing the first line is not enough: some people post-process
13414 + # each Makefile.in and add a new line on top of each file to say so.
13415 + # Grep'ing the whole file is not good either: AIX grep has a line
13416 + # limit of 2048, but all sed's we know have understand at least 4000.
13417 + if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
13418 + dirpart=`AS_DIRNAME("$mf")`
13419 + else
13420 + continue
13421 + fi
13422 + # Extract the definition of DEPDIR, am__include, and am__quote
13423 + # from the Makefile without running `make'.
13424 + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
13425 + test -z "$DEPDIR" && continue
13426 + am__include=`sed -n 's/^am__include = //p' < "$mf"`
13427 + test -z "am__include" && continue
13428 + am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
13429 + # When using ansi2knr, U may be empty or an underscore; expand it
13430 + U=`sed -n 's/^U = //p' < "$mf"`
13431 + # Find all dependency output files, they are included files with
13432 + # $(DEPDIR) in their names. We invoke sed twice because it is the
13433 + # simplest approach to changing $(DEPDIR) to its actual value in the
13434 + # expansion.
13435 + for file in `sed -n "
13436 + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
13437 + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
13438 + # Make sure the directory exists.
13439 + test -f "$dirpart/$file" && continue
13440 + fdir=`AS_DIRNAME(["$file"])`
13441 + AS_MKDIR_P([$dirpart/$fdir])
13442 + # echo "creating $dirpart/$file"
13443 + echo '# dummy' > "$dirpart/$file"
13444 + done
13445 +done
13446 +])# _AM_OUTPUT_DEPENDENCY_COMMANDS
1429813447
1429913448 - # It seems that -bexpall does not export symbols beginning with
1430013449 - # underscore (_), so it is better to generate a list of symbols to export.
1432813477 - fi
1432913478 - fi
1433013479 - ;;
14331 +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
14332 +# AM_INIT_AUTOMAKE([OPTIONS])
14333 +# -----------------------------------------------
14334 +# The call with PACKAGE and VERSION arguments is the old style
14335 +# call (pre autoconf-2.50), which is being phased out. PACKAGE
14336 +# and VERSION should now be passed to AC_INIT and removed from
14337 +# the call to AM_INIT_AUTOMAKE.
14338 +# We support both call styles for the transition. After
14339 +# the next Automake release, Autoconf can make the AC_INIT
14340 +# arguments mandatory, and then we can depend on a new Autoconf
14341 +# release and drop the old call support.
14342 +AC_DEFUN([AM_INIT_AUTOMAKE],
14343 +[AC_PREREQ([2.58])dnl
14344 +dnl Autoconf wants to disallow AM_ names. We explicitly allow
14345 +dnl the ones we care about.
14346 +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
14347 +AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
14348 +AC_REQUIRE([AC_PROG_INSTALL])dnl
14349 +# test to see if srcdir already configured
14350 +if test "`cd $srcdir && pwd`" != "`pwd`" &&
14351 + test -f $srcdir/config.status; then
14352 + AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
14353 +fi
1435413480
1435513481 - amigaos*)
1435613482 - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
1435913485 - # see comment about different semantics on the GNU ld section
1436013486 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
1436113487 - ;;
14362 +# test whether we have cygpath
14363 +if test -z "$CYGPATH_W"; then
14364 + if (cygpath --version) >/dev/null 2>/dev/null; then
14365 + CYGPATH_W='cygpath -w'
14366 + else
14367 + CYGPATH_W=echo
14368 + fi
14369 +fi
14370 +AC_SUBST([CYGPATH_W])
13488 +# AM_OUTPUT_DEPENDENCY_COMMANDS
13489 +# -----------------------------
13490 +# This macro should only be invoked once -- use via AC_REQUIRE.
13491 +#
13492 +# This code is only required when automatic dependency tracking
13493 +# is enabled. FIXME. This creates each `.P' file that we will
13494 +# need in order to bootstrap the dependency handling code.
13495 +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
13496 +[AC_CONFIG_COMMANDS([depfiles],
13497 + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
13498 + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
13499 +])
1437113500
1437213501 - bsdi[[45]]*)
1437313502 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
1437413503 - ;;
14375 +# Define the identity of the package.
14376 +dnl Distinguish between old-style and new-style calls.
14377 +m4_ifval([$2],
14378 +[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
14379 + AC_SUBST([PACKAGE], [$1])dnl
14380 + AC_SUBST([VERSION], [$2])],
14381 +[_AM_SET_OPTIONS([$1])dnl
14382 + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
14383 + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
13504 +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
13505 +# Free Software Foundation, Inc.
13506 +#
13507 +# This file is free software; the Free Software Foundation
13508 +# gives unlimited permission to copy and/or distribute it,
13509 +# with or without modifications, as long as this notice is preserved.
1438413510
1438513511 - cygwin* | mingw* | pw32*)
1438613512 - # When not using gcc, we currently assume that we are using
1440213528 - _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
1440313529 - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
1440413530 - ;;
14405 +_AM_IF_OPTION([no-define],,
14406 +[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
14407 + AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
13531 +# serial 8
1440813532
1440913533 - darwin* | rhapsody*)
1441013534 - case $host_os in
1445513579 - esac
1445613580 - fi
1445713581 - ;;
13582 +# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
13583 +AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
13584
13585 - dgux*)
13586 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
13587 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
13588 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
13589 - ;;
13590 +# Do all the work for Automake. -*- Autoconf -*-
13591
13592 - freebsd1*)
13593 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
13594 - ;;
13595 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
13596 +# 2005, 2006 Free Software Foundation, Inc.
13597 +#
13598 +# This file is free software; the Free Software Foundation
13599 +# gives unlimited permission to copy and/or distribute it,
13600 +# with or without modifications, as long as this notice is preserved.
13601
13602 - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
13603 - # support. Future versions do this automatically, but an explicit c++rt0.o
13604 - # does not break anything, and helps significantly (at the cost of a little
13605 - # extra space).
13606 - freebsd2.2*)
13607 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
13608 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
13609 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
13610 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
13611 - ;;
13612 +# serial 12
13613
13614 - # Unfortunately, older versions of FreeBSD 2 do not have this feature.
13615 - freebsd2*)
13616 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
13617 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
13618 - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
13619 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
13620 - ;;
13621 +# This macro actually does too much. Some checks are only needed if
13622 +# your package does certain things. But this isn't really a big deal.
13623
13624 - # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
13625 - freebsd* | kfreebsd*-gnu | dragonfly*)
13626 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
13627 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
13628 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
13629 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
13630 - ;;
13631 +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
13632 +# AM_INIT_AUTOMAKE([OPTIONS])
13633 +# -----------------------------------------------
13634 +# The call with PACKAGE and VERSION arguments is the old style
13635 +# call (pre autoconf-2.50), which is being phased out. PACKAGE
13636 +# and VERSION should now be passed to AC_INIT and removed from
13637 +# the call to AM_INIT_AUTOMAKE.
13638 +# We support both call styles for the transition. After
13639 +# the next Automake release, Autoconf can make the AC_INIT
13640 +# arguments mandatory, and then we can depend on a new Autoconf
13641 +# release and drop the old call support.
13642 +AC_DEFUN([AM_INIT_AUTOMAKE],
13643 +[AC_PREREQ([2.60])dnl
13644 +dnl Autoconf wants to disallow AM_ names. We explicitly allow
13645 +dnl the ones we care about.
13646 +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
13647 +AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
13648 +AC_REQUIRE([AC_PROG_INSTALL])dnl
13649 +if test "`cd $srcdir && pwd`" != "`pwd`"; then
13650 + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
13651 + # is not polluted with repeated "-I."
13652 + AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
13653 + # test to see if srcdir already configured
13654 + if test -f $srcdir/config.status; then
13655 + AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
13656 + fi
13657 +fi
13658
13659 - hpux9*)
13660 - if test "$GCC" = yes; then
13661 - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
13662 - else
13663 - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
13664 - fi
13665 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
13666 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
13667 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
13668 +# test whether we have cygpath
13669 +if test -z "$CYGPATH_W"; then
13670 + if (cygpath --version) >/dev/null 2>/dev/null; then
13671 + CYGPATH_W='cygpath -w'
13672 + else
13673 + CYGPATH_W=echo
13674 + fi
13675 +fi
13676 +AC_SUBST([CYGPATH_W])
13677
13678 - # hardcode_minus_L: Not really in the search PATH,
13679 - # but as the default location of the library.
13680 - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
13681 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
13682 - ;;
13683 +# Define the identity of the package.
13684 +dnl Distinguish between old-style and new-style calls.
13685 +m4_ifval([$2],
13686 +[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
13687 + AC_SUBST([PACKAGE], [$1])dnl
13688 + AC_SUBST([VERSION], [$2])],
13689 +[_AM_SET_OPTIONS([$1])dnl
13690 +dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
13691 +m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
13692 + [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
13693 + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
13694 + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
13695
13696 - hpux10*)
13697 - if test "$GCC" = yes -a "$with_gnu_ld" = no; then
13698 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
13699 - else
13700 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
13701 - fi
13702 - if test "$with_gnu_ld" = no; then
13703 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
13704 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
13705 +_AM_IF_OPTION([no-define],,
13706 +[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
13707 + AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
13708
13709 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
13710 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
1445813711 +# Some tools Automake needs.
1445913712 +AC_REQUIRE([AM_SANITY_CHECK])dnl
1446013713 +AC_REQUIRE([AC_ARG_PROGRAM])dnl
1448313736 + [_AM_DEPENDENCIES(CXX)],
1448413737 + [define([AC_PROG_CXX],
1448513738 + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
13739 +AC_PROVIDE_IFELSE([AC_PROG_OBJC],
13740 + [_AM_DEPENDENCIES(OBJC)],
13741 + [define([AC_PROG_OBJC],
13742 + defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
1448613743 +])
1448713744 +])
14488
14489 - dgux*)
14490 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
14491 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
14492 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
14493 - ;;
14494
14495 - freebsd1*)
14496 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
14497 - ;;
14498 +# When config.status generates a header, we must update the stamp-h file.
14499 +# This file resides in the same directory as the config header
14500 +# that is generated. The stamp files are numbered to have different names.
14501
14502 - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
14503 - # support. Future versions do this automatically, but an explicit c++rt0.o
14504 - # does not break anything, and helps significantly (at the cost of a little
14505 - # extra space).
14506 - freebsd2.2*)
14507 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
14508 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
14509 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
14510 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
14511 - ;;
14512 +# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
14513 +# loop where config.status creates the headers, so we can generate
14514 +# our stamp files there.
14515 +AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
14516 +[# Compute $1's index in $config_headers.
14517 +_am_stamp_count=1
14518 +for _am_header in $config_headers :; do
14519 + case $_am_header in
14520 + $1 | $1:* )
14521 + break ;;
14522 + * )
14523 + _am_stamp_count=`expr $_am_stamp_count + 1` ;;
14524 + esac
14525 +done
14526 +echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
14527
14528 - # Unfortunately, older versions of FreeBSD 2 do not have this feature.
14529 - freebsd2*)
14530 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
14531 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
14532 - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
14533 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
14534 - ;;
14535 +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
14536 +#
14537 +# This file is free software; the Free Software Foundation
14538 +# gives unlimited permission to copy and/or distribute it,
14539 +# with or without modifications, as long as this notice is preserved.
14540
14541 - # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
14542 - freebsd* | kfreebsd*-gnu | dragonfly*)
14543 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
14544 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
14545 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
14546 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
14547 - ;;
14548 +# AM_PROG_INSTALL_SH
14549 +# ------------------
14550 +# Define $install_sh.
14551 +AC_DEFUN([AM_PROG_INSTALL_SH],
14552 +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
14553 +install_sh=${install_sh-"$am_aux_dir/install-sh"}
14554 +AC_SUBST(install_sh)])
14555
14556 - hpux9*)
14557 - if test "$GCC" = yes; then
14558 - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
14559 - else
14560 - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
14561 - fi
14562 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
14563 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
14564 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
14565 +# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
14566 +#
14567 +# This file is free software; the Free Software Foundation
14568 +# gives unlimited permission to copy and/or distribute it,
14569 +# with or without modifications, as long as this notice is preserved.
14570
14571 - # hardcode_minus_L: Not really in the search PATH,
14572 - # but as the default location of the library.
14573 - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
14574 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
14575 - ;;
14576 +# serial 2
14577
14578 - hpux10*)
14579 - if test "$GCC" = yes -a "$with_gnu_ld" = no; then
14580 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
14581 - else
14582 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
14583 - fi
14584 - if test "$with_gnu_ld" = no; then
14585 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
14586 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
14587 +# Check whether the underlying file-system supports filenames
14588 +# with a leading dot. For instance MS-DOS doesn't.
14589 +AC_DEFUN([AM_SET_LEADING_DOT],
14590 +[rm -rf .tst 2>/dev/null
14591 +mkdir .tst 2>/dev/null
14592 +if test -d .tst; then
14593 + am__leading_dot=.
14594 +else
14595 + am__leading_dot=_
14596 +fi
14597 +rmdir .tst 2>/dev/null
14598 +AC_SUBST([am__leading_dot])])
14599
14600 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
14601 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
14602 +# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
14603 +# From Jim Meyering
1460413745
1460513746 - # hardcode_minus_L: Not really in the search PATH,
1460613747 - # but as the default location of the library.
1460713748 - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
1460813749 - fi
1460913750 - ;;
14610 +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
14611 +# Free Software Foundation, Inc.
14612 +#
14613 +# This file is free software; the Free Software Foundation
14614 +# gives unlimited permission to copy and/or distribute it,
14615 +# with or without modifications, as long as this notice is preserved.
1461613751
1461713752 - hpux11*)
1461813753 - if test "$GCC" = yes -a "$with_gnu_ld" = no; then
1464313778 - if test "$with_gnu_ld" = no; then
1464413779 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
1464513780 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
13781 +# When config.status generates a header, we must update the stamp-h file.
13782 +# This file resides in the same directory as the config header
13783 +# that is generated. The stamp files are numbered to have different names.
13784 +
13785 +# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
13786 +# loop where config.status creates the headers, so we can generate
13787 +# our stamp files there.
13788 +AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
13789 +[# Compute $1's index in $config_headers.
13790 +_am_stamp_count=1
13791 +for _am_header in $config_headers :; do
13792 + case $_am_header in
13793 + $1 | $1:* )
13794 + break ;;
13795 + * )
13796 + _am_stamp_count=`expr $_am_stamp_count + 1` ;;
13797 + esac
13798 +done
13799 +echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
13800
13801 - case $host_cpu in
13802 - hppa*64*|ia64*)
13803 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
13804 - _LT_AC_TAGVAR(hardcode_direct, $1)=no
13805 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
13806 - ;;
13807 - *)
13808 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
13809 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
13810 +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
13811 +#
13812 +# This file is free software; the Free Software Foundation
13813 +# gives unlimited permission to copy and/or distribute it,
13814 +# with or without modifications, as long as this notice is preserved.
13815
13816 - # hardcode_minus_L: Not really in the search PATH,
13817 - # but as the default location of the library.
13818 - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
13819 - ;;
13820 - esac
13821 - fi
13822 - ;;
13823 +# AM_PROG_INSTALL_SH
13824 +# ------------------
13825 +# Define $install_sh.
13826 +AC_DEFUN([AM_PROG_INSTALL_SH],
13827 +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
13828 +install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
13829 +AC_SUBST(install_sh)])
13830
13831 - irix5* | irix6* | nonstopux*)
13832 - if test "$GCC" = yes; then
13833 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
13834 - else
13835 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
13836 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
13837 - fi
13838 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
13839 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
13840 - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
13841 - ;;
13842 +# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
13843 +#
13844 +# This file is free software; the Free Software Foundation
13845 +# gives unlimited permission to copy and/or distribute it,
13846 +# with or without modifications, as long as this notice is preserved.
13847
13848 - netbsd*)
13849 - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
13850 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
13851 - else
13852 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
13853 - fi
13854 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
13855 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
13856 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
13857 - ;;
13858 +# serial 2
13859
13860 - newsos6)
13861 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
13862 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
13863 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
13864 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
13865 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
13866 - ;;
13867 +# Check whether the underlying file-system supports filenames
13868 +# with a leading dot. For instance MS-DOS doesn't.
13869 +AC_DEFUN([AM_SET_LEADING_DOT],
13870 +[rm -rf .tst 2>/dev/null
13871 +mkdir .tst 2>/dev/null
13872 +if test -d .tst; then
13873 + am__leading_dot=.
13874 +else
13875 + am__leading_dot=_
13876 +fi
13877 +rmdir .tst 2>/dev/null
13878 +AC_SUBST([am__leading_dot])])
13879
13880 - openbsd*)
13881 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
13882 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
13883 - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
13884 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
13885 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
13886 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
13887 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
13888 - else
13889 - case $host_os in
13890 - openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
13891 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
13892 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
13893 - ;;
13894 - *)
13895 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
13896 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
13897 - ;;
13898 - esac
13899 - fi
13900 - ;;
13901 +# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
13902 +# From Jim Meyering
13903
13904 - os2*)
13905 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
13906 - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
13907 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
13908 - _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
13909 - _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
13910 - ;;
13911 +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
13912 +# Free Software Foundation, Inc.
13913 +#
13914 +# This file is free software; the Free Software Foundation
13915 +# gives unlimited permission to copy and/or distribute it,
13916 +# with or without modifications, as long as this notice is preserved.
13917
13918 - osf3*)
13919 - if test "$GCC" = yes; then
13920 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
13921 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
13922 - else
13923 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
13924 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
13925 - fi
13926 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
13927 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
13928 - ;;
1464613929 +# serial 4
14647 +
13930
13931 - osf4* | osf5*) # as osf3* with the addition of -msym flag
13932 - if test "$GCC" = yes; then
13933 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
13934 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
13935 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
13936 - else
13937 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
13938 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
13939 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
13940 - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
1464813941 +AC_DEFUN([AM_MAINTAINER_MODE],
1464913942 +[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
1465013943 + dnl maintainer-mode is disabled by default
1466013953 +]
1466113954 +)
1466213955
14663 - case $host_cpu in
14664 - hppa*64*|ia64*)
14665 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
14666 - _LT_AC_TAGVAR(hardcode_direct, $1)=no
14667 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
14668 - ;;
14669 - *)
14670 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
14671 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
13956 - # Both c and cxx compiler support -rpath directly
13957 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
13958 - fi
13959 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
13960 - ;;
1467213961 +AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
1467313962
14674 - # hardcode_minus_L: Not really in the search PATH,
14675 - # but as the default location of the library.
14676 - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
14677 - ;;
14678 - esac
13963 - solaris*)
13964 - _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
13965 - if test "$GCC" = yes; then
13966 - wlarc='${wl}'
13967 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
13968 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
13969 - $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
13970 - else
13971 - wlarc=''
13972 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
13973 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
13974 - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
1467913975 - fi
13976 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
13977 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
13978 - case $host_os in
13979 - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
13980 - *)
13981 - # The compiler driver will combine linker options so we
13982 - # cannot just pass the convience library names through
13983 - # without $wl, iff we do not link with $LD.
13984 - # Luckily, gcc supports the same syntax we need for Sun Studio.
13985 - # Supported since Solaris 2.6 (maybe 2.5.1?)
13986 - case $wlarc in
13987 - '')
13988 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
13989 - *)
13990 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
13991 - esac ;;
13992 - esac
13993 - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
1468013994 - ;;
1468113995 +# Check to see how 'make' treats includes. -*- Autoconf -*-
1468213996
14683 - irix5* | irix6* | nonstopux*)
14684 - if test "$GCC" = yes; then
14685 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
13997 - sunos4*)
13998 - if test "x$host_vendor" = xsequent; then
13999 - # Use $CC to link under sequent, because it throws in some extra .o
14000 - # files that make .init and .fini sections work.
14001 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
1468614002 - else
14687 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
14688 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
14003 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
1468914004 - fi
14690 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
14691 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
14692 - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
14005 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
14006 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
14007 - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
14008 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
1469314009 - ;;
1469414010 +# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
1469514011 +#
1469714013 +# gives unlimited permission to copy and/or distribute it,
1469814014 +# with or without modifications, as long as this notice is preserved.
1469914015
14700 - netbsd*)
14701 - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
14702 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
14703 - else
14704 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
14705 - fi
14706 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
14707 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
14016 - sysv4)
14017 - case $host_vendor in
14018 - sni)
14019 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
14020 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
14021 - ;;
14022 - siemens)
14023 - ## LD is ld it makes a PLAMLIB
14024 - ## CC just makes a GrossModule.
14025 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
14026 - _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
14027 - _LT_AC_TAGVAR(hardcode_direct, $1)=no
14028 - ;;
14029 - motorola)
14030 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
14031 - _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
14032 - ;;
14033 - esac
14034 - runpath_var='LD_RUN_PATH'
1470814035 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
1470914036 - ;;
1471014037 +# serial 3
14711
14712 - newsos6)
14713 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
14714 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
14715 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
14716 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
14717 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
14718 - ;;
14038 +
1471914039 +# AM_MAKE_INCLUDE()
1472014040 +# -----------------
1472114041 +# Check to see how make treats includes.
1475814078 +rm -f confinc confmf
1475914079 +])
1476014080
14761 - openbsd*)
14762 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
14763 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
14764 - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
14765 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
14766 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
14767 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
14768 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
14769 - else
14770 - case $host_os in
14771 - openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
14772 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
14773 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
14774 - ;;
14775 - *)
14776 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
14777 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
14778 - ;;
14779 - esac
14780 - fi
14781 - ;;
14782 +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
14783
14784 - os2*)
14785 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
14786 - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
14787 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
14788 - _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
14789 - _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
14790 - ;;
14791 +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
14792 +# Free Software Foundation, Inc.
14793 +#
14794 +# This file is free software; the Free Software Foundation
14795 +# gives unlimited permission to copy and/or distribute it,
14796 +# with or without modifications, as long as this notice is preserved.
14797
14798 - osf3*)
14799 - if test "$GCC" = yes; then
14800 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
14801 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
14802 - else
14803 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
14804 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
14805 - fi
14806 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
14807 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
14808 - ;;
14809 +# serial 4
14810
14811 - osf4* | osf5*) # as osf3* with the addition of -msym flag
14812 - if test "$GCC" = yes; then
14813 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
14814 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
14815 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
14816 - else
14817 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
14818 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
14819 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
14820 - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
14821 +# AM_MISSING_PROG(NAME, PROGRAM)
14822 +# ------------------------------
14823 +AC_DEFUN([AM_MISSING_PROG],
14824 +[AC_REQUIRE([AM_MISSING_HAS_RUN])
14825 +$1=${$1-"${am_missing_run}$2"}
14826 +AC_SUBST($1)])
14827
14828 - # Both c and cxx compiler support -rpath directly
14829 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
14830 - fi
14831 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
14832 - ;;
14833
14834 - solaris*)
14835 - _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
14836 - if test "$GCC" = yes; then
14837 - wlarc='${wl}'
14838 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
14839 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
14840 - $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
14841 - else
14842 - wlarc=''
14843 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
14844 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
14845 - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
14846 - fi
14847 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
14848 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
14849 - case $host_os in
14850 - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
14851 - *)
14852 - # The compiler driver will combine linker options so we
14853 - # cannot just pass the convience library names through
14854 - # without $wl, iff we do not link with $LD.
14855 - # Luckily, gcc supports the same syntax we need for Sun Studio.
14856 - # Supported since Solaris 2.6 (maybe 2.5.1?)
14857 - case $wlarc in
14858 - '')
14859 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
14860 - *)
14861 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
14862 - esac ;;
14863 - esac
14864 - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
14865 - ;;
14866 +# AM_MISSING_HAS_RUN
14867 +# ------------------
14868 +# Define MISSING if not defined so far and test if it supports --run.
14869 +# If it does, set am_missing_run to use it, otherwise, to nothing.
14870 +AC_DEFUN([AM_MISSING_HAS_RUN],
14871 +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
14872 +test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
14873 +# Use eval to expand $SHELL
14874 +if eval "$MISSING --run true"; then
14875 + am_missing_run="$MISSING --run "
14876 +else
14877 + am_missing_run=
14878 + AC_MSG_WARN([`missing' script is too old or missing])
14879 +fi
14880 +])
14881
14882 - sunos4*)
14883 - if test "x$host_vendor" = xsequent; then
14884 - # Use $CC to link under sequent, because it throws in some extra .o
14885 - # files that make .init and .fini sections work.
14886 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
14887 - else
14888 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
14889 - fi
14890 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
14891 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
14892 - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
14893 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
14894 - ;;
14895 +# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
14896 +#
14897 +# This file is free software; the Free Software Foundation
14898 +# gives unlimited permission to copy and/or distribute it,
14899 +# with or without modifications, as long as this notice is preserved.
14900
14901 - sysv4)
14902 - case $host_vendor in
14903 - sni)
14904 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
14905 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
14906 - ;;
14907 - siemens)
14908 - ## LD is ld it makes a PLAMLIB
14909 - ## CC just makes a GrossModule.
14910 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
14911 - _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
14912 - _LT_AC_TAGVAR(hardcode_direct, $1)=no
14913 - ;;
14914 - motorola)
14915 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
14916 - _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
14917 - ;;
14918 - esac
14919 - runpath_var='LD_RUN_PATH'
14920 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
14921 - ;;
14922 +# AM_PROG_MKDIR_P
14923 +# ---------------
14924 +# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
14925 +#
14926 +# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
14927 +# created by `make install' are always world readable, even if the
14928 +# installer happens to have an overly restrictive umask (e.g. 077).
14929 +# This was a mistake. There are at least two reasons why we must not
14930 +# use `-m 0755':
14931 +# - it causes special bits like SGID to be ignored,
14932 +# - it may be too restrictive (some setups expect 775 directories).
14933 +#
14934 +# Do not use -m 0755 and let people choose whatever they expect by
14935 +# setting umask.
14936 +#
14937 +# We cannot accept any implementation of `mkdir' that recognizes `-p'.
14938 +# Some implementations (such as Solaris 8's) are not thread-safe: if a
14939 +# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
14940 +# concurrently, both version can detect that a/ is missing, but only
14941 +# one can create it and the other will error out. Consequently we
14942 +# restrict ourselves to GNU make (using the --version option ensures
14943 +# this.)
14944 +AC_DEFUN([AM_PROG_MKDIR_P],
14945 +[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
14946 + # We used to keeping the `.' as first argument, in order to
14947 + # allow $(mkdir_p) to be used without argument. As in
14948 + # $(mkdir_p) $(somedir)
14949 + # where $(somedir) is conditionally defined. However this is wrong
14950 + # for two reasons:
14951 + # 1. if the package is installed by a user who cannot write `.'
14952 + # make install will fail,
14953 + # 2. the above comment should most certainly read
14954 + # $(mkdir_p) $(DESTDIR)$(somedir)
14955 + # so it does not work when $(somedir) is undefined and
14956 + # $(DESTDIR) is not.
14957 + # To support the latter case, we have to write
14958 + # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
14959 + # so the `.' trick is pointless.
14960 + mkdir_p='mkdir -p --'
14961 +else
14962 + # On NextStep and OpenStep, the `mkdir' command does not
14963 + # recognize any option. It will interpret all options as
14964 + # directories to create, and then abort because `.' already
14965 + # exists.
14966 + for d in ./-p ./--version;
14967 + do
14968 + test -d $d && rmdir $d
14969 + done
14970 + # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
14971 + if test -f "$ac_aux_dir/mkinstalldirs"; then
14972 + mkdir_p='$(mkinstalldirs)'
14973 + else
14974 + mkdir_p='$(install_sh) -d'
14975 + fi
14976 +fi
14977 +AC_SUBST([mkdir_p])])
14978
1497914081 - sysv4.3*)
1498014082 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
1498114083 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
1498214084 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
1498314085 - ;;
14984 +# Helper functions for option handling. -*- Autoconf -*-
14086 +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
1498514087
1498614088 - sysv4*MP*)
1498714089 - if test -d /usr/nec; then
1499214094 - _LT_AC_TAGVAR(ld_shlibs, $1)=yes
1499314095 - fi
1499414096 - ;;
14995 +# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
14097 +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
14098 +# Free Software Foundation, Inc.
1499614099 +#
1499714100 +# This file is free software; the Free Software Foundation
1499814101 +# gives unlimited permission to copy and/or distribute it,
1500314106 - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
1500414107 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
1500514108 - runpath_var='LD_RUN_PATH'
15006 +# serial 3
14109 +# serial 5
1500714110
1500814111 - if test "$GCC" = yes; then
1500914112 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
1501314116 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
1501414117 - fi
1501514118 - ;;
15016 +# _AM_MANGLE_OPTION(NAME)
15017 +# -----------------------
15018 +AC_DEFUN([_AM_MANGLE_OPTION],
15019 +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
14119 +# AM_MISSING_PROG(NAME, PROGRAM)
14120 +# ------------------------------
14121 +AC_DEFUN([AM_MISSING_PROG],
14122 +[AC_REQUIRE([AM_MISSING_HAS_RUN])
14123 +$1=${$1-"${am_missing_run}$2"}
14124 +AC_SUBST($1)])
1502014125
1502114126 - sysv5* | sco3.2v5* | sco5v6*)
1502214127 - # Note: We can NOT use -z defs as we might desire, because we do not
1503414139 - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
1503514140 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
1503614141 - runpath_var='LD_RUN_PATH'
15037 +# _AM_SET_OPTION(NAME)
15038 +# ------------------------------
15039 +# Set option NAME. Presently that only means defining a flag for this option.
15040 +AC_DEFUN([_AM_SET_OPTION],
15041 +[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
1504214142
1504314143 - if test "$GCC" = yes; then
1504414144 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
1504814148 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
1504914149 - fi
1505014150 - ;;
14151 +# AM_MISSING_HAS_RUN
14152 +# ------------------
14153 +# Define MISSING if not defined so far and test if it supports --run.
14154 +# If it does, set am_missing_run to use it, otherwise, to nothing.
14155 +AC_DEFUN([AM_MISSING_HAS_RUN],
14156 +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
14157 +AC_REQUIRE_AUX_FILE([missing])dnl
14158 +test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
14159 +# Use eval to expand $SHELL
14160 +if eval "$MISSING --run true"; then
14161 + am_missing_run="$MISSING --run "
14162 +else
14163 + am_missing_run=
14164 + AC_MSG_WARN([`missing' script is too old or missing])
14165 +fi
14166 +])
14167
14168 - uts4*)
14169 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
14170 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
14171 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
14172 - ;;
14173 +# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
14174 +#
14175 +# This file is free software; the Free Software Foundation
14176 +# gives unlimited permission to copy and/or distribute it,
14177 +# with or without modifications, as long as this notice is preserved.
14178
14179 - *)
14180 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
14181 - ;;
14182 - esac
14183 - fi
14184 +# AM_PROG_MKDIR_P
14185 +# ---------------
14186 +# Check for `mkdir -p'.
14187 +AC_DEFUN([AM_PROG_MKDIR_P],
14188 +[AC_PREREQ([2.60])dnl
14189 +AC_REQUIRE([AC_PROG_MKDIR_P])dnl
14190 +dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
14191 +dnl while keeping a definition of mkdir_p for backward compatibility.
14192 +dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
14193 +dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
14194 +dnl Makefile.ins that do not define MKDIR_P, so we do our own
14195 +dnl adjustment using top_builddir (which is defined more often than
14196 +dnl MKDIR_P).
14197 +AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
14198 +case $mkdir_p in
14199 + [[\\/$]]* | ?:[[\\/]]*) ;;
14200 + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
14201 +esac
14202 ])
14203 -AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
14204 -test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
14205
14206 +# Helper functions for option handling. -*- Autoconf -*-
14207 +
14208 +# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
14209 #
14210 -# Do we need to explicitly link libc?
14211 +# This file is free software; the Free Software Foundation
14212 +# gives unlimited permission to copy and/or distribute it,
14213 +# with or without modifications, as long as this notice is preserved.
14214 +
14215 +# serial 3
14216 +
14217 +# _AM_MANGLE_OPTION(NAME)
14218 +# -----------------------
14219 +AC_DEFUN([_AM_MANGLE_OPTION],
14220 +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
14221 +
14222 +# _AM_SET_OPTION(NAME)
14223 +# ------------------------------
14224 +# Set option NAME. Presently that only means defining a flag for this option.
14225 +AC_DEFUN([_AM_SET_OPTION],
14226 +[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
14227 +
1505114228 +# _AM_SET_OPTIONS(OPTIONS)
1505214229 +# ----------------------------------
1505314230 +# OPTIONS is a space-separated list of Automake options.
1505414231 +AC_DEFUN([_AM_SET_OPTIONS],
1505514232 +[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
15056
15057 - uts4*)
15058 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
15059 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
15060 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
15061 - ;;
14233 +
1506214234 +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
1506314235 +# -------------------------------------------
1506414236 +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
1506514237 +AC_DEFUN([_AM_IF_OPTION],
1506614238 +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
15067
15068 - *)
15069 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
15070 - ;;
15071 - esac
15072 - fi
15073 -])
15074 -AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
15075 -test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
14239 +
1507614240 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
1507714241 +# Free Software Foundation, Inc.
15078 +#
15079 +# This file is free software; the Free Software Foundation
15080 +# gives unlimited permission to copy and/or distribute it,
15081 +# with or without modifications, as long as this notice is preserved.
15082
15083 +# AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
15084 +# ---------------------------------------------------------------------------
15085 +# Adds support for distributing Python modules and packages. To
15086 +# install modules, copy them to $(pythondir), using the python_PYTHON
15087 +# automake variable. To install a package with the same name as the
15088 +# automake package, install to $(pkgpythondir), or use the
15089 +# pkgpython_PYTHON automake variable.
15090 #
15091 -# Do we need to explicitly link libc?
15092 +# The variables $(pyexecdir) and $(pkgpyexecdir) are provided as
15093 +# locations to install python extension modules (shared libraries).
15094 +# Another macro is required to find the appropriate flags to compile
15095 +# extension modules.
1509614242 #
1509714243 -case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
1509814244 -x|xyes)
1509914245 - # Assume -lc should be added
1510014246 - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
15101 -
14247 +# This file is free software; the Free Software Foundation
14248 +# gives unlimited permission to copy and/or distribute it,
14249 +# with or without modifications, as long as this notice is preserved.
14250
1510214251 - if test "$enable_shared" = yes && test "$GCC" = yes; then
1510314252 - case $_LT_AC_TAGVAR(archive_cmds, $1) in
1510414253 - *'~'*)
1511114260 - AC_MSG_CHECKING([whether -lc should be explicitly linked in])
1511214261 - $rm conftest*
1511314262 - printf "$lt_simple_compile_test_code" > conftest.$ac_ext
14263 +# AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
14264 +# ---------------------------------------------------------------------------
14265 +# Adds support for distributing Python modules and packages. To
14266 +# install modules, copy them to $(pythondir), using the python_PYTHON
14267 +# automake variable. To install a package with the same name as the
14268 +# automake package, install to $(pkgpythondir), or use the
14269 +# pkgpython_PYTHON automake variable.
14270 +#
14271 +# The variables $(pyexecdir) and $(pkgpyexecdir) are provided as
14272 +# locations to install python extension modules (shared libraries).
14273 +# Another macro is required to find the appropriate flags to compile
14274 +# extension modules.
14275 +#
1511414276 +# If your package is configured with a different prefix to python,
1511514277 +# users will have to add the install directory to the PYTHONPATH
1511614278 +# environment variable, or create a .pth file (see the python
1518114343 + PYTHON=:
1518214344 else
1518314345 - cat conftest.err 1>&5
15184 - fi
14346 + AC_PATH_PROG([PYTHON], [$am_cv_pathless_PYTHON])
14347 fi
1518514348 - $rm conftest*
1518614349 - AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
1518714350 - ;;
1519014353 - ;;
1519114354 -esac
1519214355 -])# AC_LIBTOOL_PROG_LD_SHLIBS
15193 + AC_PATH_PROG([PYTHON], [$am_cv_pathless_PYTHON])
15194 + fi
1519514356 + am_display_PYTHON=$am_cv_pathless_PYTHON
1519614357 + fi
1519714358 + ])
1546114622 + ac_status=$?
1546214623 + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
1546314624 + (exit $ac_status); }])
14625 +
14626 +# Check to make sure that the build environment is sane. -*- Autoconf -*-
1546414627
1546514628 -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
1546614629 -#
1546714630 -# Check to see whether a particular set of modules exists. Similar
1546814631 -# to PKG_CHECK_MODULES(), but does not set variables or print errors.
1546914632 -#
15470 +# Check to make sure that the build environment is sane. -*- Autoconf -*-
15471 +
1547214633 +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
1547314634 +# Free Software Foundation, Inc.
1547414635 #
1557114732 -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
1557214733 -AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
1557314734 -AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
15574 -
15575 -pkg_failed=no
15576 -AC_MSG_CHECKING([for $1])
15577 -
15578 -_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
15579 -_PKG_CONFIG([$1][_LIBS], [libs], [$2])
1558014735 +# This file is free software; the Free Software Foundation
1558114736 +# gives unlimited permission to copy and/or distribute it,
1558214737 +# with or without modifications, as long as this notice is preserved.
1558314738
15584 -m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
15585 -and $1[]_LIBS to avoid the need to call pkg-config.
15586 -See the pkg-config man page for more details.])
14739 -pkg_failed=no
14740 -AC_MSG_CHECKING([for $1])
1558714741 +# AM_PROG_INSTALL_STRIP
1558814742 +# ---------------------
1558914743 +# One issue with vendor `install' (even GNU) is that you can't
1560314757 +if test "$cross_compiling" != no; then
1560414758 + AC_CHECK_TOOL([STRIP], [strip], :)
1560514759 +fi
15606 +INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
14760 +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
1560714761 +AC_SUBST([INSTALL_STRIP_PROGRAM])])
14762
14763 -_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
14764 -_PKG_CONFIG([$1][_LIBS], [libs], [$2])
14765 +# Copyright (C) 2006 Free Software Foundation, Inc.
14766 +#
14767 +# This file is free software; the Free Software Foundation
14768 +# gives unlimited permission to copy and/or distribute it,
14769 +# with or without modifications, as long as this notice is preserved.
14770
14771 -m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
14772 -and $1[]_LIBS to avoid the need to call pkg-config.
14773 -See the pkg-config man page for more details.])
14774 +# _AM_SUBST_NOTMAKE(VARIABLE)
14775 +# ---------------------------
14776 +# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
14777 +# This macro is traced by Automake.
14778 +AC_DEFUN([_AM_SUBST_NOTMAKE])
1560814779
1560914780 -if test $pkg_failed = yes; then
1561014781 - _PKG_SHORT_ERRORS_SUPPORTED
1573514906 +]) # _AM_PROG_TAR
1573614907
1573714908 m4_include([acinclude.m4])
15738 diff -urN gnome-menus-2.15.91.orig/configure gnome-menus-2.15.91/configure
15739 --- gnome-menus-2.15.91.orig/configure 2006-08-08 00:30:51.000000000 +0200
15740 +++ gnome-menus-2.15.91/configure 2006-08-13 18:57:06.000000000 +0200
15741 @@ -465,7 +465,7 @@
14909 diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur gnome-menus-2.18.0-old/config.h.in gnome-menus-2.18.0/config.h.in
14910 --- gnome-menus-2.18.0-old/config.h.in 2007-03-12 19:54:38.000000000 +0100
14911 +++ gnome-menus-2.18.0/config.h.in 2007-04-25 07:13:32.000000000 +0200
14912 @@ -15,15 +15,6 @@
14913 /* Define to 1 if you have the <dlfcn.h> header file. */
14914 #undef HAVE_DLFCN_H
14915
14916 -/* Define if we have FAM */
14917 -#undef HAVE_FAM
14918 -
14919 -/* Define to 1 if you have the `FAMNoExists' function. */
14920 -#undef HAVE_FAMNOEXISTS
14921 -
14922 -/* Define to 1 if you have the <fam.h> header file. */
14923 -#undef HAVE_FAM_H
14924 -
14925 /* Define if the GNU gettext() function is already present or preinstalled. */
14926 #undef HAVE_GETTEXT
14927
14928 diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur gnome-menus-2.18.0-old/configure gnome-menus-2.18.0/configure
14929 --- gnome-menus-2.18.0-old/configure 2007-03-12 19:54:34.000000000 +0100
14930 +++ gnome-menus-2.18.0/configure 2007-04-25 07:13:29.000000000 +0200
14931 @@ -1,6 +1,6 @@
14932 #! /bin/sh
14933 # Guess values for system-dependent variables and create Makefiles.
14934 -# Generated by GNU Autoconf 2.60 for gnome-menus 2.18.0.
14935 +# Generated by GNU Autoconf 2.61 for gnome-menus 2.18.0.
14936 #
14937 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-menus>.
14938 #
14939 @@ -12,7 +12,8 @@
14940 ## M4sh Initialization. ##
14941 ## --------------------- ##
14942
14943 -# Be Bourne compatible
14944 +# Be more Bourne compatible
14945 +DUALCASE=1; export DUALCASE # for MKS sh
14946 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
14947 emulate sh
14948 NULLCMD=:
14949 @@ -21,10 +22,13 @@
14950 alias -g '${1+"$@"}'='"$@"'
14951 setopt NO_GLOB_SUBST
14952 else
14953 - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
14954 + case `(set -o) 2>/dev/null` in
14955 + *posix*) set -o posix ;;
14956 +esac
14957 +
14958 fi
14959 -BIN_SH=xpg4; export BIN_SH # for Tru64
14960 -DUALCASE=1; export DUALCASE # for MKS sh
14961 +
14962 +
14963
14964
14965 # PATH needs CR
14966 @@ -217,7 +221,7 @@
14967 else
14968 as_candidate_shells=
14969 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
14970 -for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
14971 +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
14972 do
14973 IFS=$as_save_IFS
14974 test -z "$as_dir" && as_dir=.
14975 @@ -235,7 +239,6 @@
14976 # Try only shells that exist, to save several forks.
14977 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
14978 { ("$as_shell") 2> /dev/null <<\_ASEOF
14979 -# Be Bourne compatible
14980 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
14981 emulate sh
14982 NULLCMD=:
14983 @@ -244,10 +247,12 @@
14984 alias -g '${1+"$@"}'='"$@"'
14985 setopt NO_GLOB_SUBST
14986 else
14987 - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
14988 + case `(set -o) 2>/dev/null` in
14989 + *posix*) set -o posix ;;
14990 +esac
14991 +
14992 fi
14993 -BIN_SH=xpg4; export BIN_SH # for Tru64
14994 -DUALCASE=1; export DUALCASE # for MKS sh
14995 +
14996
14997 :
14998 _ASEOF
14999 @@ -255,7 +260,6 @@
15000 CONFIG_SHELL=$as_shell
15001 as_have_required=yes
15002 if { "$as_shell" 2> /dev/null <<\_ASEOF
15003 -# Be Bourne compatible
15004 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
15005 emulate sh
15006 NULLCMD=:
15007 @@ -264,10 +268,12 @@
15008 alias -g '${1+"$@"}'='"$@"'
15009 setopt NO_GLOB_SUBST
15010 else
15011 - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
15012 + case `(set -o) 2>/dev/null` in
15013 + *posix*) set -o posix ;;
15014 +esac
15015 +
15016 fi
15017 -BIN_SH=xpg4; export BIN_SH # for Tru64
15018 -DUALCASE=1; export DUALCASE # for MKS sh
15019 +
15020
15021 :
15022 (as_func_return () {
15023 @@ -514,19 +520,28 @@
15024 as_mkdir_p=false
15025 fi
15026
15027 -# Find out whether ``test -x'' works. Don't use a zero-byte file, as
15028 -# systems may use methods other than mode bits to determine executability.
15029 -cat >conf$$.file <<_ASEOF
15030 -#! /bin/sh
15031 -exit 0
15032 -_ASEOF
15033 -chmod +x conf$$.file
15034 -if test -x conf$$.file >/dev/null 2>&1; then
15035 - as_executable_p="test -x"
15036 +if test -x / >/dev/null 2>&1; then
15037 + as_test_x='test -x'
15038 else
15039 - as_executable_p=:
15040 + if ls -dL / >/dev/null 2>&1; then
15041 + as_ls_L_option=L
15042 + else
15043 + as_ls_L_option=
15044 + fi
15045 + as_test_x='
15046 + eval sh -c '\''
15047 + if test -d "$1"; then
15048 + test -d "$1/.";
15049 + else
15050 + case $1 in
15051 + -*)set "./$1";;
15052 + esac;
15053 + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
15054 + ???[sx]*):;;*)false;;esac;fi
15055 + '\'' sh
15056 + '
15057 fi
15058 -rm -f conf$$.file
15059 +as_executable_p=$as_test_x
15060
15061 # Sed expression to map a string onto a valid CPP name.
15062 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
15063 @@ -721,36 +736,36 @@
15064 # Factoring default headers for most tests.
15065 ac_includes_default="\
15066 #include <stdio.h>
15067 -#if HAVE_SYS_TYPES_H
15068 +#ifdef HAVE_SYS_TYPES_H
15069 # include <sys/types.h>
15070 #endif
15071 -#if HAVE_SYS_STAT_H
15072 +#ifdef HAVE_SYS_STAT_H
15073 # include <sys/stat.h>
15074 #endif
15075 -#if STDC_HEADERS
15076 +#ifdef STDC_HEADERS
15077 # include <stdlib.h>
15078 # include <stddef.h>
15079 #else
15080 -# if HAVE_STDLIB_H
15081 +# ifdef HAVE_STDLIB_H
15082 # include <stdlib.h>
15083 # endif
15084 #endif
15085 -#if HAVE_STRING_H
15086 -# if !STDC_HEADERS && HAVE_MEMORY_H
15087 +#ifdef HAVE_STRING_H
15088 +# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
15089 # include <memory.h>
15090 # endif
15091 # include <string.h>
15092 #endif
15093 -#if HAVE_STRINGS_H
15094 +#ifdef HAVE_STRINGS_H
15095 # include <strings.h>
15096 #endif
15097 -#if HAVE_INTTYPES_H
15098 +#ifdef HAVE_INTTYPES_H
15099 # include <inttypes.h>
15100 #endif
15101 -#if HAVE_STDINT_H
15102 +#ifdef HAVE_STDINT_H
15103 # include <stdint.h>
15104 #endif
15105 -#if HAVE_UNISTD_H
15106 +#ifdef HAVE_UNISTD_H
1574215107 # include <unistd.h>
1574315108 #endif"
1574415109
15745 -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 install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIB_MENU_LT_VERSION GETTEXT_PACKAGE 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 USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_SERVICE_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT ALL_LINGUAS build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ACLOCAL_AMFLAGS PKG_CONFIG ac_pt_PKG_CONFIG GLIB_CFLAGS GLIB_LIBS FAM_LIBS WARN_CFLAGS DISABLE_DEPRECATED_CFLAGS DEBUG_CFLAGS PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir PYTHON_INCLUDES HAVE_PYTHON_TRUE HAVE_PYTHON_FALSE NO_STRICT_ALIASING_CFLAGS LIBOBJS LTLIBOBJS'
15746 +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 install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIB_MENU_LT_VERSION GETTEXT_PACKAGE 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 USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_SERVICE_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT ALL_LINGUAS build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ACLOCAL_AMFLAGS PKG_CONFIG ac_pt_PKG_CONFIG GLIB_CFLAGS GLIB_LIBS GNOMEVFS_CFLAGS GNOMEVFS_LIBS WARN_CFLAGS DISABLE_DEPRECATED_CFLAGS DEBUG_CFLAGS PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir PYTHON_INCLUDES HAVE_PYTHON_TRUE HAVE_PYTHON_FALSE NO_STRICT_ALIASING_CFLAGS LIBOBJS LTLIBOBJS'
15747 ac_subst_files=''
15110 @@ -794,6 +809,7 @@
15111 INSTALL_PROGRAM
15112 INSTALL_SCRIPT
15113 INSTALL_DATA
15114 +am__isrc
15115 CYGPATH_W
15116 PACKAGE
15117 VERSION
15118 @@ -846,6 +862,7 @@
15119 host_os
15120 USE_NLS
15121 MSGFMT
15122 +MSGFMT_OPTS
15123 GMSGFMT
15124 XGETTEXT
15125 CATALOGS
15126 @@ -908,9 +925,10 @@
15127 PKG_CONFIG
15128 GLIB_CFLAGS
15129 GLIB_LIBS
15130 +GNOMEVFS_CFLAGS
15131 +GNOMEVFS_LIBS
15132 INOTIFY_SUPPORT_TRUE
15133 INOTIFY_SUPPORT_FALSE
15134 -FAM_LIBS
15135 WARN_CFLAGS
15136 DISABLE_DEPRECATED_CFLAGS
15137 DEBUG_CFLAGS
15138 @@ -936,6 +954,7 @@
15139 CC
15140 CFLAGS
15141 LDFLAGS
15142 +LIBS
15143 CPPFLAGS
15144 CPP
15145 CXX
15146 @@ -946,7 +965,9 @@
15147 FFLAGS
15148 PKG_CONFIG
15149 GLIB_CFLAGS
15150 -GLIB_LIBS'
15151 +GLIB_LIBS
15152 +GNOMEVFS_CFLAGS
15153 +GNOMEVFS_LIBS'
15154
1574815155
1574915156 # Initialize some variables set by options.
15750 @@ -958,6 +958,14 @@
15751 ac_env_GLIB_LIBS_value=$GLIB_LIBS
15752 ac_cv_env_GLIB_LIBS_set=${GLIB_LIBS+set}
15753 ac_cv_env_GLIB_LIBS_value=$GLIB_LIBS
15754 +ac_env_GNOMEVFS_CFLAGS_set=${GNOMEVFS_CFLAGS+set}
15755 +ac_env_GNOMEVFS_CFLAGS_value=$GNOMEVFS_CFLAGS
15756 +ac_cv_env_GNOMEVFS_CFLAGS_set=${GNOMEVFS_CFLAGS+set}
15757 +ac_cv_env_GNOMEVFS_CFLAGS_value=$GNOMEVFS_CFLAGS
15758 +ac_env_GNOMEVFS_LIBS_set=${GNOMEVFS_LIBS+set}
15759 +ac_env_GNOMEVFS_LIBS_value=$GNOMEVFS_LIBS
15760 +ac_cv_env_GNOMEVFS_LIBS_set=${GNOMEVFS_LIBS+set}
15761 +ac_cv_env_GNOMEVFS_LIBS_value=$GNOMEVFS_LIBS
15762
15763 #
15764 # Report the --help message.
15765 @@ -1082,6 +1090,10 @@
15157 @@ -1052,10 +1073,10 @@
15158 -disable-* | --disable-*)
15159 ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
15160 # Reject names that are not valid shell variable names.
15161 - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
15162 + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
15163 { echo "$as_me: error: invalid feature name: $ac_feature" >&2
15164 { (exit 1); exit 1; }; }
15165 - ac_feature=`echo $ac_feature | sed 's/-/_/g'`
15166 + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
15167 eval enable_$ac_feature=no ;;
15168
15169 -docdir | --docdir | --docdi | --doc | --do)
15170 @@ -1071,10 +1092,10 @@
15171 -enable-* | --enable-*)
15172 ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
15173 # Reject names that are not valid shell variable names.
15174 - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
15175 + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
15176 { echo "$as_me: error: invalid feature name: $ac_feature" >&2
15177 { (exit 1); exit 1; }; }
15178 - ac_feature=`echo $ac_feature | sed 's/-/_/g'`
15179 + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
15180 eval enable_$ac_feature=\$ac_optarg ;;
15181
15182 -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
15183 @@ -1268,19 +1289,19 @@
15184 -with-* | --with-*)
15185 ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
15186 # Reject names that are not valid shell variable names.
15187 - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
15188 + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
15189 { echo "$as_me: error: invalid package name: $ac_package" >&2
15190 { (exit 1); exit 1; }; }
15191 - ac_package=`echo $ac_package| sed 's/-/_/g'`
15192 + ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
15193 eval with_$ac_package=\$ac_optarg ;;
15194
15195 -without-* | --without-*)
15196 ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
15197 # Reject names that are not valid shell variable names.
15198 - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
15199 + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
15200 { echo "$as_me: error: invalid package name: $ac_package" >&2
15201 { (exit 1); exit 1; }; }
15202 - ac_package=`echo $ac_package | sed 's/-/_/g'`
15203 + ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
15204 eval with_$ac_package=no ;;
15205
15206 --x)
15207 @@ -1556,6 +1577,7 @@
15208 CFLAGS C compiler flags
15209 LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
15210 nonstandard directory <lib dir>
15211 + LIBS libraries to pass to the linker, e.g. -l<library>
15212 CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
15213 you have headers in a nonstandard directory <include dir>
15214 CPP C preprocessor
15215 @@ -1567,6 +1589,10 @@
1576615216 PKG_CONFIG path to pkg-config utility
1576715217 GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config
1576815218 GLIB_LIBS linker flags for GLIB, overriding pkg-config
1577315223
1577415224 Use these variables to override the choices made by `configure' or to help
1577515225 it to find libraries and programs with nonstandard names/locations.
15776 @@ -1175,7 +1187,7 @@
15777 else
15778 echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
15779 fi
15780 - cd $ac_popdir
15781 + cd "$ac_popdir"
15782 done
15226 @@ -1633,7 +1659,7 @@
15227 if $ac_init_version; then
15228 cat <<\_ACEOF
15229 gnome-menus configure 2.18.0
15230 -generated by GNU Autoconf 2.60
15231 +generated by GNU Autoconf 2.61
15232
15233 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
15234 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
15235 @@ -1647,7 +1673,7 @@
15236 running configure, to aid debugging if configure makes a mistake.
15237
15238 It was created by gnome-menus $as_me 2.18.0, which was
15239 -generated by GNU Autoconf 2.60. Invocation command line was
15240 +generated by GNU Autoconf 2.61. Invocation command line was
15241
15242 $ $0 $@
15243
15244 @@ -2001,7 +2027,8 @@
15245
15246
15247
15248 -am__api_version="1.9"
15249 +am__api_version='1.10'
15250 +
15251 ac_aux_dir=
15252 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
15253 if test -f "$ac_dir/install-sh"; then
15254 @@ -2069,7 +2096,7 @@
15255 # by default.
15256 for ac_prog in ginstall scoinst install; do
15257 for ac_exec_ext in '' $ac_executable_extensions; do
15258 - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then
15259 + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
15260 if test $ac_prog = install &&
15261 grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
15262 # AIX install. It has an incompatible calling convention.
15263 @@ -2184,38 +2211,53 @@
15264 echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
1578315265 fi
1578415266
15785 @@ -2651,8 +2663,7 @@
15267 -if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
15268 - # We used to keeping the `.' as first argument, in order to
15269 - # allow $(mkdir_p) to be used without argument. As in
15270 - # $(mkdir_p) $(somedir)
15271 - # where $(somedir) is conditionally defined. However this is wrong
15272 - # for two reasons:
15273 - # 1. if the package is installed by a user who cannot write `.'
15274 - # make install will fail,
15275 - # 2. the above comment should most certainly read
15276 - # $(mkdir_p) $(DESTDIR)$(somedir)
15277 - # so it does not work when $(somedir) is undefined and
15278 - # $(DESTDIR) is not.
15279 - # To support the latter case, we have to write
15280 - # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
15281 - # so the `.' trick is pointless.
15282 - mkdir_p='mkdir -p --'
15283 -else
15284 - # On NextStep and OpenStep, the `mkdir' command does not
15285 - # recognize any option. It will interpret all options as
15286 - # directories to create, and then abort because `.' already
15287 - # exists.
15288 - for d in ./-p ./--version;
15289 - do
15290 - test -d $d && rmdir $d
15291 - done
15292 - # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
15293 - if test -f "$ac_aux_dir/mkinstalldirs"; then
15294 - mkdir_p='$(mkinstalldirs)'
15295 +{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
15296 +echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
15297 +if test -z "$MKDIR_P"; then
15298 + if test "${ac_cv_path_mkdir+set}" = set; then
15299 + echo $ECHO_N "(cached) $ECHO_C" >&6
15300 +else
15301 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
15302 +for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
15303 +do
15304 + IFS=$as_save_IFS
15305 + test -z "$as_dir" && as_dir=.
15306 + for ac_prog in mkdir gmkdir; do
15307 + for ac_exec_ext in '' $ac_executable_extensions; do
15308 + { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
15309 + case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
15310 + 'mkdir (GNU coreutils) '* | \
15311 + 'mkdir (coreutils) '* | \
15312 + 'mkdir (fileutils) '4.1*)
15313 + ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
15314 + break 3;;
15315 + esac
15316 + done
15317 + done
15318 +done
15319 +IFS=$as_save_IFS
15320 +
15321 +fi
15322 +
15323 + if test "${ac_cv_path_mkdir+set}" = set; then
15324 + MKDIR_P="$ac_cv_path_mkdir -p"
15325 else
15326 - mkdir_p='$(install_sh) -d'
15327 + # As a last resort, use the slow shell script. Don't cache a
15328 + # value for MKDIR_P within a source directory, because that will
15329 + # break other packages using the cache if that directory is
15330 + # removed, or if the value is a relative name.
15331 + test -d ./--version && rmdir ./--version
15332 + MKDIR_P="$ac_install_sh -d"
15333 fi
15334 fi
15335 +{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
15336 +echo "${ECHO_T}$MKDIR_P" >&6; }
15337 +
15338 +mkdir_p="$MKDIR_P"
15339 +case $mkdir_p in
15340 + [\\/$]* | ?:[\\/]*) ;;
15341 + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
15342 +esac
15343
15344 for ac_prog in gawk mawk nawk awk
15345 do
15346 @@ -2235,7 +2277,7 @@
15347 IFS=$as_save_IFS
15348 test -z "$as_dir" && as_dir=.
15349 for ac_exec_ext in '' $ac_executable_extensions; do
15350 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
15351 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15352 ac_cv_prog_AWK="$ac_prog"
15353 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
15354 break 2
15355 @@ -2298,12 +2340,16 @@
15356 fi
15357 rmdir .tst 2>/dev/null
15358
15359 -# test to see if srcdir already configured
15360 -if test "`cd $srcdir && pwd`" != "`pwd`" &&
15361 - test -f $srcdir/config.status; then
15362 - { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
15363 +if test "`cd $srcdir && pwd`" != "`pwd`"; then
15364 + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
15365 + # is not polluted with repeated "-I."
15366 + am__isrc=' -I$(srcdir)'
15367 + # test to see if srcdir already configured
15368 + if test -f $srcdir/config.status; then
15369 + { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
15370 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
15371 { (exit 1); exit 1; }; }
15372 + fi
15373 fi
15374
15375 # test whether we have cygpath
15376 @@ -2346,7 +2392,7 @@
15377
15378 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
15379
15380 -install_sh=${install_sh-"$am_aux_dir/install-sh"}
15381 +install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
15382
15383 # Installed binaries are usually stripped using `strip' when the user
15384 # run `make install-strip'. However `strip' might not be the right
15385 @@ -2370,7 +2416,7 @@
15386 IFS=$as_save_IFS
15387 test -z "$as_dir" && as_dir=.
15388 for ac_exec_ext in '' $ac_executable_extensions; do
15389 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
15390 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15391 ac_cv_prog_STRIP="${ac_tool_prefix}strip"
15392 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
15393 break 2
15394 @@ -2410,7 +2456,7 @@
15395 IFS=$as_save_IFS
15396 test -z "$as_dir" && as_dir=.
15397 for ac_exec_ext in '' $ac_executable_extensions; do
15398 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
15399 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15400 ac_cv_prog_ac_ct_STRIP="strip"
15401 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
15402 break 2
15403 @@ -2450,7 +2496,7 @@
15404 fi
15405
15406 fi
15407 -INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
15408 +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
15409
15410 # We need awk for the "check" target. The system "awk" is bad on
15411 # some platforms.
15412 @@ -2478,9 +2524,7 @@
15413
15414 { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
15415 echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
15416 -
15417 -
15418 -if test $USE_MAINTAINER_MODE = yes; then
15419 + if test $USE_MAINTAINER_MODE = yes; then
15420 MAINTAINER_MODE_TRUE=
15421 MAINTAINER_MODE_FALSE='#'
15422 else
15423 @@ -2564,9 +2608,7 @@
15424 am_depcomp="$ac_aux_dir/depcomp"
15425 AMDEPBACKSLASH='\'
15426 fi
15427 -
15428 -
15429 -if test "x$enable_dependency_tracking" != xno; then
15430 + if test "x$enable_dependency_tracking" != xno; then
15431 AMDEP_TRUE=
15432 AMDEP_FALSE='#'
15433 else
15434 @@ -2575,7 +2617,6 @@
15435 fi
15436
15437
15438 -
15439 ac_ext=c
15440 ac_cpp='$CPP $CPPFLAGS'
15441 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
15442 @@ -2598,7 +2639,7 @@
15443 IFS=$as_save_IFS
15444 test -z "$as_dir" && as_dir=.
15445 for ac_exec_ext in '' $ac_executable_extensions; do
15446 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
15447 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15448 ac_cv_prog_CC="${ac_tool_prefix}gcc"
15449 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
15450 break 2
15451 @@ -2638,7 +2679,7 @@
15452 IFS=$as_save_IFS
15453 test -z "$as_dir" && as_dir=.
15454 for ac_exec_ext in '' $ac_executable_extensions; do
15455 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
15456 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15457 ac_cv_prog_ac_ct_CC="gcc"
15458 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
15459 break 2
15460 @@ -2695,7 +2736,7 @@
15461 IFS=$as_save_IFS
15462 test -z "$as_dir" && as_dir=.
15463 for ac_exec_ext in '' $ac_executable_extensions; do
15464 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
15465 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15466 ac_cv_prog_CC="${ac_tool_prefix}cc"
15467 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
15468 break 2
15469 @@ -2736,7 +2777,7 @@
15470 IFS=$as_save_IFS
15471 test -z "$as_dir" && as_dir=.
15472 for ac_exec_ext in '' $ac_executable_extensions; do
15473 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
15474 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15475 if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
15476 ac_prog_rejected=yes
15477 continue
15478 @@ -2794,7 +2835,7 @@
15479 IFS=$as_save_IFS
15480 test -z "$as_dir" && as_dir=.
15481 for ac_exec_ext in '' $ac_executable_extensions; do
15482 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
15483 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15484 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
15485 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
15486 break 2
15487 @@ -2838,7 +2879,7 @@
15488 IFS=$as_save_IFS
15489 test -z "$as_dir" && as_dir=.
15490 for ac_exec_ext in '' $ac_executable_extensions; do
15491 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
15492 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15493 ac_cv_prog_ac_ct_CC="$ac_prog"
15494 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
15495 break 2
15496 @@ -2979,7 +3020,7 @@
15497 # in a Makefile. We should not override ac_cv_exeext if it was cached,
15498 # so that the user can short-circuit this test for compilers unknown to
15499 # Autoconf.
15500 -for ac_file in $ac_files
15501 +for ac_file in $ac_files ''
15502 do
15503 test -f "$ac_file" || continue
15504 case $ac_file in
15505 @@ -3007,6 +3048,12 @@
15506 test "$ac_cv_exeext" = no && ac_cv_exeext=
15507
15508 else
15509 + ac_file=''
15510 +fi
15511 +
15512 +{ echo "$as_me:$LINENO: result: $ac_file" >&5
15513 +echo "${ECHO_T}$ac_file" >&6; }
15514 +if test -z "$ac_file"; then
15515 echo "$as_me: failed program was:" >&5
15516 sed 's/^/| /' conftest.$ac_ext >&5
15517
15518 @@ -3018,8 +3065,6 @@
15519 fi
15520
15521 ac_exeext=$ac_cv_exeext
15522 -{ echo "$as_me:$LINENO: result: $ac_file" >&5
15523 -echo "${ECHO_T}$ac_file" >&6; }
15524
15525 # Check that the compiler produces executables we can run. If not, either
15526 # the compiler is broken, or we cross compile.
15527 @@ -3197,27 +3242,10 @@
15528 rm -f conftest.er1
1578615529 cat conftest.err >&5
1578715530 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15788 (exit $ac_status); } &&
15789 - { ac_try='test -z "$ac_c_werror_flag"
15790 - || test ! -s conftest.err'
15791 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15792 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15793 (eval $ac_try) 2>&5
15794 ac_status=$?
15795 @@ -2710,8 +2721,7 @@
15531 - (exit $ac_status); } &&
15532 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15533 - { (case "(($ac_try" in
15534 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15535 - *) ac_try_echo=$ac_try;;
15536 -esac
15537 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15538 - (eval "$ac_try") 2>&5
15539 - ac_status=$?
15540 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15541 - (exit $ac_status); }; } &&
15542 - { ac_try='test -s conftest.$ac_objext'
15543 - { (case "(($ac_try" in
15544 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15545 - *) ac_try_echo=$ac_try;;
15546 -esac
15547 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15548 - (eval "$ac_try") 2>&5
15549 - ac_status=$?
15550 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15551 - (exit $ac_status); }; }; then
15552 + (exit $ac_status); } && {
15553 + test -z "$ac_c_werror_flag" ||
15554 + test ! -s conftest.err
15555 + } && test -s conftest.$ac_objext; then
15556 ac_compiler_gnu=yes
15557 else
15558 echo "$as_me: failed program was:" >&5
15559 @@ -3272,27 +3300,10 @@
15560 rm -f conftest.er1
1579615561 cat conftest.err >&5
1579715562 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15798 (exit $ac_status); } &&
15799 - { ac_try='test -z "$ac_c_werror_flag"
15800 - || test ! -s conftest.err'
15801 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15802 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15803 (eval $ac_try) 2>&5
15804 ac_status=$?
15805 @@ -2827,8 +2837,7 @@
15563 - (exit $ac_status); } &&
15564 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15565 - { (case "(($ac_try" in
15566 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15567 - *) ac_try_echo=$ac_try;;
15568 -esac
15569 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15570 - (eval "$ac_try") 2>&5
15571 - ac_status=$?
15572 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15573 - (exit $ac_status); }; } &&
15574 - { ac_try='test -s conftest.$ac_objext'
15575 - { (case "(($ac_try" in
15576 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15577 - *) ac_try_echo=$ac_try;;
15578 -esac
15579 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15580 - (eval "$ac_try") 2>&5
15581 - ac_status=$?
15582 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15583 - (exit $ac_status); }; }; then
15584 + (exit $ac_status); } && {
15585 + test -z "$ac_c_werror_flag" ||
15586 + test ! -s conftest.err
15587 + } && test -s conftest.$ac_objext; then
15588 ac_cv_prog_cc_g=yes
15589 else
15590 echo "$as_me: failed program was:" >&5
15591 @@ -3327,27 +3338,10 @@
15592 rm -f conftest.er1
1580615593 cat conftest.err >&5
1580715594 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15808 (exit $ac_status); } &&
15809 - { ac_try='test -z "$ac_c_werror_flag"
15810 - || test ! -s conftest.err'
15811 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15812 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15813 (eval $ac_try) 2>&5
15814 ac_status=$?
15815 @@ -2882,8 +2891,7 @@
15595 - (exit $ac_status); } &&
15596 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15597 - { (case "(($ac_try" in
15598 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15599 - *) ac_try_echo=$ac_try;;
15600 -esac
15601 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15602 - (eval "$ac_try") 2>&5
15603 - ac_status=$?
15604 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15605 - (exit $ac_status); }; } &&
15606 - { ac_try='test -s conftest.$ac_objext'
15607 - { (case "(($ac_try" in
15608 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15609 - *) ac_try_echo=$ac_try;;
15610 -esac
15611 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15612 - (eval "$ac_try") 2>&5
15613 - ac_status=$?
15614 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15615 - (exit $ac_status); }; }; then
15616 + (exit $ac_status); } && {
15617 + test -z "$ac_c_werror_flag" ||
15618 + test ! -s conftest.err
15619 + } && test -s conftest.$ac_objext; then
15620 :
15621 else
15622 echo "$as_me: failed program was:" >&5
15623 @@ -3383,27 +3377,10 @@
15624 rm -f conftest.er1
1581615625 cat conftest.err >&5
1581715626 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15818 (exit $ac_status); } &&
15819 - { ac_try='test -z "$ac_c_werror_flag"
15820 - || test ! -s conftest.err'
15821 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15822 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15823 (eval $ac_try) 2>&5
15824 ac_status=$?
15825 @@ -2928,8 +2936,7 @@
15627 - (exit $ac_status); } &&
15628 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15629 - { (case "(($ac_try" in
15630 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15631 - *) ac_try_echo=$ac_try;;
15632 -esac
15633 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15634 - (eval "$ac_try") 2>&5
15635 - ac_status=$?
15636 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15637 - (exit $ac_status); }; } &&
15638 - { ac_try='test -s conftest.$ac_objext'
15639 - { (case "(($ac_try" in
15640 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15641 - *) ac_try_echo=$ac_try;;
15642 -esac
15643 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15644 - (eval "$ac_try") 2>&5
15645 - ac_status=$?
15646 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15647 - (exit $ac_status); }; }; then
15648 + (exit $ac_status); } && {
15649 + test -z "$ac_c_werror_flag" ||
15650 + test ! -s conftest.err
15651 + } && test -s conftest.$ac_objext; then
15652 ac_cv_prog_cc_g=yes
15653 else
15654 echo "$as_me: failed program was:" >&5
15655 @@ -3519,27 +3496,10 @@
15656 rm -f conftest.er1
1582615657 cat conftest.err >&5
1582715658 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15828 (exit $ac_status); } &&
15829 - { ac_try='test -z "$ac_c_werror_flag"
15830 - || test ! -s conftest.err'
15831 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15832 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15833 (eval $ac_try) 2>&5
15834 ac_status=$?
15835 @@ -2973,8 +2980,7 @@
15659 - (exit $ac_status); } &&
15660 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15661 - { (case "(($ac_try" in
15662 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15663 - *) ac_try_echo=$ac_try;;
15664 -esac
15665 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15666 - (eval "$ac_try") 2>&5
15667 - ac_status=$?
15668 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15669 - (exit $ac_status); }; } &&
15670 - { ac_try='test -s conftest.$ac_objext'
15671 - { (case "(($ac_try" in
15672 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15673 - *) ac_try_echo=$ac_try;;
15674 -esac
15675 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15676 - (eval "$ac_try") 2>&5
15677 - ac_status=$?
15678 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15679 - (exit $ac_status); }; }; then
15680 + (exit $ac_status); } && {
15681 + test -z "$ac_c_werror_flag" ||
15682 + test ! -s conftest.err
15683 + } && test -s conftest.$ac_objext; then
15684 ac_cv_prog_cc_c89=$ac_arg
15685 else
15686 echo "$as_me: failed program was:" >&5
15687 @@ -3643,6 +3603,7 @@
15688 depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
15689 $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
15690 >/dev/null 2>conftest.err &&
15691 + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
15692 grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
15693 grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
15694 ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
15695 @@ -3672,9 +3633,7 @@
15696 echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
15697 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
15698
15699 -
15700 -
15701 -if
15702 + if
15703 test "x$enable_dependency_tracking" != xno \
15704 && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
15705 am__fastdepCC_TRUE=
15706 @@ -3738,17 +3697,10 @@
15707 rm -f conftest.er1
1583615708 cat conftest.err >&5
1583715709 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15838 (exit $ac_status); } &&
15839 - { ac_try='test -z "$ac_c_werror_flag"
15840 - || test ! -s conftest.err'
15841 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15842 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15843 (eval $ac_try) 2>&5
15844 ac_status=$?
15845 @@ -3406,8 +3412,7 @@
15710 - (exit $ac_status); } >/dev/null; then
15711 - if test -s conftest.err; then
15712 - ac_cpp_err=$ac_c_preproc_warn_flag
15713 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
15714 - else
15715 - ac_cpp_err=
15716 - fi
15717 -else
15718 - ac_cpp_err=yes
15719 -fi
15720 -if test -z "$ac_cpp_err"; then
15721 + (exit $ac_status); } >/dev/null && {
15722 + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
15723 + test ! -s conftest.err
15724 + }; then
15725 :
15726 else
15727 echo "$as_me: failed program was:" >&5
15728 @@ -3782,17 +3734,10 @@
15729 rm -f conftest.er1
1584615730 cat conftest.err >&5
1584715731 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15848 (exit $ac_status); } &&
15849 - { ac_try='test -z "$ac_c_werror_flag"
15850 - || test ! -s conftest.err'
15851 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15852 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15853 (eval $ac_try) 2>&5
15854 ac_status=$?
15855 @@ -3577,8 +3582,7 @@
15732 - (exit $ac_status); } >/dev/null; then
15733 - if test -s conftest.err; then
15734 - ac_cpp_err=$ac_c_preproc_warn_flag
15735 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
15736 - else
15737 - ac_cpp_err=
15738 - fi
15739 -else
15740 - ac_cpp_err=yes
15741 -fi
15742 -if test -z "$ac_cpp_err"; then
15743 + (exit $ac_status); } >/dev/null && {
15744 + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
15745 + test ! -s conftest.err
15746 + }; then
15747 # Broken: success on invalid input.
15748 continue
15749 else
15750 @@ -3857,17 +3802,10 @@
15751 rm -f conftest.er1
1585615752 cat conftest.err >&5
1585715753 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15858 (exit $ac_status); } &&
15859 - { ac_try='test -z "$ac_c_werror_flag"
15860 - || test ! -s conftest.err'
15861 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15862 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15863 (eval $ac_try) 2>&5
15864 ac_status=$?
15865 @@ -3646,8 +3650,7 @@
15754 - (exit $ac_status); } >/dev/null; then
15755 - if test -s conftest.err; then
15756 - ac_cpp_err=$ac_c_preproc_warn_flag
15757 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
15758 - else
15759 - ac_cpp_err=
15760 - fi
15761 -else
15762 - ac_cpp_err=yes
15763 -fi
15764 -if test -z "$ac_cpp_err"; then
15765 + (exit $ac_status); } >/dev/null && {
15766 + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
15767 + test ! -s conftest.err
15768 + }; then
15769 :
15770 else
15771 echo "$as_me: failed program was:" >&5
15772 @@ -3901,17 +3839,10 @@
15773 rm -f conftest.er1
1586615774 cat conftest.err >&5
1586715775 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15868 (exit $ac_status); } &&
15869 - { ac_try='test -z "$ac_c_werror_flag"
15870 - || test ! -s conftest.err'
15871 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15872 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15873 (eval $ac_try) 2>&5
15874 ac_status=$?
15875 @@ -3792,8 +3795,7 @@
15776 - (exit $ac_status); } >/dev/null; then
15777 - if test -s conftest.err; then
15778 - ac_cpp_err=$ac_c_preproc_warn_flag
15779 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
15780 - else
15781 - ac_cpp_err=
15782 - fi
15783 -else
15784 - ac_cpp_err=yes
15785 -fi
15786 -if test -z "$ac_cpp_err"; then
15787 + (exit $ac_status); } >/dev/null && {
15788 + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
15789 + test ! -s conftest.err
15790 + }; then
15791 # Broken: success on invalid input.
15792 continue
15793 else
15794 @@ -3966,7 +3897,7 @@
15795 for ac_prog in grep ggrep; do
15796 for ac_exec_ext in '' $ac_executable_extensions; do
15797 ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
15798 - { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue
15799 + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
15800 # Check for GNU ac_path_GREP and select it if it is found.
15801 # Check for GNU $ac_path_GREP
15802 case `"$ac_path_GREP" --version 2>&1` in
15803 @@ -4048,7 +3979,7 @@
15804 for ac_prog in egrep; do
15805 for ac_exec_ext in '' $ac_executable_extensions; do
15806 ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
15807 - { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue
15808 + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
15809 # Check for GNU ac_path_EGREP and select it if it is found.
15810 # Check for GNU $ac_path_EGREP
15811 case `"$ac_path_EGREP" --version 2>&1` in
15812 @@ -4144,27 +4075,10 @@
15813 rm -f conftest.er1
1587615814 cat conftest.err >&5
1587715815 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15878 (exit $ac_status); } &&
15879 - { ac_try='test -z "$ac_c_werror_flag"
15880 - || test ! -s conftest.err'
15881 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15882 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15883 (eval $ac_try) 2>&5
15884 ac_status=$?
15885 @@ -3864,8 +3866,7 @@
15816 - (exit $ac_status); } &&
15817 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15818 - { (case "(($ac_try" in
15819 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15820 - *) ac_try_echo=$ac_try;;
15821 -esac
15822 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15823 - (eval "$ac_try") 2>&5
15824 - ac_status=$?
15825 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15826 - (exit $ac_status); }; } &&
15827 - { ac_try='test -s conftest.$ac_objext'
15828 - { (case "(($ac_try" in
15829 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15830 - *) ac_try_echo=$ac_try;;
15831 -esac
15832 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15833 - (eval "$ac_try") 2>&5
15834 - ac_status=$?
15835 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15836 - (exit $ac_status); }; }; then
15837 + (exit $ac_status); } && {
15838 + test -z "$ac_c_werror_flag" ||
15839 + test ! -s conftest.err
15840 + } && test -s conftest.$ac_objext; then
15841 ac_cv_header_stdc=yes
15842 else
15843 echo "$as_me: failed program was:" >&5
15844 @@ -4340,27 +4254,10 @@
15845 rm -f conftest.er1
1588615846 cat conftest.err >&5
1588715847 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15888 (exit $ac_status); } &&
15889 - { ac_try='test -z "$ac_c_werror_flag"
15890 - || test ! -s conftest.err'
15891 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15892 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15893 (eval $ac_try) 2>&5
15894 ac_status=$?
15895 @@ -4009,8 +4010,7 @@
15848 - (exit $ac_status); } &&
15849 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15850 - { (case "(($ac_try" in
15851 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15852 - *) ac_try_echo=$ac_try;;
15853 -esac
15854 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15855 - (eval "$ac_try") 2>&5
15856 - ac_status=$?
15857 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15858 - (exit $ac_status); }; } &&
15859 - { ac_try='test -s conftest.$ac_objext'
15860 - { (case "(($ac_try" in
15861 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15862 - *) ac_try_echo=$ac_try;;
15863 -esac
15864 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15865 - (eval "$ac_try") 2>&5
15866 - ac_status=$?
15867 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15868 - (exit $ac_status); }; }; then
15869 + (exit $ac_status); } && {
15870 + test -z "$ac_c_werror_flag" ||
15871 + test ! -s conftest.err
15872 + } && test -s conftest.$ac_objext; then
15873 eval "$as_ac_Header=yes"
15874 else
15875 echo "$as_me: failed program was:" >&5
15876 @@ -4507,27 +4404,10 @@
15877 rm -f conftest.er1
1589615878 cat conftest.err >&5
1589715879 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15898 (exit $ac_status); } &&
15899 - { ac_try='test -z "$ac_c_werror_flag"
15900 - || test ! -s conftest.err'
15901 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15902 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15903 (eval $ac_try) 2>&5
15904 ac_status=$?
15905 @@ -4068,8 +4068,7 @@
15880 - (exit $ac_status); } &&
15881 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15882 - { (case "(($ac_try" in
15883 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15884 - *) ac_try_echo=$ac_try;;
15885 -esac
15886 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15887 - (eval "$ac_try") 2>&5
15888 - ac_status=$?
15889 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15890 - (exit $ac_status); }; } &&
15891 - { ac_try='test -s conftest.$ac_objext'
15892 - { (case "(($ac_try" in
15893 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15894 - *) ac_try_echo=$ac_try;;
15895 -esac
15896 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15897 - (eval "$ac_try") 2>&5
15898 - ac_status=$?
15899 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15900 - (exit $ac_status); }; }; then
15901 + (exit $ac_status); } && {
15902 + test -z "$ac_c_werror_flag" ||
15903 + test ! -s conftest.err
15904 + } && test -s conftest.$ac_objext; then
15905 ac_header_compiler=yes
15906 else
15907 echo "$as_me: failed program was:" >&5
15908 @@ -4563,17 +4443,10 @@
15909 rm -f conftest.er1
1590615910 cat conftest.err >&5
1590715911 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15908 (exit $ac_status); } &&
15909 - { ac_try='test -z "$ac_c_werror_flag"
15910 - || test ! -s conftest.err'
15911 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15912 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15913 (eval $ac_try) 2>&5
15914 ac_status=$?
15915 @@ -4166,8 +4165,7 @@
15912 - (exit $ac_status); } >/dev/null; then
15913 - if test -s conftest.err; then
15914 - ac_cpp_err=$ac_c_preproc_warn_flag
15915 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
15916 - else
15917 - ac_cpp_err=
15918 - fi
15919 -else
15920 - ac_cpp_err=yes
15921 -fi
15922 -if test -z "$ac_cpp_err"; then
15923 + (exit $ac_status); } >/dev/null && {
15924 + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
15925 + test ! -s conftest.err
15926 + }; then
15927 ac_header_preproc=yes
15928 else
15929 echo "$as_me: failed program was:" >&5
15930 @@ -4671,27 +4544,11 @@
15931 rm -f conftest.er1
1591615932 cat conftest.err >&5
1591715933 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15918 (exit $ac_status); } &&
15919 - { ac_try='test -z "$ac_c_werror_flag"
15920 - || test ! -s conftest.err'
15921 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15922 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15923 (eval $ac_try) 2>&5
15924 ac_status=$?
15925 @@ -4246,8 +4244,7 @@
15934 - (exit $ac_status); } &&
15935 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15936 - { (case "(($ac_try" in
15937 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15938 - *) ac_try_echo=$ac_try;;
15939 -esac
15940 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15941 - (eval "$ac_try") 2>&5
15942 - ac_status=$?
15943 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15944 - (exit $ac_status); }; } &&
15945 - { ac_try='test -s conftest$ac_exeext'
15946 - { (case "(($ac_try" in
15947 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15948 - *) ac_try_echo=$ac_try;;
15949 -esac
15950 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15951 - (eval "$ac_try") 2>&5
15952 - ac_status=$?
15953 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15954 - (exit $ac_status); }; }; then
15955 + (exit $ac_status); } && {
15956 + test -z "$ac_c_werror_flag" ||
15957 + test ! -s conftest.err
15958 + } && test -s conftest$ac_exeext &&
15959 + $as_test_x conftest$ac_exeext; then
15960 am_cv_val_LC_MESSAGES=yes
15961 else
15962 echo "$as_me: failed program was:" >&5
15963 @@ -4700,7 +4557,7 @@
15964 am_cv_val_LC_MESSAGES=no
15965 fi
15966
15967 -rm -f core conftest.err conftest.$ac_objext \
15968 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
15969 conftest$ac_exeext conftest.$ac_ext
15970 fi
15971 { echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
15972 @@ -4756,27 +4613,10 @@
15973 rm -f conftest.er1
1592615974 cat conftest.err >&5
1592715975 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15928 (exit $ac_status); } &&
15929 - { ac_try='test -z "$ac_c_werror_flag"
15930 - || test ! -s conftest.err'
15931 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15932 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15933 (eval $ac_try) 2>&5
15934 ac_status=$?
15935 @@ -4311,8 +4308,7 @@
15976 - (exit $ac_status); } &&
15977 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15978 - { (case "(($ac_try" in
15979 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15980 - *) ac_try_echo=$ac_try;;
15981 -esac
15982 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15983 - (eval "$ac_try") 2>&5
15984 - ac_status=$?
15985 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15986 - (exit $ac_status); }; } &&
15987 - { ac_try='test -s conftest.$ac_objext'
15988 - { (case "(($ac_try" in
15989 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15990 - *) ac_try_echo=$ac_try;;
15991 -esac
15992 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15993 - (eval "$ac_try") 2>&5
15994 - ac_status=$?
15995 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15996 - (exit $ac_status); }; }; then
15997 + (exit $ac_status); } && {
15998 + test -z "$ac_c_werror_flag" ||
15999 + test ! -s conftest.err
16000 + } && test -s conftest.$ac_objext; then
16001 ac_header_compiler=yes
16002 else
16003 echo "$as_me: failed program was:" >&5
16004 @@ -4812,17 +4652,10 @@
16005 rm -f conftest.er1
1593616006 cat conftest.err >&5
1593716007 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15938 (exit $ac_status); } &&
15939 - { ac_try='test -z "$ac_c_werror_flag"
15940 - || test ! -s conftest.err'
15941 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15942 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15943 (eval $ac_try) 2>&5
15944 ac_status=$?
15945 @@ -4376,8 +4372,7 @@
16008 - (exit $ac_status); } >/dev/null; then
16009 - if test -s conftest.err; then
16010 - ac_cpp_err=$ac_c_preproc_warn_flag
16011 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
16012 - else
16013 - ac_cpp_err=
16014 - fi
16015 -else
16016 - ac_cpp_err=yes
16017 -fi
16018 -if test -z "$ac_cpp_err"; then
16019 + (exit $ac_status); } >/dev/null && {
16020 + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
16021 + test ! -s conftest.err
16022 + }; then
16023 ac_header_preproc=yes
16024 else
16025 echo "$as_me: failed program was:" >&5
16026 @@ -4918,27 +4751,11 @@
16027 rm -f conftest.er1
1594616028 cat conftest.err >&5
1594716029 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15948 (exit $ac_status); } &&
15949 - { ac_try='test -z "$ac_c_werror_flag"
15950 - || test ! -s conftest.err'
15951 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15952 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15953 (eval $ac_try) 2>&5
15954 ac_status=$?
15955 @@ -4454,8 +4449,7 @@
16030 - (exit $ac_status); } &&
16031 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16032 - { (case "(($ac_try" in
16033 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16034 - *) ac_try_echo=$ac_try;;
16035 -esac
16036 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16037 - (eval "$ac_try") 2>&5
16038 - ac_status=$?
16039 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16040 - (exit $ac_status); }; } &&
16041 - { ac_try='test -s conftest$ac_exeext'
16042 - { (case "(($ac_try" in
16043 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16044 - *) ac_try_echo=$ac_try;;
16045 -esac
16046 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16047 - (eval "$ac_try") 2>&5
16048 - ac_status=$?
16049 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16050 - (exit $ac_status); }; }; then
16051 + (exit $ac_status); } && {
16052 + test -z "$ac_c_werror_flag" ||
16053 + test ! -s conftest.err
16054 + } && test -s conftest$ac_exeext &&
16055 + $as_test_x conftest$ac_exeext; then
16056 gt_cv_func_ngettext_libc=yes
16057 else
16058 echo "$as_me: failed program was:" >&5
16059 @@ -4947,7 +4764,7 @@
16060 gt_cv_func_ngettext_libc=no
16061 fi
16062
16063 -rm -f core conftest.err conftest.$ac_objext \
16064 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
16065 conftest$ac_exeext conftest.$ac_ext
16066
16067 fi
16068 @@ -4990,27 +4807,11 @@
16069 rm -f conftest.er1
1595616070 cat conftest.err >&5
1595716071 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15958 (exit $ac_status); } &&
15959 - { ac_try='test -z "$ac_c_werror_flag"
15960 - || test ! -s conftest.err'
15961 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15962 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15963 (eval $ac_try) 2>&5
15964 ac_status=$?
15965 @@ -4519,8 +4513,7 @@
16072 - (exit $ac_status); } &&
16073 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16074 - { (case "(($ac_try" in
16075 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16076 - *) ac_try_echo=$ac_try;;
16077 -esac
16078 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16079 - (eval "$ac_try") 2>&5
16080 - ac_status=$?
16081 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16082 - (exit $ac_status); }; } &&
16083 - { ac_try='test -s conftest$ac_exeext'
16084 - { (case "(($ac_try" in
16085 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16086 - *) ac_try_echo=$ac_try;;
16087 -esac
16088 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16089 - (eval "$ac_try") 2>&5
16090 - ac_status=$?
16091 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16092 - (exit $ac_status); }; }; then
16093 + (exit $ac_status); } && {
16094 + test -z "$ac_c_werror_flag" ||
16095 + test ! -s conftest.err
16096 + } && test -s conftest$ac_exeext &&
16097 + $as_test_x conftest$ac_exeext; then
16098 gt_cv_func_dgettext_libc=yes
16099 else
16100 echo "$as_me: failed program was:" >&5
16101 @@ -5019,7 +4820,7 @@
16102 gt_cv_func_dgettext_libc=no
16103 fi
16104
16105 -rm -f core conftest.err conftest.$ac_objext \
16106 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
16107 conftest$ac_exeext conftest.$ac_ext
16108
16109 fi
16110 @@ -5095,27 +4896,11 @@
16111 rm -f conftest.er1
1596616112 cat conftest.err >&5
1596716113 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15968 (exit $ac_status); } &&
15969 - { ac_try='test -z "$ac_c_werror_flag"
15970 - || test ! -s conftest.err'
15971 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15972 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15973 (eval $ac_try) 2>&5
15974 ac_status=$?
15975 @@ -4636,8 +4629,7 @@
16114 - (exit $ac_status); } &&
16115 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16116 - { (case "(($ac_try" in
16117 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16118 - *) ac_try_echo=$ac_try;;
16119 -esac
16120 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16121 - (eval "$ac_try") 2>&5
16122 - ac_status=$?
16123 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16124 - (exit $ac_status); }; } &&
16125 - { ac_try='test -s conftest$ac_exeext'
16126 - { (case "(($ac_try" in
16127 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16128 - *) ac_try_echo=$ac_try;;
16129 -esac
16130 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16131 - (eval "$ac_try") 2>&5
16132 - ac_status=$?
16133 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16134 - (exit $ac_status); }; }; then
16135 + (exit $ac_status); } && {
16136 + test -z "$ac_c_werror_flag" ||
16137 + test ! -s conftest.err
16138 + } && test -s conftest$ac_exeext &&
16139 + $as_test_x conftest$ac_exeext; then
16140 eval "$as_ac_var=yes"
16141 else
16142 echo "$as_me: failed program was:" >&5
16143 @@ -5124,7 +4909,7 @@
16144 eval "$as_ac_var=no"
16145 fi
16146
16147 -rm -f core conftest.err conftest.$ac_objext \
16148 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
16149 conftest$ac_exeext conftest.$ac_ext
16150 fi
16151 ac_res=`eval echo '${'$as_ac_var'}'`
16152 @@ -5189,27 +4974,11 @@
16153 rm -f conftest.er1
1597616154 cat conftest.err >&5
1597716155 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15978 (exit $ac_status); } &&
15979 - { ac_try='test -z "$ac_c_werror_flag"
15980 - || test ! -s conftest.err'
15981 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15982 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15983 (eval $ac_try) 2>&5
15984 ac_status=$?
15985 @@ -4804,8 +4796,7 @@
16156 - (exit $ac_status); } &&
16157 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16158 - { (case "(($ac_try" in
16159 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16160 - *) ac_try_echo=$ac_try;;
16161 -esac
16162 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16163 - (eval "$ac_try") 2>&5
16164 - ac_status=$?
16165 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16166 - (exit $ac_status); }; } &&
16167 - { ac_try='test -s conftest$ac_exeext'
16168 - { (case "(($ac_try" in
16169 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16170 - *) ac_try_echo=$ac_try;;
16171 -esac
16172 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16173 - (eval "$ac_try") 2>&5
16174 - ac_status=$?
16175 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16176 - (exit $ac_status); }; }; then
16177 + (exit $ac_status); } && {
16178 + test -z "$ac_c_werror_flag" ||
16179 + test ! -s conftest.err
16180 + } && test -s conftest$ac_exeext &&
16181 + $as_test_x conftest$ac_exeext; then
16182 ac_cv_lib_intl_bindtextdomain=yes
16183 else
16184 echo "$as_me: failed program was:" >&5
16185 @@ -5218,7 +4987,7 @@
16186 ac_cv_lib_intl_bindtextdomain=no
16187 fi
16188
16189 -rm -f core conftest.err conftest.$ac_objext \
16190 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
16191 conftest$ac_exeext conftest.$ac_ext
16192 LIBS=$ac_check_lib_save_LIBS
16193 fi
16194 @@ -5267,27 +5036,11 @@
16195 rm -f conftest.er1
1598616196 cat conftest.err >&5
1598716197 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15988 (exit $ac_status); } &&
15989 - { ac_try='test -z "$ac_c_werror_flag"
15990 - || test ! -s conftest.err'
15991 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15992 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15993 (eval $ac_try) 2>&5
15994 ac_status=$?
15995 @@ -4938,8 +4929,7 @@
16198 - (exit $ac_status); } &&
16199 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16200 - { (case "(($ac_try" in
16201 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16202 - *) ac_try_echo=$ac_try;;
16203 -esac
16204 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16205 - (eval "$ac_try") 2>&5
16206 - ac_status=$?
16207 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16208 - (exit $ac_status); }; } &&
16209 - { ac_try='test -s conftest$ac_exeext'
16210 - { (case "(($ac_try" in
16211 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16212 - *) ac_try_echo=$ac_try;;
16213 -esac
16214 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16215 - (eval "$ac_try") 2>&5
16216 - ac_status=$?
16217 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16218 - (exit $ac_status); }; }; then
16219 + (exit $ac_status); } && {
16220 + test -z "$ac_c_werror_flag" ||
16221 + test ! -s conftest.err
16222 + } && test -s conftest$ac_exeext &&
16223 + $as_test_x conftest$ac_exeext; then
16224 ac_cv_lib_intl_ngettext=yes
16225 else
16226 echo "$as_me: failed program was:" >&5
16227 @@ -5296,7 +5049,7 @@
16228 ac_cv_lib_intl_ngettext=no
16229 fi
16230
16231 -rm -f core conftest.err conftest.$ac_objext \
16232 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
16233 conftest$ac_exeext conftest.$ac_ext
16234 LIBS=$ac_check_lib_save_LIBS
16235 fi
16236 @@ -5345,27 +5098,11 @@
16237 rm -f conftest.er1
1599616238 cat conftest.err >&5
1599716239 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15998 (exit $ac_status); } &&
15999 - { ac_try='test -z "$ac_c_werror_flag"
16000 - || test ! -s conftest.err'
16001 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16002 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16003 (eval $ac_try) 2>&5
16004 ac_status=$?
16005 @@ -5024,8 +5014,7 @@
16240 - (exit $ac_status); } &&
16241 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16242 - { (case "(($ac_try" in
16243 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16244 - *) ac_try_echo=$ac_try;;
16245 -esac
16246 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16247 - (eval "$ac_try") 2>&5
16248 - ac_status=$?
16249 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16250 - (exit $ac_status); }; } &&
16251 - { ac_try='test -s conftest$ac_exeext'
16252 - { (case "(($ac_try" in
16253 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16254 - *) ac_try_echo=$ac_try;;
16255 -esac
16256 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16257 - (eval "$ac_try") 2>&5
16258 - ac_status=$?
16259 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16260 - (exit $ac_status); }; }; then
16261 + (exit $ac_status); } && {
16262 + test -z "$ac_c_werror_flag" ||
16263 + test ! -s conftest.err
16264 + } && test -s conftest$ac_exeext &&
16265 + $as_test_x conftest$ac_exeext; then
16266 ac_cv_lib_intl_dgettext=yes
16267 else
16268 echo "$as_me: failed program was:" >&5
16269 @@ -5374,7 +5111,7 @@
16270 ac_cv_lib_intl_dgettext=no
16271 fi
16272
16273 -rm -f core conftest.err conftest.$ac_objext \
16274 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
16275 conftest$ac_exeext conftest.$ac_ext
16276 LIBS=$ac_check_lib_save_LIBS
16277 fi
16278 @@ -5436,27 +5173,11 @@
16279 rm -f conftest.er1
1600616280 cat conftest.err >&5
1600716281 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16008 (exit $ac_status); } &&
16009 - { ac_try='test -z "$ac_c_werror_flag"
16010 - || test ! -s conftest.err'
16011 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16012 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16013 (eval $ac_try) 2>&5
16014 ac_status=$?
16015 @@ -5525,8 +5514,7 @@
16282 - (exit $ac_status); } &&
16283 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16284 - { (case "(($ac_try" in
16285 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16286 - *) ac_try_echo=$ac_try;;
16287 -esac
16288 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16289 - (eval "$ac_try") 2>&5
16290 - ac_status=$?
16291 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16292 - (exit $ac_status); }; } &&
16293 - { ac_try='test -s conftest$ac_exeext'
16294 - { (case "(($ac_try" in
16295 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16296 - *) ac_try_echo=$ac_try;;
16297 -esac
16298 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16299 - (eval "$ac_try") 2>&5
16300 - ac_status=$?
16301 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16302 - (exit $ac_status); }; }; then
16303 + (exit $ac_status); } && {
16304 + test -z "$ac_c_werror_flag" ||
16305 + test ! -s conftest.err
16306 + } && test -s conftest$ac_exeext &&
16307 + $as_test_x conftest$ac_exeext; then
16308 ac_cv_lib_intl_ngettext=yes
16309 else
16310 echo "$as_me: failed program was:" >&5
16311 @@ -5465,7 +5186,7 @@
16312 ac_cv_lib_intl_ngettext=no
16313 fi
16314
16315 -rm -f core conftest.err conftest.$ac_objext \
16316 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
16317 conftest$ac_exeext conftest.$ac_ext
16318 LIBS=$ac_check_lib_save_LIBS
16319 fi
16320 @@ -5514,27 +5235,11 @@
16321 rm -f conftest.er1
1601616322 cat conftest.err >&5
1601716323 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16018 (exit $ac_status); } &&
16019 - { ac_try='test -z "$ac_c_werror_flag"
16020 - || test ! -s conftest.err'
16021 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16022 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16023 (eval $ac_try) 2>&5
16024 ac_status=$?
16025 @@ -5580,8 +5568,7 @@
16324 - (exit $ac_status); } &&
16325 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16326 - { (case "(($ac_try" in
16327 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16328 - *) ac_try_echo=$ac_try;;
16329 -esac
16330 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16331 - (eval "$ac_try") 2>&5
16332 - ac_status=$?
16333 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16334 - (exit $ac_status); }; } &&
16335 - { ac_try='test -s conftest$ac_exeext'
16336 - { (case "(($ac_try" in
16337 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16338 - *) ac_try_echo=$ac_try;;
16339 -esac
16340 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16341 - (eval "$ac_try") 2>&5
16342 - ac_status=$?
16343 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16344 - (exit $ac_status); }; }; then
16345 + (exit $ac_status); } && {
16346 + test -z "$ac_c_werror_flag" ||
16347 + test ! -s conftest.err
16348 + } && test -s conftest$ac_exeext &&
16349 + $as_test_x conftest$ac_exeext; then
16350 ac_cv_lib_intl_dcgettext=yes
16351 else
16352 echo "$as_me: failed program was:" >&5
16353 @@ -5543,7 +5248,7 @@
16354 ac_cv_lib_intl_dcgettext=no
16355 fi
16356
16357 -rm -f core conftest.err conftest.$ac_objext \
16358 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
16359 conftest$ac_exeext conftest.$ac_ext
16360 LIBS=$ac_check_lib_save_LIBS
16361 fi
16362 @@ -5638,27 +5343,11 @@
16363 rm -f conftest.er1
1602616364 cat conftest.err >&5
1602716365 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16028 (exit $ac_status); } &&
16029 - { ac_try='test -z "$ac_c_werror_flag"
16030 - || test ! -s conftest.err'
16031 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16032 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16033 (eval $ac_try) 2>&5
16034 ac_status=$?
16035 @@ -5980,8 +5967,7 @@
16366 - (exit $ac_status); } &&
16367 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16368 - { (case "(($ac_try" in
16369 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16370 - *) ac_try_echo=$ac_try;;
16371 -esac
16372 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16373 - (eval "$ac_try") 2>&5
16374 - ac_status=$?
16375 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16376 - (exit $ac_status); }; } &&
16377 - { ac_try='test -s conftest$ac_exeext'
16378 - { (case "(($ac_try" in
16379 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16380 - *) ac_try_echo=$ac_try;;
16381 -esac
16382 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16383 - (eval "$ac_try") 2>&5
16384 - ac_status=$?
16385 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16386 - (exit $ac_status); }; }; then
16387 + (exit $ac_status); } && {
16388 + test -z "$ac_c_werror_flag" ||
16389 + test ! -s conftest.err
16390 + } && test -s conftest$ac_exeext &&
16391 + $as_test_x conftest$ac_exeext; then
16392 eval "$as_ac_var=yes"
16393 else
16394 echo "$as_me: failed program was:" >&5
16395 @@ -5667,7 +5356,7 @@
16396 eval "$as_ac_var=no"
16397 fi
16398
16399 -rm -f core conftest.err conftest.$ac_objext \
16400 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
16401 conftest$ac_exeext conftest.$ac_ext
16402 fi
16403 ac_res=`eval echo '${'$as_ac_var'}'`
16404 @@ -5814,27 +5503,11 @@
16405 rm -f conftest.er1
1603616406 cat conftest.err >&5
1603716407 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16038 (exit $ac_status); } &&
16039 - { ac_try='test -z "$ac_c_werror_flag"
16040 - || test ! -s conftest.err'
16041 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16042 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16043 (eval $ac_try) 2>&5
16044 ac_status=$?
16045 @@ -6039,8 +6025,7 @@
16408 - (exit $ac_status); } &&
16409 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16410 - { (case "(($ac_try" in
16411 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16412 - *) ac_try_echo=$ac_try;;
16413 -esac
16414 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16415 - (eval "$ac_try") 2>&5
16416 - ac_status=$?
16417 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16418 - (exit $ac_status); }; } &&
16419 - { ac_try='test -s conftest$ac_exeext'
16420 - { (case "(($ac_try" in
16421 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16422 - *) ac_try_echo=$ac_try;;
16423 -esac
16424 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16425 - (eval "$ac_try") 2>&5
16426 - ac_status=$?
16427 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16428 - (exit $ac_status); }; }; then
16429 + (exit $ac_status); } && {
16430 + test -z "$ac_c_werror_flag" ||
16431 + test ! -s conftest.err
16432 + } && test -s conftest$ac_exeext &&
16433 + $as_test_x conftest$ac_exeext; then
16434 eval "$as_ac_var=yes"
16435 else
16436 echo "$as_me: failed program was:" >&5
16437 @@ -5843,7 +5516,7 @@
16438 eval "$as_ac_var=no"
16439 fi
16440
16441 -rm -f core conftest.err conftest.$ac_objext \
16442 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
16443 conftest$ac_exeext conftest.$ac_ext
16444 fi
16445 ac_res=`eval echo '${'$as_ac_var'}'`
16446 @@ -5857,6 +5530,35 @@
16447 fi
16448 done
16449
16450 + MSGFMT_OPTS=
16451 + { echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
16452 +echo $ECHO_N "checking if msgfmt accepts -c... $ECHO_C" >&6; }
16453 + cat >conftest.foo <<_ACEOF
16454 +
16455 +msgid ""
16456 +msgstr ""
16457 +"Content-Type: text/plain; charset=UTF-8\n"
16458 +"Project-Id-Version: test 1.0\n"
16459 +"PO-Revision-Date: 2007-02-15 12:01+0100\n"
16460 +"Last-Translator: test <foo@bar.xx>\n"
16461 +"Language-Team: C <LL@li.org>\n"
16462 +"MIME-Version: 1.0\n"
16463 +"Content-Transfer-Encoding: 8bit\n"
16464 +
16465 +_ACEOF
16466 +if { (echo "$as_me:$LINENO: msgfmt -c -o /dev/null conftest.foo") >&5
16467 + (msgfmt -c -o /dev/null conftest.foo) 2>&5
16468 + ac_status=$?
16469 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
16470 + (exit $ac_status); }; then
16471 + MSGFMT_OPTS=-c; { echo "$as_me:$LINENO: result: yes" >&5
16472 +echo "${ECHO_T}yes" >&6; }
16473 +else { echo "$as_me:$LINENO: result: no" >&5
16474 +echo "${ECHO_T}no" >&6; }
16475 +echo "$as_me: failed input was:" >&5
16476 +sed 's/^/| /' conftest.foo >&5
16477 +fi
16478 +
16479 # Extract the first word of "gmsgfmt", so it can be a program name with args.
16480 set dummy gmsgfmt; ac_word=$2
16481 { echo "$as_me:$LINENO: checking for $ac_word" >&5
16482 @@ -5875,7 +5577,7 @@
16483 IFS=$as_save_IFS
16484 test -z "$as_dir" && as_dir=.
16485 for ac_exec_ext in '' $ac_executable_extensions; do
16486 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
16487 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
16488 ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
16489 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
16490 break 2
16491 @@ -5963,27 +5665,11 @@
16492 rm -f conftest.er1
1604616493 cat conftest.err >&5
1604716494 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16048 (exit $ac_status); } &&
16049 - { ac_try='test -z "$ac_c_werror_flag"
16050 - || test ! -s conftest.err'
16051 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16052 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16053 (eval $ac_try) 2>&5
16054 ac_status=$?
16055 @@ -6156,8 +6141,7 @@
16495 - (exit $ac_status); } &&
16496 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16497 - { (case "(($ac_try" in
16498 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16499 - *) ac_try_echo=$ac_try;;
16500 -esac
16501 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16502 - (eval "$ac_try") 2>&5
16503 - ac_status=$?
16504 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16505 - (exit $ac_status); }; } &&
16506 - { ac_try='test -s conftest$ac_exeext'
16507 - { (case "(($ac_try" in
16508 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16509 - *) ac_try_echo=$ac_try;;
16510 -esac
16511 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16512 - (eval "$ac_try") 2>&5
16513 - ac_status=$?
16514 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16515 - (exit $ac_status); }; }; then
16516 + (exit $ac_status); } && {
16517 + test -z "$ac_c_werror_flag" ||
16518 + test ! -s conftest.err
16519 + } && test -s conftest$ac_exeext &&
16520 + $as_test_x conftest$ac_exeext; then
16521 CATOBJEXT=.gmo
16522 DATADIRNAME=share
16523 else
16524 @@ -6055,27 +5741,11 @@
16525 rm -f conftest.er1
1605616526 cat conftest.err >&5
1605716527 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16058 (exit $ac_status); } &&
16059 - { ac_try='test -z "$ac_c_werror_flag"
16060 - || test ! -s conftest.err'
16061 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16062 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16063 (eval $ac_try) 2>&5
16064 ac_status=$?
16065 @@ -6211,8 +6195,7 @@
16528 - (exit $ac_status); } &&
16529 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16530 - { (case "(($ac_try" in
16531 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16532 - *) ac_try_echo=$ac_try;;
16533 -esac
16534 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16535 - (eval "$ac_try") 2>&5
16536 - ac_status=$?
16537 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16538 - (exit $ac_status); }; } &&
16539 - { ac_try='test -s conftest$ac_exeext'
16540 - { (case "(($ac_try" in
16541 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16542 - *) ac_try_echo=$ac_try;;
16543 -esac
16544 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16545 - (eval "$ac_try") 2>&5
16546 - ac_status=$?
16547 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16548 - (exit $ac_status); }; }; then
16549 + (exit $ac_status); } && {
16550 + test -z "$ac_c_werror_flag" ||
16551 + test ! -s conftest.err
16552 + } && test -s conftest$ac_exeext &&
16553 + $as_test_x conftest$ac_exeext; then
16554 ac_cv_func_bind_textdomain_codeset=yes
16555 else
16556 echo "$as_me: failed program was:" >&5
16557 @@ -6084,7 +5754,7 @@
16558 ac_cv_func_bind_textdomain_codeset=no
16559 fi
16560
16561 -rm -f core conftest.err conftest.$ac_objext \
16562 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
16563 conftest$ac_exeext conftest.$ac_ext
16564 fi
16565 { echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
16566 @@ -6105,7 +5775,7 @@
16567 esac
16568 fi
16569
16570 -rm -f core conftest.err conftest.$ac_objext \
16571 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
16572 conftest$ac_exeext conftest.$ac_ext
16573 LIBS="$glib_save_LIBS"
16574 INSTOBJEXT=.mo
16575 @@ -6312,7 +5982,7 @@
16576 IFS=$as_save_IFS
16577 test -z "$as_dir" && as_dir=.
16578 for ac_exec_ext in '' $ac_executable_extensions; do
16579 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
16580 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
16581 ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
16582 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
16583 break 2
16584 @@ -6375,7 +6045,7 @@
16585 IFS=$as_save_IFS
16586 test -z "$as_dir" && as_dir=.
16587 for ac_exec_ext in '' $ac_executable_extensions; do
16588 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
16589 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
16590 ac_cv_path_INTLTOOL_ICONV="$as_dir/$ac_word$ac_exec_ext"
16591 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
16592 break 2
16593 @@ -6416,7 +6086,7 @@
16594 IFS=$as_save_IFS
16595 test -z "$as_dir" && as_dir=.
16596 for ac_exec_ext in '' $ac_executable_extensions; do
16597 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
16598 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
16599 ac_cv_path_INTLTOOL_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
16600 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
16601 break 2
16602 @@ -6457,7 +6127,7 @@
16603 IFS=$as_save_IFS
16604 test -z "$as_dir" && as_dir=.
16605 for ac_exec_ext in '' $ac_executable_extensions; do
16606 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
16607 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
16608 ac_cv_path_INTLTOOL_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
16609 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
16610 break 2
16611 @@ -6498,7 +6168,7 @@
16612 IFS=$as_save_IFS
16613 test -z "$as_dir" && as_dir=.
16614 for ac_exec_ext in '' $ac_executable_extensions; do
16615 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
16616 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
16617 ac_cv_path_INTLTOOL_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
16618 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
16619 break 2
16620 @@ -6557,27 +6227,11 @@
16621 rm -f conftest.er1
1606616622 cat conftest.err >&5
1606716623 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16068 (exit $ac_status); } &&
16069 - { ac_try='test -z "$ac_c_werror_flag"
16070 - || test ! -s conftest.err'
16071 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16072 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16073 (eval $ac_try) 2>&5
16074 ac_status=$?
16075 @@ -6257,8 +6240,7 @@
16624 - (exit $ac_status); } &&
16625 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16626 - { (case "(($ac_try" in
16627 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16628 - *) ac_try_echo=$ac_try;;
16629 -esac
16630 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16631 - (eval "$ac_try") 2>&5
16632 - ac_status=$?
16633 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16634 - (exit $ac_status); }; } &&
16635 - { ac_try='test -s conftest$ac_exeext'
16636 - { (case "(($ac_try" in
16637 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16638 - *) ac_try_echo=$ac_try;;
16639 -esac
16640 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16641 - (eval "$ac_try") 2>&5
16642 - ac_status=$?
16643 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16644 - (exit $ac_status); }; }; then
16645 + (exit $ac_status); } && {
16646 + test -z "$ac_c_werror_flag" ||
16647 + test ! -s conftest.err
16648 + } && test -s conftest$ac_exeext &&
16649 + $as_test_x conftest$ac_exeext; then
16650 DATADIRNAME=share
16651 else
16652 echo "$as_me: failed program was:" >&5
16653 @@ -6648,27 +6302,11 @@
16654 rm -f conftest.er1
1607616655 cat conftest.err >&5
1607716656 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16078 (exit $ac_status); } &&
16079 - { ac_try='test -z "$ac_c_werror_flag"
16080 - || test ! -s conftest.err'
16081 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16082 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16083 (eval $ac_try) 2>&5
16084 ac_status=$?
16085 @@ -6302,8 +6284,7 @@
16657 - (exit $ac_status); } &&
16658 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16659 - { (case "(($ac_try" in
16660 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16661 - *) ac_try_echo=$ac_try;;
16662 -esac
16663 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16664 - (eval "$ac_try") 2>&5
16665 - ac_status=$?
16666 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16667 - (exit $ac_status); }; } &&
16668 - { ac_try='test -s conftest$ac_exeext'
16669 - { (case "(($ac_try" in
16670 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16671 - *) ac_try_echo=$ac_try;;
16672 -esac
16673 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16674 - (eval "$ac_try") 2>&5
16675 - ac_status=$?
16676 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16677 - (exit $ac_status); }; }; then
16678 + (exit $ac_status); } && {
16679 + test -z "$ac_c_werror_flag" ||
16680 + test ! -s conftest.err
16681 + } && test -s conftest$ac_exeext &&
16682 + $as_test_x conftest$ac_exeext; then
16683 ac_cv_func_bind_textdomain_codeset=yes
16684 else
16685 echo "$as_me: failed program was:" >&5
16686 @@ -6677,7 +6315,7 @@
16687 ac_cv_func_bind_textdomain_codeset=no
16688 fi
16689
16690 -rm -f core conftest.err conftest.$ac_objext \
16691 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
16692 conftest$ac_exeext conftest.$ac_ext
16693 fi
16694 { echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
16695 @@ -6695,7 +6333,7 @@
16696 esac
16697 fi
16698
16699 -rm -f core conftest.err conftest.$ac_objext \
16700 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
16701 conftest$ac_exeext conftest.$ac_ext
16702 fi
16703
16704 @@ -6756,27 +6394,11 @@
16705 rm -f conftest.er1
1608616706 cat conftest.err >&5
1608716707 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16088 (exit $ac_status); } &&
16089 - { ac_try='test -z "$ac_c_werror_flag"
16090 - || test ! -s conftest.err'
16091 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16092 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16093 (eval $ac_try) 2>&5
16094 ac_status=$?
16095 @@ -6484,8 +6465,7 @@
16708 - (exit $ac_status); } &&
16709 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16710 - { (case "(($ac_try" in
16711 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16712 - *) ac_try_echo=$ac_try;;
16713 -esac
16714 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16715 - (eval "$ac_try") 2>&5
16716 - ac_status=$?
16717 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16718 - (exit $ac_status); }; } &&
16719 - { ac_try='test -s conftest$ac_exeext'
16720 - { (case "(($ac_try" in
16721 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16722 - *) ac_try_echo=$ac_try;;
16723 -esac
16724 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16725 - (eval "$ac_try") 2>&5
16726 - ac_status=$?
16727 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16728 - (exit $ac_status); }; }; then
16729 + (exit $ac_status); } && {
16730 + test -z "$ac_c_werror_flag" ||
16731 + test ! -s conftest.err
16732 + } && test -s conftest$ac_exeext &&
16733 + $as_test_x conftest$ac_exeext; then
16734 ac_cv_search_strerror=$ac_res
16735 else
16736 echo "$as_me: failed program was:" >&5
16737 @@ -6785,7 +6407,7 @@
16738
16739 fi
16740
16741 -rm -f core conftest.err conftest.$ac_objext \
16742 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
16743 conftest$ac_exeext
16744 if test "${ac_cv_search_strerror+set}" = set; then
16745 break
16746 @@ -6829,7 +6451,7 @@
16747 IFS=$as_save_IFS
16748 test -z "$as_dir" && as_dir=.
16749 for ac_exec_ext in '' $ac_executable_extensions; do
16750 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
16751 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
16752 ac_cv_prog_CC="${ac_tool_prefix}gcc"
16753 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
16754 break 2
16755 @@ -6869,7 +6491,7 @@
16756 IFS=$as_save_IFS
16757 test -z "$as_dir" && as_dir=.
16758 for ac_exec_ext in '' $ac_executable_extensions; do
16759 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
16760 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
16761 ac_cv_prog_ac_ct_CC="gcc"
16762 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
16763 break 2
16764 @@ -6926,7 +6548,7 @@
16765 IFS=$as_save_IFS
16766 test -z "$as_dir" && as_dir=.
16767 for ac_exec_ext in '' $ac_executable_extensions; do
16768 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
16769 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
16770 ac_cv_prog_CC="${ac_tool_prefix}cc"
16771 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
16772 break 2
16773 @@ -6967,7 +6589,7 @@
16774 IFS=$as_save_IFS
16775 test -z "$as_dir" && as_dir=.
16776 for ac_exec_ext in '' $ac_executable_extensions; do
16777 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
16778 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
16779 if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
16780 ac_prog_rejected=yes
16781 continue
16782 @@ -7025,7 +6647,7 @@
16783 IFS=$as_save_IFS
16784 test -z "$as_dir" && as_dir=.
16785 for ac_exec_ext in '' $ac_executable_extensions; do
16786 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
16787 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
16788 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
16789 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
16790 break 2
16791 @@ -7069,7 +6691,7 @@
16792 IFS=$as_save_IFS
16793 test -z "$as_dir" && as_dir=.
16794 for ac_exec_ext in '' $ac_executable_extensions; do
16795 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
16796 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
16797 ac_cv_prog_ac_ct_CC="$ac_prog"
16798 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
16799 break 2
16800 @@ -7189,27 +6811,10 @@
16801 rm -f conftest.er1
1609616802 cat conftest.err >&5
1609716803 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16098 (exit $ac_status); } &&
16099 - { ac_try='test -z "$ac_c_werror_flag"
16100 - || test ! -s conftest.err'
16101 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16102 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16103 (eval $ac_try) 2>&5
16104 ac_status=$?
16105 @@ -7050,7 +7030,7 @@
16804 - (exit $ac_status); } &&
16805 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16806 - { (case "(($ac_try" in
16807 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16808 - *) ac_try_echo=$ac_try;;
16809 -esac
16810 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16811 - (eval "$ac_try") 2>&5
16812 - ac_status=$?
16813 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16814 - (exit $ac_status); }; } &&
16815 - { ac_try='test -s conftest.$ac_objext'
16816 - { (case "(($ac_try" in
16817 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16818 - *) ac_try_echo=$ac_try;;
16819 -esac
16820 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16821 - (eval "$ac_try") 2>&5
16822 - ac_status=$?
16823 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16824 - (exit $ac_status); }; }; then
16825 + (exit $ac_status); } && {
16826 + test -z "$ac_c_werror_flag" ||
16827 + test ! -s conftest.err
16828 + } && test -s conftest.$ac_objext; then
16829 ac_compiler_gnu=yes
16830 else
16831 echo "$as_me: failed program was:" >&5
16832 @@ -7264,27 +6869,10 @@
16833 rm -f conftest.er1
16834 cat conftest.err >&5
16835 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16836 - (exit $ac_status); } &&
16837 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16838 - { (case "(($ac_try" in
16839 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16840 - *) ac_try_echo=$ac_try;;
16841 -esac
16842 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16843 - (eval "$ac_try") 2>&5
16844 - ac_status=$?
16845 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16846 - (exit $ac_status); }; } &&
16847 - { ac_try='test -s conftest.$ac_objext'
16848 - { (case "(($ac_try" in
16849 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16850 - *) ac_try_echo=$ac_try;;
16851 -esac
16852 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16853 - (eval "$ac_try") 2>&5
16854 - ac_status=$?
16855 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16856 - (exit $ac_status); }; }; then
16857 + (exit $ac_status); } && {
16858 + test -z "$ac_c_werror_flag" ||
16859 + test ! -s conftest.err
16860 + } && test -s conftest.$ac_objext; then
16861 ac_cv_prog_cc_g=yes
16862 else
16863 echo "$as_me: failed program was:" >&5
16864 @@ -7319,27 +6907,10 @@
16865 rm -f conftest.er1
16866 cat conftest.err >&5
16867 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16868 - (exit $ac_status); } &&
16869 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16870 - { (case "(($ac_try" in
16871 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16872 - *) ac_try_echo=$ac_try;;
16873 -esac
16874 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16875 - (eval "$ac_try") 2>&5
16876 - ac_status=$?
16877 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16878 - (exit $ac_status); }; } &&
16879 - { ac_try='test -s conftest.$ac_objext'
16880 - { (case "(($ac_try" in
16881 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16882 - *) ac_try_echo=$ac_try;;
16883 -esac
16884 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16885 - (eval "$ac_try") 2>&5
16886 - ac_status=$?
16887 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16888 - (exit $ac_status); }; }; then
16889 + (exit $ac_status); } && {
16890 + test -z "$ac_c_werror_flag" ||
16891 + test ! -s conftest.err
16892 + } && test -s conftest.$ac_objext; then
16893 :
16894 else
16895 echo "$as_me: failed program was:" >&5
16896 @@ -7375,27 +6946,10 @@
16897 rm -f conftest.er1
16898 cat conftest.err >&5
16899 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16900 - (exit $ac_status); } &&
16901 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16902 - { (case "(($ac_try" in
16903 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16904 - *) ac_try_echo=$ac_try;;
16905 -esac
16906 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16907 - (eval "$ac_try") 2>&5
16908 - ac_status=$?
16909 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16910 - (exit $ac_status); }; } &&
16911 - { ac_try='test -s conftest.$ac_objext'
16912 - { (case "(($ac_try" in
16913 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16914 - *) ac_try_echo=$ac_try;;
16915 -esac
16916 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16917 - (eval "$ac_try") 2>&5
16918 - ac_status=$?
16919 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16920 - (exit $ac_status); }; }; then
16921 + (exit $ac_status); } && {
16922 + test -z "$ac_c_werror_flag" ||
16923 + test ! -s conftest.err
16924 + } && test -s conftest.$ac_objext; then
16925 ac_cv_prog_cc_g=yes
16926 else
16927 echo "$as_me: failed program was:" >&5
16928 @@ -7511,27 +7065,10 @@
16929 rm -f conftest.er1
16930 cat conftest.err >&5
16931 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16932 - (exit $ac_status); } &&
16933 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16934 - { (case "(($ac_try" in
16935 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16936 - *) ac_try_echo=$ac_try;;
16937 -esac
16938 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16939 - (eval "$ac_try") 2>&5
16940 - ac_status=$?
16941 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16942 - (exit $ac_status); }; } &&
16943 - { ac_try='test -s conftest.$ac_objext'
16944 - { (case "(($ac_try" in
16945 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16946 - *) ac_try_echo=$ac_try;;
16947 -esac
16948 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16949 - (eval "$ac_try") 2>&5
16950 - ac_status=$?
16951 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16952 - (exit $ac_status); }; }; then
16953 + (exit $ac_status); } && {
16954 + test -z "$ac_c_werror_flag" ||
16955 + test ! -s conftest.err
16956 + } && test -s conftest.$ac_objext; then
16957 ac_cv_prog_cc_c89=$ac_arg
16958 else
16959 echo "$as_me: failed program was:" >&5
16960 @@ -7635,6 +7172,7 @@
16961 depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
16962 $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
16963 >/dev/null 2>conftest.err &&
16964 + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
16965 grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
16966 grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
16967 ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
16968 @@ -7664,9 +7202,7 @@
16969 echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
16970 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
16971
16972 -
16973 -
16974 -if
16975 + if
16976 test "x$enable_dependency_tracking" != xno \
16977 && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
16978 am__fastdepCC_TRUE=
16979 @@ -7714,27 +7250,10 @@
16980 rm -f conftest.er1
16981 cat conftest.err >&5
16982 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16983 - (exit $ac_status); } &&
16984 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16985 - { (case "(($ac_try" in
16986 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16987 - *) ac_try_echo=$ac_try;;
16988 -esac
16989 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16990 - (eval "$ac_try") 2>&5
16991 - ac_status=$?
16992 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16993 - (exit $ac_status); }; } &&
16994 - { ac_try='test -s conftest.$ac_objext'
16995 - { (case "(($ac_try" in
16996 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16997 - *) ac_try_echo=$ac_try;;
16998 -esac
16999 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17000 - (eval "$ac_try") 2>&5
17001 - ac_status=$?
17002 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17003 - (exit $ac_status); }; }; then
17004 + (exit $ac_status); } && {
17005 + test -z "$ac_c_werror_flag" ||
17006 + test ! -s conftest.err
17007 + } && test -s conftest.$ac_objext; then
17008 ac_cv_header_stdc=yes
17009 else
17010 echo "$as_me: failed program was:" >&5
17011 @@ -8247,7 +7766,7 @@
1610617012 lt_cv_deplibs_check_method=pass_all
1610717013 ;;
1610817014
1611117017 if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
1611217018 case $host_cpu in
1611317019 i*86 )
16114 @@ -7104,11 +7084,11 @@
17020 @@ -8301,11 +7820,11 @@
1611517021 ;;
1611617022
1611717023 # This must be Linux ELF.
1612517031 if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
1612617032 lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
1612717033 else
16128 @@ -7224,7 +7204,7 @@
17034 @@ -8421,7 +7940,7 @@
1612917035 ;;
1613017036 *-*-irix6*)
1613117037 # Find out which ABI we are using.
16132 - echo '#line 7227 "configure"' > conftest.$ac_ext
16133 + echo '#line 7207 "configure"' > conftest.$ac_ext
17038 - echo '#line 8424 "configure"' > conftest.$ac_ext
17039 + echo '#line 7943 "configure"' > conftest.$ac_ext
1613417040 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
1613517041 (eval $ac_compile) 2>&5
1613617042 ac_status=$?
16137 @@ -7344,8 +7324,7 @@
17043 @@ -8545,27 +8064,11 @@
17044 rm -f conftest.er1
1613817045 cat conftest.err >&5
1613917046 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16140 (exit $ac_status); } &&
16141 - { ac_try='test -z "$ac_c_werror_flag"
16142 - || test ! -s conftest.err'
16143 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16144 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16145 (eval $ac_try) 2>&5
16146 ac_status=$?
16147 @@ -7682,8 +7661,7 @@
17047 - (exit $ac_status); } &&
17048 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
17049 - { (case "(($ac_try" in
17050 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17051 - *) ac_try_echo=$ac_try;;
17052 -esac
17053 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17054 - (eval "$ac_try") 2>&5
17055 - ac_status=$?
17056 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17057 - (exit $ac_status); }; } &&
17058 - { ac_try='test -s conftest$ac_exeext'
17059 - { (case "(($ac_try" in
17060 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17061 - *) ac_try_echo=$ac_try;;
17062 -esac
17063 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17064 - (eval "$ac_try") 2>&5
17065 - ac_status=$?
17066 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17067 - (exit $ac_status); }; }; then
17068 + (exit $ac_status); } && {
17069 + test -z "$ac_c_werror_flag" ||
17070 + test ! -s conftest.err
17071 + } && test -s conftest$ac_exeext &&
17072 + $as_test_x conftest$ac_exeext; then
17073 lt_cv_cc_needs_belf=yes
17074 else
17075 echo "$as_me: failed program was:" >&5
17076 @@ -8574,7 +8077,7 @@
17077 lt_cv_cc_needs_belf=no
17078 fi
17079
17080 -rm -f core conftest.err conftest.$ac_objext \
17081 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
17082 conftest$ac_exeext conftest.$ac_ext
17083 ac_ext=c
17084 ac_cpp='$CPP $CPPFLAGS'
17085 @@ -8628,7 +8131,7 @@
17086 IFS=$as_save_IFS
17087 test -z "$as_dir" && as_dir=.
17088 for ac_exec_ext in '' $ac_executable_extensions; do
17089 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
17090 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17091 ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
17092 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
17093 break 2
17094 @@ -8668,7 +8171,7 @@
17095 IFS=$as_save_IFS
17096 test -z "$as_dir" && as_dir=.
17097 for ac_exec_ext in '' $ac_executable_extensions; do
17098 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
17099 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17100 ac_cv_prog_ac_ct_DLLTOOL="dlltool"
17101 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
17102 break 2
17103 @@ -8724,7 +8227,7 @@
17104 IFS=$as_save_IFS
17105 test -z "$as_dir" && as_dir=.
17106 for ac_exec_ext in '' $ac_executable_extensions; do
17107 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
17108 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17109 ac_cv_prog_AS="${ac_tool_prefix}as"
17110 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
17111 break 2
17112 @@ -8764,7 +8267,7 @@
17113 IFS=$as_save_IFS
17114 test -z "$as_dir" && as_dir=.
17115 for ac_exec_ext in '' $ac_executable_extensions; do
17116 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
17117 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17118 ac_cv_prog_ac_ct_AS="as"
17119 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
17120 break 2
17121 @@ -8820,7 +8323,7 @@
17122 IFS=$as_save_IFS
17123 test -z "$as_dir" && as_dir=.
17124 for ac_exec_ext in '' $ac_executable_extensions; do
17125 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
17126 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17127 ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
17128 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
17129 break 2
17130 @@ -8860,7 +8363,7 @@
17131 IFS=$as_save_IFS
17132 test -z "$as_dir" && as_dir=.
17133 for ac_exec_ext in '' $ac_executable_extensions; do
17134 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
17135 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17136 ac_cv_prog_ac_ct_OBJDUMP="objdump"
17137 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
17138 break 2
17139 @@ -8945,27 +8448,10 @@
17140 rm -f conftest.er1
1614817141 cat conftest.err >&5
1614917142 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16150 (exit $ac_status); } &&
16151 - { ac_try='test -z "$ac_c_werror_flag"
16152 - || test ! -s conftest.err'
16153 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16154 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16155 (eval $ac_try) 2>&5
16156 ac_status=$?
16157 @@ -7943,8 +7921,7 @@
17143 - (exit $ac_status); } &&
17144 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
17145 - { (case "(($ac_try" in
17146 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17147 - *) ac_try_echo=$ac_try;;
17148 -esac
17149 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17150 - (eval "$ac_try") 2>&5
17151 - ac_status=$?
17152 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17153 - (exit $ac_status); }; } &&
17154 - { ac_try='test -s conftest.$ac_objext'
17155 - { (case "(($ac_try" in
17156 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17157 - *) ac_try_echo=$ac_try;;
17158 -esac
17159 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17160 - (eval "$ac_try") 2>&5
17161 - ac_status=$?
17162 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17163 - (exit $ac_status); }; }; then
17164 + (exit $ac_status); } && {
17165 + test -z "$ac_c_werror_flag" ||
17166 + test ! -s conftest.err
17167 + } && test -s conftest.$ac_objext; then
17168 ac_header_compiler=yes
17169 else
17170 echo "$as_me: failed program was:" >&5
17171 @@ -9001,17 +8487,10 @@
17172 rm -f conftest.er1
1615817173 cat conftest.err >&5
1615917174 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16160 (exit $ac_status); } &&
16161 - { ac_try='test -z "$ac_cxx_werror_flag"
16162 - || test ! -s conftest.err'
16163 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
16164 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16165 (eval $ac_try) 2>&5
16166 ac_status=$?
16167 @@ -8002,8 +7979,7 @@
17175 - (exit $ac_status); } >/dev/null; then
17176 - if test -s conftest.err; then
17177 - ac_cpp_err=$ac_c_preproc_warn_flag
17178 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
17179 - else
17180 - ac_cpp_err=
17181 - fi
17182 -else
17183 - ac_cpp_err=yes
17184 -fi
17185 -if test -z "$ac_cpp_err"; then
17186 + (exit $ac_status); } >/dev/null && {
17187 + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
17188 + test ! -s conftest.err
17189 + }; then
17190 ac_header_preproc=yes
17191 else
17192 echo "$as_me: failed program was:" >&5
17193 @@ -9103,7 +8582,7 @@
17194 IFS=$as_save_IFS
17195 test -z "$as_dir" && as_dir=.
17196 for ac_exec_ext in '' $ac_executable_extensions; do
17197 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
17198 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17199 ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
17200 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
17201 break 2
17202 @@ -9147,7 +8626,7 @@
17203 IFS=$as_save_IFS
17204 test -z "$as_dir" && as_dir=.
17205 for ac_exec_ext in '' $ac_executable_extensions; do
17206 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
17207 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17208 ac_cv_prog_ac_ct_CXX="$ac_prog"
17209 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
17210 break 2
17211 @@ -9260,27 +8739,10 @@
17212 rm -f conftest.er1
1616817213 cat conftest.err >&5
1616917214 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16170 (exit $ac_status); } &&
16171 - { ac_try='test -z "$ac_cxx_werror_flag"
16172 - || test ! -s conftest.err'
16173 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
16174 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16175 (eval $ac_try) 2>&5
16176 ac_status=$?
16177 @@ -8074,8 +8050,7 @@
17215 - (exit $ac_status); } &&
17216 - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
17217 - { (case "(($ac_try" in
17218 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17219 - *) ac_try_echo=$ac_try;;
17220 -esac
17221 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17222 - (eval "$ac_try") 2>&5
17223 - ac_status=$?
17224 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17225 - (exit $ac_status); }; } &&
17226 - { ac_try='test -s conftest.$ac_objext'
17227 - { (case "(($ac_try" in
17228 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17229 - *) ac_try_echo=$ac_try;;
17230 -esac
17231 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17232 - (eval "$ac_try") 2>&5
17233 - ac_status=$?
17234 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17235 - (exit $ac_status); }; }; then
17236 + (exit $ac_status); } && {
17237 + test -z "$ac_cxx_werror_flag" ||
17238 + test ! -s conftest.err
17239 + } && test -s conftest.$ac_objext; then
17240 ac_compiler_gnu=yes
17241 else
17242 echo "$as_me: failed program was:" >&5
17243 @@ -9335,27 +8797,10 @@
17244 rm -f conftest.er1
1617817245 cat conftest.err >&5
1617917246 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16180 (exit $ac_status); } &&
16181 - { ac_try='test -z "$ac_cxx_werror_flag"
16182 - || test ! -s conftest.err'
16183 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
16184 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16185 (eval $ac_try) 2>&5
16186 ac_status=$?
16187 @@ -8119,8 +8094,7 @@
17247 - (exit $ac_status); } &&
17248 - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
17249 - { (case "(($ac_try" in
17250 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17251 - *) ac_try_echo=$ac_try;;
17252 -esac
17253 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17254 - (eval "$ac_try") 2>&5
17255 - ac_status=$?
17256 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17257 - (exit $ac_status); }; } &&
17258 - { ac_try='test -s conftest.$ac_objext'
17259 - { (case "(($ac_try" in
17260 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17261 - *) ac_try_echo=$ac_try;;
17262 -esac
17263 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17264 - (eval "$ac_try") 2>&5
17265 - ac_status=$?
17266 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17267 - (exit $ac_status); }; }; then
17268 + (exit $ac_status); } && {
17269 + test -z "$ac_cxx_werror_flag" ||
17270 + test ! -s conftest.err
17271 + } && test -s conftest.$ac_objext; then
17272 ac_cv_prog_cxx_g=yes
17273 else
17274 echo "$as_me: failed program was:" >&5
17275 @@ -9390,27 +8835,10 @@
17276 rm -f conftest.er1
1618817277 cat conftest.err >&5
1618917278 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16190 (exit $ac_status); } &&
16191 - { ac_try='test -z "$ac_cxx_werror_flag"
16192 - || test ! -s conftest.err'
16193 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
16194 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16195 (eval $ac_try) 2>&5
16196 ac_status=$?
16197 @@ -8592,7 +8566,7 @@
16198
16199
16200 # Provide some information about the compiler.
16201 -echo "$as_me:8595:" \
16202 +echo "$as_me:8569:" \
16203 "checking for Fortran 77 compiler version" >&5
16204 ac_compiler=`set X $ac_compile; echo $2`
16205 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
16206 @@ -8638,8 +8612,7 @@
17279 - (exit $ac_status); } &&
17280 - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
17281 - { (case "(($ac_try" in
17282 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17283 - *) ac_try_echo=$ac_try;;
17284 -esac
17285 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17286 - (eval "$ac_try") 2>&5
17287 - ac_status=$?
17288 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17289 - (exit $ac_status); }; } &&
17290 - { ac_try='test -s conftest.$ac_objext'
17291 - { (case "(($ac_try" in
17292 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17293 - *) ac_try_echo=$ac_try;;
17294 -esac
17295 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17296 - (eval "$ac_try") 2>&5
17297 - ac_status=$?
17298 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17299 - (exit $ac_status); }; }; then
17300 + (exit $ac_status); } && {
17301 + test -z "$ac_cxx_werror_flag" ||
17302 + test ! -s conftest.err
17303 + } && test -s conftest.$ac_objext; then
17304 :
17305 else
17306 echo "$as_me: failed program was:" >&5
17307 @@ -9446,27 +8874,10 @@
17308 rm -f conftest.er1
1620717309 cat conftest.err >&5
1620817310 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16209 (exit $ac_status); } &&
16210 - { ac_try='test -z "$ac_f77_werror_flag"
16211 - || test ! -s conftest.err'
16212 + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
16213 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16214 (eval $ac_try) 2>&5
16215 ac_status=$?
16216 @@ -8688,8 +8661,7 @@
17311 - (exit $ac_status); } &&
17312 - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
17313 - { (case "(($ac_try" in
17314 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17315 - *) ac_try_echo=$ac_try;;
17316 -esac
17317 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17318 - (eval "$ac_try") 2>&5
17319 - ac_status=$?
17320 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17321 - (exit $ac_status); }; } &&
17322 - { ac_try='test -s conftest.$ac_objext'
17323 - { (case "(($ac_try" in
17324 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17325 - *) ac_try_echo=$ac_try;;
17326 -esac
17327 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17328 - (eval "$ac_try") 2>&5
17329 - ac_status=$?
17330 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17331 - (exit $ac_status); }; }; then
17332 + (exit $ac_status); } && {
17333 + test -z "$ac_cxx_werror_flag" ||
17334 + test ! -s conftest.err
17335 + } && test -s conftest.$ac_objext; then
17336 ac_cv_prog_cxx_g=yes
17337 else
17338 echo "$as_me: failed program was:" >&5
17339 @@ -9574,6 +8985,7 @@
17340 depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
17341 $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
17342 >/dev/null 2>conftest.err &&
17343 + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
17344 grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
17345 grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
17346 ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
17347 @@ -9603,9 +9015,7 @@
17348 echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
17349 CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
17350
17351 -
17352 -
17353 -if
17354 + if
17355 test "x$enable_dependency_tracking" != xno \
17356 && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
17357 am__fastdepCXX_TRUE=
17358 @@ -9669,17 +9079,10 @@
17359 rm -f conftest.er1
1621717360 cat conftest.err >&5
1621817361 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16219 (exit $ac_status); } &&
16220 - { ac_try='test -z "$ac_f77_werror_flag"
16221 - || test ! -s conftest.err'
16222 + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
16223 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16224 (eval $ac_try) 2>&5
16225 ac_status=$?
16226 @@ -8897,7 +8869,7 @@
17362 - (exit $ac_status); } >/dev/null; then
17363 - if test -s conftest.err; then
17364 - ac_cpp_err=$ac_cxx_preproc_warn_flag
17365 - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
17366 - else
17367 - ac_cpp_err=
17368 - fi
17369 -else
17370 - ac_cpp_err=yes
17371 -fi
17372 -if test -z "$ac_cpp_err"; then
17373 + (exit $ac_status); } >/dev/null && {
17374 + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
17375 + test ! -s conftest.err
17376 + }; then
17377 :
17378 else
17379 echo "$as_me: failed program was:" >&5
17380 @@ -9713,17 +9116,10 @@
17381 rm -f conftest.er1
17382 cat conftest.err >&5
17383 echo "$as_me:$LINENO: \$? = $ac_status" >&5
17384 - (exit $ac_status); } >/dev/null; then
17385 - if test -s conftest.err; then
17386 - ac_cpp_err=$ac_cxx_preproc_warn_flag
17387 - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
17388 - else
17389 - ac_cpp_err=
17390 - fi
17391 -else
17392 - ac_cpp_err=yes
17393 -fi
17394 -if test -z "$ac_cpp_err"; then
17395 + (exit $ac_status); } >/dev/null && {
17396 + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
17397 + test ! -s conftest.err
17398 + }; then
17399 # Broken: success on invalid input.
17400 continue
17401 else
17402 @@ -9788,17 +9184,10 @@
17403 rm -f conftest.er1
17404 cat conftest.err >&5
17405 echo "$as_me:$LINENO: \$? = $ac_status" >&5
17406 - (exit $ac_status); } >/dev/null; then
17407 - if test -s conftest.err; then
17408 - ac_cpp_err=$ac_cxx_preproc_warn_flag
17409 - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
17410 - else
17411 - ac_cpp_err=
17412 - fi
17413 -else
17414 - ac_cpp_err=yes
17415 -fi
17416 -if test -z "$ac_cpp_err"; then
17417 + (exit $ac_status); } >/dev/null && {
17418 + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
17419 + test ! -s conftest.err
17420 + }; then
17421 :
17422 else
17423 echo "$as_me: failed program was:" >&5
17424 @@ -9832,17 +9221,10 @@
17425 rm -f conftest.er1
17426 cat conftest.err >&5
17427 echo "$as_me:$LINENO: \$? = $ac_status" >&5
17428 - (exit $ac_status); } >/dev/null; then
17429 - if test -s conftest.err; then
17430 - ac_cpp_err=$ac_cxx_preproc_warn_flag
17431 - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
17432 - else
17433 - ac_cpp_err=
17434 - fi
17435 -else
17436 - ac_cpp_err=yes
17437 -fi
17438 -if test -z "$ac_cpp_err"; then
17439 + (exit $ac_status); } >/dev/null && {
17440 + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
17441 + test ! -s conftest.err
17442 + }; then
17443 # Broken: success on invalid input.
17444 continue
17445 else
17446 @@ -9883,7 +9265,7 @@
17447 ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
17448 ac_compiler_gnu=$ac_cv_f77_compiler_gnu
17449 if test -n "$ac_tool_prefix"; then
17450 - for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
17451 + for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
17452 do
17453 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
17454 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
17455 @@ -9901,7 +9283,7 @@
17456 IFS=$as_save_IFS
17457 test -z "$as_dir" && as_dir=.
17458 for ac_exec_ext in '' $ac_executable_extensions; do
17459 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
17460 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17461 ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
17462 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
17463 break 2
17464 @@ -9927,7 +9309,7 @@
17465 fi
17466 if test -z "$F77"; then
17467 ac_ct_F77=$F77
17468 - for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
17469 + for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
17470 do
17471 # Extract the first word of "$ac_prog", so it can be a program name with args.
17472 set dummy $ac_prog; ac_word=$2
17473 @@ -9945,7 +9327,7 @@
17474 IFS=$as_save_IFS
17475 test -z "$as_dir" && as_dir=.
17476 for ac_exec_ext in '' $ac_executable_extensions; do
17477 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
17478 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17479 ac_cv_prog_ac_ct_F77="$ac_prog"
17480 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
17481 break 2
17482 @@ -10052,27 +9434,10 @@
17483 rm -f conftest.er1
17484 cat conftest.err >&5
17485 echo "$as_me:$LINENO: \$? = $ac_status" >&5
17486 - (exit $ac_status); } &&
17487 - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
17488 - { (case "(($ac_try" in
17489 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17490 - *) ac_try_echo=$ac_try;;
17491 -esac
17492 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17493 - (eval "$ac_try") 2>&5
17494 - ac_status=$?
17495 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17496 - (exit $ac_status); }; } &&
17497 - { ac_try='test -s conftest.$ac_objext'
17498 - { (case "(($ac_try" in
17499 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17500 - *) ac_try_echo=$ac_try;;
17501 -esac
17502 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17503 - (eval "$ac_try") 2>&5
17504 - ac_status=$?
17505 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17506 - (exit $ac_status); }; }; then
17507 + (exit $ac_status); } && {
17508 + test -z "$ac_f77_werror_flag" ||
17509 + test ! -s conftest.err
17510 + } && test -s conftest.$ac_objext; then
17511 ac_compiler_gnu=yes
17512 else
17513 echo "$as_me: failed program was:" >&5
17514 @@ -10115,27 +9480,10 @@
17515 rm -f conftest.er1
17516 cat conftest.err >&5
17517 echo "$as_me:$LINENO: \$? = $ac_status" >&5
17518 - (exit $ac_status); } &&
17519 - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
17520 - { (case "(($ac_try" in
17521 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17522 - *) ac_try_echo=$ac_try;;
17523 -esac
17524 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17525 - (eval "$ac_try") 2>&5
17526 - ac_status=$?
17527 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17528 - (exit $ac_status); }; } &&
17529 - { ac_try='test -s conftest.$ac_objext'
17530 - { (case "(($ac_try" in
17531 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17532 - *) ac_try_echo=$ac_try;;
17533 -esac
17534 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17535 - (eval "$ac_try") 2>&5
17536 - ac_status=$?
17537 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17538 - (exit $ac_status); }; }; then
17539 + (exit $ac_status); } && {
17540 + test -z "$ac_f77_werror_flag" ||
17541 + test ! -s conftest.err
17542 + } && test -s conftest.$ac_objext; then
17543 ac_cv_prog_f77_g=yes
17544 else
17545 echo "$as_me: failed program was:" >&5
17546 @@ -10333,7 +9681,7 @@
1622717547 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
1622817548 lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
1622917549 ;;
1623217552 if test "$host_cpu" = ia64; then
1623317553 symcode='[ABCDGIRSTW]'
1623417554 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
16235 @@ -9655,11 +9627,11 @@
17555 @@ -10590,7 +9938,7 @@
17556 IFS=$as_save_IFS
17557 test -z "$as_dir" && as_dir=.
17558 for ac_exec_ext in '' $ac_executable_extensions; do
17559 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
17560 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17561 ac_cv_prog_AR="${ac_tool_prefix}ar"
17562 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
17563 break 2
17564 @@ -10630,7 +9978,7 @@
17565 IFS=$as_save_IFS
17566 test -z "$as_dir" && as_dir=.
17567 for ac_exec_ext in '' $ac_executable_extensions; do
17568 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
17569 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17570 ac_cv_prog_ac_ct_AR="ar"
17571 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
17572 break 2
17573 @@ -10686,7 +10034,7 @@
17574 IFS=$as_save_IFS
17575 test -z "$as_dir" && as_dir=.
17576 for ac_exec_ext in '' $ac_executable_extensions; do
17577 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
17578 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17579 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
17580 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
17581 break 2
17582 @@ -10726,7 +10074,7 @@
17583 IFS=$as_save_IFS
17584 test -z "$as_dir" && as_dir=.
17585 for ac_exec_ext in '' $ac_executable_extensions; do
17586 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
17587 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17588 ac_cv_prog_ac_ct_RANLIB="ranlib"
17589 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
17590 break 2
17591 @@ -10782,7 +10130,7 @@
17592 IFS=$as_save_IFS
17593 test -z "$as_dir" && as_dir=.
17594 for ac_exec_ext in '' $ac_executable_extensions; do
17595 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
17596 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17597 ac_cv_prog_STRIP="${ac_tool_prefix}strip"
17598 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
17599 break 2
17600 @@ -10822,7 +10170,7 @@
17601 IFS=$as_save_IFS
17602 test -z "$as_dir" && as_dir=.
17603 for ac_exec_ext in '' $ac_executable_extensions; do
17604 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
17605 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17606 ac_cv_prog_ac_ct_STRIP="strip"
17607 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
17608 break 2
17609 @@ -11139,11 +10487,11 @@
1623617610 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1623717611 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1623817612 -e 's:$: $lt_compiler_flag:'`
16239 - (eval echo "\"\$as_me:9658: $lt_compile\"" >&5)
16240 + (eval echo "\"\$as_me:9630: $lt_compile\"" >&5)
17613 - (eval echo "\"\$as_me:11142: $lt_compile\"" >&5)
17614 + (eval echo "\"\$as_me:10490: $lt_compile\"" >&5)
1624117615 (eval "$lt_compile" 2>conftest.err)
1624217616 ac_status=$?
1624317617 cat conftest.err >&5
16244 - echo "$as_me:9662: \$? = $ac_status" >&5
16245 + echo "$as_me:9634: \$? = $ac_status" >&5
17618 - echo "$as_me:11146: \$? = $ac_status" >&5
17619 + echo "$as_me:10494: \$? = $ac_status" >&5
1624617620 if (exit $ac_status) && test -s "$ac_outfile"; then
1624717621 # The compiler can only warn and ignore the option if not recognized
1624817622 # So say no if there are warnings other than the usual output.
16249 @@ -9817,7 +9789,7 @@
17623 @@ -11301,7 +10649,7 @@
1625017624 lt_prog_compiler_static='-Bstatic'
1625117625 ;;
1625217626
1625517629 case $cc_basename in
1625617630 icc* | ecc*)
1625717631 lt_prog_compiler_wl='-Wl,'
16258 @@ -9923,11 +9895,11 @@
17632 @@ -11407,11 +10755,11 @@
1625917633 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1626017634 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1626117635 -e 's:$: $lt_compiler_flag:'`
16262 - (eval echo "\"\$as_me:9926: $lt_compile\"" >&5)
16263 + (eval echo "\"\$as_me:9898: $lt_compile\"" >&5)
17636 - (eval echo "\"\$as_me:11410: $lt_compile\"" >&5)
17637 + (eval echo "\"\$as_me:10758: $lt_compile\"" >&5)
1626417638 (eval "$lt_compile" 2>conftest.err)
1626517639 ac_status=$?
1626617640 cat conftest.err >&5
16267 - echo "$as_me:9930: \$? = $ac_status" >&5
16268 + echo "$as_me:9902: \$? = $ac_status" >&5
17641 - echo "$as_me:11414: \$? = $ac_status" >&5
17642 + echo "$as_me:10762: \$? = $ac_status" >&5
1626917643 if (exit $ac_status) && test -s "$ac_outfile"; then
1627017644 # The compiler can only warn and ignore the option if not recognized
1627117645 # So say no if there are warnings other than the usual output.
16272 @@ -10027,11 +9999,11 @@
17646 @@ -11511,11 +10859,11 @@
1627317647 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1627417648 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1627517649 -e 's:$: $lt_compiler_flag:'`
16276 - (eval echo "\"\$as_me:10030: $lt_compile\"" >&5)
16277 + (eval echo "\"\$as_me:10002: $lt_compile\"" >&5)
17650 - (eval echo "\"\$as_me:11514: $lt_compile\"" >&5)
17651 + (eval echo "\"\$as_me:10862: $lt_compile\"" >&5)
1627817652 (eval "$lt_compile" 2>out/conftest.err)
1627917653 ac_status=$?
1628017654 cat out/conftest.err >&5
16281 - echo "$as_me:10034: \$? = $ac_status" >&5
16282 + echo "$as_me:10006: \$? = $ac_status" >&5
17655 - echo "$as_me:11518: \$? = $ac_status" >&5
17656 + echo "$as_me:10866: \$? = $ac_status" >&5
1628317657 if (exit $ac_status) && test -s out/conftest2.$ac_objext
1628417658 then
1628517659 # The compiler can only warn and ignore the option if not recognized
16286 @@ -10256,7 +10228,7 @@
17660 @@ -11740,7 +11088,7 @@
1628717661 archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
1628817662 ;;
1628917663
1629217666 if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
1629317667 tmp_addflag=
1629417668 case $cc_basename,$host_cpu in
16295 @@ -10282,12 +10254,13 @@
17669 @@ -11766,12 +11114,13 @@
1629617670 $echo "local: *; };" >> $output_objdir/$libname.ver~
1629717671 $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
1629817672 fi
1630717681 if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
1630817682 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
1630917683 wlarc=
16310 @@ -10503,8 +10476,7 @@
17684 @@ -11991,27 +11340,11 @@
17685 rm -f conftest.er1
1631117686 cat conftest.err >&5
1631217687 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16313 (exit $ac_status); } &&
16314 - { ac_try='test -z "$ac_c_werror_flag"
16315 - || test ! -s conftest.err'
16316 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16317 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16318 (eval $ac_try) 2>&5
16319 ac_status=$?
16320 @@ -10564,8 +10536,7 @@
17688 - (exit $ac_status); } &&
17689 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
17690 - { (case "(($ac_try" in
17691 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17692 - *) ac_try_echo=$ac_try;;
17693 -esac
17694 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17695 - (eval "$ac_try") 2>&5
17696 - ac_status=$?
17697 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17698 - (exit $ac_status); }; } &&
17699 - { ac_try='test -s conftest$ac_exeext'
17700 - { (case "(($ac_try" in
17701 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17702 - *) ac_try_echo=$ac_try;;
17703 -esac
17704 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17705 - (eval "$ac_try") 2>&5
17706 - ac_status=$?
17707 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17708 - (exit $ac_status); }; }; then
17709 + (exit $ac_status); } && {
17710 + test -z "$ac_c_werror_flag" ||
17711 + test ! -s conftest.err
17712 + } && test -s conftest$ac_exeext &&
17713 + $as_test_x conftest$ac_exeext; then
17714
17715 aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
17716 }'`
17717 @@ -12025,7 +11358,7 @@
17718
17719 fi
17720
17721 -rm -f core conftest.err conftest.$ac_objext \
17722 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
17723 conftest$ac_exeext conftest.$ac_ext
17724 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
17725
17726 @@ -12066,27 +11399,11 @@
17727 rm -f conftest.er1
1632117728 cat conftest.err >&5
1632217729 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16323 (exit $ac_status); } &&
16324 - { ac_try='test -z "$ac_c_werror_flag"
16325 - || test ! -s conftest.err'
16326 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16327 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16328 (eval $ac_try) 2>&5
16329 ac_status=$?
16330 @@ -10719,7 +10690,7 @@
17730 - (exit $ac_status); } &&
17731 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
17732 - { (case "(($ac_try" in
17733 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17734 - *) ac_try_echo=$ac_try;;
17735 -esac
17736 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17737 - (eval "$ac_try") 2>&5
17738 - ac_status=$?
17739 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17740 - (exit $ac_status); }; } &&
17741 - { ac_try='test -s conftest$ac_exeext'
17742 - { (case "(($ac_try" in
17743 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17744 - *) ac_try_echo=$ac_try;;
17745 -esac
17746 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17747 - (eval "$ac_try") 2>&5
17748 - ac_status=$?
17749 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17750 - (exit $ac_status); }; }; then
17751 + (exit $ac_status); } && {
17752 + test -z "$ac_c_werror_flag" ||
17753 + test ! -s conftest.err
17754 + } && test -s conftest$ac_exeext &&
17755 + $as_test_x conftest$ac_exeext; then
17756
17757 aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
17758 }'`
17759 @@ -12100,7 +11417,7 @@
17760
17761 fi
17762
17763 -rm -f core conftest.err conftest.$ac_objext \
17764 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
17765 conftest$ac_exeext conftest.$ac_ext
17766 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
17767
17768 @@ -12231,7 +11548,7 @@
1633117769 ;;
1633217770
1633317771 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
1633617774 archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
1633717775 hardcode_libdir_flag_spec='-R$libdir'
1633817776 hardcode_direct=yes
16339 @@ -10821,7 +10792,7 @@
17777 @@ -12333,7 +11650,7 @@
1634017778 link_all_deplibs=yes
1634117779 ;;
1634217780
1634517783 if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
1634617784 archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
1634717785 else
16348 @@ -11311,18 +11282,6 @@
17786 @@ -12823,18 +12140,6 @@
1634917787 dynamic_linker=no
1635017788 ;;
1635117789
1636417802 freebsd* | dragonfly*)
1636517803 # DragonFly does not have aout. When/if they implement a new
1636617804 # versioning mechanism, adjust this.
16367 @@ -11478,7 +11437,7 @@
17805 @@ -12990,7 +12295,7 @@
1636817806 ;;
1636917807
1637017808 # This must be Linux ELF.
1637317811 version_type=linux
1637417812 need_lib_prefix=no
1637517813 need_version=no
16376 @@ -11492,31 +11451,10 @@
17814 @@ -13004,31 +12309,10 @@
1637717815 # before this can be enabled.
1637817816 hardcode_into_libs=yes
1637917817
1638117819 - libsuff=
1638217820 - case "$host_cpu" in
1638317821 - x86_64*|s390x*|powerpc64*)
16384 - echo '#line 11499 "configure"' > conftest.$ac_ext
17822 - echo '#line 13011 "configure"' > conftest.$ac_ext
1638517823 - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
1638617824 - (eval $ac_compile) 2>&5
1638717825 - ac_status=$?
1640617844 fi
1640717845
1640817846 # We used to test for /lib/ld.so.1 and disable shared libraries on
16409 @@ -11528,7 +11466,7 @@
17847 @@ -13040,7 +12324,7 @@
1641017848 dynamic_linker='GNU/Linux ld.so'
1641117849 ;;
1641217850
1641517853 version_type=linux
1641617854 need_lib_prefix=no
1641717855 need_version=no
16418 @@ -11537,7 +11475,7 @@
17856 @@ -13049,7 +12333,7 @@
1641917857 shlibpath_var=LD_LIBRARY_PATH
1642017858 shlibpath_overrides_runpath=no
1642117859 hardcode_into_libs=yes
1642417862 ;;
1642517863
1642617864 netbsd*)
16427 @@ -11853,8 +11791,7 @@
17865 @@ -13369,27 +12653,11 @@
17866 rm -f conftest.er1
1642817867 cat conftest.err >&5
1642917868 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16430 (exit $ac_status); } &&
16431 - { ac_try='test -z "$ac_c_werror_flag"
16432 - || test ! -s conftest.err'
16433 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16434 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16435 (eval $ac_try) 2>&5
16436 ac_status=$?
16437 @@ -11957,8 +11894,7 @@
17869 - (exit $ac_status); } &&
17870 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
17871 - { (case "(($ac_try" in
17872 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17873 - *) ac_try_echo=$ac_try;;
17874 -esac
17875 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17876 - (eval "$ac_try") 2>&5
17877 - ac_status=$?
17878 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17879 - (exit $ac_status); }; } &&
17880 - { ac_try='test -s conftest$ac_exeext'
17881 - { (case "(($ac_try" in
17882 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17883 - *) ac_try_echo=$ac_try;;
17884 -esac
17885 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17886 - (eval "$ac_try") 2>&5
17887 - ac_status=$?
17888 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17889 - (exit $ac_status); }; }; then
17890 + (exit $ac_status); } && {
17891 + test -z "$ac_c_werror_flag" ||
17892 + test ! -s conftest.err
17893 + } && test -s conftest$ac_exeext &&
17894 + $as_test_x conftest$ac_exeext; then
17895 ac_cv_lib_dl_dlopen=yes
17896 else
17897 echo "$as_me: failed program was:" >&5
17898 @@ -13398,7 +12666,7 @@
17899 ac_cv_lib_dl_dlopen=no
17900 fi
17901
17902 -rm -f core conftest.err conftest.$ac_objext \
17903 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
17904 conftest$ac_exeext conftest.$ac_ext
17905 LIBS=$ac_check_lib_save_LIBS
17906 fi
17907 @@ -13480,27 +12748,11 @@
17908 rm -f conftest.er1
1643817909 cat conftest.err >&5
1643917910 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16440 (exit $ac_status); } &&
16441 - { ac_try='test -z "$ac_c_werror_flag"
16442 - || test ! -s conftest.err'
16443 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16444 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16445 (eval $ac_try) 2>&5
16446 ac_status=$?
16447 @@ -12023,8 +11959,7 @@
17911 - (exit $ac_status); } &&
17912 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
17913 - { (case "(($ac_try" in
17914 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17915 - *) ac_try_echo=$ac_try;;
17916 -esac
17917 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17918 - (eval "$ac_try") 2>&5
17919 - ac_status=$?
17920 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17921 - (exit $ac_status); }; } &&
17922 - { ac_try='test -s conftest$ac_exeext'
17923 - { (case "(($ac_try" in
17924 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17925 - *) ac_try_echo=$ac_try;;
17926 -esac
17927 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17928 - (eval "$ac_try") 2>&5
17929 - ac_status=$?
17930 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17931 - (exit $ac_status); }; }; then
17932 + (exit $ac_status); } && {
17933 + test -z "$ac_c_werror_flag" ||
17934 + test ! -s conftest.err
17935 + } && test -s conftest$ac_exeext &&
17936 + $as_test_x conftest$ac_exeext; then
17937 ac_cv_func_shl_load=yes
17938 else
17939 echo "$as_me: failed program was:" >&5
17940 @@ -13509,7 +12761,7 @@
17941 ac_cv_func_shl_load=no
17942 fi
17943
17944 -rm -f core conftest.err conftest.$ac_objext \
17945 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
17946 conftest$ac_exeext conftest.$ac_ext
17947 fi
17948 { echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
17949 @@ -13559,27 +12811,11 @@
17950 rm -f conftest.er1
1644817951 cat conftest.err >&5
1644917952 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16450 (exit $ac_status); } &&
16451 - { ac_try='test -z "$ac_c_werror_flag"
16452 - || test ! -s conftest.err'
16453 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16454 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16455 (eval $ac_try) 2>&5
16456 ac_status=$?
16457 @@ -12117,8 +12052,7 @@
17953 - (exit $ac_status); } &&
17954 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
17955 - { (case "(($ac_try" in
17956 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17957 - *) ac_try_echo=$ac_try;;
17958 -esac
17959 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17960 - (eval "$ac_try") 2>&5
17961 - ac_status=$?
17962 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17963 - (exit $ac_status); }; } &&
17964 - { ac_try='test -s conftest$ac_exeext'
17965 - { (case "(($ac_try" in
17966 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17967 - *) ac_try_echo=$ac_try;;
17968 -esac
17969 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17970 - (eval "$ac_try") 2>&5
17971 - ac_status=$?
17972 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17973 - (exit $ac_status); }; }; then
17974 + (exit $ac_status); } && {
17975 + test -z "$ac_c_werror_flag" ||
17976 + test ! -s conftest.err
17977 + } && test -s conftest$ac_exeext &&
17978 + $as_test_x conftest$ac_exeext; then
17979 ac_cv_lib_dld_shl_load=yes
17980 else
17981 echo "$as_me: failed program was:" >&5
17982 @@ -13588,7 +12824,7 @@
17983 ac_cv_lib_dld_shl_load=no
17984 fi
17985
17986 -rm -f core conftest.err conftest.$ac_objext \
17987 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
17988 conftest$ac_exeext conftest.$ac_ext
17989 LIBS=$ac_check_lib_save_LIBS
17990 fi
17991 @@ -13660,27 +12896,11 @@
17992 rm -f conftest.er1
1645817993 cat conftest.err >&5
1645917994 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16460 (exit $ac_status); } &&
16461 - { ac_try='test -z "$ac_c_werror_flag"
16462 - || test ! -s conftest.err'
16463 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16464 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16465 (eval $ac_try) 2>&5
16466 ac_status=$?
16467 @@ -12183,8 +12117,7 @@
17995 - (exit $ac_status); } &&
17996 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
17997 - { (case "(($ac_try" in
17998 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17999 - *) ac_try_echo=$ac_try;;
18000 -esac
18001 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
18002 - (eval "$ac_try") 2>&5
18003 - ac_status=$?
18004 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18005 - (exit $ac_status); }; } &&
18006 - { ac_try='test -s conftest$ac_exeext'
18007 - { (case "(($ac_try" in
18008 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
18009 - *) ac_try_echo=$ac_try;;
18010 -esac
18011 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
18012 - (eval "$ac_try") 2>&5
18013 - ac_status=$?
18014 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18015 - (exit $ac_status); }; }; then
18016 + (exit $ac_status); } && {
18017 + test -z "$ac_c_werror_flag" ||
18018 + test ! -s conftest.err
18019 + } && test -s conftest$ac_exeext &&
18020 + $as_test_x conftest$ac_exeext; then
18021 ac_cv_func_dlopen=yes
18022 else
18023 echo "$as_me: failed program was:" >&5
18024 @@ -13689,7 +12909,7 @@
18025 ac_cv_func_dlopen=no
18026 fi
18027
18028 -rm -f core conftest.err conftest.$ac_objext \
18029 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
18030 conftest$ac_exeext conftest.$ac_ext
18031 fi
18032 { echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
18033 @@ -13739,27 +12959,11 @@
18034 rm -f conftest.er1
1646818035 cat conftest.err >&5
1646918036 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16470 (exit $ac_status); } &&
16471 - { ac_try='test -z "$ac_c_werror_flag"
16472 - || test ! -s conftest.err'
16473 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16474 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16475 (eval $ac_try) 2>&5
16476 ac_status=$?
16477 @@ -12250,8 +12183,7 @@
18037 - (exit $ac_status); } &&
18038 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
18039 - { (case "(($ac_try" in
18040 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
18041 - *) ac_try_echo=$ac_try;;
18042 -esac
18043 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
18044 - (eval "$ac_try") 2>&5
18045 - ac_status=$?
18046 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18047 - (exit $ac_status); }; } &&
18048 - { ac_try='test -s conftest$ac_exeext'
18049 - { (case "(($ac_try" in
18050 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
18051 - *) ac_try_echo=$ac_try;;
18052 -esac
18053 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
18054 - (eval "$ac_try") 2>&5
18055 - ac_status=$?
18056 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18057 - (exit $ac_status); }; }; then
18058 + (exit $ac_status); } && {
18059 + test -z "$ac_c_werror_flag" ||
18060 + test ! -s conftest.err
18061 + } && test -s conftest$ac_exeext &&
18062 + $as_test_x conftest$ac_exeext; then
18063 ac_cv_lib_dl_dlopen=yes
18064 else
18065 echo "$as_me: failed program was:" >&5
18066 @@ -13768,7 +12972,7 @@
18067 ac_cv_lib_dl_dlopen=no
18068 fi
18069
18070 -rm -f core conftest.err conftest.$ac_objext \
18071 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
18072 conftest$ac_exeext conftest.$ac_ext
18073 LIBS=$ac_check_lib_save_LIBS
18074 fi
18075 @@ -13819,27 +13023,11 @@
18076 rm -f conftest.er1
1647818077 cat conftest.err >&5
1647918078 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16480 (exit $ac_status); } &&
16481 - { ac_try='test -z "$ac_c_werror_flag"
16482 - || test ! -s conftest.err'
16483 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16484 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16485 (eval $ac_try) 2>&5
16486 ac_status=$?
16487 @@ -12317,8 +12249,7 @@
18079 - (exit $ac_status); } &&
18080 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
18081 - { (case "(($ac_try" in
18082 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
18083 - *) ac_try_echo=$ac_try;;
18084 -esac
18085 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
18086 - (eval "$ac_try") 2>&5
18087 - ac_status=$?
18088 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18089 - (exit $ac_status); }; } &&
18090 - { ac_try='test -s conftest$ac_exeext'
18091 - { (case "(($ac_try" in
18092 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
18093 - *) ac_try_echo=$ac_try;;
18094 -esac
18095 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
18096 - (eval "$ac_try") 2>&5
18097 - ac_status=$?
18098 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18099 - (exit $ac_status); }; }; then
18100 + (exit $ac_status); } && {
18101 + test -z "$ac_c_werror_flag" ||
18102 + test ! -s conftest.err
18103 + } && test -s conftest$ac_exeext &&
18104 + $as_test_x conftest$ac_exeext; then
18105 ac_cv_lib_svld_dlopen=yes
18106 else
18107 echo "$as_me: failed program was:" >&5
18108 @@ -13848,7 +13036,7 @@
18109 ac_cv_lib_svld_dlopen=no
18110 fi
18111
18112 -rm -f core conftest.err conftest.$ac_objext \
18113 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
18114 conftest$ac_exeext conftest.$ac_ext
18115 LIBS=$ac_check_lib_save_LIBS
18116 fi
18117 @@ -13899,27 +13087,11 @@
18118 rm -f conftest.er1
1648818119 cat conftest.err >&5
1648918120 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16490 (exit $ac_status); } &&
16491 - { ac_try='test -z "$ac_c_werror_flag"
16492 - || test ! -s conftest.err'
16493 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16494 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16495 (eval $ac_try) 2>&5
16496 ac_status=$?
16497 @@ -12393,7 +12324,7 @@
18121 - (exit $ac_status); } &&
18122 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
18123 - { (case "(($ac_try" in
18124 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
18125 - *) ac_try_echo=$ac_try;;
18126 -esac
18127 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
18128 - (eval "$ac_try") 2>&5
18129 - ac_status=$?
18130 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18131 - (exit $ac_status); }; } &&
18132 - { ac_try='test -s conftest$ac_exeext'
18133 - { (case "(($ac_try" in
18134 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
18135 - *) ac_try_echo=$ac_try;;
18136 -esac
18137 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
18138 - (eval "$ac_try") 2>&5
18139 - ac_status=$?
18140 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18141 - (exit $ac_status); }; }; then
18142 + (exit $ac_status); } && {
18143 + test -z "$ac_c_werror_flag" ||
18144 + test ! -s conftest.err
18145 + } && test -s conftest$ac_exeext &&
18146 + $as_test_x conftest$ac_exeext; then
18147 ac_cv_lib_dld_dld_link=yes
18148 else
18149 echo "$as_me: failed program was:" >&5
18150 @@ -13928,7 +13100,7 @@
18151 ac_cv_lib_dld_dld_link=no
18152 fi
18153
18154 -rm -f core conftest.err conftest.$ac_objext \
18155 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
18156 conftest$ac_exeext conftest.$ac_ext
18157 LIBS=$ac_check_lib_save_LIBS
18158 fi
18159 @@ -13984,7 +13156,7 @@
1649818160 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1649918161 lt_status=$lt_dlunknown
1650018162 cat > conftest.$ac_ext <<EOF
16501 -#line 12396 "configure"
16502 +#line 12327 "configure"
18163 -#line 13987 "configure"
18164 +#line 13159 "configure"
1650318165 #include "confdefs.h"
1650418166
1650518167 #if HAVE_DLFCN_H
16506 @@ -12493,7 +12424,7 @@
18168 @@ -14084,7 +13256,7 @@
1650718169 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1650818170 lt_status=$lt_dlunknown
1650918171 cat > conftest.$ac_ext <<EOF
16510 -#line 12496 "configure"
16511 +#line 12427 "configure"
18172 -#line 14087 "configure"
18173 +#line 13259 "configure"
1651218174 #include "confdefs.h"
1651318175
1651418176 #if HAVE_DLFCN_H
16515 @@ -13576,8 +13507,7 @@
18177 @@ -15171,27 +14343,11 @@
18178 rm -f conftest.er1
1651618179 cat conftest.err >&5
1651718180 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16518 (exit $ac_status); } &&
16519 - { ac_try='test -z "$ac_cxx_werror_flag"
16520 - || test ! -s conftest.err'
16521 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
16522 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16523 (eval $ac_try) 2>&5
16524 ac_status=$?
16525 @@ -13638,8 +13568,7 @@
18181 - (exit $ac_status); } &&
18182 - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
18183 - { (case "(($ac_try" in
18184 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
18185 - *) ac_try_echo=$ac_try;;
18186 -esac
18187 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
18188 - (eval "$ac_try") 2>&5
18189 - ac_status=$?
18190 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18191 - (exit $ac_status); }; } &&
18192 - { ac_try='test -s conftest$ac_exeext'
18193 - { (case "(($ac_try" in
18194 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
18195 - *) ac_try_echo=$ac_try;;
18196 -esac
18197 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
18198 - (eval "$ac_try") 2>&5
18199 - ac_status=$?
18200 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18201 - (exit $ac_status); }; }; then
18202 + (exit $ac_status); } && {
18203 + test -z "$ac_cxx_werror_flag" ||
18204 + test ! -s conftest.err
18205 + } && test -s conftest$ac_exeext &&
18206 + $as_test_x conftest$ac_exeext; then
18207
18208 aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
18209 }'`
18210 @@ -15205,7 +14361,7 @@
18211
18212 fi
18213
18214 -rm -f core conftest.err conftest.$ac_objext \
18215 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
18216 conftest$ac_exeext conftest.$ac_ext
18217 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18218
18219 @@ -15247,27 +14403,11 @@
18220 rm -f conftest.er1
1652618221 cat conftest.err >&5
1652718222 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16528 (exit $ac_status); } &&
16529 - { ac_try='test -z "$ac_cxx_werror_flag"
16530 - || test ! -s conftest.err'
16531 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
16532 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16533 (eval $ac_try) 2>&5
16534 ac_status=$?
16535 @@ -13810,7 +13739,7 @@
18223 - (exit $ac_status); } &&
18224 - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
18225 - { (case "(($ac_try" in
18226 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
18227 - *) ac_try_echo=$ac_try;;
18228 -esac
18229 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
18230 - (eval "$ac_try") 2>&5
18231 - ac_status=$?
18232 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18233 - (exit $ac_status); }; } &&
18234 - { ac_try='test -s conftest$ac_exeext'
18235 - { (case "(($ac_try" in
18236 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
18237 - *) ac_try_echo=$ac_try;;
18238 -esac
18239 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
18240 - (eval "$ac_try") 2>&5
18241 - ac_status=$?
18242 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18243 - (exit $ac_status); }; }; then
18244 + (exit $ac_status); } && {
18245 + test -z "$ac_cxx_werror_flag" ||
18246 + test ! -s conftest.err
18247 + } && test -s conftest$ac_exeext &&
18248 + $as_test_x conftest$ac_exeext; then
18249
18250 aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
18251 }'`
18252 @@ -15281,7 +14421,7 @@
18253
18254 fi
18255
18256 -rm -f core conftest.err conftest.$ac_objext \
18257 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
18258 conftest$ac_exeext conftest.$ac_ext
18259 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18260
18261 @@ -15429,7 +14569,7 @@
1653618262 freebsd-elf*)
1653718263 archive_cmds_need_lc_CXX=no
1653818264 ;;
1654118267 # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
1654218268 # conventions
1654318269 ld_shlibs_CXX=yes
16544 @@ -13969,7 +13898,7 @@
18270 @@ -15588,7 +14728,7 @@
1654518271 hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
1654618272 hardcode_libdir_separator_CXX=:
1654718273 ;;
1655018276 case $cc_basename in
1655118277 KCC*)
1655218278 # Kuck and Associates, Inc. (KAI) C++ Compiler
16553 @@ -14071,7 +14000,7 @@
18279 @@ -15690,7 +14830,7 @@
1655418280 ;;
1655518281 esac
1655618282 ;;
1655918285 if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
1656018286 archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
1656118287 wlarc=
16562 @@ -14638,7 +14567,7 @@
18288 @@ -16257,7 +15397,7 @@
1656318289 ;;
1656418290 esac
1656518291 ;;
1656818294 # FreeBSD uses GNU C++
1656918295 ;;
1657018296 hpux9* | hpux10* | hpux11*)
16571 @@ -14681,7 +14610,7 @@
18297 @@ -16300,7 +15440,7 @@
1657218298 ;;
1657318299 esac
1657418300 ;;
1657718303 case $cc_basename in
1657818304 KCC*)
1657918305 # KAI C++ Compiler
16580 @@ -14724,7 +14653,7 @@
18306 @@ -16343,7 +15483,7 @@
1658118307 ;;
1658218308 esac
1658318309 ;;
1658618312 ;;
1658718313 osf3* | osf4* | osf5*)
1658818314 case $cc_basename in
16589 @@ -14833,11 +14762,11 @@
18315 @@ -16452,11 +15592,11 @@
1659018316 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1659118317 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1659218318 -e 's:$: $lt_compiler_flag:'`
16593 - (eval echo "\"\$as_me:14836: $lt_compile\"" >&5)
16594 + (eval echo "\"\$as_me:14765: $lt_compile\"" >&5)
18319 - (eval echo "\"\$as_me:16455: $lt_compile\"" >&5)
18320 + (eval echo "\"\$as_me:15595: $lt_compile\"" >&5)
1659518321 (eval "$lt_compile" 2>conftest.err)
1659618322 ac_status=$?
1659718323 cat conftest.err >&5
16598 - echo "$as_me:14840: \$? = $ac_status" >&5
16599 + echo "$as_me:14769: \$? = $ac_status" >&5
18324 - echo "$as_me:16459: \$? = $ac_status" >&5
18325 + echo "$as_me:15599: \$? = $ac_status" >&5
1660018326 if (exit $ac_status) && test -s "$ac_outfile"; then
1660118327 # The compiler can only warn and ignore the option if not recognized
1660218328 # So say no if there are warnings other than the usual output.
16603 @@ -14937,11 +14866,11 @@
18329 @@ -16556,11 +15696,11 @@
1660418330 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1660518331 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1660618332 -e 's:$: $lt_compiler_flag:'`
16607 - (eval echo "\"\$as_me:14940: $lt_compile\"" >&5)
16608 + (eval echo "\"\$as_me:14869: $lt_compile\"" >&5)
18333 - (eval echo "\"\$as_me:16559: $lt_compile\"" >&5)
18334 + (eval echo "\"\$as_me:15699: $lt_compile\"" >&5)
1660918335 (eval "$lt_compile" 2>out/conftest.err)
1661018336 ac_status=$?
1661118337 cat out/conftest.err >&5
16612 - echo "$as_me:14944: \$? = $ac_status" >&5
16613 + echo "$as_me:14873: \$? = $ac_status" >&5
18338 - echo "$as_me:16563: \$? = $ac_status" >&5
18339 + echo "$as_me:15703: \$? = $ac_status" >&5
1661418340 if (exit $ac_status) && test -s out/conftest2.$ac_objext
1661518341 then
1661618342 # The compiler can only warn and ignore the option if not recognized
16617 @@ -15009,6 +14938,9 @@
18343 @@ -16628,6 +15768,9 @@
1661818344 cygwin* | mingw*)
1661918345 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
1662018346 ;;
1662418350 *)
1662518351 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
1662618352 ;;
16627 @@ -15288,18 +15220,6 @@
18353 @@ -16907,18 +16050,6 @@
1662818354 dynamic_linker=no
1662918355 ;;
1663018356
1664318369 freebsd* | dragonfly*)
1664418370 # DragonFly does not have aout. When/if they implement a new
1664518371 # versioning mechanism, adjust this.
16646 @@ -15455,7 +15375,7 @@
18372 @@ -17074,7 +16205,7 @@
1664718373 ;;
1664818374
1664918375 # This must be Linux ELF.
1665218378 version_type=linux
1665318379 need_lib_prefix=no
1665418380 need_version=no
16655 @@ -15469,31 +15389,10 @@
18381 @@ -17088,31 +16219,10 @@
1665618382 # before this can be enabled.
1665718383 hardcode_into_libs=yes
1665818384
1666018386 - libsuff=
1666118387 - case "$host_cpu" in
1666218388 - x86_64*|s390x*|powerpc64*)
16663 - echo '#line 15476 "configure"' > conftest.$ac_ext
18389 - echo '#line 17095 "configure"' > conftest.$ac_ext
1666418390 - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
1666518391 - (eval $ac_compile) 2>&5
1666618392 - ac_status=$?
1668518411 fi
1668618412
1668718413 # We used to test for /lib/ld.so.1 and disable shared libraries on
16688 @@ -15505,7 +15404,7 @@
18414 @@ -17124,7 +16234,7 @@
1668918415 dynamic_linker='GNU/Linux ld.so'
1669018416 ;;
1669118417
1669418420 version_type=linux
1669518421 need_lib_prefix=no
1669618422 need_version=no
16697 @@ -15514,7 +15413,7 @@
18423 @@ -17133,7 +16243,7 @@
1669818424 shlibpath_var=LD_LIBRARY_PATH
1669918425 shlibpath_overrides_runpath=no
1670018426 hardcode_into_libs=yes
1670318429 ;;
1670418430
1670518431 netbsd*)
16706 @@ -16422,7 +16321,7 @@
18432 @@ -18041,7 +17151,7 @@
1670718433 lt_prog_compiler_static_F77='-Bstatic'
1670818434 ;;
1670918435
1671218438 case $cc_basename in
1671318439 icc* | ecc*)
1671418440 lt_prog_compiler_wl_F77='-Wl,'
16715 @@ -16528,11 +16427,11 @@
18441 @@ -18147,11 +17257,11 @@
1671618442 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1671718443 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1671818444 -e 's:$: $lt_compiler_flag:'`
16719 - (eval echo "\"\$as_me:16531: $lt_compile\"" >&5)
16720 + (eval echo "\"\$as_me:16430: $lt_compile\"" >&5)
18445 - (eval echo "\"\$as_me:18150: $lt_compile\"" >&5)
18446 + (eval echo "\"\$as_me:17260: $lt_compile\"" >&5)
1672118447 (eval "$lt_compile" 2>conftest.err)
1672218448 ac_status=$?
1672318449 cat conftest.err >&5
16724 - echo "$as_me:16535: \$? = $ac_status" >&5
16725 + echo "$as_me:16434: \$? = $ac_status" >&5
18450 - echo "$as_me:18154: \$? = $ac_status" >&5
18451 + echo "$as_me:17264: \$? = $ac_status" >&5
1672618452 if (exit $ac_status) && test -s "$ac_outfile"; then
1672718453 # The compiler can only warn and ignore the option if not recognized
1672818454 # So say no if there are warnings other than the usual output.
16729 @@ -16632,11 +16531,11 @@
18455 @@ -18251,11 +17361,11 @@
1673018456 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1673118457 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1673218458 -e 's:$: $lt_compiler_flag:'`
16733 - (eval echo "\"\$as_me:16635: $lt_compile\"" >&5)
16734 + (eval echo "\"\$as_me:16534: $lt_compile\"" >&5)
18459 - (eval echo "\"\$as_me:18254: $lt_compile\"" >&5)
18460 + (eval echo "\"\$as_me:17364: $lt_compile\"" >&5)
1673518461 (eval "$lt_compile" 2>out/conftest.err)
1673618462 ac_status=$?
1673718463 cat out/conftest.err >&5
16738 - echo "$as_me:16639: \$? = $ac_status" >&5
16739 + echo "$as_me:16538: \$? = $ac_status" >&5
18464 - echo "$as_me:18258: \$? = $ac_status" >&5
18465 + echo "$as_me:17368: \$? = $ac_status" >&5
1674018466 if (exit $ac_status) && test -s out/conftest2.$ac_objext
1674118467 then
1674218468 # The compiler can only warn and ignore the option if not recognized
16743 @@ -16861,7 +16760,7 @@
18469 @@ -18480,7 +17590,7 @@
1674418470 archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
1674518471 ;;
1674618472
1674918475 if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
1675018476 tmp_addflag=
1675118477 case $cc_basename,$host_cpu in
16752 @@ -16887,12 +16786,13 @@
18478 @@ -18506,12 +17616,13 @@
1675318479 $echo "local: *; };" >> $output_objdir/$libname.ver~
1675418480 $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
1675518481 fi
1676418490 if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
1676518491 archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
1676618492 wlarc=
16767 @@ -17098,8 +16998,7 @@
18493 @@ -18721,27 +17832,11 @@
18494 rm -f conftest.er1
1676818495 cat conftest.err >&5
1676918496 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16770 (exit $ac_status); } &&
16771 - { ac_try='test -z "$ac_f77_werror_flag"
16772 - || test ! -s conftest.err'
16773 + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
16774 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16775 (eval $ac_try) 2>&5
16776 ac_status=$?
16777 @@ -17149,8 +17048,7 @@
18497 - (exit $ac_status); } &&
18498 - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
18499 - { (case "(($ac_try" in
18500 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
18501 - *) ac_try_echo=$ac_try;;
18502 -esac
18503 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
18504 - (eval "$ac_try") 2>&5
18505 - ac_status=$?
18506 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18507 - (exit $ac_status); }; } &&
18508 - { ac_try='test -s conftest$ac_exeext'
18509 - { (case "(($ac_try" in
18510 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
18511 - *) ac_try_echo=$ac_try;;
18512 -esac
18513 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
18514 - (eval "$ac_try") 2>&5
18515 - ac_status=$?
18516 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18517 - (exit $ac_status); }; }; then
18518 + (exit $ac_status); } && {
18519 + test -z "$ac_f77_werror_flag" ||
18520 + test ! -s conftest.err
18521 + } && test -s conftest$ac_exeext &&
18522 + $as_test_x conftest$ac_exeext; then
18523
18524 aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
18525 }'`
18526 @@ -18755,7 +17850,7 @@
18527
18528 fi
18529
18530 -rm -f core conftest.err conftest.$ac_objext \
18531 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
18532 conftest$ac_exeext conftest.$ac_ext
18533 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18534
18535 @@ -18786,27 +17881,11 @@
18536 rm -f conftest.er1
1677818537 cat conftest.err >&5
1677918538 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16780 (exit $ac_status); } &&
16781 - { ac_try='test -z "$ac_f77_werror_flag"
16782 - || test ! -s conftest.err'
16783 + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
16784 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16785 (eval $ac_try) 2>&5
16786 ac_status=$?
16787 @@ -17304,7 +17202,7 @@
18539 - (exit $ac_status); } &&
18540 - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
18541 - { (case "(($ac_try" in
18542 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
18543 - *) ac_try_echo=$ac_try;;
18544 -esac
18545 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
18546 - (eval "$ac_try") 2>&5
18547 - ac_status=$?
18548 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18549 - (exit $ac_status); }; } &&
18550 - { ac_try='test -s conftest$ac_exeext'
18551 - { (case "(($ac_try" in
18552 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
18553 - *) ac_try_echo=$ac_try;;
18554 -esac
18555 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
18556 - (eval "$ac_try") 2>&5
18557 - ac_status=$?
18558 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18559 - (exit $ac_status); }; }; then
18560 + (exit $ac_status); } && {
18561 + test -z "$ac_f77_werror_flag" ||
18562 + test ! -s conftest.err
18563 + } && test -s conftest$ac_exeext &&
18564 + $as_test_x conftest$ac_exeext; then
18565
18566 aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
18567 }'`
18568 @@ -18820,7 +17899,7 @@
18569
18570 fi
18571
18572 -rm -f core conftest.err conftest.$ac_objext \
18573 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
18574 conftest$ac_exeext conftest.$ac_ext
18575 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18576
18577 @@ -18951,7 +18030,7 @@
1678818578 ;;
1678918579
1679018580 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
1679318583 archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
1679418584 hardcode_libdir_flag_spec_F77='-R$libdir'
1679518585 hardcode_direct_F77=yes
16796 @@ -17406,7 +17304,7 @@
18586 @@ -19053,7 +18132,7 @@
1679718587 link_all_deplibs_F77=yes
1679818588 ;;
1679918589
1680218592 if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
1680318593 archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
1680418594 else
16805 @@ -17896,18 +17794,6 @@
18595 @@ -19543,18 +18622,6 @@
1680618596 dynamic_linker=no
1680718597 ;;
1680818598
1682118611 freebsd* | dragonfly*)
1682218612 # DragonFly does not have aout. When/if they implement a new
1682318613 # versioning mechanism, adjust this.
16824 @@ -18063,7 +17949,7 @@
18614 @@ -19710,7 +18777,7 @@
1682518615 ;;
1682618616
1682718617 # This must be Linux ELF.
1683018620 version_type=linux
1683118621 need_lib_prefix=no
1683218622 need_version=no
16833 @@ -18077,31 +17963,10 @@
18623 @@ -19724,31 +18791,10 @@
1683418624 # before this can be enabled.
1683518625 hardcode_into_libs=yes
1683618626
1683818628 - libsuff=
1683918629 - case "$host_cpu" in
1684018630 - x86_64*|s390x*|powerpc64*)
16841 - echo '#line 18084 "configure"' > conftest.$ac_ext
18631 - echo '#line 19731 "configure"' > conftest.$ac_ext
1684218632 - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
1684318633 - (eval $ac_compile) 2>&5
1684418634 - ac_status=$?
1686318653 fi
1686418654
1686518655 # We used to test for /lib/ld.so.1 and disable shared libraries on
16866 @@ -18113,7 +17978,7 @@
18656 @@ -19760,7 +18806,7 @@
1686718657 dynamic_linker='GNU/Linux ld.so'
1686818658 ;;
1686918659
1687218662 version_type=linux
1687318663 need_lib_prefix=no
1687418664 need_version=no
16875 @@ -18122,7 +17987,7 @@
18665 @@ -19769,7 +18815,7 @@
1687618666 shlibpath_var=LD_LIBRARY_PATH
1687718667 shlibpath_overrides_runpath=no
1687818668 hardcode_into_libs=yes
1688118671 ;;
1688218672
1688318673 netbsd*)
16884 @@ -18856,11 +18721,11 @@
18674 @@ -20502,11 +19548,11 @@
1688518675 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1688618676 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1688718677 -e 's:$: $lt_compiler_flag:'`
16888 - (eval echo "\"\$as_me:18859: $lt_compile\"" >&5)
16889 + (eval echo "\"\$as_me:18724: $lt_compile\"" >&5)
18678 - (eval echo "\"\$as_me:20505: $lt_compile\"" >&5)
18679 + (eval echo "\"\$as_me:19551: $lt_compile\"" >&5)
1689018680 (eval "$lt_compile" 2>conftest.err)
1689118681 ac_status=$?
1689218682 cat conftest.err >&5
16893 - echo "$as_me:18863: \$? = $ac_status" >&5
16894 + echo "$as_me:18728: \$? = $ac_status" >&5
18683 - echo "$as_me:20509: \$? = $ac_status" >&5
18684 + echo "$as_me:19555: \$? = $ac_status" >&5
1689518685 if (exit $ac_status) && test -s "$ac_outfile"; then
1689618686 # The compiler can only warn and ignore the option if not recognized
1689718687 # So say no if there are warnings other than the usual output.
16898 @@ -19018,7 +18883,7 @@
18688 @@ -20664,7 +19710,7 @@
1689918689 lt_prog_compiler_static_GCJ='-Bstatic'
1690018690 ;;
1690118691
1690418694 case $cc_basename in
1690518695 icc* | ecc*)
1690618696 lt_prog_compiler_wl_GCJ='-Wl,'
16907 @@ -19124,11 +18989,11 @@
18697 @@ -20770,11 +19816,11 @@
1690818698 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1690918699 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1691018700 -e 's:$: $lt_compiler_flag:'`
16911 - (eval echo "\"\$as_me:19127: $lt_compile\"" >&5)
16912 + (eval echo "\"\$as_me:18992: $lt_compile\"" >&5)
18701 - (eval echo "\"\$as_me:20773: $lt_compile\"" >&5)
18702 + (eval echo "\"\$as_me:19819: $lt_compile\"" >&5)
1691318703 (eval "$lt_compile" 2>conftest.err)
1691418704 ac_status=$?
1691518705 cat conftest.err >&5
16916 - echo "$as_me:19131: \$? = $ac_status" >&5
16917 + echo "$as_me:18996: \$? = $ac_status" >&5
18706 - echo "$as_me:20777: \$? = $ac_status" >&5
18707 + echo "$as_me:19823: \$? = $ac_status" >&5
1691818708 if (exit $ac_status) && test -s "$ac_outfile"; then
1691918709 # The compiler can only warn and ignore the option if not recognized
1692018710 # So say no if there are warnings other than the usual output.
16921 @@ -19228,11 +19093,11 @@
18711 @@ -20874,11 +19920,11 @@
1692218712 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1692318713 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1692418714 -e 's:$: $lt_compiler_flag:'`
16925 - (eval echo "\"\$as_me:19231: $lt_compile\"" >&5)
16926 + (eval echo "\"\$as_me:19096: $lt_compile\"" >&5)
18715 - (eval echo "\"\$as_me:20877: $lt_compile\"" >&5)
18716 + (eval echo "\"\$as_me:19923: $lt_compile\"" >&5)
1692718717 (eval "$lt_compile" 2>out/conftest.err)
1692818718 ac_status=$?
1692918719 cat out/conftest.err >&5
16930 - echo "$as_me:19235: \$? = $ac_status" >&5
16931 + echo "$as_me:19100: \$? = $ac_status" >&5
18720 - echo "$as_me:20881: \$? = $ac_status" >&5
18721 + echo "$as_me:19927: \$? = $ac_status" >&5
1693218722 if (exit $ac_status) && test -s out/conftest2.$ac_objext
1693318723 then
1693418724 # The compiler can only warn and ignore the option if not recognized
16935 @@ -19457,7 +19322,7 @@
18725 @@ -21103,7 +20149,7 @@
1693618726 archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
1693718727 ;;
1693818728
1694118731 if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
1694218732 tmp_addflag=
1694318733 case $cc_basename,$host_cpu in
16944 @@ -19483,12 +19348,13 @@
18734 @@ -21129,12 +20175,13 @@
1694518735 $echo "local: *; };" >> $output_objdir/$libname.ver~
1694618736 $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
1694718737 fi
1695618746 if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
1695718747 archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
1695818748 wlarc=
16959 @@ -19704,8 +19570,7 @@
18749 @@ -21354,27 +20401,11 @@
18750 rm -f conftest.er1
1696018751 cat conftest.err >&5
1696118752 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16962 (exit $ac_status); } &&
16963 - { ac_try='test -z "$ac_c_werror_flag"
16964 - || test ! -s conftest.err'
16965 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16966 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16967 (eval $ac_try) 2>&5
16968 ac_status=$?
16969 @@ -19765,8 +19630,7 @@
18753 - (exit $ac_status); } &&
18754 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
18755 - { (case "(($ac_try" in
18756 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
18757 - *) ac_try_echo=$ac_try;;
18758 -esac
18759 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
18760 - (eval "$ac_try") 2>&5
18761 - ac_status=$?
18762 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18763 - (exit $ac_status); }; } &&
18764 - { ac_try='test -s conftest$ac_exeext'
18765 - { (case "(($ac_try" in
18766 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
18767 - *) ac_try_echo=$ac_try;;
18768 -esac
18769 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
18770 - (eval "$ac_try") 2>&5
18771 - ac_status=$?
18772 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18773 - (exit $ac_status); }; }; then
18774 + (exit $ac_status); } && {
18775 + test -z "$ac_c_werror_flag" ||
18776 + test ! -s conftest.err
18777 + } && test -s conftest$ac_exeext &&
18778 + $as_test_x conftest$ac_exeext; then
18779
18780 aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
18781 }'`
18782 @@ -21388,7 +20419,7 @@
18783
18784 fi
18785
18786 -rm -f core conftest.err conftest.$ac_objext \
18787 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
18788 conftest$ac_exeext conftest.$ac_ext
18789 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18790
18791 @@ -21429,27 +20460,11 @@
18792 rm -f conftest.er1
1697018793 cat conftest.err >&5
1697118794 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16972 (exit $ac_status); } &&
16973 - { ac_try='test -z "$ac_c_werror_flag"
16974 - || test ! -s conftest.err'
16975 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16976 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16977 (eval $ac_try) 2>&5
16978 ac_status=$?
16979 @@ -19920,7 +19784,7 @@
18795 - (exit $ac_status); } &&
18796 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
18797 - { (case "(($ac_try" in
18798 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
18799 - *) ac_try_echo=$ac_try;;
18800 -esac
18801 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
18802 - (eval "$ac_try") 2>&5
18803 - ac_status=$?
18804 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18805 - (exit $ac_status); }; } &&
18806 - { ac_try='test -s conftest$ac_exeext'
18807 - { (case "(($ac_try" in
18808 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
18809 - *) ac_try_echo=$ac_try;;
18810 -esac
18811 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
18812 - (eval "$ac_try") 2>&5
18813 - ac_status=$?
18814 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18815 - (exit $ac_status); }; }; then
18816 + (exit $ac_status); } && {
18817 + test -z "$ac_c_werror_flag" ||
18818 + test ! -s conftest.err
18819 + } && test -s conftest$ac_exeext &&
18820 + $as_test_x conftest$ac_exeext; then
18821
18822 aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
18823 }'`
18824 @@ -21463,7 +20478,7 @@
18825
18826 fi
18827
18828 -rm -f core conftest.err conftest.$ac_objext \
18829 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
18830 conftest$ac_exeext conftest.$ac_ext
18831 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18832
18833 @@ -21594,7 +20609,7 @@
1698018834 ;;
1698118835
1698218836 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
1698518839 archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
1698618840 hardcode_libdir_flag_spec_GCJ='-R$libdir'
1698718841 hardcode_direct_GCJ=yes
16988 @@ -20022,7 +19886,7 @@
18842 @@ -21696,7 +20711,7 @@
1698918843 link_all_deplibs_GCJ=yes
1699018844 ;;
1699118845
1699418848 if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
1699518849 archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
1699618850 else
16997 @@ -20512,18 +20376,6 @@
18851 @@ -22186,18 +21201,6 @@
1699818852 dynamic_linker=no
1699918853 ;;
1700018854
1701318867 freebsd* | dragonfly*)
1701418868 # DragonFly does not have aout. When/if they implement a new
1701518869 # versioning mechanism, adjust this.
17016 @@ -20679,7 +20531,7 @@
18870 @@ -22353,7 +21356,7 @@
1701718871 ;;
1701818872
1701918873 # This must be Linux ELF.
1702218876 version_type=linux
1702318877 need_lib_prefix=no
1702418878 need_version=no
17025 @@ -20693,31 +20545,10 @@
18879 @@ -22367,31 +21370,10 @@
1702618880 # before this can be enabled.
1702718881 hardcode_into_libs=yes
1702818882
1703018884 - libsuff=
1703118885 - case "$host_cpu" in
1703218886 - x86_64*|s390x*|powerpc64*)
17033 - echo '#line 20700 "configure"' > conftest.$ac_ext
18887 - echo '#line 22374 "configure"' > conftest.$ac_ext
1703418888 - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
1703518889 - (eval $ac_compile) 2>&5
1703618890 - ac_status=$?
1705518909 fi
1705618910
1705718911 # We used to test for /lib/ld.so.1 and disable shared libraries on
17058 @@ -20729,7 +20560,7 @@
18912 @@ -22403,7 +21385,7 @@
1705918913 dynamic_linker='GNU/Linux ld.so'
1706018914 ;;
1706118915
1706418918 version_type=linux
1706518919 need_lib_prefix=no
1706618920 need_version=no
17067 @@ -20738,7 +20569,7 @@
18921 @@ -22412,7 +21394,7 @@
1706818922 shlibpath_var=LD_LIBRARY_PATH
1706918923 shlibpath_overrides_runpath=no
1707018924 hardcode_into_libs=yes
1707318927 ;;
1707418928
1707518929 netbsd*)
17076 @@ -22139,342 +21970,118 @@
17077
17078
17079
17080 -FAM_LIBS=
17081 -echo "$as_me:$LINENO: checking for FAMOpen in -lfam" >&5
17082 -echo $ECHO_N "checking for FAMOpen in -lfam... $ECHO_C" >&6
18930 @@ -23615,7 +22597,7 @@
18931 IFS=$as_save_IFS
18932 test -z "$as_dir" && as_dir=.
18933 for ac_exec_ext in '' $ac_executable_extensions; do
18934 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
18935 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
18936 ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
18937 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
18938 break 2
18939 @@ -23658,7 +22640,7 @@
18940 IFS=$as_save_IFS
18941 test -z "$as_dir" && as_dir=.
18942 for ac_exec_ext in '' $ac_executable_extensions; do
18943 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
18944 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
18945 ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
18946 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
18947 break 2
18948 @@ -23827,6 +22809,119 @@
18949
18950
18951
18952 +pkg_failed=no
18953 +{ echo "$as_me:$LINENO: checking for GNOMEVFS" >&5
18954 +echo $ECHO_N "checking for GNOMEVFS... $ECHO_C" >&6; }
18955 +
18956 +if test -n "$PKG_CONFIG"; then
18957 + if test -n "$GNOMEVFS_CFLAGS"; then
18958 + pkg_cv_GNOMEVFS_CFLAGS="$GNOMEVFS_CFLAGS"
18959 + else
18960 + if test -n "$PKG_CONFIG" && \
18961 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-2.0 >= 2.14\"") >&5
18962 + ($PKG_CONFIG --exists --print-errors "gnome-vfs-2.0 >= 2.14") 2>&5
18963 + ac_status=$?
18964 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
18965 + (exit $ac_status); }; then
18966 + pkg_cv_GNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= 2.14" 2>/dev/null`
18967 +else
18968 + pkg_failed=yes
18969 +fi
18970 + fi
18971 +else
18972 + pkg_failed=untried
18973 +fi
18974 +if test -n "$PKG_CONFIG"; then
18975 + if test -n "$GNOMEVFS_LIBS"; then
18976 + pkg_cv_GNOMEVFS_LIBS="$GNOMEVFS_LIBS"
18977 + else
18978 + if test -n "$PKG_CONFIG" && \
18979 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-2.0 >= 2.14\"") >&5
18980 + ($PKG_CONFIG --exists --print-errors "gnome-vfs-2.0 >= 2.14") 2>&5
18981 + ac_status=$?
18982 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
18983 + (exit $ac_status); }; then
18984 + pkg_cv_GNOMEVFS_LIBS=`$PKG_CONFIG --libs "gnome-vfs-2.0 >= 2.14" 2>/dev/null`
18985 +else
18986 + pkg_failed=yes
18987 +fi
18988 + fi
18989 +else
18990 + pkg_failed=untried
18991 +fi
18992 +
18993 +
18994 +
18995 +if test $pkg_failed = yes; then
18996 +
18997 +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
18998 + _pkg_short_errors_supported=yes
18999 +else
19000 + _pkg_short_errors_supported=no
19001 +fi
19002 + if test $_pkg_short_errors_supported = yes; then
19003 + GNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gnome-vfs-2.0 >= 2.14"`
19004 + else
19005 + GNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnome-vfs-2.0 >= 2.14"`
19006 + fi
19007 + # Put the nasty error message in config.log where it belongs
19008 + echo "$GNOMEVFS_PKG_ERRORS" >&5
19009 +
19010 + { { echo "$as_me:$LINENO: error: Package requirements (gnome-vfs-2.0 >= 2.14) were not met:
19011 +
19012 +$GNOMEVFS_PKG_ERRORS
19013 +
19014 +Consider adjusting the PKG_CONFIG_PATH environment variable if you
19015 +installed software in a non-standard prefix.
19016 +
19017 +Alternatively, you may set the environment variables GNOMEVFS_CFLAGS
19018 +and GNOMEVFS_LIBS to avoid the need to call pkg-config.
19019 +See the pkg-config man page for more details.
19020 +" >&5
19021 +echo "$as_me: error: Package requirements (gnome-vfs-2.0 >= 2.14) were not met:
19022 +
19023 +$GNOMEVFS_PKG_ERRORS
19024 +
19025 +Consider adjusting the PKG_CONFIG_PATH environment variable if you
19026 +installed software in a non-standard prefix.
19027 +
19028 +Alternatively, you may set the environment variables GNOMEVFS_CFLAGS
19029 +and GNOMEVFS_LIBS to avoid the need to call pkg-config.
19030 +See the pkg-config man page for more details.
19031 +" >&2;}
19032 + { (exit 1); exit 1; }; }
19033 +elif test $pkg_failed = untried; then
19034 + { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
19035 +is in your PATH or set the PKG_CONFIG environment variable to the full
19036 +path to pkg-config.
19037 +
19038 +Alternatively, you may set the environment variables GNOMEVFS_CFLAGS
19039 +and GNOMEVFS_LIBS to avoid the need to call pkg-config.
19040 +See the pkg-config man page for more details.
19041 +
19042 +To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
19043 +See \`config.log' for more details." >&5
19044 +echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
19045 +is in your PATH or set the PKG_CONFIG environment variable to the full
19046 +path to pkg-config.
19047 +
19048 +Alternatively, you may set the environment variables GNOMEVFS_CFLAGS
19049 +and GNOMEVFS_LIBS to avoid the need to call pkg-config.
19050 +See the pkg-config man page for more details.
19051 +
19052 +To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
19053 +See \`config.log' for more details." >&2;}
19054 + { (exit 1); exit 1; }; }
19055 +else
19056 + GNOMEVFS_CFLAGS=$pkg_cv_GNOMEVFS_CFLAGS
19057 + GNOMEVFS_LIBS=$pkg_cv_GNOMEVFS_LIBS
19058 + { echo "$as_me:$LINENO: result: yes" >&5
19059 +echo "${ECHO_T}yes" >&6; }
19060 + :
19061 +fi
19062 +
19063 +
19064 +
19065 # Check whether --enable-inotify was given.
19066 if test "${enable_inotify+set}" = set; then
19067 enableval=$enable_inotify;
19068 @@ -23899,27 +22994,11 @@
19069 rm -f conftest.er1
19070 cat conftest.err >&5
19071 echo "$as_me:$LINENO: \$? = $ac_status" >&5
19072 - (exit $ac_status); } &&
19073 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
19074 - { (case "(($ac_try" in
19075 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19076 - *) ac_try_echo=$ac_try;;
19077 -esac
19078 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19079 - (eval "$ac_try") 2>&5
19080 - ac_status=$?
19081 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19082 - (exit $ac_status); }; } &&
19083 - { ac_try='test -s conftest$ac_exeext'
19084 - { (case "(($ac_try" in
19085 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19086 - *) ac_try_echo=$ac_try;;
19087 -esac
19088 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19089 - (eval "$ac_try") 2>&5
19090 - ac_status=$?
19091 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19092 - (exit $ac_status); }; }; then
19093 + (exit $ac_status); } && {
19094 + test -z "$ac_c_werror_flag" ||
19095 + test ! -s conftest.err
19096 + } && test -s conftest$ac_exeext &&
19097 + $as_test_x conftest$ac_exeext; then
19098 ac_cv_func_inotify_init=yes
19099 else
19100 echo "$as_me: failed program was:" >&5
19101 @@ -23928,295 +23007,24 @@
19102 ac_cv_func_inotify_init=no
19103 fi
19104
19105 -rm -f core conftest.err conftest.$ac_objext \
19106 - conftest$ac_exeext conftest.$ac_ext
19107 -fi
19108 -{ echo "$as_me:$LINENO: result: $ac_cv_func_inotify_init" >&5
19109 -echo "${ECHO_T}$ac_cv_func_inotify_init" >&6; }
19110 -if test $ac_cv_func_inotify_init = yes; then
19111 - if test "${ac_cv_header_sys_inotify_h+set}" = set; then
19112 - { echo "$as_me:$LINENO: checking for sys/inotify.h" >&5
19113 -echo $ECHO_N "checking for sys/inotify.h... $ECHO_C" >&6; }
19114 -if test "${ac_cv_header_sys_inotify_h+set}" = set; then
19115 - echo $ECHO_N "(cached) $ECHO_C" >&6
19116 -fi
19117 -{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_inotify_h" >&5
19118 -echo "${ECHO_T}$ac_cv_header_sys_inotify_h" >&6; }
19119 -else
19120 - # Is the header compilable?
19121 -{ echo "$as_me:$LINENO: checking sys/inotify.h usability" >&5
19122 -echo $ECHO_N "checking sys/inotify.h usability... $ECHO_C" >&6; }
19123 -cat >conftest.$ac_ext <<_ACEOF
19124 -/* confdefs.h. */
19125 -_ACEOF
19126 -cat confdefs.h >>conftest.$ac_ext
19127 -cat >>conftest.$ac_ext <<_ACEOF
19128 -/* end confdefs.h. */
19129 -$ac_includes_default
19130 -#include <sys/inotify.h>
19131 -_ACEOF
19132 -rm -f conftest.$ac_objext
19133 -if { (ac_try="$ac_compile"
19134 -case "(($ac_try" in
19135 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19136 - *) ac_try_echo=$ac_try;;
19137 -esac
19138 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19139 - (eval "$ac_compile") 2>conftest.er1
19140 - ac_status=$?
19141 - grep -v '^ *+' conftest.er1 >conftest.err
19142 - rm -f conftest.er1
19143 - cat conftest.err >&5
19144 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19145 - (exit $ac_status); } &&
19146 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
19147 - { (case "(($ac_try" in
19148 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19149 - *) ac_try_echo=$ac_try;;
19150 -esac
19151 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19152 - (eval "$ac_try") 2>&5
19153 - ac_status=$?
19154 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19155 - (exit $ac_status); }; } &&
19156 - { ac_try='test -s conftest.$ac_objext'
19157 - { (case "(($ac_try" in
19158 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19159 - *) ac_try_echo=$ac_try;;
19160 -esac
19161 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19162 - (eval "$ac_try") 2>&5
19163 - ac_status=$?
19164 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19165 - (exit $ac_status); }; }; then
19166 - ac_header_compiler=yes
19167 -else
19168 - echo "$as_me: failed program was:" >&5
19169 -sed 's/^/| /' conftest.$ac_ext >&5
19170 -
19171 - ac_header_compiler=no
19172 -fi
19173 -
19174 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
19175 -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
19176 -echo "${ECHO_T}$ac_header_compiler" >&6; }
19177 -
19178 -# Is the header present?
19179 -{ echo "$as_me:$LINENO: checking sys/inotify.h presence" >&5
19180 -echo $ECHO_N "checking sys/inotify.h presence... $ECHO_C" >&6; }
19181 -cat >conftest.$ac_ext <<_ACEOF
19182 -/* confdefs.h. */
19183 -_ACEOF
19184 -cat confdefs.h >>conftest.$ac_ext
19185 -cat >>conftest.$ac_ext <<_ACEOF
19186 -/* end confdefs.h. */
19187 -#include <sys/inotify.h>
19188 -_ACEOF
19189 -if { (ac_try="$ac_cpp conftest.$ac_ext"
19190 -case "(($ac_try" in
19191 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19192 - *) ac_try_echo=$ac_try;;
19193 -esac
19194 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19195 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
19196 - ac_status=$?
19197 - grep -v '^ *+' conftest.er1 >conftest.err
19198 - rm -f conftest.er1
19199 - cat conftest.err >&5
19200 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19201 - (exit $ac_status); } >/dev/null; then
19202 - if test -s conftest.err; then
19203 - ac_cpp_err=$ac_c_preproc_warn_flag
19204 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
19205 - else
19206 - ac_cpp_err=
19207 - fi
19208 -else
19209 - ac_cpp_err=yes
19210 -fi
19211 -if test -z "$ac_cpp_err"; then
19212 - ac_header_preproc=yes
19213 -else
19214 - echo "$as_me: failed program was:" >&5
19215 -sed 's/^/| /' conftest.$ac_ext >&5
19216 -
19217 - ac_header_preproc=no
19218 -fi
19219 -
19220 -rm -f conftest.err conftest.$ac_ext
19221 -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
19222 -echo "${ECHO_T}$ac_header_preproc" >&6; }
19223 -
19224 -# So? What about this header?
19225 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
19226 - yes:no: )
19227 - { echo "$as_me:$LINENO: WARNING: sys/inotify.h: accepted by the compiler, rejected by the preprocessor!" >&5
19228 -echo "$as_me: WARNING: sys/inotify.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
19229 - { echo "$as_me:$LINENO: WARNING: sys/inotify.h: proceeding with the compiler's result" >&5
19230 -echo "$as_me: WARNING: sys/inotify.h: proceeding with the compiler's result" >&2;}
19231 - ac_header_preproc=yes
19232 - ;;
19233 - no:yes:* )
19234 - { echo "$as_me:$LINENO: WARNING: sys/inotify.h: present but cannot be compiled" >&5
19235 -echo "$as_me: WARNING: sys/inotify.h: present but cannot be compiled" >&2;}
19236 - { echo "$as_me:$LINENO: WARNING: sys/inotify.h: check for missing prerequisite headers?" >&5
19237 -echo "$as_me: WARNING: sys/inotify.h: check for missing prerequisite headers?" >&2;}
19238 - { echo "$as_me:$LINENO: WARNING: sys/inotify.h: see the Autoconf documentation" >&5
19239 -echo "$as_me: WARNING: sys/inotify.h: see the Autoconf documentation" >&2;}
19240 - { echo "$as_me:$LINENO: WARNING: sys/inotify.h: section \"Present But Cannot Be Compiled\"" >&5
19241 -echo "$as_me: WARNING: sys/inotify.h: section \"Present But Cannot Be Compiled\"" >&2;}
19242 - { echo "$as_me:$LINENO: WARNING: sys/inotify.h: proceeding with the preprocessor's result" >&5
19243 -echo "$as_me: WARNING: sys/inotify.h: proceeding with the preprocessor's result" >&2;}
19244 - { echo "$as_me:$LINENO: WARNING: sys/inotify.h: in the future, the compiler will take precedence" >&5
19245 -echo "$as_me: WARNING: sys/inotify.h: in the future, the compiler will take precedence" >&2;}
19246 - ( cat <<\_ASBOX
19247 -## -------------------------------------------------------------------------- ##
19248 -## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-menus ##
19249 -## -------------------------------------------------------------------------- ##
19250 -_ASBOX
19251 - ) | sed "s/^/$as_me: WARNING: /" >&2
19252 - ;;
19253 -esac
19254 -{ echo "$as_me:$LINENO: checking for sys/inotify.h" >&5
19255 -echo $ECHO_N "checking for sys/inotify.h... $ECHO_C" >&6; }
19256 -if test "${ac_cv_header_sys_inotify_h+set}" = set; then
19257 - echo $ECHO_N "(cached) $ECHO_C" >&6
19258 -else
19259 - ac_cv_header_sys_inotify_h=$ac_header_preproc
19260 -fi
19261 -{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_inotify_h" >&5
19262 -echo "${ECHO_T}$ac_cv_header_sys_inotify_h" >&6; }
19263 -
19264 -fi
19265 -if test $ac_cv_header_sys_inotify_h = yes; then
19266 -
19267 -cat >>confdefs.h <<\_ACEOF
19268 -#define HAVE_INOTIFY
19269 -_ACEOF
19270 -
19271 -else
19272 - { { echo "$as_me:$LINENO: error: No sys/inotify.h header found - cannot enable inotify support" >&5
19273 -echo "$as_me: error: No sys/inotify.h header found - cannot enable inotify support" >&2;}
19274 - { (exit 1); exit 1; }; }
19275 -fi
19276 -
19277 -
19278 -else
19279 - { { echo "$as_me:$LINENO: error: No inotify syscalls in libc found - cannot enable inotify support" >&5
19280 -echo "$as_me: error: No inotify syscalls in libc found - cannot enable inotify support" >&2;}
19281 - { (exit 1); exit 1; }; }
19282 -fi
19283 -
19284 -fi
19285 -
19286 -
19287 -
19288 -if test "x$enable_inotify" = "xyes"; then
19289 - INOTIFY_SUPPORT_TRUE=
19290 - INOTIFY_SUPPORT_FALSE='#'
19291 -else
19292 - INOTIFY_SUPPORT_TRUE='#'
19293 - INOTIFY_SUPPORT_FALSE=
19294 -fi
19295 -
19296 -
19297 -if test "x$enable_inotify" != "xyes" ; then
19298 - FAM_LIBS=
19299 - { echo "$as_me:$LINENO: checking for FAMOpen in -lfam" >&5
19300 -echo $ECHO_N "checking for FAMOpen in -lfam... $ECHO_C" >&6; }
1708319301 -if test "${ac_cv_lib_fam_FAMOpen+set}" = set; then
1708419302 - echo $ECHO_N "(cached) $ECHO_C" >&6
1708519303 -else
1709119309 -cat confdefs.h >>conftest.$ac_ext
1709219310 -cat >>conftest.$ac_ext <<_ACEOF
1709319311 -/* end confdefs.h. */
17094 +pkg_failed=no
17095 +echo "$as_me:$LINENO: checking for GNOMEVFS" >&5
17096 +echo $ECHO_N "checking for GNOMEVFS... $ECHO_C" >&6
17097
17098 -/* Override any gcc2 internal prototype to avoid an error. */
19312 -
19313 -/* Override any GCC internal prototype to avoid an error.
19314 - Use char because int might match the return type of a GCC
19315 - builtin and then its argument prototype would still apply. */
1709919316 -#ifdef __cplusplus
1710019317 -extern "C"
1710119318 -#endif
17102 -/* We use char because int might match the return type of a gcc2
17103 - builtin and then its argument prototype would still apply. */
1710419319 -char FAMOpen ();
1710519320 -int
1710619321 -main ()
1710719322 -{
17108 -FAMOpen ();
19323 -return FAMOpen ();
1710919324 - ;
1711019325 - return 0;
1711119326 -}
1711219327 -_ACEOF
1711319328 -rm -f conftest.$ac_objext conftest$ac_exeext
17114 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
17115 - (eval $ac_link) 2>conftest.er1
19329 -if { (ac_try="$ac_link"
19330 -case "(($ac_try" in
19331 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19332 - *) ac_try_echo=$ac_try;;
19333 -esac
19334 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19335 - (eval "$ac_link") 2>conftest.er1
1711619336 - ac_status=$?
1711719337 - grep -v '^ *+' conftest.er1 >conftest.err
1711819338 - rm -f conftest.er1
1711919339 - cat conftest.err >&5
1712019340 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1712119341 - (exit $ac_status); } &&
17122 - { ac_try='test -z "$ac_c_werror_flag"
17123 - || test ! -s conftest.err'
17124 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17125 - (eval $ac_try) 2>&5
19342 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
19343 - { (case "(($ac_try" in
19344 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19345 - *) ac_try_echo=$ac_try;;
19346 -esac
19347 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19348 - (eval "$ac_try") 2>&5
1712619349 - ac_status=$?
1712719350 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1712819351 - (exit $ac_status); }; } &&
1712919352 - { ac_try='test -s conftest$ac_exeext'
17130 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17131 - (eval $ac_try) 2>&5
17132 +if test -n "$PKG_CONFIG"; then
17133 + if test -n "$GNOMEVFS_CFLAGS"; then
17134 + pkg_cv_GNOMEVFS_CFLAGS="$GNOMEVFS_CFLAGS"
17135 + else
17136 + if test -n "$PKG_CONFIG" && \
17137 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-2.0 >= 2.14\"") >&5
17138 + ($PKG_CONFIG --exists --print-errors "gnome-vfs-2.0 >= 2.14") 2>&5
17139 ac_status=$?
17140 echo "$as_me:$LINENO: \$? = $ac_status" >&5
19353 - { (case "(($ac_try" in
19354 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19355 - *) ac_try_echo=$ac_try;;
19356 -esac
19357 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19358 - (eval "$ac_try") 2>&5
19359 - ac_status=$?
19360 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1714119361 - (exit $ac_status); }; }; then
1714219362 - ac_cv_lib_fam_FAMOpen=yes
17143 + (exit $ac_status); }; then
17144 + pkg_cv_GNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= 2.14" 2>/dev/null`
17145 else
19363 -else
1714619364 - echo "$as_me: failed program was:" >&5
1714719365 -sed 's/^/| /' conftest.$ac_ext >&5
1714819366 -
17149 -ac_cv_lib_fam_FAMOpen=no
19367 - ac_cv_lib_fam_FAMOpen=no
1715019368 -fi
17151 -rm -f conftest.err conftest.$ac_objext \
17152 - conftest$ac_exeext conftest.$ac_ext
19369 -
19370 -rm -f core conftest.err conftest.$ac_objext \
19371 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
19372 conftest$ac_exeext conftest.$ac_ext
1715319373 -LIBS=$ac_check_lib_save_LIBS
17154 -fi
17155 -echo "$as_me:$LINENO: result: $ac_cv_lib_fam_FAMOpen" >&5
17156 -echo "${ECHO_T}$ac_cv_lib_fam_FAMOpen" >&6
19374 fi
19375 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_fam_FAMOpen" >&5
19376 -echo "${ECHO_T}$ac_cv_lib_fam_FAMOpen" >&6; }
1715719377 -if test $ac_cv_lib_fam_FAMOpen = yes; then
1715819378 -
1715919379 -for ac_header in fam.h
1716019380 -do
1716119381 -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
17162 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
17163 - echo "$as_me:$LINENO: checking for $ac_header" >&5
17164 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
17165 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
17166 - echo $ECHO_N "(cached) $ECHO_C" >&6
17167 + pkg_failed=yes
19382 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
19383 - { echo "$as_me:$LINENO: checking for $ac_header" >&5
19384 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
19385 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
19386 +{ echo "$as_me:$LINENO: result: $ac_cv_func_inotify_init" >&5
19387 +echo "${ECHO_T}$ac_cv_func_inotify_init" >&6; }
19388 +if test $ac_cv_func_inotify_init = yes; then
19389 + if test "${ac_cv_header_sys_inotify_h+set}" = set; then
19390 + { echo "$as_me:$LINENO: checking for sys/inotify.h" >&5
19391 +echo $ECHO_N "checking for sys/inotify.h... $ECHO_C" >&6; }
19392 +if test "${ac_cv_header_sys_inotify_h+set}" = set; then
19393 echo $ECHO_N "(cached) $ECHO_C" >&6
1716819394 fi
17169 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
17170 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
17171 -else
17172 - # Is the header compilable?
17173 -echo "$as_me:$LINENO: checking $ac_header usability" >&5
17174 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
17175 -cat >conftest.$ac_ext <<_ACEOF
17176 -/* confdefs.h. */
17177 -_ACEOF
17178 -cat confdefs.h >>conftest.$ac_ext
17179 -cat >>conftest.$ac_ext <<_ACEOF
17180 -/* end confdefs.h. */
17181 -$ac_includes_default
19395 -ac_res=`eval echo '${'$as_ac_Header'}'`
19396 - { echo "$as_me:$LINENO: result: $ac_res" >&5
19397 -echo "${ECHO_T}$ac_res" >&6; }
19398 +{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_inotify_h" >&5
19399 +echo "${ECHO_T}$ac_cv_header_sys_inotify_h" >&6; }
19400 else
19401 # Is the header compilable?
19402 -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
19403 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
19404 +{ echo "$as_me:$LINENO: checking sys/inotify.h usability" >&5
19405 +echo $ECHO_N "checking sys/inotify.h usability... $ECHO_C" >&6; }
19406 cat >conftest.$ac_ext <<_ACEOF
19407 /* confdefs.h. */
19408 _ACEOF
19409 @@ -24224,7 +23032,7 @@
19410 cat >>conftest.$ac_ext <<_ACEOF
19411 /* end confdefs.h. */
19412 $ac_includes_default
1718219413 -#include <$ac_header>
17183 -_ACEOF
17184 -rm -f conftest.$ac_objext
17185 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
17186 - (eval $ac_compile) 2>conftest.er1
17187 - ac_status=$?
17188 - grep -v '^ *+' conftest.er1 >conftest.err
17189 - rm -f conftest.er1
17190 - cat conftest.err >&5
17191 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19414 +#include <sys/inotify.h>
19415 _ACEOF
19416 rm -f conftest.$ac_objext
19417 if { (ac_try="$ac_compile"
19418 @@ -24239,27 +23047,10 @@
19419 rm -f conftest.er1
19420 cat conftest.err >&5
19421 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1719219422 - (exit $ac_status); } &&
17193 - { ac_try='test -z "$ac_c_werror_flag"
17194 - || test ! -s conftest.err'
17195 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17196 - (eval $ac_try) 2>&5
19423 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
19424 - { (case "(($ac_try" in
19425 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19426 - *) ac_try_echo=$ac_try;;
19427 -esac
19428 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19429 - (eval "$ac_try") 2>&5
1719719430 - ac_status=$?
1719819431 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1719919432 - (exit $ac_status); }; } &&
1720019433 - { ac_try='test -s conftest.$ac_objext'
17201 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17202 - (eval $ac_try) 2>&5
19434 - { (case "(($ac_try" in
19435 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19436 - *) ac_try_echo=$ac_try;;
19437 -esac
19438 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19439 - (eval "$ac_try") 2>&5
1720319440 - ac_status=$?
1720419441 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1720519442 - (exit $ac_status); }; }; then
17206 - ac_header_compiler=yes
17207 + fi
19443 + (exit $ac_status); } && {
19444 + test -z "$ac_c_werror_flag" ||
19445 + test ! -s conftest.err
19446 + } && test -s conftest.$ac_objext; then
19447 ac_header_compiler=yes
1720819448 else
17209 - echo "$as_me: failed program was:" >&5
17210 -sed 's/^/| /' conftest.$ac_ext >&5
17211 -
17212 -ac_header_compiler=no
17213 + pkg_failed=untried
17214 fi
17215 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
17216 -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
17217 -echo "${ECHO_T}$ac_header_compiler" >&6
17218 -
17219 -# Is the header present?
17220 -echo "$as_me:$LINENO: checking $ac_header presence" >&5
17221 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
17222 -cat >conftest.$ac_ext <<_ACEOF
17223 -/* confdefs.h. */
17224 -_ACEOF
17225 -cat confdefs.h >>conftest.$ac_ext
17226 -cat >>conftest.$ac_ext <<_ACEOF
17227 -/* end confdefs.h. */
19449 echo "$as_me: failed program was:" >&5
19450 @@ -24273,15 +23064,15 @@
19451 echo "${ECHO_T}$ac_header_compiler" >&6; }
19452
19453 # Is the header present?
19454 -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
19455 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
19456 +{ echo "$as_me:$LINENO: checking sys/inotify.h presence" >&5
19457 +echo $ECHO_N "checking sys/inotify.h presence... $ECHO_C" >&6; }
19458 cat >conftest.$ac_ext <<_ACEOF
19459 /* confdefs.h. */
19460 _ACEOF
19461 cat confdefs.h >>conftest.$ac_ext
19462 cat >>conftest.$ac_ext <<_ACEOF
19463 /* end confdefs.h. */
1722819464 -#include <$ac_header>
17229 -_ACEOF
17230 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
17231 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
17232 +if test -n "$PKG_CONFIG"; then
17233 + if test -n "$GNOMEVFS_LIBS"; then
17234 + pkg_cv_GNOMEVFS_LIBS="$GNOMEVFS_LIBS"
17235 + else
17236 + if test -n "$PKG_CONFIG" && \
17237 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-2.0 >= 2.14\"") >&5
17238 + ($PKG_CONFIG --exists --print-errors "gnome-vfs-2.0 >= 2.14") 2>&5
17239 ac_status=$?
17240 - grep -v '^ *+' conftest.er1 >conftest.err
17241 - rm -f conftest.er1
17242 - cat conftest.err >&5
19465 +#include <sys/inotify.h>
19466 _ACEOF
19467 if { (ac_try="$ac_cpp conftest.$ac_ext"
19468 case "(($ac_try" in
19469 @@ -24295,17 +23086,10 @@
19470 rm -f conftest.er1
19471 cat conftest.err >&5
1724319472 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1724419473 - (exit $ac_status); } >/dev/null; then
1724519474 - if test -s conftest.err; then
1724819477 - else
1724919478 - ac_cpp_err=
1725019479 - fi
17251 + (exit $ac_status); }; then
17252 + pkg_cv_GNOMEVFS_LIBS=`$PKG_CONFIG --libs "gnome-vfs-2.0 >= 2.14" 2>/dev/null`
19480 -else
19481 - ac_cpp_err=yes
19482 -fi
19483 -if test -z "$ac_cpp_err"; then
19484 + (exit $ac_status); } >/dev/null && {
19485 + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
19486 + test ! -s conftest.err
19487 + }; then
19488 ac_header_preproc=yes
1725319489 else
17254 - ac_cpp_err=yes
17255 + pkg_failed=yes
17256 fi
17257 -if test -z "$ac_cpp_err"; then
17258 - ac_header_preproc=yes
17259 + fi
17260 else
17261 - echo "$as_me: failed program was:" >&5
17262 -sed 's/^/| /' conftest.$ac_ext >&5
17263 -
17264 - ac_header_preproc=no
17265 + pkg_failed=untried
17266 fi
17267 -rm -f conftest.err conftest.$ac_ext
17268 -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
17269 -echo "${ECHO_T}$ac_header_preproc" >&6
17270
17271 -# So? What about this header?
17272 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
17273 - yes:no: )
19490 echo "$as_me: failed program was:" >&5
19491 @@ -24321,25 +23105,25 @@
19492 # So? What about this header?
19493 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
19494 yes:no: )
1727419495 - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
1727519496 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
1727619497 - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
1727719498 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
17278 - ac_header_preproc=yes
17279 - ;;
17280 - no:yes:* )
19499 + { echo "$as_me:$LINENO: WARNING: sys/inotify.h: accepted by the compiler, rejected by the preprocessor!" >&5
19500 +echo "$as_me: WARNING: sys/inotify.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
19501 + { echo "$as_me:$LINENO: WARNING: sys/inotify.h: proceeding with the compiler's result" >&5
19502 +echo "$as_me: WARNING: sys/inotify.h: proceeding with the compiler's result" >&2;}
19503 ac_header_preproc=yes
19504 ;;
19505 no:yes:* )
1728119506 - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
1728219507 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
1728319508 - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
1729019515 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
1729119516 - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
1729219517 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
17293 - (
17294 - cat <<\_ASBOX
17295 -## -------------------------------------------------------------------------- ##
17296 -## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-menus ##
17297 -## -------------------------------------------------------------------------- ##
17298 -_ASBOX
17299 - ) |
17300 - sed "s/^/$as_me: WARNING: /" >&2
17301 - ;;
17302 -esac
17303 -echo "$as_me:$LINENO: checking for $ac_header" >&5
17304 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
17305 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
17306 - echo $ECHO_N "(cached) $ECHO_C" >&6
17307 -else
19518 + { echo "$as_me:$LINENO: WARNING: sys/inotify.h: present but cannot be compiled" >&5
19519 +echo "$as_me: WARNING: sys/inotify.h: present but cannot be compiled" >&2;}
19520 + { echo "$as_me:$LINENO: WARNING: sys/inotify.h: check for missing prerequisite headers?" >&5
19521 +echo "$as_me: WARNING: sys/inotify.h: check for missing prerequisite headers?" >&2;}
19522 + { echo "$as_me:$LINENO: WARNING: sys/inotify.h: see the Autoconf documentation" >&5
19523 +echo "$as_me: WARNING: sys/inotify.h: see the Autoconf documentation" >&2;}
19524 + { echo "$as_me:$LINENO: WARNING: sys/inotify.h: section \"Present But Cannot Be Compiled\"" >&5
19525 +echo "$as_me: WARNING: sys/inotify.h: section \"Present But Cannot Be Compiled\"" >&2;}
19526 + { echo "$as_me:$LINENO: WARNING: sys/inotify.h: proceeding with the preprocessor's result" >&5
19527 +echo "$as_me: WARNING: sys/inotify.h: proceeding with the preprocessor's result" >&2;}
19528 + { echo "$as_me:$LINENO: WARNING: sys/inotify.h: in the future, the compiler will take precedence" >&5
19529 +echo "$as_me: WARNING: sys/inotify.h: in the future, the compiler will take precedence" >&2;}
19530 ( cat <<\_ASBOX
19531 ## -------------------------------------------------------------------------- ##
19532 ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-menus ##
19533 @@ -24348,156 +23132,46 @@
19534 ) | sed "s/^/$as_me: WARNING: /" >&2
19535 ;;
19536 esac
19537 -{ echo "$as_me:$LINENO: checking for $ac_header" >&5
19538 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
19539 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
19540 +{ echo "$as_me:$LINENO: checking for sys/inotify.h" >&5
19541 +echo $ECHO_N "checking for sys/inotify.h... $ECHO_C" >&6; }
19542 +if test "${ac_cv_header_sys_inotify_h+set}" = set; then
19543 echo $ECHO_N "(cached) $ECHO_C" >&6
19544 else
1730819545 - eval "$as_ac_Header=\$ac_header_preproc"
17309 -fi
17310 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
17311 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
17312
17313 -fi
19546 + ac_cv_header_sys_inotify_h=$ac_header_preproc
19547 fi
19548 -ac_res=`eval echo '${'$as_ac_Header'}'`
19549 - { echo "$as_me:$LINENO: result: $ac_res" >&5
19550 -echo "${ECHO_T}$ac_res" >&6; }
19551 +{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_inotify_h" >&5
19552 +echo "${ECHO_T}$ac_cv_header_sys_inotify_h" >&6; }
19553
19554 fi
1731419555 -if test `eval echo '${'$as_ac_Header'}'` = yes; then
1731519556 - cat >>confdefs.h <<_ACEOF
1731619557 -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
1731719558 -_ACEOF
17318
17319 -cat >>confdefs.h <<\_ACEOF
19559 +if test $ac_cv_header_sys_inotify_h = yes; then
19560
19561 cat >>confdefs.h <<\_ACEOF
1732019562 -#define HAVE_FAM
17321 -_ACEOF
17322 +if test $pkg_failed = yes; then
17323
17324 - FAM_LIBS="-lfam"
17325 +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
17326 + _pkg_short_errors_supported=yes
17327 else
19563 +#define HAVE_INOTIFY
19564 _ACEOF
19565
19566 - FAM_LIBS="-lfam"
19567 -else
1732819568 - { echo "$as_me:$LINENO: WARNING: *** FAM support will not be built (header files not found) ***" >&5
1732919569 -echo "$as_me: WARNING: *** FAM support will not be built (header files not found) ***" >&2;}
17330 + _pkg_short_errors_supported=no
17331 fi
17332 + if test $_pkg_short_errors_supported = yes; then
17333 + GNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gnome-vfs-2.0 >= 2.14"`
17334 + else
17335 + GNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnome-vfs-2.0 >= 2.14"`
17336 + fi
17337 + # Put the nasty error message in config.log where it belongs
17338 + echo "$GNOMEVFS_PKG_ERRORS" >&5
17339
19570 -fi
19571 -
1734019572 -done
17341 + { { echo "$as_me:$LINENO: error: Package requirements (gnome-vfs-2.0 >= 2.14) were not met:
17342
17343 -else
19573 -
19574 else
1734419575 - { echo "$as_me:$LINENO: WARNING: *** FAM support will not be built (FAM library not found) ***" >&5
1734519576 -echo "$as_me: WARNING: *** FAM support will not be built (FAM library not found) ***" >&2;}
17346 -fi
17347 +$GNOMEVFS_PKG_ERRORS
17348
17349 +Consider adjusting the PKG_CONFIG_PATH environment variable if you
17350 +installed software in a non-standard prefix.
17351
17352 +Alternatively, you may set the environment variables GNOMEVFS_CFLAGS
17353 +and GNOMEVFS_LIBS to avoid the need to call pkg-config.
17354 +See the pkg-config man page for more details.
17355 +" >&5
17356 +echo "$as_me: error: Package requirements (gnome-vfs-2.0 >= 2.14) were not met:
17357
17358 -gmenu_save_libs="$LIBS"
17359 -LIBS="$LIBS $FAM_LIBS"
17360 +$GNOMEVFS_PKG_ERRORS
17361
19577 + { { echo "$as_me:$LINENO: error: No sys/inotify.h header found - cannot enable inotify support" >&5
19578 +echo "$as_me: error: No sys/inotify.h header found - cannot enable inotify support" >&2;}
19579 + { (exit 1); exit 1; }; }
19580 fi
19581
19582
19583 -
19584 - gmenu_save_libs="$LIBS"
19585 - LIBS="$LIBS $FAM_LIBS"
19586 -
1736219587 -for ac_func in FAMNoExists
1736319588 -do
1736419589 -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
17365 -echo "$as_me:$LINENO: checking for $ac_func" >&5
17366 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
17367 -if eval "test \"\${$as_ac_var+set}\" = set"; then
19590 -{ echo "$as_me:$LINENO: checking for $ac_func" >&5
19591 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
19592 -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
1736819593 - echo $ECHO_N "(cached) $ECHO_C" >&6
1736919594 -else
1737019595 - cat >conftest.$ac_ext <<_ACEOF
1737619601 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
1737719602 - For example, HP-UX 11i <limits.h> declares gettimeofday. */
1737819603 -#define $ac_func innocuous_$ac_func
17379 +Consider adjusting the PKG_CONFIG_PATH environment variable if you
17380 +installed software in a non-standard prefix.
17381
19604 -
1738219605 -/* System header to define __stub macros and hopefully few prototypes,
1738319606 - which can conflict with char $ac_func (); below.
1738419607 - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
1738519608 - <limits.h> exists even on freestanding compilers. */
17386 +Alternatively, you may set the environment variables GNOMEVFS_CFLAGS
17387 +and GNOMEVFS_LIBS to avoid the need to call pkg-config.
17388 +See the pkg-config man page for more details.
17389 +" >&2;}
17390 + { (exit 1); exit 1; }; }
17391 +elif test $pkg_failed = untried; then
17392 + { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
17393 +is in your PATH or set the PKG_CONFIG environment variable to the full
17394 +path to pkg-config.
17395
19609 -
1739619610 -#ifdef __STDC__
1739719611 -# include <limits.h>
1739819612 -#else
1739919613 -# include <assert.h>
1740019614 -#endif
17401 +Alternatively, you may set the environment variables GNOMEVFS_CFLAGS
17402 +and GNOMEVFS_LIBS to avoid the need to call pkg-config.
17403 +See the pkg-config man page for more details.
17404
19615 -
1740519616 -#undef $ac_func
17406 +To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
17407 +See \`config.log' for more details." >&5
17408 +echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
17409 +is in your PATH or set the PKG_CONFIG environment variable to the full
17410 +path to pkg-config.
17411
17412 -/* Override any gcc2 internal prototype to avoid an error. */
19617 -
19618 -/* Override any GCC internal prototype to avoid an error.
19619 - Use char because int might match the return type of a GCC
19620 - builtin and then its argument prototype would still apply. */
1741319621 -#ifdef __cplusplus
1741419622 -extern "C"
17415 -{
1741619623 -#endif
17417 -/* We use char because int might match the return type of a gcc2
17418 - builtin and then its argument prototype would still apply. */
1741919624 -char $ac_func ();
1742019625 -/* The GNU C library defines this for functions which it implements
1742119626 - to always fail with ENOSYS. Some functions are actually named
1742219627 - something starting with __ and the normal name is an alias. */
17423 -#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
19628 -#if defined __stub_$ac_func || defined __stub___$ac_func
1742419629 -choke me
17425 -#else
17426 -char (*f) () = $ac_func;
1742719630 -#endif
17428 -#ifdef __cplusplus
17429 -}
17430 -#endif
17431 +Alternatively, you may set the environment variables GNOMEVFS_CFLAGS
17432 +and GNOMEVFS_LIBS to avoid the need to call pkg-config.
17433 +See the pkg-config man page for more details.
17434
19631 -
1743519632 -int
1743619633 -main ()
1743719634 -{
17438 -return f != $ac_func;
19635 -return $ac_func ();
1743919636 - ;
1744019637 - return 0;
1744119638 -}
1744219639 -_ACEOF
1744319640 -rm -f conftest.$ac_objext conftest$ac_exeext
17444 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
17445 - (eval $ac_link) 2>conftest.er1
19641 -if { (ac_try="$ac_link"
19642 -case "(($ac_try" in
19643 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19644 - *) ac_try_echo=$ac_try;;
19645 -esac
19646 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19647 - (eval "$ac_link") 2>conftest.er1
1744619648 - ac_status=$?
1744719649 - grep -v '^ *+' conftest.er1 >conftest.err
1744819650 - rm -f conftest.er1
1744919651 - cat conftest.err >&5
1745019652 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1745119653 - (exit $ac_status); } &&
17452 - { ac_try='test -z "$ac_c_werror_flag"
17453 - || test ! -s conftest.err'
17454 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17455 - (eval $ac_try) 2>&5
19654 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
19655 - { (case "(($ac_try" in
19656 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19657 - *) ac_try_echo=$ac_try;;
19658 -esac
19659 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19660 - (eval "$ac_try") 2>&5
1745619661 - ac_status=$?
1745719662 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1745819663 - (exit $ac_status); }; } &&
1745919664 - { ac_try='test -s conftest$ac_exeext'
17460 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17461 - (eval $ac_try) 2>&5
19665 - { (case "(($ac_try" in
19666 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19667 - *) ac_try_echo=$ac_try;;
19668 -esac
19669 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19670 - (eval "$ac_try") 2>&5
1746219671 - ac_status=$?
1746319672 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1746419673 - (exit $ac_status); }; }; then
1746519674 - eval "$as_ac_var=yes"
17466 +To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
17467 +See \`config.log' for more details." >&2;}
17468 + { (exit 1); exit 1; }; }
1746919675 else
1747019676 - echo "$as_me: failed program was:" >&5
1747119677 -sed 's/^/| /' conftest.$ac_ext >&5
1747219678 -
17473 -eval "$as_ac_var=no"
17474 -fi
17475 -rm -f conftest.err conftest.$ac_objext \
19679 - eval "$as_ac_var=no"
19680 + { { echo "$as_me:$LINENO: error: No inotify syscalls in libc found - cannot enable inotify support" >&5
19681 +echo "$as_me: error: No inotify syscalls in libc found - cannot enable inotify support" >&2;}
19682 + { (exit 1); exit 1; }; }
19683 fi
19684
19685 -rm -f core conftest.err conftest.$ac_objext \
1747619686 - conftest$ac_exeext conftest.$ac_ext
17477 + GNOMEVFS_CFLAGS=$pkg_cv_GNOMEVFS_CFLAGS
17478 + GNOMEVFS_LIBS=$pkg_cv_GNOMEVFS_LIBS
17479 + echo "$as_me:$LINENO: result: yes" >&5
17480 +echo "${ECHO_T}yes" >&6
17481 + :
1748219687 fi
17483 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
17484 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
19688 -ac_res=`eval echo '${'$as_ac_var'}'`
19689 - { echo "$as_me:$LINENO: result: $ac_res" >&5
19690 -echo "${ECHO_T}$ac_res" >&6; }
1748519691 -if test `eval echo '${'$as_ac_var'}'` = yes; then
1748619692 - cat >>confdefs.h <<_ACEOF
1748719693 -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
1748819694 -_ACEOF
1748919695
19696 + if test "x$enable_inotify" = "xyes"; then
19697 + INOTIFY_SUPPORT_TRUE=
19698 + INOTIFY_SUPPORT_FALSE='#'
19699 +else
19700 + INOTIFY_SUPPORT_TRUE='#'
19701 + INOTIFY_SUPPORT_FALSE=
19702 fi
19703 -done
19704
19705 - LIBS="$gmenu_save_libs"
1749019706 -fi
17491 -done
17492
17493 -LIBS="$gmenu_save_libs"
17494
17495
17496
17497 @@ -22536,8 +22143,7 @@
19707
19708
19709
19710 @@ -24563,27 +23237,10 @@
19711 rm -f conftest.er1
1749819712 cat conftest.err >&5
1749919713 echo "$as_me:$LINENO: \$? = $ac_status" >&5
17500 (exit $ac_status); } &&
17501 - { ac_try='test -z "$ac_c_werror_flag"
17502 - || test ! -s conftest.err'
17503 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
17504 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17505 (eval $ac_try) 2>&5
17506 ac_status=$?
17507 @@ -23793,7 +23399,8 @@
17508 s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
17509 s,@GLIB_CFLAGS@,$GLIB_CFLAGS,;t t
17510 s,@GLIB_LIBS@,$GLIB_LIBS,;t t
17511 -s,@FAM_LIBS@,$FAM_LIBS,;t t
17512 +s,@GNOMEVFS_CFLAGS@,$GNOMEVFS_CFLAGS,;t t
17513 +s,@GNOMEVFS_LIBS@,$GNOMEVFS_LIBS,;t t
17514 s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t
17515 s,@DISABLE_DEPRECATED_CFLAGS@,$DISABLE_DEPRECATED_CFLAGS,;t t
17516 s,@DEBUG_CFLAGS@,$DEBUG_CFLAGS,;t t
17517 @@ -23978,11 +23585,6 @@
17518 *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
19714 - (exit $ac_status); } &&
19715 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
19716 - { (case "(($ac_try" in
19717 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19718 - *) ac_try_echo=$ac_try;;
19719 -esac
19720 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19721 - (eval "$ac_try") 2>&5
19722 - ac_status=$?
19723 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19724 - (exit $ac_status); }; } &&
19725 - { ac_try='test -s conftest.$ac_objext'
19726 - { (case "(($ac_try" in
19727 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19728 - *) ac_try_echo=$ac_try;;
19729 -esac
19730 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19731 - (eval "$ac_try") 2>&5
19732 - ac_status=$?
19733 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19734 - (exit $ac_status); }; }; then
19735 + (exit $ac_status); } && {
19736 + test -z "$ac_c_werror_flag" ||
19737 + test ! -s conftest.err
19738 + } && test -s conftest.$ac_objext; then
19739 has_option=yes
19740 else
19741 echo "$as_me: failed program was:" >&5
19742 @@ -24777,7 +23434,7 @@
19743 IFS=$as_save_IFS
19744 test -z "$as_dir" && as_dir=.
19745 for ac_exec_ext in '' $ac_executable_extensions; do
19746 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
19747 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
19748 ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
19749 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
19750 break 2
19751 @@ -24919,17 +23576,10 @@
19752 rm -f conftest.er1
19753 cat conftest.err >&5
19754 echo "$as_me:$LINENO: \$? = $ac_status" >&5
19755 - (exit $ac_status); } >/dev/null; then
19756 - if test -s conftest.err; then
19757 - ac_cpp_err=$ac_c_preproc_warn_flag
19758 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
19759 - else
19760 - ac_cpp_err=
19761 - fi
19762 -else
19763 - ac_cpp_err=yes
19764 -fi
19765 -if test -z "$ac_cpp_err"; then
19766 + (exit $ac_status); } >/dev/null && {
19767 + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
19768 + test ! -s conftest.err
19769 + }; then
19770 { echo "$as_me:$LINENO: result: found" >&5
19771 echo "${ECHO_T}found" >&6; }
19772 have_python_headers=yes
19773 @@ -24962,9 +23612,7 @@
19774 fi
19775 fi
19776
19777 -
19778 -
19779 -if test x$have_python = xyes; then
19780 + if test x$have_python = xyes; then
19781 HAVE_PYTHON_TRUE=
19782 HAVE_PYTHON_FALSE='#'
19783 else
19784 @@ -25210,7 +23858,8 @@
19785 ## M4sh Initialization. ##
19786 ## --------------------- ##
19787
19788 -# Be Bourne compatible
19789 +# Be more Bourne compatible
19790 +DUALCASE=1; export DUALCASE # for MKS sh
19791 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
19792 emulate sh
19793 NULLCMD=:
19794 @@ -25219,10 +23868,13 @@
19795 alias -g '${1+"$@"}'='"$@"'
19796 setopt NO_GLOB_SUBST
19797 else
19798 - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
19799 + case `(set -o) 2>/dev/null` in
19800 + *posix*) set -o posix ;;
19801 +esac
19802 +
19803 fi
19804 -BIN_SH=xpg4; export BIN_SH # for Tru64
19805 -DUALCASE=1; export DUALCASE # for MKS sh
19806 +
19807 +
19808
19809
19810 # PATH needs CR
19811 @@ -25446,19 +24098,28 @@
19812 as_mkdir_p=false
19813 fi
19814
19815 -# Find out whether ``test -x'' works. Don't use a zero-byte file, as
19816 -# systems may use methods other than mode bits to determine executability.
19817 -cat >conf$$.file <<_ASEOF
19818 -#! /bin/sh
19819 -exit 0
19820 -_ASEOF
19821 -chmod +x conf$$.file
19822 -if test -x conf$$.file >/dev/null 2>&1; then
19823 - as_executable_p="test -x"
19824 +if test -x / >/dev/null 2>&1; then
19825 + as_test_x='test -x'
19826 else
19827 - as_executable_p=:
19828 + if ls -dL / >/dev/null 2>&1; then
19829 + as_ls_L_option=L
19830 + else
19831 + as_ls_L_option=
19832 + fi
19833 + as_test_x='
19834 + eval sh -c '\''
19835 + if test -d "$1"; then
19836 + test -d "$1/.";
19837 + else
19838 + case $1 in
19839 + -*)set "./$1";;
19840 + esac;
19841 + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
19842 + ???[sx]*):;;*)false;;esac;fi
19843 + '\'' sh
19844 + '
19845 fi
19846 -rm -f conf$$.file
19847 +as_executable_p=$as_test_x
19848
19849 # Sed expression to map a string onto a valid CPP name.
19850 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
19851 @@ -25474,7 +24135,7 @@
19852 # values after options handling.
19853 ac_log="
19854 This file was extended by gnome-menus $as_me 2.18.0, which was
19855 -generated by GNU Autoconf 2.60. Invocation command line was
19856 +generated by GNU Autoconf 2.61. Invocation command line was
19857
19858 CONFIG_FILES = $CONFIG_FILES
19859 CONFIG_HEADERS = $CONFIG_HEADERS
19860 @@ -25503,7 +24164,7 @@
19861 Usage: $0 [OPTIONS] [FILE]...
19862
19863 -h, --help print this help, then exit
19864 - -V, --version print version number, then exit
19865 + -V, --version print version number and configuration settings, then exit
19866 -q, --quiet do not print progress messages
19867 -d, --debug don't remove temporary files
19868 --recheck update $as_me by reconfiguring in the same conditions
19869 @@ -25527,7 +24188,7 @@
19870 cat >>$CONFIG_STATUS <<_ACEOF
19871 ac_cs_version="\\
19872 gnome-menus config.status 2.18.0
19873 -configured by $0, generated by GNU Autoconf 2.60,
19874 +configured by $0, generated by GNU Autoconf 2.61,
19875 with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
19876
19877 Copyright (C) 2006 Free Software Foundation, Inc.
19878 @@ -25537,6 +24198,7 @@
19879 ac_pwd='$ac_pwd'
19880 srcdir='$srcdir'
19881 INSTALL='$INSTALL'
19882 +MKDIR_P='$MKDIR_P'
19883 _ACEOF
19884
19885 cat >>$CONFIG_STATUS <<\_ACEOF
19886 @@ -25763,6 +24425,7 @@
19887 INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
19888 INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
19889 INSTALL_DATA!$INSTALL_DATA$ac_delim
19890 +am__isrc!$am__isrc$ac_delim
19891 CYGPATH_W!$CYGPATH_W$ac_delim
19892 PACKAGE!$PACKAGE$ac_delim
19893 VERSION!$VERSION$ac_delim
19894 @@ -25815,11 +24478,10 @@
19895 host_os!$host_os$ac_delim
19896 USE_NLS!$USE_NLS$ac_delim
19897 MSGFMT!$MSGFMT$ac_delim
19898 +MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim
19899 GMSGFMT!$GMSGFMT$ac_delim
19900 XGETTEXT!$XGETTEXT$ac_delim
19901 CATALOGS!$CATALOGS$ac_delim
19902 -CATOBJEXT!$CATOBJEXT$ac_delim
19903 -DATADIRNAME!$DATADIRNAME$ac_delim
19904 _ACEOF
19905
19906 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
19907 @@ -25861,6 +24523,8 @@
19908 ac_delim='%!_!# '
19909 for ac_last_try in false false false false false :; do
19910 cat >conf$$subs.sed <<_ACEOF
19911 +CATOBJEXT!$CATOBJEXT$ac_delim
19912 +DATADIRNAME!$DATADIRNAME$ac_delim
19913 GMOFILES!$GMOFILES$ac_delim
19914 INSTOBJEXT!$INSTOBJEXT$ac_delim
19915 INTLLIBS!$INTLLIBS$ac_delim
19916 @@ -25918,9 +24582,10 @@
19917 PKG_CONFIG!$PKG_CONFIG$ac_delim
19918 GLIB_CFLAGS!$GLIB_CFLAGS$ac_delim
19919 GLIB_LIBS!$GLIB_LIBS$ac_delim
19920 +GNOMEVFS_CFLAGS!$GNOMEVFS_CFLAGS$ac_delim
19921 +GNOMEVFS_LIBS!$GNOMEVFS_LIBS$ac_delim
19922 INOTIFY_SUPPORT_TRUE!$INOTIFY_SUPPORT_TRUE$ac_delim
19923 INOTIFY_SUPPORT_FALSE!$INOTIFY_SUPPORT_FALSE$ac_delim
19924 -FAM_LIBS!$FAM_LIBS$ac_delim
19925 WARN_CFLAGS!$WARN_CFLAGS$ac_delim
19926 DISABLE_DEPRECATED_CFLAGS!$DISABLE_DEPRECATED_CFLAGS$ac_delim
19927 DEBUG_CFLAGS!$DEBUG_CFLAGS$ac_delim
19928 @@ -25941,7 +24606,7 @@
19929 LTLIBOBJS!$LTLIBOBJS$ac_delim
19930 _ACEOF
19931
19932 - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 78; then
19933 + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 81; then
19934 break
19935 elif $ac_last_try; then
19936 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
19937 @@ -26168,6 +24833,11 @@
19938 [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
19939 *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
1751919940 esac
17520
17521 - if test x"$ac_file" != x-; then
17522 - { echo "$as_me:$LINENO: creating $ac_file" >&5
17523 -echo "$as_me: creating $ac_file" >&6;}
17524 - rm -f "$ac_file"
17525 - fi
17526 # Let's still pretend it is `configure' which instantiates (i.e., don't
17527 # use $as_me), people would be surprised to read:
17528 # /* config.h. Generated by config.status. */
17529 @@ -24021,6 +23623,12 @@
17530 fi;;
17531 esac
17532 done` || { (exit 1); exit 1; }
17533 +
17534 + if test x"$ac_file" != x-; then
17535 + { echo "$as_me:$LINENO: creating $ac_file" >&5
17536 +echo "$as_me: creating $ac_file" >&6;}
17537 + rm -f "$ac_file"
19941 + ac_MKDIR_P=$MKDIR_P
19942 + case $MKDIR_P in
19943 + [\\/$]* | ?:[\\/]* ) ;;
19944 + */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
19945 + esac
19946 _ACEOF
19947
19948 cat >>$CONFIG_STATUS <<\_ACEOF
19949 @@ -26221,6 +24891,7 @@
19950 s&@abs_builddir@&$ac_abs_builddir&;t t
19951 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
19952 s&@INSTALL@&$ac_INSTALL&;t t
19953 +s&@MKDIR_P@&$ac_MKDIR_P&;t t
19954 $ac_datarootdir_hack
19955 " $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
19956
19957 @@ -26385,8 +25056,9 @@
19958 # some people rename them; so instead we look at the file content.
19959 # Grep'ing the first line is not enough: some people post-process
19960 # each Makefile.in and add a new line on top of each file to say so.
19961 - # So let's grep whole file.
19962 - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
19963 + # Grep'ing the whole file is not good either: AIX grep has a line
19964 + # limit of 2048, but all sed's we know have understand at least 4000.
19965 + if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
19966 dirpart=`$as_dirname -- "$mf" ||
19967 $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
19968 X"$mf" : 'X\(//\)[^/]' \| \
19969 diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur gnome-menus-2.18.0-old/depcomp gnome-menus-2.18.0/depcomp
19970 --- gnome-menus-2.18.0-old/depcomp 2007-03-12 19:55:02.000000000 +0100
19971 +++ gnome-menus-2.18.0/depcomp 2007-04-25 07:13:33.000000000 +0200
19972 @@ -1,9 +1,10 @@
19973 #! /bin/sh
19974 # depcomp - compile a program generating dependencies as side-effects
19975
19976 -scriptversion=2005-07-09.11
19977 +scriptversion=2006-10-15.18
19978
19979 -# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
19980 +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
19981 +# Foundation, Inc.
19982
19983 # This program is free software; you can redistribute it and/or modify
19984 # it under the terms of the GNU General Public License as published by
19985 @@ -91,7 +92,20 @@
19986 ## gcc 3 implements dependency tracking that does exactly what
19987 ## we want. Yay! Note: for some reason libtool 1.4 doesn't like
19988 ## it if -MD -MP comes after the -MF stuff. Hmm.
19989 - "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
19990 +## Unfortunately, FreeBSD c89 acceptance of flags depends upon
19991 +## the command line argument order; so add the flags where they
19992 +## appear in depend2.am. Note that the slowdown incurred here
19993 +## affects only configure: in makefiles, %FASTDEP% shortcuts this.
19994 + for arg
19995 + do
19996 + case $arg in
19997 + -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
19998 + *) set fnord "$@" "$arg" ;;
19999 + esac
20000 + shift # fnord
20001 + shift # $arg
20002 + done
20003 + "$@"
20004 stat=$?
20005 if test $stat -eq 0; then :
20006 else
20007 @@ -276,6 +290,46 @@
20008 rm -f "$tmpdepfile"
20009 ;;
20010
20011 +hp2)
20012 + # The "hp" stanza above does not work with aCC (C++) and HP's ia64
20013 + # compilers, which have integrated preprocessors. The correct option
20014 + # to use with these is +Maked; it writes dependencies to a file named
20015 + # 'foo.d', which lands next to the object file, wherever that
20016 + # happens to be.
20017 + # Much of this is similar to the tru64 case; see comments there.
20018 + dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
20019 + test "x$dir" = "x$object" && dir=
20020 + base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
20021 + if test "$libtool" = yes; then
20022 + tmpdepfile1=$dir$base.d
20023 + tmpdepfile2=$dir.libs/$base.d
20024 + "$@" -Wc,+Maked
20025 + else
20026 + tmpdepfile1=$dir$base.d
20027 + tmpdepfile2=$dir$base.d
20028 + "$@" +Maked
1753820029 + fi
17539 _ACEOF
17540 cat >>$CONFIG_STATUS <<_ACEOF
17541 sed "$ac_vpsub
17542 diff -urN gnome-menus-2.15.91.orig/desktop-directories/Makefile.in gnome-menus-2.15.91/desktop-directories/Makefile.in
17543 --- gnome-menus-2.15.91.orig/desktop-directories/Makefile.in 2006-08-08 00:30:54.000000000 +0200
17544 +++ gnome-menus-2.15.91/desktop-directories/Makefile.in 2006-08-13 18:57:14.000000000 +0200
17545 @@ -95,13 +95,14 @@
20030 + stat=$?
20031 + if test $stat -eq 0; then :
20032 + else
20033 + rm -f "$tmpdepfile1" "$tmpdepfile2"
20034 + exit $stat
20035 + fi
20036 +
20037 + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
20038 + do
20039 + test -f "$tmpdepfile" && break
20040 + done
20041 + if test -f "$tmpdepfile"; then
20042 + sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
20043 + # Add `dependent.h:' lines.
20044 + sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
20045 + else
20046 + echo "#dummy" > "$depfile"
20047 + fi
20048 + rm -f "$tmpdepfile" "$tmpdepfile2"
20049 + ;;
20050 +
20051 tru64)
20052 # The Tru64 compiler uses -MD to generate dependencies as a side
20053 # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
20054 @@ -288,13 +342,13 @@
20055
20056 if test "$libtool" = yes; then
20057 # With Tru64 cc, shared objects can also be used to make a
20058 - # static library. This mecanism is used in libtool 1.4 series to
20059 + # static library. This mechanism is used in libtool 1.4 series to
20060 # handle both shared and static libraries in a single compilation.
20061 # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
20062 #
20063 # With libtool 1.5 this exception was removed, and libtool now
20064 # generates 2 separate objects for the 2 libraries. These two
20065 - # compilations output dependencies in in $dir.libs/$base.o.d and
20066 + # compilations output dependencies in $dir.libs/$base.o.d and
20067 # in $dir$base.o.d. We have to check for both files, because
20068 # one of the two compilations can be disabled. We should prefer
20069 # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
20070 diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur gnome-menus-2.18.0-old/desktop-directories/Makefile.in gnome-menus-2.18.0/desktop-directories/Makefile.in
20071 --- gnome-menus-2.18.0-old/desktop-directories/Makefile.in 2007-03-12 19:54:56.000000000 +0100
20072 +++ gnome-menus-2.18.0/desktop-directories/Makefile.in 2007-04-25 07:13:33.000000000 +0200
20073 @@ -1,8 +1,8 @@
20074 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
20075 +# Makefile.in generated by automake 1.10 from Makefile.am.
20076 # @configure_input@
20077
20078 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
20079 -# 2003, 2004, 2005 Free Software Foundation, Inc.
20080 +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
20081 # This Makefile.in is free software; the Free Software Foundation
20082 # gives unlimited permission to copy and/or distribute it,
20083 # with or without modifications, as long as this notice is preserved.
20084 @@ -14,15 +14,11 @@
20085
20086 @SET_MAKE@
20087
20088 -srcdir = @srcdir@
20089 -top_srcdir = @top_srcdir@
20090 VPATH = @srcdir@
20091 pkgdatadir = $(datadir)/@PACKAGE@
20092 pkglibdir = $(libdir)/@PACKAGE@
20093 pkgincludedir = $(includedir)/@PACKAGE@
20094 -top_builddir = ..
20095 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
20096 -INSTALL = @INSTALL@
20097 install_sh_DATA = $(install_sh) -c -m 644
20098 install_sh_PROGRAM = $(install_sh) -c
20099 install_sh_SCRIPT = $(install_sh) -c
20100 @@ -61,8 +57,6 @@
20101 ACLOCAL = @ACLOCAL@
20102 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
20103 ALL_LINGUAS = @ALL_LINGUAS@
20104 -AMDEP_FALSE = @AMDEP_FALSE@
20105 -AMDEP_TRUE = @AMDEP_TRUE@
20106 AMTAR = @AMTAR@
20107 AR = @AR@
20108 AS = @AS@
20109 @@ -95,18 +89,16 @@
1754620110 EGREP = @EGREP@
1754720111 EXEEXT = @EXEEXT@
1754820112 F77 = @F77@
1755520119 GMSGFMT = @GMSGFMT@
1755620120 +GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
1755720121 +GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
17558 HAVE_PYTHON_FALSE = @HAVE_PYTHON_FALSE@
17559 HAVE_PYTHON_TRUE = @HAVE_PYTHON_TRUE@
20122 GREP = @GREP@
20123 -HAVE_PYTHON_FALSE = @HAVE_PYTHON_FALSE@
20124 -HAVE_PYTHON_TRUE = @HAVE_PYTHON_TRUE@
20125 -INOTIFY_SUPPORT_FALSE = @INOTIFY_SUPPORT_FALSE@
20126 -INOTIFY_SUPPORT_TRUE = @INOTIFY_SUPPORT_TRUE@
20127 +INSTALL = @INSTALL@
1756020128 INSTALL_DATA = @INSTALL_DATA@
17561 diff -urN gnome-menus-2.15.91.orig/layout/Makefile.in gnome-menus-2.15.91/layout/Makefile.in
17562 --- gnome-menus-2.15.91.orig/layout/Makefile.in 2006-08-08 00:30:54.000000000 +0200
17563 +++ gnome-menus-2.15.91/layout/Makefile.in 2006-08-13 18:57:14.000000000 +0200
17564 @@ -95,13 +95,14 @@
20129 INSTALL_PROGRAM = @INSTALL_PROGRAM@
20130 INSTALL_SCRIPT = @INSTALL_SCRIPT@
20131 @@ -147,11 +139,11 @@
20132 LN_S = @LN_S@
20133 LTLIBOBJS = @LTLIBOBJS@
20134 MAINT = @MAINT@
20135 -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
20136 -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
20137 MAKEINFO = @MAKEINFO@
20138 +MKDIR_P = @MKDIR_P@
20139 MKINSTALLDIRS = @MKINSTALLDIRS@
20140 MSGFMT = @MSGFMT@
20141 +MSGFMT_OPTS = @MSGFMT_OPTS@
20142 NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
20143 OBJDUMP = @OBJDUMP@
20144 OBJEXT = @OBJEXT@
20145 @@ -181,13 +173,13 @@
20146 VERSION = @VERSION@
20147 WARN_CFLAGS = @WARN_CFLAGS@
20148 XGETTEXT = @XGETTEXT@
20149 +abs_builddir = @abs_builddir@
20150 +abs_srcdir = @abs_srcdir@
20151 +abs_top_builddir = @abs_top_builddir@
20152 +abs_top_srcdir = @abs_top_srcdir@
20153 ac_ct_CC = @ac_ct_CC@
20154 ac_ct_CXX = @ac_ct_CXX@
20155 ac_ct_F77 = @ac_ct_F77@
20156 -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
20157 -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
20158 -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
20159 -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
20160 am__include = @am__include@
20161 am__leading_dot = @am__leading_dot@
20162 am__quote = @am__quote@
20163 @@ -199,6 +191,7 @@
20164 build_cpu = @build_cpu@
20165 build_os = @build_os@
20166 build_vendor = @build_vendor@
20167 +builddir = @builddir@
20168 datadir = @datadir@
20169 datarootdir = @datarootdir@
20170 docdir = @docdir@
20171 @@ -230,8 +223,11 @@
20172 pythondir = @pythondir@
20173 sbindir = @sbindir@
20174 sharedstatedir = @sharedstatedir@
20175 +srcdir = @srcdir@
20176 sysconfdir = @sysconfdir@
20177 target_alias = @target_alias@
20178 +top_builddir = @top_builddir@
20179 +top_srcdir = @top_srcdir@
20180 NULL =
20181 directorydir = $(datadir)/desktop-directories
20182 directory_in_files = \
20183 @@ -300,13 +296,9 @@
20184
20185 clean-libtool:
20186 -rm -rf .libs _libs
20187 -
20188 -distclean-libtool:
20189 - -rm -f libtool
20190 -uninstall-info-am:
20191 install-directoryDATA: $(directory_DATA)
20192 @$(NORMAL_INSTALL)
20193 - test -z "$(directorydir)" || $(mkdir_p) "$(DESTDIR)$(directorydir)"
20194 + test -z "$(directorydir)" || $(MKDIR_P) "$(DESTDIR)$(directorydir)"
20195 @list='$(directory_DATA)'; for p in $$list; do \
20196 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
20197 f=$(am__strip_dir) \
20198 @@ -329,22 +321,21 @@
20199
20200
20201 distdir: $(DISTFILES)
20202 - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
20203 - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
20204 - list='$(DISTFILES)'; for file in $$list; do \
20205 - case $$file in \
20206 - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
20207 - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
20208 - esac; \
20209 + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
20210 + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
20211 + list='$(DISTFILES)'; \
20212 + dist_files=`for file in $$list; do echo $$file; done | \
20213 + sed -e "s|^$$srcdirstrip/||;t" \
20214 + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
20215 + case $$dist_files in \
20216 + */*) $(MKDIR_P) `echo "$$dist_files" | \
20217 + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
20218 + sort -u` ;; \
20219 + esac; \
20220 + for file in $$dist_files; do \
20221 if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
20222 - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
20223 - if test "$$dir" != "$$file" && test "$$dir" != "."; then \
20224 - dir="/$$dir"; \
20225 - $(mkdir_p) "$(distdir)$$dir"; \
20226 - else \
20227 - dir=''; \
20228 - fi; \
20229 if test -d $$d/$$file; then \
20230 + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
20231 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
20232 cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
20233 fi; \
20234 @@ -360,7 +351,7 @@
20235 all-am: Makefile $(DATA)
20236 installdirs:
20237 for dir in "$(DESTDIR)$(directorydir)"; do \
20238 - test -z "$$dir" || $(mkdir_p) "$$dir"; \
20239 + test -z "$$dir" || $(MKDIR_P) "$$dir"; \
20240 done
20241 install: install-am
20242 install-exec: install-exec-am
20243 @@ -393,7 +384,7 @@
20244
20245 distclean: distclean-am
20246 -rm -f Makefile
20247 -distclean-am: clean-am distclean-generic distclean-libtool
20248 +distclean-am: clean-am distclean-generic
20249
20250 dvi: dvi-am
20251
20252 @@ -407,12 +398,20 @@
20253
20254 install-data-am: install-directoryDATA
20255
20256 +install-dvi: install-dvi-am
20257 +
20258 install-exec-am:
20259
20260 +install-html: install-html-am
20261 +
20262 install-info: install-info-am
20263
20264 install-man:
20265
20266 +install-pdf: install-pdf-am
20267 +
20268 +install-ps: install-ps-am
20269 +
20270 installcheck-am:
20271
20272 maintainer-clean: maintainer-clean-am
20273 @@ -431,18 +430,21 @@
20274
20275 ps-am:
20276
20277 -uninstall-am: uninstall-directoryDATA uninstall-info-am
20278 +uninstall-am: uninstall-directoryDATA
20279 +
20280 +.MAKE: install-am install-strip
20281
20282 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
20283 distclean distclean-generic distclean-libtool distdir dvi \
20284 dvi-am html html-am info info-am install install-am \
20285 - install-data install-data-am install-directoryDATA \
20286 - install-exec install-exec-am install-info install-info-am \
20287 - install-man install-strip installcheck installcheck-am \
20288 - installdirs maintainer-clean maintainer-clean-generic \
20289 - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
20290 - ps ps-am uninstall uninstall-am uninstall-directoryDATA \
20291 - uninstall-info-am
20292 + install-data install-data-am install-directoryDATA install-dvi \
20293 + install-dvi-am install-exec install-exec-am install-html \
20294 + install-html-am install-info install-info-am install-man \
20295 + install-pdf install-pdf-am install-ps install-ps-am \
20296 + install-strip installcheck installcheck-am installdirs \
20297 + maintainer-clean maintainer-clean-generic mostlyclean \
20298 + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
20299 + uninstall uninstall-am uninstall-directoryDATA
20300
20301
20302 @INTLTOOL_DIRECTORY_RULE@
20303 diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur gnome-menus-2.18.0-old/install-sh gnome-menus-2.18.0/install-sh
20304 --- gnome-menus-2.18.0-old/install-sh 2007-03-12 19:54:55.000000000 +0100
20305 +++ gnome-menus-2.18.0/install-sh 2007-04-25 07:13:32.000000000 +0200
20306 @@ -1,7 +1,7 @@
20307 #!/bin/sh
20308 # install - install a program, script, or datafile
20309
20310 -scriptversion=2005-05-14.22
20311 +scriptversion=2006-10-14.15
20312
20313 # This originates from X11R5 (mit/util/scripts/install.sh), which was
20314 # later released in X11R6 (xc/config/util/install.sh) with the
20315 @@ -39,15 +39,24 @@
20316 # when there is no Makefile.
20317 #
20318 # This script is compatible with the BSD install script, but was written
20319 -# from scratch. It can only install one file at a time, a restriction
20320 -# shared with many OS's install programs.
20321 +# from scratch.
20322 +
20323 +nl='
20324 +'
20325 +IFS=" "" $nl"
20326
20327 # set DOITPROG to echo to test this script
20328
20329 # Don't use :- since 4.3BSD and earlier shells don't like it.
20330 doit="${DOITPROG-}"
20331 +if test -z "$doit"; then
20332 + doit_exec=exec
20333 +else
20334 + doit_exec=$doit
20335 +fi
20336
20337 -# put in absolute paths if you don't have them in your path; or use env. vars.
20338 +# Put in absolute file names if you don't have them in your path;
20339 +# or use environment vars.
20340
20341 mvprog="${MVPROG-mv}"
20342 cpprog="${CPPROG-cp}"
20343 @@ -58,7 +67,13 @@
20344 rmprog="${RMPROG-rm}"
20345 mkdirprog="${MKDIRPROG-mkdir}"
20346
20347 -chmodcmd="$chmodprog 0755"
20348 +posix_glob=
20349 +posix_mkdir=
20350 +
20351 +# Desired mode of installed file.
20352 +mode=0755
20353 +
20354 +chmodcmd=$chmodprog
20355 chowncmd=
20356 chgrpcmd=
20357 stripcmd=
20358 @@ -95,7 +110,7 @@
20359 CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
20360 "
20361
20362 -while test -n "$1"; do
20363 +while test $# -ne 0; do
20364 case $1 in
20365 -c) shift
20366 continue;;
20367 @@ -111,9 +126,15 @@
20368
20369 --help) echo "$usage"; exit $?;;
20370
20371 - -m) chmodcmd="$chmodprog $2"
20372 + -m) mode=$2
20373 shift
20374 shift
20375 + case $mode in
20376 + *' '* | *' '* | *'
20377 +'* | *'*'* | *'?'* | *'['*)
20378 + echo "$0: invalid mode: $mode" >&2
20379 + exit 1;;
20380 + esac
20381 continue;;
20382
20383 -o) chowncmd="$chownprog $2"
20384 @@ -136,25 +157,33 @@
20385
20386 --version) echo "$0 $scriptversion"; exit $?;;
20387
20388 - *) # When -d is used, all remaining arguments are directories to create.
20389 - # When -t is used, the destination is already specified.
20390 - test -n "$dir_arg$dstarg" && break
20391 - # Otherwise, the last argument is the destination. Remove it from $@.
20392 - for arg
20393 - do
20394 - if test -n "$dstarg"; then
20395 - # $@ is not empty: it contains at least $arg.
20396 - set fnord "$@" "$dstarg"
20397 - shift # fnord
20398 - fi
20399 - shift # arg
20400 - dstarg=$arg
20401 - done
20402 + --) shift
20403 break;;
20404 +
20405 + -*) echo "$0: invalid option: $1" >&2
20406 + exit 1;;
20407 +
20408 + *) break;;
20409 esac
20410 done
20411
20412 -if test -z "$1"; then
20413 +if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
20414 + # When -d is used, all remaining arguments are directories to create.
20415 + # When -t is used, the destination is already specified.
20416 + # Otherwise, the last argument is the destination. Remove it from $@.
20417 + for arg
20418 + do
20419 + if test -n "$dstarg"; then
20420 + # $@ is not empty: it contains at least $arg.
20421 + set fnord "$@" "$dstarg"
20422 + shift # fnord
20423 + fi
20424 + shift # arg
20425 + dstarg=$arg
20426 + done
20427 +fi
20428 +
20429 +if test $# -eq 0; then
20430 if test -z "$dir_arg"; then
20431 echo "$0: no input file specified." >&2
20432 exit 1
20433 @@ -164,6 +193,33 @@
20434 exit 0
20435 fi
20436
20437 +if test -z "$dir_arg"; then
20438 + trap '(exit $?); exit' 1 2 13 15
20439 +
20440 + # Set umask so as not to create temps with too-generous modes.
20441 + # However, 'strip' requires both read and write access to temps.
20442 + case $mode in
20443 + # Optimize common cases.
20444 + *644) cp_umask=133;;
20445 + *755) cp_umask=22;;
20446 +
20447 + *[0-7])
20448 + if test -z "$stripcmd"; then
20449 + u_plus_rw=
20450 + else
20451 + u_plus_rw='% 200'
20452 + fi
20453 + cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
20454 + *)
20455 + if test -z "$stripcmd"; then
20456 + u_plus_rw=
20457 + else
20458 + u_plus_rw=,u+rw
20459 + fi
20460 + cp_umask=$mode$u_plus_rw;;
20461 + esac
20462 +fi
20463 +
20464 for src
20465 do
20466 # Protect names starting with `-'.
20467 @@ -173,15 +229,11 @@
20468
20469 if test -n "$dir_arg"; then
20470 dst=$src
20471 - src=
20472 -
20473 - if test -d "$dst"; then
20474 - mkdircmd=:
20475 - chmodcmd=
20476 - else
20477 - mkdircmd=$mkdirprog
20478 - fi
20479 + dstdir=$dst
20480 + test -d "$dstdir"
20481 + dstdir_status=$?
20482 else
20483 +
20484 # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
20485 # might cause directories to be created, which would be especially bad
20486 # if $src (and thus $dsttmp) contains '*'.
20487 @@ -208,53 +260,188 @@
20488 echo "$0: $dstarg: Is a directory" >&2
20489 exit 1
20490 fi
20491 - dst=$dst/`basename "$src"`
20492 + dstdir=$dst
20493 + dst=$dstdir/`basename "$src"`
20494 + dstdir_status=0
20495 + else
20496 + # Prefer dirname, but fall back on a substitute if dirname fails.
20497 + dstdir=`
20498 + (dirname "$dst") 2>/dev/null ||
20499 + expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
20500 + X"$dst" : 'X\(//\)[^/]' \| \
20501 + X"$dst" : 'X\(//\)$' \| \
20502 + X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
20503 + echo X"$dst" |
20504 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
20505 + s//\1/
20506 + q
20507 + }
20508 + /^X\(\/\/\)[^/].*/{
20509 + s//\1/
20510 + q
20511 + }
20512 + /^X\(\/\/\)$/{
20513 + s//\1/
20514 + q
20515 + }
20516 + /^X\(\/\).*/{
20517 + s//\1/
20518 + q
20519 + }
20520 + s/.*/./; q'
20521 + `
20522 +
20523 + test -d "$dstdir"
20524 + dstdir_status=$?
20525 fi
20526 fi
20527
20528 - # This sed command emulates the dirname command.
20529 - dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
20530 -
20531 - # Make sure that the destination directory exists.
20532 + obsolete_mkdir_used=false
20533
20534 - # Skip lots of stat calls in the usual case.
20535 - if test ! -d "$dstdir"; then
20536 - defaultIFS='
20537 - '
20538 - IFS="${IFS-$defaultIFS}"
20539 -
20540 - oIFS=$IFS
20541 - # Some sh's can't handle IFS=/ for some reason.
20542 - IFS='%'
20543 - set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
20544 - shift
20545 - IFS=$oIFS
20546 + if test $dstdir_status != 0; then
20547 + case $posix_mkdir in
20548 + '')
20549 + # Create intermediate dirs using mode 755 as modified by the umask.
20550 + # This is like FreeBSD 'install' as of 1997-10-28.
20551 + umask=`umask`
20552 + case $stripcmd.$umask in
20553 + # Optimize common cases.
20554 + *[2367][2367]) mkdir_umask=$umask;;
20555 + .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
20556 +
20557 + *[0-7])
20558 + mkdir_umask=`expr $umask + 22 \
20559 + - $umask % 100 % 40 + $umask % 20 \
20560 + - $umask % 10 % 4 + $umask % 2
20561 + `;;
20562 + *) mkdir_umask=$umask,go-w;;
20563 + esac
20564 +
20565 + # With -d, create the new directory with the user-specified mode.
20566 + # Otherwise, rely on $mkdir_umask.
20567 + if test -n "$dir_arg"; then
20568 + mkdir_mode=-m$mode
20569 + else
20570 + mkdir_mode=
20571 + fi
20572 +
20573 + posix_mkdir=false
20574 + case $umask in
20575 + *[123567][0-7][0-7])
20576 + # POSIX mkdir -p sets u+wx bits regardless of umask, which
20577 + # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
20578 + ;;
20579 + *)
20580 + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
20581 + trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
20582 +
20583 + if (umask $mkdir_umask &&
20584 + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
20585 + then
20586 + if test -z "$dir_arg" || {
20587 + # Check for POSIX incompatibilities with -m.
20588 + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
20589 + # other-writeable bit of parent directory when it shouldn't.
20590 + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
20591 + ls_ld_tmpdir=`ls -ld "$tmpdir"`
20592 + case $ls_ld_tmpdir in
20593 + d????-?r-*) different_mode=700;;
20594 + d????-?--*) different_mode=755;;
20595 + *) false;;
20596 + esac &&
20597 + $mkdirprog -m$different_mode -p -- "$tmpdir" && {
20598 + ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
20599 + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
20600 + }
20601 + }
20602 + then posix_mkdir=:
20603 + fi
20604 + rmdir "$tmpdir/d" "$tmpdir"
20605 + else
20606 + # Remove any dirs left behind by ancient mkdir implementations.
20607 + rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
20608 + fi
20609 + trap '' 0;;
20610 + esac;;
20611 + esac
20612
20613 - pathcomp=
20614 + if
20615 + $posix_mkdir && (
20616 + umask $mkdir_umask &&
20617 + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
20618 + )
20619 + then :
20620 + else
20621
20622 - while test $# -ne 0 ; do
20623 - pathcomp=$pathcomp$1
20624 + # The umask is ridiculous, or mkdir does not conform to POSIX,
20625 + # or it failed possibly due to a race condition. Create the
20626 + # directory the slow way, step by step, checking for races as we go.
20627 +
20628 + case $dstdir in
20629 + /*) prefix=/ ;;
20630 + -*) prefix=./ ;;
20631 + *) prefix= ;;
20632 + esac
20633 +
20634 + case $posix_glob in
20635 + '')
20636 + if (set -f) 2>/dev/null; then
20637 + posix_glob=true
20638 + else
20639 + posix_glob=false
20640 + fi ;;
20641 + esac
20642 +
20643 + oIFS=$IFS
20644 + IFS=/
20645 + $posix_glob && set -f
20646 + set fnord $dstdir
20647 shift
20648 - if test ! -d "$pathcomp"; then
20649 - $mkdirprog "$pathcomp"
20650 - # mkdir can fail with a `File exist' error in case several
20651 - # install-sh are creating the directory concurrently. This
20652 - # is OK.
20653 - test -d "$pathcomp" || exit
20654 + $posix_glob && set +f
20655 + IFS=$oIFS
20656 +
20657 + prefixes=
20658 +
20659 + for d
20660 + do
20661 + test -z "$d" && continue
20662 +
20663 + prefix=$prefix$d
20664 + if test -d "$prefix"; then
20665 + prefixes=
20666 + else
20667 + if $posix_mkdir; then
20668 + (umask=$mkdir_umask &&
20669 + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
20670 + # Don't fail if two instances are running concurrently.
20671 + test -d "$prefix" || exit 1
20672 + else
20673 + case $prefix in
20674 + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
20675 + *) qprefix=$prefix;;
20676 + esac
20677 + prefixes="$prefixes '$qprefix'"
20678 + fi
20679 + fi
20680 + prefix=$prefix/
20681 + done
20682 +
20683 + if test -n "$prefixes"; then
20684 + # Don't fail if two instances are running concurrently.
20685 + (umask $mkdir_umask &&
20686 + eval "\$doit_exec \$mkdirprog $prefixes") ||
20687 + test -d "$dstdir" || exit 1
20688 + obsolete_mkdir_used=true
20689 fi
20690 - pathcomp=$pathcomp/
20691 - done
20692 + fi
20693 fi
20694
20695 if test -n "$dir_arg"; then
20696 - $doit $mkdircmd "$dst" \
20697 - && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
20698 - && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
20699 - && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
20700 - && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
20701 -
20702 + { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
20703 + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
20704 + { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
20705 + test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
20706 else
20707 - dstfile=`basename "$dst"`
20708
20709 # Make a couple of temp file names in the proper directory.
20710 dsttmp=$dstdir/_inst.$$_
20711 @@ -262,10 +449,9 @@
20712
20713 # Trap to clean up those temp files at exit.
20714 trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
20715 - trap '(exit $?); exit' 1 2 13 15
20716
20717 # Copy the file name to the temp name.
20718 - $doit $cpprog "$src" "$dsttmp" &&
20719 + (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
20720
20721 # and set any options; do chmod last to preserve setuid bits.
20722 #
20723 @@ -276,10 +462,10 @@
20724 { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
20725 && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
20726 && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
20727 - && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
20728 + && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
20729
20730 # Now rename the file to the real destination.
20731 - { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
20732 + { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
20733 || {
20734 # The rename failed, perhaps because mv can't rename something else
20735 # to itself, or perhaps because mv is so ancient that it does not
20736 @@ -291,11 +477,12 @@
20737 # reasons. In this case, the final cleanup might fail but the new
20738 # file should still install successfully.
20739 {
20740 - if test -f "$dstdir/$dstfile"; then
20741 - $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
20742 - || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
20743 + if test -f "$dst"; then
20744 + $doit $rmcmd -f "$dst" 2>/dev/null \
20745 + || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
20746 + && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
20747 || {
20748 - echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
20749 + echo "$0: cannot unlink or rename $dst" >&2
20750 (exit 1); exit 1
20751 }
20752 else
20753 @@ -304,16 +491,13 @@
20754 } &&
20755
20756 # Now rename the file to the real destination.
20757 - $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
20758 + $doit $mvcmd "$dsttmp" "$dst"
20759 }
20760 - }
20761 - fi || { (exit 1); exit 1; }
20762 -done
20763 + } || exit 1
20764
20765 -# The final little trick to "correctly" pass the exit status to the exit trap.
20766 -{
20767 - (exit 0); exit 0
20768 -}
20769 + trap '' 0
20770 + fi
20771 +done
20772
20773 # Local variables:
20774 # eval: (add-hook 'write-file-hooks 'time-stamp)
20775 diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur gnome-menus-2.18.0-old/layout/Makefile.in gnome-menus-2.18.0/layout/Makefile.in
20776 --- gnome-menus-2.18.0-old/layout/Makefile.in 2007-03-12 19:54:57.000000000 +0100
20777 +++ gnome-menus-2.18.0/layout/Makefile.in 2007-04-25 07:13:33.000000000 +0200
20778 @@ -1,8 +1,8 @@
20779 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
20780 +# Makefile.in generated by automake 1.10 from Makefile.am.
20781 # @configure_input@
20782
20783 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
20784 -# 2003, 2004, 2005 Free Software Foundation, Inc.
20785 +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
20786 # This Makefile.in is free software; the Free Software Foundation
20787 # gives unlimited permission to copy and/or distribute it,
20788 # with or without modifications, as long as this notice is preserved.
20789 @@ -14,15 +14,11 @@
20790
20791 @SET_MAKE@
20792
20793 -srcdir = @srcdir@
20794 -top_srcdir = @top_srcdir@
20795 VPATH = @srcdir@
20796 pkgdatadir = $(datadir)/@PACKAGE@
20797 pkglibdir = $(libdir)/@PACKAGE@
20798 pkgincludedir = $(includedir)/@PACKAGE@
20799 -top_builddir = ..
20800 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
20801 -INSTALL = @INSTALL@
20802 install_sh_DATA = $(install_sh) -c -m 644
20803 install_sh_PROGRAM = $(install_sh) -c
20804 install_sh_SCRIPT = $(install_sh) -c
20805 @@ -61,8 +57,6 @@
20806 ACLOCAL = @ACLOCAL@
20807 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
20808 ALL_LINGUAS = @ALL_LINGUAS@
20809 -AMDEP_FALSE = @AMDEP_FALSE@
20810 -AMDEP_TRUE = @AMDEP_TRUE@
20811 AMTAR = @AMTAR@
20812 AR = @AR@
20813 AS = @AS@
20814 @@ -95,18 +89,16 @@
1756520815 EGREP = @EGREP@
1756620816 EXEEXT = @EXEEXT@
1756720817 F77 = @F77@
1757420824 GMSGFMT = @GMSGFMT@
1757520825 +GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
1757620826 +GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
17577 HAVE_PYTHON_FALSE = @HAVE_PYTHON_FALSE@
17578 HAVE_PYTHON_TRUE = @HAVE_PYTHON_TRUE@
20827 GREP = @GREP@
20828 -HAVE_PYTHON_FALSE = @HAVE_PYTHON_FALSE@
20829 -HAVE_PYTHON_TRUE = @HAVE_PYTHON_TRUE@
20830 -INOTIFY_SUPPORT_FALSE = @INOTIFY_SUPPORT_FALSE@
20831 -INOTIFY_SUPPORT_TRUE = @INOTIFY_SUPPORT_TRUE@
20832 +INSTALL = @INSTALL@
1757920833 INSTALL_DATA = @INSTALL_DATA@
17580 diff -urN gnome-menus-2.15.91.orig/libmenu/Makefile.in gnome-menus-2.15.91/libmenu/Makefile.in
17581 --- gnome-menus-2.15.91.orig/libmenu/Makefile.in 2006-08-08 00:30:54.000000000 +0200
17582 +++ gnome-menus-2.15.91/libmenu/Makefile.in 2006-08-13 18:57:14.000000000 +0200
17583 @@ -67,7 +67,7 @@
17584 am__objects_1 =
20834 INSTALL_PROGRAM = @INSTALL_PROGRAM@
20835 INSTALL_SCRIPT = @INSTALL_SCRIPT@
20836 @@ -147,11 +139,11 @@
20837 LN_S = @LN_S@
20838 LTLIBOBJS = @LTLIBOBJS@
20839 MAINT = @MAINT@
20840 -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
20841 -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
20842 MAKEINFO = @MAKEINFO@
20843 +MKDIR_P = @MKDIR_P@
20844 MKINSTALLDIRS = @MKINSTALLDIRS@
20845 MSGFMT = @MSGFMT@
20846 +MSGFMT_OPTS = @MSGFMT_OPTS@
20847 NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
20848 OBJDUMP = @OBJDUMP@
20849 OBJEXT = @OBJEXT@
20850 @@ -181,13 +173,13 @@
20851 VERSION = @VERSION@
20852 WARN_CFLAGS = @WARN_CFLAGS@
20853 XGETTEXT = @XGETTEXT@
20854 +abs_builddir = @abs_builddir@
20855 +abs_srcdir = @abs_srcdir@
20856 +abs_top_builddir = @abs_top_builddir@
20857 +abs_top_srcdir = @abs_top_srcdir@
20858 ac_ct_CC = @ac_ct_CC@
20859 ac_ct_CXX = @ac_ct_CXX@
20860 ac_ct_F77 = @ac_ct_F77@
20861 -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
20862 -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
20863 -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
20864 -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
20865 am__include = @am__include@
20866 am__leading_dot = @am__leading_dot@
20867 am__quote = @am__quote@
20868 @@ -199,6 +191,7 @@
20869 build_cpu = @build_cpu@
20870 build_os = @build_os@
20871 build_vendor = @build_vendor@
20872 +builddir = @builddir@
20873 datadir = @datadir@
20874 datarootdir = @datarootdir@
20875 docdir = @docdir@
20876 @@ -230,8 +223,11 @@
20877 pythondir = @pythondir@
20878 sbindir = @sbindir@
20879 sharedstatedir = @sharedstatedir@
20880 +srcdir = @srcdir@
20881 sysconfdir = @sysconfdir@
20882 target_alias = @target_alias@
20883 +top_builddir = @top_builddir@
20884 +top_srcdir = @top_srcdir@
20885 NULL =
20886 menudir = $(sysconfdir)/xdg/menus
20887 menu_DATA = \
20888 @@ -279,13 +275,9 @@
20889
20890 clean-libtool:
20891 -rm -rf .libs _libs
20892 -
20893 -distclean-libtool:
20894 - -rm -f libtool
20895 -uninstall-info-am:
20896 install-menuDATA: $(menu_DATA)
20897 @$(NORMAL_INSTALL)
20898 - test -z "$(menudir)" || $(mkdir_p) "$(DESTDIR)$(menudir)"
20899 + test -z "$(menudir)" || $(MKDIR_P) "$(DESTDIR)$(menudir)"
20900 @list='$(menu_DATA)'; for p in $$list; do \
20901 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
20902 f=$(am__strip_dir) \
20903 @@ -308,22 +300,21 @@
20904
20905
20906 distdir: $(DISTFILES)
20907 - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
20908 - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
20909 - list='$(DISTFILES)'; for file in $$list; do \
20910 - case $$file in \
20911 - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
20912 - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
20913 - esac; \
20914 + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
20915 + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
20916 + list='$(DISTFILES)'; \
20917 + dist_files=`for file in $$list; do echo $$file; done | \
20918 + sed -e "s|^$$srcdirstrip/||;t" \
20919 + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
20920 + case $$dist_files in \
20921 + */*) $(MKDIR_P) `echo "$$dist_files" | \
20922 + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
20923 + sort -u` ;; \
20924 + esac; \
20925 + for file in $$dist_files; do \
20926 if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
20927 - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
20928 - if test "$$dir" != "$$file" && test "$$dir" != "."; then \
20929 - dir="/$$dir"; \
20930 - $(mkdir_p) "$(distdir)$$dir"; \
20931 - else \
20932 - dir=''; \
20933 - fi; \
20934 if test -d $$d/$$file; then \
20935 + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
20936 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
20937 cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
20938 fi; \
20939 @@ -339,7 +330,7 @@
20940 all-am: Makefile $(DATA)
20941 installdirs:
20942 for dir in "$(DESTDIR)$(menudir)"; do \
20943 - test -z "$$dir" || $(mkdir_p) "$$dir"; \
20944 + test -z "$$dir" || $(MKDIR_P) "$$dir"; \
20945 done
20946 install: install-am
20947 install-exec: install-exec-am
20948 @@ -371,7 +362,7 @@
20949
20950 distclean: distclean-am
20951 -rm -f Makefile
20952 -distclean-am: clean-am distclean-generic distclean-libtool
20953 +distclean-am: clean-am distclean-generic
20954
20955 dvi: dvi-am
20956
20957 @@ -385,12 +376,20 @@
20958
20959 install-data-am: install-menuDATA
20960
20961 +install-dvi: install-dvi-am
20962 +
20963 install-exec-am:
20964
20965 +install-html: install-html-am
20966 +
20967 install-info: install-info-am
20968
20969 install-man:
20970
20971 +install-pdf: install-pdf-am
20972 +
20973 +install-ps: install-ps-am
20974 +
20975 installcheck-am:
20976
20977 maintainer-clean: maintainer-clean-am
20978 @@ -409,17 +408,21 @@
20979
20980 ps-am:
20981
20982 -uninstall-am: uninstall-info-am uninstall-menuDATA
20983 +uninstall-am: uninstall-menuDATA
20984 +
20985 +.MAKE: install-am install-strip
20986
20987 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
20988 distclean distclean-generic distclean-libtool distdir dvi \
20989 dvi-am html html-am info info-am install install-am \
20990 - install-data install-data-am install-exec install-exec-am \
20991 + install-data install-data-am install-dvi install-dvi-am \
20992 + install-exec install-exec-am install-html install-html-am \
20993 install-info install-info-am install-man install-menuDATA \
20994 + install-pdf install-pdf-am install-ps install-ps-am \
20995 install-strip installcheck installcheck-am installdirs \
20996 maintainer-clean maintainer-clean-generic mostlyclean \
20997 mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
20998 - uninstall uninstall-am uninstall-info-am uninstall-menuDATA
20999 + uninstall uninstall-am uninstall-menuDATA
21000
21001 # Tell versions [3.59,3.63) of GNU make to not export all variables.
21002 # Otherwise a system limit (for SysV at least) may be exceeded.
21003 diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur gnome-menus-2.18.0-old/libmenu/Makefile.in gnome-menus-2.18.0/libmenu/Makefile.in
21004 --- gnome-menus-2.18.0-old/libmenu/Makefile.in 2007-03-12 19:54:58.000000000 +0100
21005 +++ gnome-menus-2.18.0/libmenu/Makefile.in 2007-04-25 07:13:33.000000000 +0200
21006 @@ -1,8 +1,8 @@
21007 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
21008 +# Makefile.in generated by automake 1.10 from Makefile.am.
21009 # @configure_input@
21010
21011 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
21012 -# 2003, 2004, 2005 Free Software Foundation, Inc.
21013 +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
21014 # This Makefile.in is free software; the Free Software Foundation
21015 # gives unlimited permission to copy and/or distribute it,
21016 # with or without modifications, as long as this notice is preserved.
21017 @@ -16,15 +16,11 @@
21018
21019
21020
21021 -srcdir = @srcdir@
21022 -top_srcdir = @top_srcdir@
21023 VPATH = @srcdir@
21024 pkgdatadir = $(datadir)/@PACKAGE@
21025 pkglibdir = $(libdir)/@PACKAGE@
21026 pkgincludedir = $(includedir)/@PACKAGE@
21027 -top_builddir = ..
21028 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
21029 -INSTALL = @INSTALL@
21030 install_sh_DATA = $(install_sh) -c -m 644
21031 install_sh_PROGRAM = $(install_sh) -c
21032 install_sh_SCRIPT = $(install_sh) -c
21033 @@ -69,25 +65,29 @@
21034 entry-directories.h gmenu-tree.c gmenu-tree.h menu-layout.c \
21035 menu-layout.h menu-monitor.c menu-monitor.h \
21036 menu-monitor-backend.h menu-util.c menu-util.h \
21037 - menu-monitor-fam.c menu-monitor-inotify.c
21038 -@INOTIFY_SUPPORT_FALSE@am__objects_1 = menu-monitor-fam.lo
21039 + menu-monitor-gnomevfs.c menu-monitor-inotify.c
21040 +@INOTIFY_SUPPORT_FALSE@am__objects_1 = menu-monitor-gnomevfs.lo
21041 @INOTIFY_SUPPORT_TRUE@am__objects_1 = menu-monitor-inotify.lo
21042 am__objects_2 =
1758521043 am_libgnome_menu_la_OBJECTS = canonicalize.lo desktop-entries.lo \
1758621044 entry-directories.lo gmenu-tree.lo menu-layout.lo \
17587 - menu-monitor.lo menu-monitor-fam.lo menu-util.lo \
17588 + menu-monitor.lo menu-monitor-gnomevfs.lo menu-util.lo \
17589 $(am__objects_1)
21045 menu-monitor.lo menu-util.lo $(am__objects_1) $(am__objects_2)
1759021046 libgnome_menu_la_OBJECTS = $(am_libgnome_menu_la_OBJECTS)
17591 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
17592 @@ -127,13 +127,14 @@
21047 -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
21048 +libgnome_menu_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
21049 + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
21050 + $(libgnome_menu_la_LDFLAGS) $(LDFLAGS) -o $@
21051 +DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
21052 depcomp = $(SHELL) $(top_srcdir)/depcomp
21053 am__depfiles_maybe = depfiles
21054 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
21055 $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
21056 -LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
21057 - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
21058 - $(AM_CFLAGS) $(CFLAGS)
21059 +LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
21060 + --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
21061 + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
21062 CCLD = $(CC)
21063 -LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
21064 - $(AM_LDFLAGS) $(LDFLAGS) -o $@
21065 +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
21066 + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
21067 + $(LDFLAGS) -o $@
21068 SOURCES = $(libgnome_menu_la_SOURCES)
21069 DIST_SOURCES = $(am__libgnome_menu_la_SOURCES_DIST)
21070 pkgconfigDATA_INSTALL = $(INSTALL_DATA)
21071 @@ -100,8 +100,6 @@
21072 ACLOCAL = @ACLOCAL@
21073 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
21074 ALL_LINGUAS = @ALL_LINGUAS@
21075 -AMDEP_FALSE = @AMDEP_FALSE@
21076 -AMDEP_TRUE = @AMDEP_TRUE@
21077 AMTAR = @AMTAR@
21078 AR = @AR@
21079 AS = @AS@
21080 @@ -134,18 +132,16 @@
1759321081 EGREP = @EGREP@
1759421082 EXEEXT = @EXEEXT@
1759521083 F77 = @F77@
1760221090 GMSGFMT = @GMSGFMT@
1760321091 +GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
1760421092 +GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
17605 HAVE_PYTHON_FALSE = @HAVE_PYTHON_FALSE@
17606 HAVE_PYTHON_TRUE = @HAVE_PYTHON_TRUE@
21093 GREP = @GREP@
21094 -HAVE_PYTHON_FALSE = @HAVE_PYTHON_FALSE@
21095 -HAVE_PYTHON_TRUE = @HAVE_PYTHON_TRUE@
21096 -INOTIFY_SUPPORT_FALSE = @INOTIFY_SUPPORT_FALSE@
21097 -INOTIFY_SUPPORT_TRUE = @INOTIFY_SUPPORT_TRUE@
21098 +INSTALL = @INSTALL@
1760721099 INSTALL_DATA = @INSTALL_DATA@
17608 @@ -265,6 +266,7 @@
21100 INSTALL_PROGRAM = @INSTALL_PROGRAM@
21101 INSTALL_SCRIPT = @INSTALL_SCRIPT@
21102 @@ -186,11 +182,11 @@
21103 LN_S = @LN_S@
21104 LTLIBOBJS = @LTLIBOBJS@
21105 MAINT = @MAINT@
21106 -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
21107 -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
21108 MAKEINFO = @MAKEINFO@
21109 +MKDIR_P = @MKDIR_P@
21110 MKINSTALLDIRS = @MKINSTALLDIRS@
21111 MSGFMT = @MSGFMT@
21112 +MSGFMT_OPTS = @MSGFMT_OPTS@
21113 NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
21114 OBJDUMP = @OBJDUMP@
21115 OBJEXT = @OBJEXT@
21116 @@ -220,13 +216,13 @@
21117 VERSION = @VERSION@
21118 WARN_CFLAGS = @WARN_CFLAGS@
21119 XGETTEXT = @XGETTEXT@
21120 +abs_builddir = @abs_builddir@
21121 +abs_srcdir = @abs_srcdir@
21122 +abs_top_builddir = @abs_top_builddir@
21123 +abs_top_srcdir = @abs_top_srcdir@
21124 ac_ct_CC = @ac_ct_CC@
21125 ac_ct_CXX = @ac_ct_CXX@
21126 ac_ct_F77 = @ac_ct_F77@
21127 -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
21128 -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
21129 -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
21130 -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
21131 am__include = @am__include@
21132 am__leading_dot = @am__leading_dot@
21133 am__quote = @am__quote@
21134 @@ -238,6 +234,7 @@
21135 build_cpu = @build_cpu@
21136 build_os = @build_os@
21137 build_vendor = @build_vendor@
21138 +builddir = @builddir@
21139 datadir = @datadir@
21140 datarootdir = @datarootdir@
21141 docdir = @docdir@
21142 @@ -269,22 +266,26 @@
21143 pythondir = @pythondir@
21144 sbindir = @sbindir@
21145 sharedstatedir = @sharedstatedir@
21146 +srcdir = @srcdir@
21147 sysconfdir = @sysconfdir@
21148 target_alias = @target_alias@
21149 +top_builddir = @top_builddir@
21150 +top_srcdir = @top_srcdir@
21151 NULL =
1760921152 INCLUDES = \
1761021153 -DGMENU_I_KNOW_THIS_IS_UNSTABLE \
1761121154 $(GLIB_CFLAGS) \
1761321156 $(DISABLE_DEPRECATED_CFLAGS) \
1761421157 $(DEBUG_CFLAGS) \
1761521158 $(WARN_CFLAGS) \
17616 @@ -285,14 +287,14 @@
17617 menu-monitor.c \
17618 menu-monitor.h \
17619 menu-monitor-backend.h \
17620 - menu-monitor-fam.c \
17621 + menu-monitor-gnomevfs.c \
17622 menu-util.c \
17623 menu-util.h \
1762421159 $(NULL)
21160
21161 lib_LTLIBRARIES = libgnome-menu.la
21162 -@INOTIFY_SUPPORT_FALSE@MONITOR_BACKEND_SOURCES = menu-monitor-fam.c
21163 +@INOTIFY_SUPPORT_FALSE@MONITOR_BACKEND_SOURCES = menu-monitor-gnomevfs.c
21164 @INOTIFY_SUPPORT_TRUE@MONITOR_BACKEND_SOURCES = menu-monitor-inotify.c
21165 -@INOTIFY_SUPPORT_FALSE@MONITOR_BACKEND_EX_DIST = menu-monitor-inotify.c
21166 -@INOTIFY_SUPPORT_TRUE@MONITOR_BACKEND_EX_DIST = menu-monitor-fam.c
21167 +@INOTIFY_SUPPORT_FALSE@MONITOR_BACKEND_EX_DIST = menu-monitor-inotify.c menu-monitor-fam.c
21168 +@INOTIFY_SUPPORT_TRUE@MONITOR_BACKEND_EX_DIST = menu-monitor-gnomevfs.c menu-monitor-fam.c
21169 libgnome_menu_la_SOURCES = \
21170 canonicalize.c \
21171 canonicalize.h \
21172 @@ -306,7 +307,7 @@
1762521173
1762621174 libgnome_menu_la_LIBADD = \
1762721175 $(GLIB_LIBS) \
1762821176 - $(FAM_LIBS) \
17629 + $(GNOMEVFS_LIBS) \
21177 + $(GNOMEVFS_LIBS) \
1763021178 $(NULL)
1763121179
1763221180 libgnome_menu_la_LDFLAGS = \
17633 @@ -391,7 +393,7 @@
21181 @@ -367,7 +368,7 @@
21182 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
21183 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
21184 @$(NORMAL_INSTALL)
21185 - test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
21186 + test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
21187 @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
21188 if test -f $$p; then \
21189 f=$(am__strip_dir) \
21190 @@ -378,7 +379,7 @@
21191
21192 uninstall-libLTLIBRARIES:
21193 @$(NORMAL_UNINSTALL)
21194 - @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
21195 + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
21196 p=$(am__strip_dir) \
21197 echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
21198 $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
21199 @@ -393,7 +394,7 @@
21200 rm -f "$${dir}/so_locations"; \
21201 done
21202 libgnome-menu.la: $(libgnome_menu_la_OBJECTS) $(libgnome_menu_la_DEPENDENCIES)
21203 - $(LINK) -rpath $(libdir) $(libgnome_menu_la_LDFLAGS) $(libgnome_menu_la_OBJECTS) $(libgnome_menu_la_LIBADD) $(LIBS)
21204 + $(libgnome_menu_la_LINK) -rpath $(libdir) $(libgnome_menu_la_OBJECTS) $(libgnome_menu_la_LIBADD) $(LIBS)
21205
21206 mostlyclean-compile:
21207 -rm -f *.$(OBJEXT)
21208 @@ -406,28 +407,28 @@
1763421209 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/entry-directories.Plo@am__quote@
1763521210 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmenu-tree.Plo@am__quote@
1763621211 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/menu-layout.Plo@am__quote@
1763721212 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/menu-monitor-fam.Plo@am__quote@
1763821213 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/menu-monitor-gnomevfs.Plo@am__quote@
21214 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/menu-monitor-inotify.Plo@am__quote@
1763921215 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/menu-monitor.Plo@am__quote@
1764021216 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/menu-util.Plo@am__quote@
1764121217
17642 diff -urN gnome-menus-2.15.91.orig/ltmain.sh gnome-menus-2.15.91/ltmain.sh
17643 --- gnome-menus-2.15.91.orig/ltmain.sh 2006-04-29 10:39:27.000000000 +0200
17644 +++ gnome-menus-2.15.91/ltmain.sh 2006-03-11 19:49:04.000000000 +0100
21218 .c.o:
21219 -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
21220 -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
21221 +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
21222 +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
21223 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
21224 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
21225 @am__fastdepCC_FALSE@ $(COMPILE) -c $<
21226
21227 .c.obj:
21228 -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
21229 -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
21230 +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
21231 +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
21232 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
21233 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
21234 @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
21235
21236 .c.lo:
21237 -@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
21238 -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
21239 +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
21240 +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
21241 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
21242 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
21243 @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
21244 @@ -437,13 +438,9 @@
21245
21246 clean-libtool:
21247 -rm -rf .libs _libs
21248 -
21249 -distclean-libtool:
21250 - -rm -f libtool
21251 -uninstall-info-am:
21252 install-pkgconfigDATA: $(pkgconfig_DATA)
21253 @$(NORMAL_INSTALL)
21254 - test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"
21255 + test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
21256 @list='$(pkgconfig_DATA)'; for p in $$list; do \
21257 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
21258 f=$(am__strip_dir) \
21259 @@ -460,7 +457,7 @@
21260 done
21261 install-libgnome_menu_includeHEADERS: $(libgnome_menu_include_HEADERS)
21262 @$(NORMAL_INSTALL)
21263 - test -z "$(libgnome_menu_includedir)" || $(mkdir_p) "$(DESTDIR)$(libgnome_menu_includedir)"
21264 + test -z "$(libgnome_menu_includedir)" || $(MKDIR_P) "$(DESTDIR)$(libgnome_menu_includedir)"
21265 @list='$(libgnome_menu_include_HEADERS)'; for p in $$list; do \
21266 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
21267 f=$(am__strip_dir) \
21268 @@ -525,22 +522,21 @@
21269 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
21270
21271 distdir: $(DISTFILES)
21272 - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
21273 - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
21274 - list='$(DISTFILES)'; for file in $$list; do \
21275 - case $$file in \
21276 - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
21277 - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
21278 - esac; \
21279 + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
21280 + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
21281 + list='$(DISTFILES)'; \
21282 + dist_files=`for file in $$list; do echo $$file; done | \
21283 + sed -e "s|^$$srcdirstrip/||;t" \
21284 + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
21285 + case $$dist_files in \
21286 + */*) $(MKDIR_P) `echo "$$dist_files" | \
21287 + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
21288 + sort -u` ;; \
21289 + esac; \
21290 + for file in $$dist_files; do \
21291 if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
21292 - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
21293 - if test "$$dir" != "$$file" && test "$$dir" != "."; then \
21294 - dir="/$$dir"; \
21295 - $(mkdir_p) "$(distdir)$$dir"; \
21296 - else \
21297 - dir=''; \
21298 - fi; \
21299 if test -d $$d/$$file; then \
21300 + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
21301 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
21302 cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
21303 fi; \
21304 @@ -556,7 +552,7 @@
21305 all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
21306 installdirs:
21307 for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(libgnome_menu_includedir)"; do \
21308 - test -z "$$dir" || $(mkdir_p) "$$dir"; \
21309 + test -z "$$dir" || $(MKDIR_P) "$$dir"; \
21310 done
21311 install: install-am
21312 install-exec: install-exec-am
21313 @@ -591,7 +587,7 @@
21314 -rm -rf ./$(DEPDIR)
21315 -rm -f Makefile
21316 distclean-am: clean-am distclean-compile distclean-generic \
21317 - distclean-libtool distclean-tags
21318 + distclean-tags
21319
21320 dvi: dvi-am
21321
21322 @@ -606,12 +602,20 @@
21323 install-data-am: install-libgnome_menu_includeHEADERS \
21324 install-pkgconfigDATA
21325
21326 +install-dvi: install-dvi-am
21327 +
21328 install-exec-am: install-libLTLIBRARIES
21329
21330 +install-html: install-html-am
21331 +
21332 install-info: install-info-am
21333
21334 install-man:
21335
21336 +install-pdf: install-pdf-am
21337 +
21338 +install-ps: install-ps-am
21339 +
21340 installcheck-am:
21341
21342 maintainer-clean: maintainer-clean-am
21343 @@ -632,22 +636,25 @@
21344
21345 ps-am:
21346
21347 -uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
21348 +uninstall-am: uninstall-libLTLIBRARIES \
21349 uninstall-libgnome_menu_includeHEADERS uninstall-pkgconfigDATA
21350
21351 +.MAKE: install-am install-strip
21352 +
21353 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
21354 clean-libLTLIBRARIES clean-libtool ctags distclean \
21355 distclean-compile distclean-generic distclean-libtool \
21356 distclean-tags distdir dvi dvi-am html html-am info info-am \
21357 - install install-am install-data install-data-am install-exec \
21358 - install-exec-am install-info install-info-am \
21359 + install install-am install-data install-data-am install-dvi \
21360 + install-dvi-am install-exec install-exec-am install-html \
21361 + install-html-am install-info install-info-am \
21362 install-libLTLIBRARIES install-libgnome_menu_includeHEADERS \
21363 - install-man install-pkgconfigDATA install-strip installcheck \
21364 + install-man install-pdf install-pdf-am install-pkgconfigDATA \
21365 + install-ps install-ps-am install-strip installcheck \
21366 installcheck-am installdirs maintainer-clean \
21367 maintainer-clean-generic mostlyclean mostlyclean-compile \
21368 mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
21369 - tags uninstall uninstall-am uninstall-info-am \
21370 - uninstall-libLTLIBRARIES \
21371 + tags uninstall uninstall-am uninstall-libLTLIBRARIES \
21372 uninstall-libgnome_menu_includeHEADERS uninstall-pkgconfigDATA
21373
21374 # Tell versions [3.59,3.63) of GNU make to not export all variables.
21375 diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur gnome-menus-2.18.0-old/ltmain.sh gnome-menus-2.18.0/ltmain.sh
21376 --- gnome-menus-2.18.0-old/ltmain.sh 2007-02-17 10:05:30.000000000 +0100
21377 +++ gnome-menus-2.18.0/ltmain.sh 2006-06-19 20:36:49.000000000 +0200
1764521378 @@ -43,7 +43,7 @@
1764621379
1764721380 PROGRAM=ltmain.sh
1767521408 esac
1767621409 ;;
1767721410 no)
17678 diff -urN gnome-menus-2.15.91.orig/python/Makefile.in gnome-menus-2.15.91/python/Makefile.in
17679 --- gnome-menus-2.15.91.orig/python/Makefile.in 2006-08-08 00:30:55.000000000 +0200
17680 +++ gnome-menus-2.15.91/python/Makefile.in 2006-08-13 18:57:14.000000000 +0200
17681 @@ -113,13 +113,14 @@
21411 diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur gnome-menus-2.18.0-old/Makefile.in gnome-menus-2.18.0/Makefile.in
21412 --- gnome-menus-2.18.0-old/Makefile.in 2007-03-12 19:55:05.000000000 +0100
21413 +++ gnome-menus-2.18.0/Makefile.in 2007-04-25 07:13:33.000000000 +0200
21414 @@ -1,8 +1,8 @@
21415 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
21416 +# Makefile.in generated by automake 1.10 from Makefile.am.
21417 # @configure_input@
21418
21419 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
21420 -# 2003, 2004, 2005 Free Software Foundation, Inc.
21421 +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
21422 # This Makefile.in is free software; the Free Software Foundation
21423 # gives unlimited permission to copy and/or distribute it,
21424 # with or without modifications, as long as this notice is preserved.
21425 @@ -13,15 +13,11 @@
21426 # PARTICULAR PURPOSE.
21427
21428 @SET_MAKE@
21429 -srcdir = @srcdir@
21430 -top_srcdir = @top_srcdir@
21431 VPATH = @srcdir@
21432 pkgdatadir = $(datadir)/@PACKAGE@
21433 pkglibdir = $(libdir)/@PACKAGE@
21434 pkgincludedir = $(includedir)/@PACKAGE@
21435 -top_builddir = .
21436 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
21437 -INSTALL = @INSTALL@
21438 install_sh_DATA = $(install_sh) -c -m 644
21439 install_sh_PROGRAM = $(install_sh) -c
21440 install_sh_SCRIPT = $(install_sh) -c
21441 @@ -35,19 +31,19 @@
21442 POST_UNINSTALL = :
21443 build_triplet = @build@
21444 host_triplet = @host@
21445 +subdir = .
21446 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
21447 $(srcdir)/Makefile.in $(srcdir)/config.h.in \
21448 $(top_srcdir)/configure AUTHORS COPYING COPYING.LIB ChangeLog \
21449 INSTALL NEWS config.guess config.sub depcomp install-sh \
21450 ltmain.sh missing mkinstalldirs py-compile
21451 -subdir = .
21452 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
21453 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
21454 $(top_srcdir)/configure.in
21455 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
21456 $(ACLOCAL_M4)
21457 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
21458 - configure.lineno configure.status.lineno
21459 + configure.lineno config.status.lineno
21460 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
21461 CONFIG_HEADER = config.h
21462 CONFIG_CLEAN_FILES =
21463 @@ -55,10 +51,13 @@
21464 DIST_SOURCES =
21465 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
21466 html-recursive info-recursive install-data-recursive \
21467 - install-exec-recursive install-info-recursive \
21468 - install-recursive installcheck-recursive installdirs-recursive \
21469 - pdf-recursive ps-recursive uninstall-info-recursive \
21470 - uninstall-recursive
21471 + install-dvi-recursive install-exec-recursive \
21472 + install-html-recursive install-info-recursive \
21473 + install-pdf-recursive install-ps-recursive install-recursive \
21474 + installcheck-recursive installdirs-recursive pdf-recursive \
21475 + ps-recursive uninstall-recursive
21476 +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
21477 + distclean-recursive maintainer-clean-recursive
21478 ETAGS = etags
21479 CTAGS = ctags
21480 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
21481 @@ -75,8 +74,6 @@
21482 ACLOCAL = @ACLOCAL@
21483 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
21484 ALL_LINGUAS = @ALL_LINGUAS@
21485 -AMDEP_FALSE = @AMDEP_FALSE@
21486 -AMDEP_TRUE = @AMDEP_TRUE@
21487 AMTAR = @AMTAR@
21488 AR = @AR@
21489 AS = @AS@
21490 @@ -109,18 +106,16 @@
1768221491 EGREP = @EGREP@
1768321492 EXEEXT = @EXEEXT@
1768421493 F77 = @F77@
1769121500 GMSGFMT = @GMSGFMT@
1769221501 +GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
1769321502 +GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
17694 HAVE_PYTHON_FALSE = @HAVE_PYTHON_FALSE@
17695 HAVE_PYTHON_TRUE = @HAVE_PYTHON_TRUE@
21503 GREP = @GREP@
21504 -HAVE_PYTHON_FALSE = @HAVE_PYTHON_FALSE@
21505 -HAVE_PYTHON_TRUE = @HAVE_PYTHON_TRUE@
21506 -INOTIFY_SUPPORT_FALSE = @INOTIFY_SUPPORT_FALSE@
21507 -INOTIFY_SUPPORT_TRUE = @INOTIFY_SUPPORT_TRUE@
21508 +INSTALL = @INSTALL@
1769621509 INSTALL_DATA = @INSTALL_DATA@
17697 diff -urN gnome-menus-2.15.91.orig/simple-editor/GMenuSimpleEditor/Makefile.in gnome-menus-2.15.91/simple-editor/GMenuSimpleEditor/Makefile.in
17698 --- gnome-menus-2.15.91.orig/simple-editor/GMenuSimpleEditor/Makefile.in 2006-08-08 00:30:55.000000000 +0200
17699 +++ gnome-menus-2.15.91/simple-editor/GMenuSimpleEditor/Makefile.in 2006-08-13 18:57:14.000000000 +0200
17700 @@ -96,13 +96,14 @@
21510 INSTALL_PROGRAM = @INSTALL_PROGRAM@
21511 INSTALL_SCRIPT = @INSTALL_SCRIPT@
21512 @@ -161,11 +156,11 @@
21513 LN_S = @LN_S@
21514 LTLIBOBJS = @LTLIBOBJS@
21515 MAINT = @MAINT@
21516 -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
21517 -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
21518 MAKEINFO = @MAKEINFO@
21519 +MKDIR_P = @MKDIR_P@
21520 MKINSTALLDIRS = @MKINSTALLDIRS@
21521 MSGFMT = @MSGFMT@
21522 +MSGFMT_OPTS = @MSGFMT_OPTS@
21523 NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
21524 OBJDUMP = @OBJDUMP@
21525 OBJEXT = @OBJEXT@
21526 @@ -195,13 +190,13 @@
21527 VERSION = @VERSION@
21528 WARN_CFLAGS = @WARN_CFLAGS@
21529 XGETTEXT = @XGETTEXT@
21530 +abs_builddir = @abs_builddir@
21531 +abs_srcdir = @abs_srcdir@
21532 +abs_top_builddir = @abs_top_builddir@
21533 +abs_top_srcdir = @abs_top_srcdir@
21534 ac_ct_CC = @ac_ct_CC@
21535 ac_ct_CXX = @ac_ct_CXX@
21536 ac_ct_F77 = @ac_ct_F77@
21537 -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
21538 -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
21539 -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
21540 -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
21541 am__include = @am__include@
21542 am__leading_dot = @am__leading_dot@
21543 am__quote = @am__quote@
21544 @@ -213,6 +208,7 @@
21545 build_cpu = @build_cpu@
21546 build_os = @build_os@
21547 build_vendor = @build_vendor@
21548 +builddir = @builddir@
21549 datadir = @datadir@
21550 datarootdir = @datarootdir@
21551 docdir = @docdir@
21552 @@ -244,8 +240,11 @@
21553 pythondir = @pythondir@
21554 sbindir = @sbindir@
21555 sharedstatedir = @sharedstatedir@
21556 +srcdir = @srcdir@
21557 sysconfdir = @sysconfdir@
21558 target_alias = @target_alias@
21559 +top_builddir = @top_builddir@
21560 +top_srcdir = @top_srcdir@
21561 NULL =
21562 @HAVE_PYTHON_TRUE@PYTHON_SUBDIRS = python simple-editor
21563 ALL_SUBDIRS = \
21564 @@ -312,7 +311,7 @@
21565 config.h: stamp-h1
21566 @if test ! -f $@; then \
21567 rm -f stamp-h1; \
21568 - $(MAKE) stamp-h1; \
21569 + $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
21570 else :; fi
21571
21572 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
21573 @@ -334,7 +333,6 @@
21574
21575 distclean-libtool:
21576 -rm -f libtool
21577 -uninstall-info-am:
21578
21579 # This directory's subdirectories are mostly independent; you can cd
21580 # into them and run `make' without going through this Makefile.
21581 @@ -367,8 +365,7 @@
21582 $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
21583 fi; test -z "$$fail"
21584
21585 -mostlyclean-recursive clean-recursive distclean-recursive \
21586 -maintainer-clean-recursive:
21587 +$(RECURSIVE_CLEAN_TARGETS):
21588 @failcom='exit 1'; \
21589 for f in x $$MAKEFLAGS; do \
21590 case $$f in \
21591 @@ -470,24 +467,22 @@
21592
21593 distdir: $(DISTFILES)
21594 $(am__remove_distdir)
21595 - mkdir $(distdir)
21596 - $(mkdir_p) $(distdir)/libmenu $(distdir)/po
21597 - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
21598 - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
21599 - list='$(DISTFILES)'; for file in $$list; do \
21600 - case $$file in \
21601 - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
21602 - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
21603 - esac; \
21604 + test -d $(distdir) || mkdir $(distdir)
21605 + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
21606 + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
21607 + list='$(DISTFILES)'; \
21608 + dist_files=`for file in $$list; do echo $$file; done | \
21609 + sed -e "s|^$$srcdirstrip/||;t" \
21610 + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
21611 + case $$dist_files in \
21612 + */*) $(MKDIR_P) `echo "$$dist_files" | \
21613 + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
21614 + sort -u` ;; \
21615 + esac; \
21616 + for file in $$dist_files; do \
21617 if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
21618 - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
21619 - if test "$$dir" != "$$file" && test "$$dir" != "."; then \
21620 - dir="/$$dir"; \
21621 - $(mkdir_p) "$(distdir)$$dir"; \
21622 - else \
21623 - dir=''; \
21624 - fi; \
21625 if test -d $$d/$$file; then \
21626 + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
21627 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
21628 cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
21629 fi; \
21630 @@ -501,7 +496,7 @@
21631 list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
21632 if test "$$subdir" = .; then :; else \
21633 test -d "$(distdir)/$$subdir" \
21634 - || $(mkdir_p) "$(distdir)/$$subdir" \
21635 + || $(MKDIR_P) "$(distdir)/$$subdir" \
21636 || exit 1; \
21637 distdir=`$(am__cd) $(distdir) && pwd`; \
21638 top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
21639 @@ -509,6 +504,8 @@
21640 $(MAKE) $(AM_MAKEFLAGS) \
21641 top_distdir="$$top_distdir" \
21642 distdir="$$distdir/$$subdir" \
21643 + am__remove_distdir=: \
21644 + am__skip_length_check=: \
21645 distdir) \
21646 || exit 1; \
21647 fi; \
21648 @@ -516,7 +513,7 @@
21649 -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
21650 ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
21651 ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
21652 - ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
21653 + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
21654 || chmod -R a+r $(distdir)
21655 dist-gzip: distdir
21656 tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
21657 @@ -591,7 +588,7 @@
21658 $(am__remove_distdir)
21659 @(echo "$(distdir) archives ready for distribution: "; \
21660 list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
21661 - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
21662 + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
21663 distuninstallcheck:
21664 @cd $(distuninstallcheck_dir) \
21665 && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
21666 @@ -662,12 +659,20 @@
21667
21668 install-data-am:
21669
21670 +install-dvi: install-dvi-recursive
21671 +
21672 install-exec-am:
21673
21674 +install-html: install-html-recursive
21675 +
21676 install-info: install-info-recursive
21677
21678 install-man:
21679
21680 +install-pdf: install-pdf-recursive
21681 +
21682 +install-ps: install-ps-recursive
21683 +
21684 installcheck-am:
21685
21686 maintainer-clean: maintainer-clean-recursive
21687 @@ -688,24 +693,26 @@
21688
21689 ps-am:
21690
21691 -uninstall-am: uninstall-info-am
21692 +uninstall-am:
21693
21694 -uninstall-info: uninstall-info-recursive
21695 +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
21696 + install-strip
21697
21698 -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
21699 - check-am clean clean-generic clean-libtool clean-recursive \
21700 - ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
21701 - dist-shar dist-tarZ dist-zip distcheck distclean \
21702 +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
21703 + all all-am am--refresh check check-am clean clean-generic \
21704 + clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
21705 + dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
21706 distclean-generic distclean-hdr distclean-libtool \
21707 - distclean-recursive distclean-tags distcleancheck distdir \
21708 - distuninstallcheck dvi dvi-am html html-am info info-am \
21709 - install install-am install-data install-data-am install-exec \
21710 - install-exec-am install-info install-info-am install-man \
21711 - install-strip installcheck installcheck-am installdirs \
21712 - installdirs-am maintainer-clean maintainer-clean-generic \
21713 - maintainer-clean-recursive mostlyclean mostlyclean-generic \
21714 - mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
21715 - tags tags-recursive uninstall uninstall-am uninstall-info-am
21716 + distclean-tags distcleancheck distdir distuninstallcheck dvi \
21717 + dvi-am html html-am info info-am install install-am \
21718 + install-data install-data-am install-dvi install-dvi-am \
21719 + install-exec install-exec-am install-html install-html-am \
21720 + install-info install-info-am install-man install-pdf \
21721 + install-pdf-am install-ps install-ps-am install-strip \
21722 + installcheck installcheck-am installdirs installdirs-am \
21723 + maintainer-clean maintainer-clean-generic mostlyclean \
21724 + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
21725 + tags tags-recursive uninstall uninstall-am
21726
21727 # Tell versions [3.59,3.63) of GNU make to not export all variables.
21728 # Otherwise a system limit (for SysV at least) may be exceeded.
21729 diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur gnome-menus-2.18.0-old/missing gnome-menus-2.18.0/missing
21730 --- gnome-menus-2.18.0-old/missing 2007-03-12 19:54:55.000000000 +0100
21731 +++ gnome-menus-2.18.0/missing 2007-04-25 07:13:32.000000000 +0200
21732 @@ -1,9 +1,9 @@
21733 #! /bin/sh
21734 # Common stub for a few missing GNU programs while installing.
21735
21736 -scriptversion=2005-06-08.21
21737 +scriptversion=2006-05-10.23
21738
21739 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
21740 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
21741 # Free Software Foundation, Inc.
21742 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
21743
21744 @@ -33,6 +33,8 @@
21745 fi
21746
21747 run=:
21748 +sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
21749 +sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
21750
21751 # In the cases where this matters, `missing' is being run in the
21752 # srcdir already.
21753 @@ -44,7 +46,7 @@
21754
21755 msg="missing on your system"
21756
21757 -case "$1" in
21758 +case $1 in
21759 --run)
21760 # Try to run requested program, and just exit if it succeeds.
21761 run=
21762 @@ -77,6 +79,7 @@
21763 aclocal touch file \`aclocal.m4'
21764 autoconf touch file \`configure'
21765 autoheader touch file \`config.h.in'
21766 + autom4te touch the output file, or create a stub one
21767 automake touch all \`Makefile.in' files
21768 bison create \`y.tab.[ch]', if possible, from existing .[ch]
21769 flex create \`lex.yy.c', if possible, from existing .c
21770 @@ -106,7 +109,7 @@
21771 # Now exit if we have it, but it failed. Also exit now if we
21772 # don't have it and --version was passed (most likely to detect
21773 # the program).
21774 -case "$1" in
21775 +case $1 in
21776 lex|yacc)
21777 # Not GNU programs, they don't have --version.
21778 ;;
21779 @@ -135,7 +138,7 @@
21780
21781 # If it does not exist, or fails to run (possibly an outdated version),
21782 # try to emulate it.
21783 -case "$1" in
21784 +case $1 in
21785 aclocal*)
21786 echo 1>&2 "\
21787 WARNING: \`$1' is $msg. You should only need it if
21788 @@ -164,7 +167,7 @@
21789 test -z "$files" && files="config.h"
21790 touch_files=
21791 for f in $files; do
21792 - case "$f" in
21793 + case $f in
21794 *:*) touch_files="$touch_files "`echo "$f" |
21795 sed -e 's/^[^:]*://' -e 's/:.*//'`;;
21796 *) touch_files="$touch_files $f.in";;
21797 @@ -192,8 +195,8 @@
21798 You can get \`$1' as part of \`Autoconf' from any GNU
21799 archive site."
21800
21801 - file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
21802 - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
21803 + file=`echo "$*" | sed -n "$sed_output"`
21804 + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
21805 if test -f "$file"; then
21806 touch $file
21807 else
21808 @@ -214,25 +217,25 @@
21809 in order for those modifications to take effect. You can get
21810 \`Bison' from any GNU archive site."
21811 rm -f y.tab.c y.tab.h
21812 - if [ $# -ne 1 ]; then
21813 + if test $# -ne 1; then
21814 eval LASTARG="\${$#}"
21815 - case "$LASTARG" in
21816 + case $LASTARG in
21817 *.y)
21818 SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
21819 - if [ -f "$SRCFILE" ]; then
21820 + if test -f "$SRCFILE"; then
21821 cp "$SRCFILE" y.tab.c
21822 fi
21823 SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
21824 - if [ -f "$SRCFILE" ]; then
21825 + if test -f "$SRCFILE"; then
21826 cp "$SRCFILE" y.tab.h
21827 fi
21828 ;;
21829 esac
21830 fi
21831 - if [ ! -f y.tab.h ]; then
21832 + if test ! -f y.tab.h; then
21833 echo >y.tab.h
21834 fi
21835 - if [ ! -f y.tab.c ]; then
21836 + if test ! -f y.tab.c; then
21837 echo 'main() { return 0; }' >y.tab.c
21838 fi
21839 ;;
21840 @@ -244,18 +247,18 @@
21841 in order for those modifications to take effect. You can get
21842 \`Flex' from any GNU archive site."
21843 rm -f lex.yy.c
21844 - if [ $# -ne 1 ]; then
21845 + if test $# -ne 1; then
21846 eval LASTARG="\${$#}"
21847 - case "$LASTARG" in
21848 + case $LASTARG in
21849 *.l)
21850 SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
21851 - if [ -f "$SRCFILE" ]; then
21852 + if test -f "$SRCFILE"; then
21853 cp "$SRCFILE" lex.yy.c
21854 fi
21855 ;;
21856 esac
21857 fi
21858 - if [ ! -f lex.yy.c ]; then
21859 + if test ! -f lex.yy.c; then
21860 echo 'main() { return 0; }' >lex.yy.c
21861 fi
21862 ;;
21863 @@ -267,11 +270,9 @@
21864 \`Help2man' package in order for those modifications to take
21865 effect. You can get \`Help2man' from any GNU archive site."
21866
21867 - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
21868 - if test -z "$file"; then
21869 - file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
21870 - fi
21871 - if [ -f "$file" ]; then
21872 + file=`echo "$*" | sed -n "$sed_output"`
21873 + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
21874 + if test -f "$file"; then
21875 touch $file
21876 else
21877 test -z "$file" || exec >$file
21878 @@ -289,11 +290,17 @@
21879 DU, IRIX). You might want to install the \`Texinfo' package or
21880 the \`GNU make' package. Grab either from any GNU archive site."
21881 # The file to touch is that specified with -o ...
21882 - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
21883 + file=`echo "$*" | sed -n "$sed_output"`
21884 + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
21885 if test -z "$file"; then
21886 # ... or it is the one specified with @setfilename ...
21887 infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
21888 - file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
21889 + file=`sed -n '
21890 + /^@setfilename/{
21891 + s/.* \([^ ]*\) *$/\1/
21892 + p
21893 + q
21894 + }' $infile`
21895 # ... or it is derived from the source name (dir/f.texi becomes f.info)
21896 test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
21897 fi
21898 @@ -317,13 +324,13 @@
21899 fi
21900 firstarg="$1"
21901 if shift; then
21902 - case "$firstarg" in
21903 + case $firstarg in
21904 *o*)
21905 firstarg=`echo "$firstarg" | sed s/o//`
21906 tar "$firstarg" "$@" && exit 0
21907 ;;
21908 esac
21909 - case "$firstarg" in
21910 + case $firstarg in
21911 *h*)
21912 firstarg=`echo "$firstarg" | sed s/h//`
21913 tar "$firstarg" "$@" && exit 0
21914 diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur gnome-menus-2.18.0-old/mkinstalldirs gnome-menus-2.18.0/mkinstalldirs
21915 --- gnome-menus-2.18.0-old/mkinstalldirs 2007-03-12 19:55:04.000000000 +0100
21916 +++ gnome-menus-2.18.0/mkinstalldirs 2007-04-25 07:13:33.000000000 +0200
21917 @@ -1,7 +1,7 @@
21918 #! /bin/sh
21919 # mkinstalldirs --- make directory hierarchy
21920
21921 -scriptversion=2005-06-29.22
21922 +scriptversion=2006-05-11.19
21923
21924 # Original author: Noah Friedman <friedman@prep.ai.mit.edu>
21925 # Created: 1993-05-16
21926 @@ -11,6 +11,9 @@
21927 # bugs to <bug-automake@gnu.org> or send patches to
21928 # <automake-patches@gnu.org>.
21929
21930 +nl='
21931 +'
21932 +IFS=" "" $nl"
21933 errstatus=0
21934 dirmode=
21935
21936 diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur gnome-menus-2.18.0-old/python/Makefile.in gnome-menus-2.18.0/python/Makefile.in
21937 --- gnome-menus-2.18.0-old/python/Makefile.in 2007-03-12 19:54:59.000000000 +0100
21938 +++ gnome-menus-2.18.0/python/Makefile.in 2007-04-25 07:13:33.000000000 +0200
21939 @@ -1,8 +1,8 @@
21940 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
21941 +# Makefile.in generated by automake 1.10 from Makefile.am.
21942 # @configure_input@
21943
21944 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
21945 -# 2003, 2004, 2005 Free Software Foundation, Inc.
21946 +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
21947 # This Makefile.in is free software; the Free Software Foundation
21948 # gives unlimited permission to copy and/or distribute it,
21949 # with or without modifications, as long as this notice is preserved.
21950 @@ -14,15 +14,11 @@
21951
21952 @SET_MAKE@
21953
21954 -srcdir = @srcdir@
21955 -top_srcdir = @top_srcdir@
21956 VPATH = @srcdir@
21957 pkgdatadir = $(datadir)/@PACKAGE@
21958 pkglibdir = $(libdir)/@PACKAGE@
21959 pkgincludedir = $(includedir)/@PACKAGE@
21960 -top_builddir = ..
21961 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
21962 -INSTALL = @INSTALL@
21963 install_sh_DATA = $(install_sh) -c -m 644
21964 install_sh_PROGRAM = $(install_sh) -c
21965 install_sh_SCRIPT = $(install_sh) -c
21966 @@ -60,17 +56,21 @@
21967 $(top_builddir)/libmenu/libgnome-menu.la
21968 am_gmenu_la_OBJECTS = gmenu.lo
21969 gmenu_la_OBJECTS = $(am_gmenu_la_OBJECTS)
21970 -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
21971 +gmenu_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
21972 + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(gmenu_la_LDFLAGS) \
21973 + $(LDFLAGS) -o $@
21974 +DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
21975 depcomp = $(SHELL) $(top_srcdir)/depcomp
21976 am__depfiles_maybe = depfiles
21977 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
21978 $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
21979 -LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
21980 - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
21981 - $(AM_CFLAGS) $(CFLAGS)
21982 +LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
21983 + --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
21984 + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
21985 CCLD = $(CC)
21986 -LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
21987 - $(AM_LDFLAGS) $(LDFLAGS) -o $@
21988 +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
21989 + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
21990 + $(LDFLAGS) -o $@
21991 SOURCES = $(gmenu_la_SOURCES)
21992 DIST_SOURCES = $(gmenu_la_SOURCES)
21993 ETAGS = etags
21994 @@ -79,8 +79,6 @@
21995 ACLOCAL = @ACLOCAL@
21996 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
21997 ALL_LINGUAS = @ALL_LINGUAS@
21998 -AMDEP_FALSE = @AMDEP_FALSE@
21999 -AMDEP_TRUE = @AMDEP_TRUE@
22000 AMTAR = @AMTAR@
22001 AR = @AR@
22002 AS = @AS@
22003 @@ -113,18 +111,16 @@
1770122004 EGREP = @EGREP@
1770222005 EXEEXT = @EXEEXT@
1770322006 F77 = @F77@
1771022013 GMSGFMT = @GMSGFMT@
1771122014 +GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
1771222015 +GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
17713 HAVE_PYTHON_FALSE = @HAVE_PYTHON_FALSE@
17714 HAVE_PYTHON_TRUE = @HAVE_PYTHON_TRUE@
22016 GREP = @GREP@
22017 -HAVE_PYTHON_FALSE = @HAVE_PYTHON_FALSE@
22018 -HAVE_PYTHON_TRUE = @HAVE_PYTHON_TRUE@
22019 -INOTIFY_SUPPORT_FALSE = @INOTIFY_SUPPORT_FALSE@
22020 -INOTIFY_SUPPORT_TRUE = @INOTIFY_SUPPORT_TRUE@
22021 +INSTALL = @INSTALL@
1771522022 INSTALL_DATA = @INSTALL_DATA@
17716 diff -urN gnome-menus-2.15.91.orig/simple-editor/Makefile.in gnome-menus-2.15.91/simple-editor/Makefile.in
17717 --- gnome-menus-2.15.91.orig/simple-editor/Makefile.in 2006-08-08 00:30:55.000000000 +0200
17718 +++ gnome-menus-2.15.91/simple-editor/Makefile.in 2006-08-13 18:57:15.000000000 +0200
17719 @@ -109,13 +109,14 @@
22023 INSTALL_PROGRAM = @INSTALL_PROGRAM@
22024 INSTALL_SCRIPT = @INSTALL_SCRIPT@
22025 @@ -165,11 +161,11 @@
22026 LN_S = @LN_S@
22027 LTLIBOBJS = @LTLIBOBJS@
22028 MAINT = @MAINT@
22029 -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
22030 -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
22031 MAKEINFO = @MAKEINFO@
22032 +MKDIR_P = @MKDIR_P@
22033 MKINSTALLDIRS = @MKINSTALLDIRS@
22034 MSGFMT = @MSGFMT@
22035 +MSGFMT_OPTS = @MSGFMT_OPTS@
22036 NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
22037 OBJDUMP = @OBJDUMP@
22038 OBJEXT = @OBJEXT@
22039 @@ -199,13 +195,13 @@
22040 VERSION = @VERSION@
22041 WARN_CFLAGS = @WARN_CFLAGS@
22042 XGETTEXT = @XGETTEXT@
22043 +abs_builddir = @abs_builddir@
22044 +abs_srcdir = @abs_srcdir@
22045 +abs_top_builddir = @abs_top_builddir@
22046 +abs_top_srcdir = @abs_top_srcdir@
22047 ac_ct_CC = @ac_ct_CC@
22048 ac_ct_CXX = @ac_ct_CXX@
22049 ac_ct_F77 = @ac_ct_F77@
22050 -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
22051 -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
22052 -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
22053 -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
22054 am__include = @am__include@
22055 am__leading_dot = @am__leading_dot@
22056 am__quote = @am__quote@
22057 @@ -217,6 +213,7 @@
22058 build_cpu = @build_cpu@
22059 build_os = @build_os@
22060 build_vendor = @build_vendor@
22061 +builddir = @builddir@
22062 datadir = @datadir@
22063 datarootdir = @datarootdir@
22064 docdir = @docdir@
22065 @@ -248,8 +245,11 @@
22066 pythondir = @pythondir@
22067 sbindir = @sbindir@
22068 sharedstatedir = @sharedstatedir@
22069 +srcdir = @srcdir@
22070 sysconfdir = @sysconfdir@
22071 target_alias = @target_alias@
22072 +top_builddir = @top_builddir@
22073 +top_srcdir = @top_srcdir@
22074 NULL =
22075 INCLUDES = \
22076 -DGMENU_I_KNOW_THIS_IS_UNSTABLE \
22077 @@ -302,7 +302,7 @@
22078 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
22079 install-gmenuLTLIBRARIES: $(gmenu_LTLIBRARIES)
22080 @$(NORMAL_INSTALL)
22081 - test -z "$(gmenudir)" || $(mkdir_p) "$(DESTDIR)$(gmenudir)"
22082 + test -z "$(gmenudir)" || $(MKDIR_P) "$(DESTDIR)$(gmenudir)"
22083 @list='$(gmenu_LTLIBRARIES)'; for p in $$list; do \
22084 if test -f $$p; then \
22085 f=$(am__strip_dir) \
22086 @@ -313,7 +313,7 @@
22087
22088 uninstall-gmenuLTLIBRARIES:
22089 @$(NORMAL_UNINSTALL)
22090 - @set -x; list='$(gmenu_LTLIBRARIES)'; for p in $$list; do \
22091 + @list='$(gmenu_LTLIBRARIES)'; for p in $$list; do \
22092 p=$(am__strip_dir) \
22093 echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(gmenudir)/$$p'"; \
22094 $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(gmenudir)/$$p"; \
22095 @@ -328,7 +328,7 @@
22096 rm -f "$${dir}/so_locations"; \
22097 done
22098 gmenu.la: $(gmenu_la_OBJECTS) $(gmenu_la_DEPENDENCIES)
22099 - $(LINK) -rpath $(gmenudir) $(gmenu_la_LDFLAGS) $(gmenu_la_OBJECTS) $(gmenu_la_LIBADD) $(LIBS)
22100 + $(gmenu_la_LINK) -rpath $(gmenudir) $(gmenu_la_OBJECTS) $(gmenu_la_LIBADD) $(LIBS)
22101
22102 mostlyclean-compile:
22103 -rm -f *.$(OBJEXT)
22104 @@ -339,22 +339,22 @@
22105 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmenu.Plo@am__quote@
22106
22107 .c.o:
22108 -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
22109 -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
22110 +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
22111 +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
22112 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
22113 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22114 @am__fastdepCC_FALSE@ $(COMPILE) -c $<
22115
22116 .c.obj:
22117 -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
22118 -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
22119 +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
22120 +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
22121 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
22122 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22123 @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
22124
22125 .c.lo:
22126 -@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
22127 -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
22128 +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
22129 +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
22130 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
22131 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22132 @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
22133 @@ -365,10 +365,6 @@
22134 clean-libtool:
22135 -rm -rf .libs _libs
22136
22137 -distclean-libtool:
22138 - -rm -f libtool
22139 -uninstall-info-am:
22140 -
22141 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
22142 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
22143 unique=`for i in $$list; do \
22144 @@ -418,22 +414,21 @@
22145 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
22146
22147 distdir: $(DISTFILES)
22148 - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
22149 - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
22150 - list='$(DISTFILES)'; for file in $$list; do \
22151 - case $$file in \
22152 - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
22153 - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
22154 - esac; \
22155 + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
22156 + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
22157 + list='$(DISTFILES)'; \
22158 + dist_files=`for file in $$list; do echo $$file; done | \
22159 + sed -e "s|^$$srcdirstrip/||;t" \
22160 + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
22161 + case $$dist_files in \
22162 + */*) $(MKDIR_P) `echo "$$dist_files" | \
22163 + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
22164 + sort -u` ;; \
22165 + esac; \
22166 + for file in $$dist_files; do \
22167 if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
22168 - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
22169 - if test "$$dir" != "$$file" && test "$$dir" != "."; then \
22170 - dir="/$$dir"; \
22171 - $(mkdir_p) "$(distdir)$$dir"; \
22172 - else \
22173 - dir=''; \
22174 - fi; \
22175 if test -d $$d/$$file; then \
22176 + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
22177 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
22178 cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
22179 fi; \
22180 @@ -449,7 +444,7 @@
22181 all-am: Makefile $(LTLIBRARIES)
22182 installdirs:
22183 for dir in "$(DESTDIR)$(gmenudir)"; do \
22184 - test -z "$$dir" || $(mkdir_p) "$$dir"; \
22185 + test -z "$$dir" || $(MKDIR_P) "$$dir"; \
22186 done
22187 install: install-am
22188 install-exec: install-exec-am
22189 @@ -484,7 +479,7 @@
22190 -rm -rf ./$(DEPDIR)
22191 -rm -f Makefile
22192 distclean-am: clean-am distclean-compile distclean-generic \
22193 - distclean-libtool distclean-tags
22194 + distclean-tags
22195
22196 dvi: dvi-am
22197
22198 @@ -498,12 +493,20 @@
22199
22200 install-data-am: install-gmenuLTLIBRARIES
22201
22202 +install-dvi: install-dvi-am
22203 +
22204 install-exec-am:
22205
22206 +install-html: install-html-am
22207 +
22208 install-info: install-info-am
22209
22210 install-man:
22211
22212 +install-pdf: install-pdf-am
22213 +
22214 +install-ps: install-ps-am
22215 +
22216 installcheck-am:
22217
22218 maintainer-clean: maintainer-clean-am
22219 @@ -524,20 +527,23 @@
22220
22221 ps-am:
22222
22223 -uninstall-am: uninstall-gmenuLTLIBRARIES uninstall-info-am
22224 +uninstall-am: uninstall-gmenuLTLIBRARIES
22225 +
22226 +.MAKE: install-am install-strip
22227
22228 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
22229 clean-gmenuLTLIBRARIES clean-libtool ctags distclean \
22230 distclean-compile distclean-generic distclean-libtool \
22231 distclean-tags distdir dvi dvi-am html html-am info info-am \
22232 - install install-am install-data install-data-am install-exec \
22233 - install-exec-am install-gmenuLTLIBRARIES install-info \
22234 - install-info-am install-man install-strip installcheck \
22235 - installcheck-am installdirs maintainer-clean \
22236 + install install-am install-data install-data-am install-dvi \
22237 + install-dvi-am install-exec install-exec-am \
22238 + install-gmenuLTLIBRARIES install-html install-html-am \
22239 + install-info install-info-am install-man install-pdf \
22240 + install-pdf-am install-ps install-ps-am install-strip \
22241 + installcheck installcheck-am installdirs maintainer-clean \
22242 maintainer-clean-generic mostlyclean mostlyclean-compile \
22243 mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
22244 - tags uninstall uninstall-am uninstall-gmenuLTLIBRARIES \
22245 - uninstall-info-am
22246 + tags uninstall uninstall-am uninstall-gmenuLTLIBRARIES
22247
22248 # Tell versions [3.59,3.63) of GNU make to not export all variables.
22249 # Otherwise a system limit (for SysV at least) may be exceeded.
22250 diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur gnome-menus-2.18.0-old/simple-editor/GMenuSimpleEditor/Makefile.in gnome-menus-2.18.0/simple-editor/GMenuSimpleEditor/Makefile.in
22251 --- gnome-menus-2.18.0-old/simple-editor/GMenuSimpleEditor/Makefile.in 2007-03-12 19:55:01.000000000 +0100
22252 +++ gnome-menus-2.18.0/simple-editor/GMenuSimpleEditor/Makefile.in 2007-04-25 07:13:33.000000000 +0200
22253 @@ -1,8 +1,8 @@
22254 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
22255 +# Makefile.in generated by automake 1.10 from Makefile.am.
22256 # @configure_input@
22257
22258 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
22259 -# 2003, 2004, 2005 Free Software Foundation, Inc.
22260 +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
22261 # This Makefile.in is free software; the Free Software Foundation
22262 # gives unlimited permission to copy and/or distribute it,
22263 # with or without modifications, as long as this notice is preserved.
22264 @@ -13,15 +13,11 @@
22265 # PARTICULAR PURPOSE.
22266
22267 @SET_MAKE@
22268 -srcdir = @srcdir@
22269 -top_srcdir = @top_srcdir@
22270 VPATH = @srcdir@
22271 pkgdatadir = $(datadir)/@PACKAGE@
22272 pkglibdir = $(libdir)/@PACKAGE@
22273 pkgincludedir = $(includedir)/@PACKAGE@
22274 -top_builddir = ../..
22275 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
22276 -INSTALL = @INSTALL@
22277 install_sh_DATA = $(install_sh) -c -m 644
22278 install_sh_PROGRAM = $(install_sh) -c
22279 install_sh_SCRIPT = $(install_sh) -c
22280 @@ -62,8 +58,6 @@
22281 ACLOCAL = @ACLOCAL@
22282 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
22283 ALL_LINGUAS = @ALL_LINGUAS@
22284 -AMDEP_FALSE = @AMDEP_FALSE@
22285 -AMDEP_TRUE = @AMDEP_TRUE@
22286 AMTAR = @AMTAR@
22287 AR = @AR@
22288 AS = @AS@
22289 @@ -96,18 +90,16 @@
1772022290 EGREP = @EGREP@
1772122291 EXEEXT = @EXEEXT@
1772222292 F77 = @F77@
1772922299 GMSGFMT = @GMSGFMT@
1773022300 +GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
1773122301 +GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
17732 HAVE_PYTHON_FALSE = @HAVE_PYTHON_FALSE@
17733 HAVE_PYTHON_TRUE = @HAVE_PYTHON_TRUE@
22302 GREP = @GREP@
22303 -HAVE_PYTHON_FALSE = @HAVE_PYTHON_FALSE@
22304 -HAVE_PYTHON_TRUE = @HAVE_PYTHON_TRUE@
22305 -INOTIFY_SUPPORT_FALSE = @INOTIFY_SUPPORT_FALSE@
22306 -INOTIFY_SUPPORT_TRUE = @INOTIFY_SUPPORT_TRUE@
22307 +INSTALL = @INSTALL@
1773422308 INSTALL_DATA = @INSTALL_DATA@
17735 diff -urN gnome-menus-2.15.91.orig/util/Makefile.in gnome-menus-2.15.91/util/Makefile.in
17736 --- gnome-menus-2.15.91.orig/util/Makefile.in 2006-08-08 00:30:55.000000000 +0200
17737 +++ gnome-menus-2.15.91/util/Makefile.in 2006-08-13 18:57:15.000000000 +0200
17738 @@ -111,13 +111,14 @@
22309 INSTALL_PROGRAM = @INSTALL_PROGRAM@
22310 INSTALL_SCRIPT = @INSTALL_SCRIPT@
22311 @@ -148,11 +140,11 @@
22312 LN_S = @LN_S@
22313 LTLIBOBJS = @LTLIBOBJS@
22314 MAINT = @MAINT@
22315 -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
22316 -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
22317 MAKEINFO = @MAKEINFO@
22318 +MKDIR_P = @MKDIR_P@
22319 MKINSTALLDIRS = @MKINSTALLDIRS@
22320 MSGFMT = @MSGFMT@
22321 +MSGFMT_OPTS = @MSGFMT_OPTS@
22322 NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
22323 OBJDUMP = @OBJDUMP@
22324 OBJEXT = @OBJEXT@
22325 @@ -182,13 +174,13 @@
22326 VERSION = @VERSION@
22327 WARN_CFLAGS = @WARN_CFLAGS@
22328 XGETTEXT = @XGETTEXT@
22329 +abs_builddir = @abs_builddir@
22330 +abs_srcdir = @abs_srcdir@
22331 +abs_top_builddir = @abs_top_builddir@
22332 +abs_top_srcdir = @abs_top_srcdir@
22333 ac_ct_CC = @ac_ct_CC@
22334 ac_ct_CXX = @ac_ct_CXX@
22335 ac_ct_F77 = @ac_ct_F77@
22336 -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
22337 -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
22338 -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
22339 -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
22340 am__include = @am__include@
22341 am__leading_dot = @am__leading_dot@
22342 am__quote = @am__quote@
22343 @@ -200,6 +192,7 @@
22344 build_cpu = @build_cpu@
22345 build_os = @build_os@
22346 build_vendor = @build_vendor@
22347 +builddir = @builddir@
22348 datadir = @datadir@
22349 datarootdir = @datarootdir@
22350 docdir = @docdir@
22351 @@ -231,8 +224,11 @@
22352 pythondir = @pythondir@
22353 sbindir = @sbindir@
22354 sharedstatedir = @sharedstatedir@
22355 +srcdir = @srcdir@
22356 sysconfdir = @sysconfdir@
22357 target_alias = @target_alias@
22358 +top_builddir = @top_builddir@
22359 +top_srcdir = @top_srcdir@
22360 appdir = $(pyexecdir)/GMenuSimpleEditor
22361 app_PYTHON = \
22362 __init__.py \
22363 @@ -282,13 +278,9 @@
22364
22365 clean-libtool:
22366 -rm -rf .libs _libs
22367 -
22368 -distclean-libtool:
22369 - -rm -f libtool
22370 -uninstall-info-am:
22371 install-appPYTHON: $(app_PYTHON)
22372 @$(NORMAL_INSTALL)
22373 - test -z "$(appdir)" || $(mkdir_p) "$(DESTDIR)$(appdir)"
22374 + test -z "$(appdir)" || $(MKDIR_P) "$(DESTDIR)$(appdir)"
22375 @list='$(app_PYTHON)'; dlist=''; for p in $$list; do\
22376 if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
22377 if test -f $$b$$p; then \
22378 @@ -316,7 +308,7 @@
22379 done
22380 install-nodist_appPYTHON: $(nodist_app_PYTHON)
22381 @$(NORMAL_INSTALL)
22382 - test -z "$(appdir)" || $(mkdir_p) "$(DESTDIR)$(appdir)"
22383 + test -z "$(appdir)" || $(MKDIR_P) "$(DESTDIR)$(appdir)"
22384 @list='$(nodist_app_PYTHON)'; dlist=''; for p in $$list; do\
22385 if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
22386 if test -f $$b$$p; then \
22387 @@ -350,22 +342,21 @@
22388
22389
22390 distdir: $(DISTFILES)
22391 - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
22392 - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
22393 - list='$(DISTFILES)'; for file in $$list; do \
22394 - case $$file in \
22395 - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
22396 - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
22397 - esac; \
22398 + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
22399 + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
22400 + list='$(DISTFILES)'; \
22401 + dist_files=`for file in $$list; do echo $$file; done | \
22402 + sed -e "s|^$$srcdirstrip/||;t" \
22403 + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
22404 + case $$dist_files in \
22405 + */*) $(MKDIR_P) `echo "$$dist_files" | \
22406 + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
22407 + sort -u` ;; \
22408 + esac; \
22409 + for file in $$dist_files; do \
22410 if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
22411 - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
22412 - if test "$$dir" != "$$file" && test "$$dir" != "."; then \
22413 - dir="/$$dir"; \
22414 - $(mkdir_p) "$(distdir)$$dir"; \
22415 - else \
22416 - dir=''; \
22417 - fi; \
22418 if test -d $$d/$$file; then \
22419 + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
22420 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
22421 cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
22422 fi; \
22423 @@ -381,7 +372,7 @@
22424 all-am: Makefile all-local
22425 installdirs:
22426 for dir in "$(DESTDIR)$(appdir)" "$(DESTDIR)$(appdir)"; do \
22427 - test -z "$$dir" || $(mkdir_p) "$$dir"; \
22428 + test -z "$$dir" || $(MKDIR_P) "$$dir"; \
22429 done
22430 install: install-am
22431 install-exec: install-exec-am
22432 @@ -414,7 +405,7 @@
22433
22434 distclean: distclean-am
22435 -rm -f Makefile
22436 -distclean-am: clean-am distclean-generic distclean-libtool
22437 +distclean-am: clean-am distclean-generic
22438
22439 dvi: dvi-am
22440
22441 @@ -428,12 +419,20 @@
22442
22443 install-data-am: install-appPYTHON install-nodist_appPYTHON
22444
22445 +install-dvi: install-dvi-am
22446 +
22447 install-exec-am:
22448
22449 +install-html: install-html-am
22450 +
22451 install-info: install-info-am
22452
22453 install-man:
22454
22455 +install-pdf: install-pdf-am
22456 +
22457 +install-ps: install-ps-am
22458 +
22459 installcheck-am:
22460
22461 maintainer-clean: maintainer-clean-am
22462 @@ -452,20 +451,22 @@
22463
22464 ps-am:
22465
22466 -uninstall-am: uninstall-appPYTHON uninstall-info-am \
22467 - uninstall-nodist_appPYTHON
22468 +uninstall-am: uninstall-appPYTHON uninstall-nodist_appPYTHON
22469 +
22470 +.MAKE: install-am install-strip
22471
22472 .PHONY: all all-am all-local check check-am clean clean-generic \
22473 clean-libtool distclean distclean-generic distclean-libtool \
22474 distdir dvi dvi-am html html-am info info-am install \
22475 install-am install-appPYTHON install-data install-data-am \
22476 - install-exec install-exec-am install-info install-info-am \
22477 - install-man install-nodist_appPYTHON install-strip \
22478 + install-dvi install-dvi-am install-exec install-exec-am \
22479 + install-html install-html-am install-info install-info-am \
22480 + install-man install-nodist_appPYTHON install-pdf \
22481 + install-pdf-am install-ps install-ps-am install-strip \
22482 installcheck installcheck-am installdirs maintainer-clean \
22483 maintainer-clean-generic mostlyclean mostlyclean-generic \
22484 mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
22485 - uninstall-appPYTHON uninstall-info-am \
22486 - uninstall-nodist_appPYTHON
22487 + uninstall-appPYTHON uninstall-nodist_appPYTHON
22488
22489
22490 all-local: config.py
22491 diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur gnome-menus-2.18.0-old/simple-editor/Makefile.in gnome-menus-2.18.0/simple-editor/Makefile.in
22492 --- gnome-menus-2.18.0-old/simple-editor/Makefile.in 2007-03-12 19:55:02.000000000 +0100
22493 +++ gnome-menus-2.18.0/simple-editor/Makefile.in 2007-04-25 07:13:33.000000000 +0200
22494 @@ -1,8 +1,8 @@
22495 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
22496 +# Makefile.in generated by automake 1.10 from Makefile.am.
22497 # @configure_input@
22498
22499 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
22500 -# 2003, 2004, 2005 Free Software Foundation, Inc.
22501 +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
22502 # This Makefile.in is free software; the Free Software Foundation
22503 # gives unlimited permission to copy and/or distribute it,
22504 # with or without modifications, as long as this notice is preserved.
22505 @@ -15,15 +15,11 @@
22506 @SET_MAKE@
22507
22508
22509 -srcdir = @srcdir@
22510 -top_srcdir = @top_srcdir@
22511 VPATH = @srcdir@
22512 pkgdatadir = $(datadir)/@PACKAGE@
22513 pkglibdir = $(libdir)/@PACKAGE@
22514 pkgincludedir = $(includedir)/@PACKAGE@
22515 -top_builddir = ..
22516 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
22517 -INSTALL = @INSTALL@
22518 install_sh_DATA = $(install_sh) -c -m 644
22519 install_sh_PROGRAM = $(install_sh) -c
22520 install_sh_SCRIPT = $(install_sh) -c
22521 @@ -55,10 +51,11 @@
22522 DIST_SOURCES =
22523 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
22524 html-recursive info-recursive install-data-recursive \
22525 - install-exec-recursive install-info-recursive \
22526 - install-recursive installcheck-recursive installdirs-recursive \
22527 - pdf-recursive ps-recursive uninstall-info-recursive \
22528 - uninstall-recursive
22529 + install-dvi-recursive install-exec-recursive \
22530 + install-html-recursive install-info-recursive \
22531 + install-pdf-recursive install-ps-recursive install-recursive \
22532 + installcheck-recursive installdirs-recursive pdf-recursive \
22533 + ps-recursive uninstall-recursive
22534 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
22535 am__vpath_adj = case $$p in \
22536 $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
22537 @@ -68,6 +65,8 @@
22538 desktopDATA_INSTALL = $(INSTALL_DATA)
22539 gladeDATA_INSTALL = $(INSTALL_DATA)
22540 DATA = $(desktop_DATA) $(glade_DATA)
22541 +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
22542 + distclean-recursive maintainer-clean-recursive
22543 ETAGS = etags
22544 CTAGS = ctags
22545 DIST_SUBDIRS = $(SUBDIRS)
22546 @@ -75,8 +74,6 @@
22547 ACLOCAL = @ACLOCAL@
22548 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
22549 ALL_LINGUAS = @ALL_LINGUAS@
22550 -AMDEP_FALSE = @AMDEP_FALSE@
22551 -AMDEP_TRUE = @AMDEP_TRUE@
22552 AMTAR = @AMTAR@
22553 AR = @AR@
22554 AS = @AS@
22555 @@ -109,18 +106,16 @@
1773922556 EGREP = @EGREP@
1774022557 EXEEXT = @EXEEXT@
1774122558 F77 = @F77@
1774822565 GMSGFMT = @GMSGFMT@
1774922566 +GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
1775022567 +GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
17751 HAVE_PYTHON_FALSE = @HAVE_PYTHON_FALSE@
17752 HAVE_PYTHON_TRUE = @HAVE_PYTHON_TRUE@
22568 GREP = @GREP@
22569 -HAVE_PYTHON_FALSE = @HAVE_PYTHON_FALSE@
22570 -HAVE_PYTHON_TRUE = @HAVE_PYTHON_TRUE@
22571 -INOTIFY_SUPPORT_FALSE = @INOTIFY_SUPPORT_FALSE@
22572 -INOTIFY_SUPPORT_TRUE = @INOTIFY_SUPPORT_TRUE@
22573 +INSTALL = @INSTALL@
1775322574 INSTALL_DATA = @INSTALL_DATA@
22575 INSTALL_PROGRAM = @INSTALL_PROGRAM@
22576 INSTALL_SCRIPT = @INSTALL_SCRIPT@
22577 @@ -161,11 +156,11 @@
22578 LN_S = @LN_S@
22579 LTLIBOBJS = @LTLIBOBJS@
22580 MAINT = @MAINT@
22581 -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
22582 -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
22583 MAKEINFO = @MAKEINFO@
22584 +MKDIR_P = @MKDIR_P@
22585 MKINSTALLDIRS = @MKINSTALLDIRS@
22586 MSGFMT = @MSGFMT@
22587 +MSGFMT_OPTS = @MSGFMT_OPTS@
22588 NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
22589 OBJDUMP = @OBJDUMP@
22590 OBJEXT = @OBJEXT@
22591 @@ -195,13 +190,13 @@
22592 VERSION = @VERSION@
22593 WARN_CFLAGS = @WARN_CFLAGS@
22594 XGETTEXT = @XGETTEXT@
22595 +abs_builddir = @abs_builddir@
22596 +abs_srcdir = @abs_srcdir@
22597 +abs_top_builddir = @abs_top_builddir@
22598 +abs_top_srcdir = @abs_top_srcdir@
22599 ac_ct_CC = @ac_ct_CC@
22600 ac_ct_CXX = @ac_ct_CXX@
22601 ac_ct_F77 = @ac_ct_F77@
22602 -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
22603 -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
22604 -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
22605 -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
22606 am__include = @am__include@
22607 am__leading_dot = @am__leading_dot@
22608 am__quote = @am__quote@
22609 @@ -213,6 +208,7 @@
22610 build_cpu = @build_cpu@
22611 build_os = @build_os@
22612 build_vendor = @build_vendor@
22613 +builddir = @builddir@
22614 datadir = @datadir@
22615 datarootdir = @datarootdir@
22616 docdir = @docdir@
22617 @@ -244,8 +240,11 @@
22618 pythondir = @pythondir@
22619 sbindir = @sbindir@
22620 sharedstatedir = @sharedstatedir@
22621 +srcdir = @srcdir@
22622 sysconfdir = @sysconfdir@
22623 target_alias = @target_alias@
22624 +top_builddir = @top_builddir@
22625 +top_srcdir = @top_srcdir@
22626 SUBDIRS = GMenuSimpleEditor
22627 bin_SCRIPTS = gmenu-simple-editor
22628 gladedir = $(pkgdatadir)/glade
22629 @@ -296,7 +295,7 @@
22630 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
22631 install-binSCRIPTS: $(bin_SCRIPTS)
22632 @$(NORMAL_INSTALL)
22633 - test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
22634 + test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
22635 @list='$(bin_SCRIPTS)'; for p in $$list; do \
22636 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
22637 if test -f $$d$$p; then \
22638 @@ -319,13 +318,9 @@
22639
22640 clean-libtool:
22641 -rm -rf .libs _libs
22642 -
22643 -distclean-libtool:
22644 - -rm -f libtool
22645 -uninstall-info-am:
22646 install-desktopDATA: $(desktop_DATA)
22647 @$(NORMAL_INSTALL)
22648 - test -z "$(desktopdir)" || $(mkdir_p) "$(DESTDIR)$(desktopdir)"
22649 + test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
22650 @list='$(desktop_DATA)'; for p in $$list; do \
22651 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
22652 f=$(am__strip_dir) \
22653 @@ -342,7 +337,7 @@
22654 done
22655 install-gladeDATA: $(glade_DATA)
22656 @$(NORMAL_INSTALL)
22657 - test -z "$(gladedir)" || $(mkdir_p) "$(DESTDIR)$(gladedir)"
22658 + test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)"
22659 @list='$(glade_DATA)'; for p in $$list; do \
22660 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
22661 f=$(am__strip_dir) \
22662 @@ -389,8 +384,7 @@
22663 $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
22664 fi; test -z "$$fail"
22665
22666 -mostlyclean-recursive clean-recursive distclean-recursive \
22667 -maintainer-clean-recursive:
22668 +$(RECURSIVE_CLEAN_TARGETS):
22669 @failcom='exit 1'; \
22670 for f in x $$MAKEFLAGS; do \
22671 case $$f in \
22672 @@ -491,22 +485,21 @@
22673 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
22674
22675 distdir: $(DISTFILES)
22676 - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
22677 - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
22678 - list='$(DISTFILES)'; for file in $$list; do \
22679 - case $$file in \
22680 - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
22681 - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
22682 - esac; \
22683 + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
22684 + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
22685 + list='$(DISTFILES)'; \
22686 + dist_files=`for file in $$list; do echo $$file; done | \
22687 + sed -e "s|^$$srcdirstrip/||;t" \
22688 + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
22689 + case $$dist_files in \
22690 + */*) $(MKDIR_P) `echo "$$dist_files" | \
22691 + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
22692 + sort -u` ;; \
22693 + esac; \
22694 + for file in $$dist_files; do \
22695 if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
22696 - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
22697 - if test "$$dir" != "$$file" && test "$$dir" != "."; then \
22698 - dir="/$$dir"; \
22699 - $(mkdir_p) "$(distdir)$$dir"; \
22700 - else \
22701 - dir=''; \
22702 - fi; \
22703 if test -d $$d/$$file; then \
22704 + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
22705 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
22706 cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
22707 fi; \
22708 @@ -520,7 +513,7 @@
22709 list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
22710 if test "$$subdir" = .; then :; else \
22711 test -d "$(distdir)/$$subdir" \
22712 - || $(mkdir_p) "$(distdir)/$$subdir" \
22713 + || $(MKDIR_P) "$(distdir)/$$subdir" \
22714 || exit 1; \
22715 distdir=`$(am__cd) $(distdir) && pwd`; \
22716 top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
22717 @@ -528,6 +521,8 @@
22718 $(MAKE) $(AM_MAKEFLAGS) \
22719 top_distdir="$$top_distdir" \
22720 distdir="$$distdir/$$subdir" \
22721 + am__remove_distdir=: \
22722 + am__skip_length_check=: \
22723 distdir) \
22724 || exit 1; \
22725 fi; \
22726 @@ -538,7 +533,7 @@
22727 installdirs: installdirs-recursive
22728 installdirs-am:
22729 for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(gladedir)"; do \
22730 - test -z "$$dir" || $(mkdir_p) "$$dir"; \
22731 + test -z "$$dir" || $(MKDIR_P) "$$dir"; \
22732 done
22733 install: install-recursive
22734 install-exec: install-exec-recursive
22735 @@ -571,8 +566,7 @@
22736
22737 distclean: distclean-recursive
22738 -rm -f Makefile
22739 -distclean-am: clean-am distclean-generic distclean-libtool \
22740 - distclean-tags
22741 +distclean-am: clean-am distclean-generic distclean-tags
22742
22743 dvi: dvi-recursive
22744
22745 @@ -586,12 +580,20 @@
22746
22747 install-data-am: install-desktopDATA install-gladeDATA
22748
22749 +install-dvi: install-dvi-recursive
22750 +
22751 install-exec-am: install-binSCRIPTS
22752
22753 +install-html: install-html-recursive
22754 +
22755 install-info: install-info-recursive
22756
22757 install-man:
22758
22759 +install-pdf: install-pdf-recursive
22760 +
22761 +install-ps: install-ps-recursive
22762 +
22763 installcheck-am:
22764
22765 maintainer-clean: maintainer-clean-recursive
22766 @@ -611,24 +613,26 @@
22767 ps-am:
22768
22769 uninstall-am: uninstall-binSCRIPTS uninstall-desktopDATA \
22770 - uninstall-gladeDATA uninstall-info-am
22771 + uninstall-gladeDATA
22772
22773 -uninstall-info: uninstall-info-recursive
22774 +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
22775 + install-strip
22776
22777 -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
22778 - clean clean-generic clean-libtool clean-recursive ctags \
22779 - ctags-recursive distclean distclean-generic distclean-libtool \
22780 - distclean-recursive distclean-tags distdir dvi dvi-am html \
22781 +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
22782 + all all-am check check-am clean clean-generic clean-libtool \
22783 + ctags ctags-recursive distclean distclean-generic \
22784 + distclean-libtool distclean-tags distdir dvi dvi-am html \
22785 html-am info info-am install install-am install-binSCRIPTS \
22786 - install-data install-data-am install-desktopDATA install-exec \
22787 - install-exec-am install-gladeDATA install-info install-info-am \
22788 - install-man install-strip installcheck installcheck-am \
22789 + install-data install-data-am install-desktopDATA install-dvi \
22790 + install-dvi-am install-exec install-exec-am install-gladeDATA \
22791 + install-html install-html-am install-info install-info-am \
22792 + install-man install-pdf install-pdf-am install-ps \
22793 + install-ps-am install-strip installcheck installcheck-am \
22794 installdirs installdirs-am maintainer-clean \
22795 - maintainer-clean-generic maintainer-clean-recursive \
22796 - mostlyclean mostlyclean-generic mostlyclean-libtool \
22797 - mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
22798 + maintainer-clean-generic mostlyclean mostlyclean-generic \
22799 + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
22800 uninstall uninstall-am uninstall-binSCRIPTS \
22801 - uninstall-desktopDATA uninstall-gladeDATA uninstall-info-am
22802 + uninstall-desktopDATA uninstall-gladeDATA
22803
22804
22805 gmenu-simple-editor: gmenu-simple-editor.in
22806 diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur gnome-menus-2.18.0-old/util/Makefile.in gnome-menus-2.18.0/util/Makefile.in
22807 --- gnome-menus-2.18.0-old/util/Makefile.in 2007-03-12 19:55:03.000000000 +0100
22808 +++ gnome-menus-2.18.0/util/Makefile.in 2007-04-25 07:13:33.000000000 +0200
22809 @@ -1,8 +1,8 @@
22810 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
22811 +# Makefile.in generated by automake 1.10 from Makefile.am.
22812 # @configure_input@
22813
22814 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
22815 -# 2003, 2004, 2005 Free Software Foundation, Inc.
22816 +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
22817 # This Makefile.in is free software; the Free Software Foundation
22818 # gives unlimited permission to copy and/or distribute it,
22819 # with or without modifications, as long as this notice is preserved.
22820 @@ -14,15 +14,11 @@
22821
22822 @SET_MAKE@
22823
22824 -srcdir = @srcdir@
22825 -top_srcdir = @top_srcdir@
22826 VPATH = @srcdir@
22827 pkgdatadir = $(datadir)/@PACKAGE@
22828 pkglibdir = $(libdir)/@PACKAGE@
22829 pkgincludedir = $(includedir)/@PACKAGE@
22830 -top_builddir = ..
22831 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
22832 -INSTALL = @INSTALL@
22833 install_sh_DATA = $(install_sh) -c -m 644
22834 install_sh_PROGRAM = $(install_sh) -c
22835 install_sh_SCRIPT = $(install_sh) -c
22836 @@ -58,17 +54,18 @@
22837 am__DEPENDENCIES_1 =
22838 gnome_menu_spec_test_DEPENDENCIES = ../libmenu/libgnome-menu.la \
22839 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
22840 -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
22841 +DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
22842 depcomp = $(SHELL) $(top_srcdir)/depcomp
22843 am__depfiles_maybe = depfiles
22844 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
22845 $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
22846 -LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
22847 - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
22848 - $(AM_CFLAGS) $(CFLAGS)
22849 +LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
22850 + --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
22851 + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
22852 CCLD = $(CC)
22853 -LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
22854 - $(AM_LDFLAGS) $(LDFLAGS) -o $@
22855 +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
22856 + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
22857 + $(LDFLAGS) -o $@
22858 SOURCES = $(gnome_menu_spec_test_SOURCES)
22859 DIST_SOURCES = $(gnome_menu_spec_test_SOURCES)
22860 ETAGS = etags
22861 @@ -77,8 +74,6 @@
22862 ACLOCAL = @ACLOCAL@
22863 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
22864 ALL_LINGUAS = @ALL_LINGUAS@
22865 -AMDEP_FALSE = @AMDEP_FALSE@
22866 -AMDEP_TRUE = @AMDEP_TRUE@
22867 AMTAR = @AMTAR@
22868 AR = @AR@
22869 AS = @AS@
22870 @@ -111,18 +106,16 @@
22871 EGREP = @EGREP@
22872 EXEEXT = @EXEEXT@
22873 F77 = @F77@
22874 -FAM_LIBS = @FAM_LIBS@
22875 FFLAGS = @FFLAGS@
22876 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
22877 GLIB_CFLAGS = @GLIB_CFLAGS@
22878 GLIB_LIBS = @GLIB_LIBS@
22879 GMOFILES = @GMOFILES@
22880 GMSGFMT = @GMSGFMT@
22881 +GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
22882 +GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
22883 GREP = @GREP@
22884 -HAVE_PYTHON_FALSE = @HAVE_PYTHON_FALSE@
22885 -HAVE_PYTHON_TRUE = @HAVE_PYTHON_TRUE@
22886 -INOTIFY_SUPPORT_FALSE = @INOTIFY_SUPPORT_FALSE@
22887 -INOTIFY_SUPPORT_TRUE = @INOTIFY_SUPPORT_TRUE@
22888 +INSTALL = @INSTALL@
22889 INSTALL_DATA = @INSTALL_DATA@
22890 INSTALL_PROGRAM = @INSTALL_PROGRAM@
22891 INSTALL_SCRIPT = @INSTALL_SCRIPT@
22892 @@ -163,11 +156,11 @@
22893 LN_S = @LN_S@
22894 LTLIBOBJS = @LTLIBOBJS@
22895 MAINT = @MAINT@
22896 -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
22897 -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
22898 MAKEINFO = @MAKEINFO@
22899 +MKDIR_P = @MKDIR_P@
22900 MKINSTALLDIRS = @MKINSTALLDIRS@
22901 MSGFMT = @MSGFMT@
22902 +MSGFMT_OPTS = @MSGFMT_OPTS@
22903 NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
22904 OBJDUMP = @OBJDUMP@
22905 OBJEXT = @OBJEXT@
22906 @@ -197,13 +190,13 @@
22907 VERSION = @VERSION@
22908 WARN_CFLAGS = @WARN_CFLAGS@
22909 XGETTEXT = @XGETTEXT@
22910 +abs_builddir = @abs_builddir@
22911 +abs_srcdir = @abs_srcdir@
22912 +abs_top_builddir = @abs_top_builddir@
22913 +abs_top_srcdir = @abs_top_srcdir@
22914 ac_ct_CC = @ac_ct_CC@
22915 ac_ct_CXX = @ac_ct_CXX@
22916 ac_ct_F77 = @ac_ct_F77@
22917 -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
22918 -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
22919 -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
22920 -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
22921 am__include = @am__include@
22922 am__leading_dot = @am__leading_dot@
22923 am__quote = @am__quote@
22924 @@ -215,6 +208,7 @@
22925 build_cpu = @build_cpu@
22926 build_os = @build_os@
22927 build_vendor = @build_vendor@
22928 +builddir = @builddir@
22929 datadir = @datadir@
22930 datarootdir = @datarootdir@
22931 docdir = @docdir@
22932 @@ -246,8 +240,11 @@
22933 pythondir = @pythondir@
22934 sbindir = @sbindir@
22935 sharedstatedir = @sharedstatedir@
22936 +srcdir = @srcdir@
22937 sysconfdir = @sysconfdir@
22938 target_alias = @target_alias@
22939 +top_builddir = @top_builddir@
22940 +top_srcdir = @top_srcdir@
22941 NULL =
22942 INCLUDES = \
22943 -DGMENU_I_KNOW_THIS_IS_UNSTABLE \
22944 @@ -303,7 +300,7 @@
22945 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
22946 install-binPROGRAMS: $(bin_PROGRAMS)
22947 @$(NORMAL_INSTALL)
22948 - test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
22949 + test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
22950 @list='$(bin_PROGRAMS)'; for p in $$list; do \
22951 p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
22952 if test -f $$p \
22953 @@ -331,7 +328,7 @@
22954 done
22955 gnome-menu-spec-test$(EXEEXT): $(gnome_menu_spec_test_OBJECTS) $(gnome_menu_spec_test_DEPENDENCIES)
22956 @rm -f gnome-menu-spec-test$(EXEEXT)
22957 - $(LINK) $(gnome_menu_spec_test_LDFLAGS) $(gnome_menu_spec_test_OBJECTS) $(gnome_menu_spec_test_LDADD) $(LIBS)
22958 + $(LINK) $(gnome_menu_spec_test_OBJECTS) $(gnome_menu_spec_test_LDADD) $(LIBS)
22959
22960 mostlyclean-compile:
22961 -rm -f *.$(OBJEXT)
22962 @@ -342,22 +339,22 @@
22963 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-menu-spec.Po@am__quote@
22964
22965 .c.o:
22966 -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
22967 -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
22968 +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
22969 +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
22970 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
22971 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22972 @am__fastdepCC_FALSE@ $(COMPILE) -c $<
22973
22974 .c.obj:
22975 -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
22976 -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
22977 +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
22978 +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
22979 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
22980 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22981 @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
22982
22983 .c.lo:
22984 -@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
22985 -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
22986 +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
22987 +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
22988 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
22989 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22990 @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
22991 @@ -368,10 +365,6 @@
22992 clean-libtool:
22993 -rm -rf .libs _libs
22994
22995 -distclean-libtool:
22996 - -rm -f libtool
22997 -uninstall-info-am:
22998 -
22999 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
23000 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
23001 unique=`for i in $$list; do \
23002 @@ -421,22 +414,21 @@
23003 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
23004
23005 distdir: $(DISTFILES)
23006 - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
23007 - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
23008 - list='$(DISTFILES)'; for file in $$list; do \
23009 - case $$file in \
23010 - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
23011 - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
23012 - esac; \
23013 + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
23014 + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
23015 + list='$(DISTFILES)'; \
23016 + dist_files=`for file in $$list; do echo $$file; done | \
23017 + sed -e "s|^$$srcdirstrip/||;t" \
23018 + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
23019 + case $$dist_files in \
23020 + */*) $(MKDIR_P) `echo "$$dist_files" | \
23021 + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
23022 + sort -u` ;; \
23023 + esac; \
23024 + for file in $$dist_files; do \
23025 if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
23026 - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
23027 - if test "$$dir" != "$$file" && test "$$dir" != "."; then \
23028 - dir="/$$dir"; \
23029 - $(mkdir_p) "$(distdir)$$dir"; \
23030 - else \
23031 - dir=''; \
23032 - fi; \
23033 if test -d $$d/$$file; then \
23034 + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
23035 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
23036 cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
23037 fi; \
23038 @@ -452,7 +444,7 @@
23039 all-am: Makefile $(PROGRAMS)
23040 installdirs:
23041 for dir in "$(DESTDIR)$(bindir)"; do \
23042 - test -z "$$dir" || $(mkdir_p) "$$dir"; \
23043 + test -z "$$dir" || $(MKDIR_P) "$$dir"; \
23044 done
23045 install: install-am
23046 install-exec: install-exec-am
23047 @@ -486,7 +478,7 @@
23048 -rm -rf ./$(DEPDIR)
23049 -rm -f Makefile
23050 distclean-am: clean-am distclean-compile distclean-generic \
23051 - distclean-libtool distclean-tags
23052 + distclean-tags
23053
23054 dvi: dvi-am
23055
23056 @@ -500,12 +492,20 @@
23057
23058 install-data-am:
23059
23060 +install-dvi: install-dvi-am
23061 +
23062 install-exec-am: install-binPROGRAMS
23063
23064 +install-html: install-html-am
23065 +
23066 install-info: install-info-am
23067
23068 install-man:
23069
23070 +install-pdf: install-pdf-am
23071 +
23072 +install-ps: install-ps-am
23073 +
23074 installcheck-am:
23075
23076 maintainer-clean: maintainer-clean-am
23077 @@ -526,19 +526,23 @@
23078
23079 ps-am:
23080
23081 -uninstall-am: uninstall-binPROGRAMS uninstall-info-am
23082 +uninstall-am: uninstall-binPROGRAMS
23083 +
23084 +.MAKE: install-am install-strip
23085
23086 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
23087 clean-generic clean-libtool ctags distclean distclean-compile \
23088 distclean-generic distclean-libtool distclean-tags distdir dvi \
23089 dvi-am html html-am info info-am install install-am \
23090 - install-binPROGRAMS install-data install-data-am install-exec \
23091 - install-exec-am install-info install-info-am install-man \
23092 + install-binPROGRAMS install-data install-data-am install-dvi \
23093 + install-dvi-am install-exec install-exec-am install-html \
23094 + install-html-am install-info install-info-am install-man \
23095 + install-pdf install-pdf-am install-ps install-ps-am \
23096 install-strip installcheck installcheck-am installdirs \
23097 maintainer-clean maintainer-clean-generic mostlyclean \
23098 mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
23099 pdf pdf-am ps ps-am tags uninstall uninstall-am \
23100 - uninstall-binPROGRAMS uninstall-info-am
23101 + uninstall-binPROGRAMS
23102
23103 # Tell versions [3.59,3.63) of GNU make to not export all variables.
23104 # Otherwise a system limit (for SysV at least) may be exceeded.