alsa-lib: Switched to quilt. Prepared for 1.0.14 upload.
git-svn-id: svn://anonscm.debian.org/svn/pkg-alsa/trunk/alsa-lib@1886 9eaf2def-abe4-0310-ac0d-9aefe66b05c3
Elimar Riesebieter
16 years ago
0 | alsa-lib (1.0.14~rc4-3) UNRELEASED; urgency=low | |
1 | ||
2 | * NOT RELEASED YET | |
3 | ||
4 | -- Jordi Mallach <jordi@debian.org> Thu, 17 May 2007 02:16:06 +0200 | |
0 | alsa-lib (1.0.14-1) unstable; urgency=low | |
1 | ||
2 | * New upstream release | |
3 | ||
4 | [ Elimar Riesebieter ] | |
5 | * Patchmanagement switched to quilt. This is more comfortable. | |
6 | ||
7 | -- Elimar Riesebieter <riesebie@lxtec.de> Tue, 05 Jun 2007 19:30:13 +0200 | |
5 | 8 | |
6 | 9 | alsa-lib (1.0.14~rc4-2) experimental; urgency=low |
7 | 10 |
0 | Changelog between 1.0.14rc4 and 1.0.14 releases | |
1 | (http://www.alsa-project.org/changes/v1-0-14rc4--v1-0-14.txt) | |
2 | ******************************************** | |
3 | ||
4 | * alsa-lib | |
5 | + Core | |
6 | - Add config and plugin directory options to configure | |
7 | + PCM API | |
8 | - Add support for gain in softvol plugin | |
9 | - dmix/dshare/dsnoop plugin: enable slowptr by default | |
10 | - Revert the wrong change in src/pcm/Makefile.am | |
11 | + ALSA Lisp | |
12 | - Add config and plugin directory options to configure | |
13 | + Configuration | |
14 | - Add support for gain in softvol plugin | |
15 | - Add config and plugin directory options to configure | |
16 | - Specify subdevice number for Maestor3 dmix setting | |
17 | + Simple Abstraction Mixer Modules | |
18 | - Add config and plugin directory options to configure | |
19 | ||
0 | 20 | Changelog between 1.0.14rc3 and 1.0.14rc4 releases |
1 | 21 | (http://www.alsa-project.org/changes/v1-0-14rc3--v1-0-14rc4.txt) |
2 | 22 | ******************************************** |
2 | 2 | Priority: optional |
3 | 3 | Maintainer: Debian ALSA Maintainers <pkg-alsa-devel@lists.alioth.debian.org> |
4 | 4 | Uploaders: Jordi Mallach <jordi@debian.org>, Mikael Magnusson <mikma@users.sourceforge.net>, Elimar Riesebieter <riesebie@lxtec.de> |
5 | Build-Depends: debhelper (>= 5.0.37), dpatch, autotools-dev, doxygen, libc6-dev-powerpc [ppc64], libc6-dev-i386 [amd64], libc6-dev-amd64 [i386], libc6-dev-ppc64 [powerpc], libc6-dev-s390x [s390], libc6-dev-sparc64 [sparc], lib32gcc1 [amd64 ppc64], lib64gcc1 [i386 powerpc sparc s390], gcc-multilib [amd64 i386 powerpc ppc64 s390 sparc] | |
5 | Build-Depends: debhelper (>= 5.0.37), quilt (>= 0.40), autotools-dev, doxygen, libc6-dev-powerpc [ppc64], libc6-dev-i386 [amd64], libc6-dev-amd64 [i386], libc6-dev-ppc64 [powerpc], libc6-dev-s390x [s390], libc6-dev-sparc64 [sparc], lib32gcc1 [amd64 ppc64], lib64gcc1 [i386 powerpc sparc s390], gcc-multilib [amd64 i386 powerpc ppc64 s390 sparc] | |
6 | 6 | Standards-Version: 3.7.2 |
7 | 7 | XS-Vcs-Svn: svn://svn.debian.org/pkg-alsa/trunk/alsa-lib |
8 | 8 | XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-alsa/trunk/alsa-lib/ |
0 | 01_alpha_versioned_symbols | |
1 | 02_aclocal_libs_fix | |
2 | 04_doxygen_links | |
3 | 10_add-maintainer-mode | |
4 | 40_relibtoolise | |
5 | 41_configure_cross_compile |
0 | #! /bin/sh -e | |
1 | ## 01_alpha_symbols.dpatch by Jordi Mallach <jordi@debian.org> | |
2 | ## | |
3 | ## All lines beginning with `## DP:' are a description of the patch. | |
4 | ## DP: Fix use of embedded assembly so that we always use symbol versioning | |
5 | ## DP: instead of weak symbol aliases on alpha, since the assembly used for | |
6 | ## DP: weak symbols is apparently non-portable. | |
7 | ||
8 | if [ $# -lt 1 ]; then | |
9 | echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 | |
10 | exit 1 | |
11 | fi | |
12 | ||
13 | [ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts | |
14 | patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}" | |
15 | ||
16 | case "$1" in | |
17 | -patch) patch -p1 ${patch_opts} < $0;; | |
18 | -unpatch) patch -R -p1 ${patch_opts} < $0;; | |
19 | *) | |
20 | echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 | |
21 | exit 1;; | |
22 | esac | |
23 | ||
24 | exit 0 | |
25 | ||
26 | @DPATCH@ | |
27 | diff -urNad a/include/alsa-symbols.h b/include/alsa-symbols.h | |
28 | --- a/include/alsa-symbols.h 2006-09-29 21:12:43.000000000 +0200 | |
29 | +++ b/include/alsa-symbols.h 2006-09-29 21:12:01.000000000 +0200 | |
30 | @@ -43,7 +43,7 @@ | |
31 | __asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@@" #version) | |
32 | #endif | |
33 | ||
34 | -#ifdef USE_VERSIONED_SYMBOLS | |
35 | +#if defined(USE_VERSIONED_SYMBOLS) || defined(__alpha__) | |
36 | #define use_symbol_version(real, name, version) \ | |
37 | symbol_version(real, name, version) | |
38 | #define use_default_symbol_version(real, name, version) \ |
0 | #!/bin/sh -e | |
1 | ## 02_aclocal_libs_fix.dpatch by Jordi Mallach <jordi@debian.org> | |
2 | ## | |
3 | ## DP: Don't modify LIBS if there's no need to. Patch from Josip Rodin. | |
4 | ||
5 | if [ $# -lt 1 ]; then | |
6 | echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" | |
7 | exit 1 | |
8 | fi | |
9 | ||
10 | [ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts | |
11 | patch_opts="${patch_opts:--f --no-backup-if-mismatch}" | |
12 | ||
13 | case "$1" in | |
14 | -patch) patch $patch_opts -p1 < $0;; | |
15 | -unpatch) patch $patch_opts -p1 -R < $0;; | |
16 | *) | |
17 | echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" | |
18 | exit 1;; | |
19 | esac | |
20 | ||
21 | exit 0 | |
22 | ||
23 | @DPATCH@ | |
24 | diff -urNad alsa-lib-1.0.12~/utils/alsa.m4 alsa-lib-1.0.12/utils/alsa.m4 | |
25 | --- alsa-lib-1.0.12~/utils/alsa.m4 2006-09-03 15:28:21.000000000 +0200 | |
26 | +++ alsa-lib-1.0.12/utils/alsa.m4 2006-09-03 15:27:35.000000000 +0200 | |
27 | @@ -43,6 +43,7 @@ | |
28 | CFLAGS="$CFLAGS -I$alsa_inc_prefix" | |
29 | fi | |
30 | AC_MSG_RESULT($ALSA_CFLAGS) | |
31 | +CFLAGS="$alsa_save_CFLAGS" | |
32 | ||
33 | dnl add any special lib dirs | |
34 | AC_MSG_CHECKING(for ALSA LDFLAGS) | |
35 | @@ -119,19 +120,15 @@ | |
36 | ) | |
37 | fi | |
38 | ||
39 | +LDFLAGS="$alsa_save_LDFLAGS" | |
40 | +LIBS="$alsa_save_LIBS" | |
41 | + | |
42 | if test "x$alsa_found" = "xyes" ; then | |
43 | ifelse([$2], , :, [$2]) | |
44 | - LIBS=`echo $LIBS | sed 's/-lasound//g'` | |
45 | - LIBS=`echo $LIBS | sed 's/ //'` | |
46 | - LIBS="-lasound $LIBS" | |
47 | -fi | |
48 | -if test "x$alsa_found" = "xno" ; then | |
49 | - ifelse([$3], , :, [$3]) | |
50 | - CFLAGS="$alsa_save_CFLAGS" | |
51 | - LDFLAGS="$alsa_save_LDFLAGS" | |
52 | - LIBS="$alsa_save_LIBS" | |
53 | +else | |
54 | ALSA_CFLAGS="" | |
55 | ALSA_LIBS="" | |
56 | + ifelse([$3], , :, [$3]) | |
57 | fi | |
58 | ||
59 | dnl That should be it. Now just export out symbols: |
0 | #! /bin/sh /usr/share/dpatch/dpatch-run | |
1 | ## 04_doxygen_links.dpatch by <mikma@users.sourceforge.net> | |
2 | ## | |
3 | ## All lines beginning with `## DP:' are a description of the patch. | |
4 | ## DP: Fix broken doxygen links in pcm.c and rawmidi.c. | |
5 | ||
6 | @DPATCH@ | |
7 | diff -urNad alsa-lib-1.0.12~/src/pcm/pcm.c alsa-lib-1.0.12/src/pcm/pcm.c | |
8 | --- alsa-lib-1.0.12~/src/pcm/pcm.c 2006-09-03 15:33:45.000000000 +0200 | |
9 | +++ alsa-lib-1.0.12/src/pcm/pcm.c 2006-09-03 15:32:36.000000000 +0200 | |
10 | @@ -925,7 +925,7 @@ | |
11 | * \return PCM state #snd_pcm_state_t of given PCM handle | |
12 | * | |
13 | * This is a faster way to obtain only the PCM state without calling | |
14 | - * \link ::snd_pcm_status() \endlink. | |
15 | + * ::snd_pcm_status(). | |
16 | */ | |
17 | snd_pcm_state_t snd_pcm_state(snd_pcm_t *pcm) | |
18 | { | |
19 | @@ -987,7 +987,7 @@ | |
20 | * | |
21 | * This function can be used when the stream is in the suspend state | |
22 | * to do the fine resume from this state. Not all hardware supports | |
23 | - * this feature, when an -ENOSYS error is returned, use the \link ::snd_pcm_prepare() \endlink | |
24 | + * this feature, when an -ENOSYS error is returned, use the ::snd_pcm_prepare() | |
25 | * function to recovery. | |
26 | */ | |
27 | int snd_pcm_resume(snd_pcm_t *pcm) | |
28 | @@ -1055,7 +1055,7 @@ | |
29 | * This function stops the PCM <i>immediately</i>. | |
30 | * The pending samples on the buffer are ignored. | |
31 | * | |
32 | - * For processing all pending samples, use \link ::snd_pcm_drain() \endlink | |
33 | + * For processing all pending samples, use ::snd_pcm_drain() | |
34 | * instead. | |
35 | */ | |
36 | int snd_pcm_drop(snd_pcm_t *pcm) | |
37 | @@ -1078,7 +1078,7 @@ | |
38 | * the PCM. | |
39 | * For capture stop PCM permitting to retrieve residual frames. | |
40 | * | |
41 | - * For stopping the PCM stream immediately, use \link ::snd_pcm_drop() \endlink | |
42 | + * For stopping the PCM stream immediately, use ::snd_pcm_drop() | |
43 | * instead. | |
44 | */ | |
45 | int snd_pcm_drain(snd_pcm_t *pcm) | |
46 | @@ -1098,7 +1098,7 @@ | |
47 | * \return 0 on success otherwise a negative error code | |
48 | * | |
49 | * Note that this function works only on the hardware which supports | |
50 | - * pause feature. You can check it via \link ::snd_pcm_hw_params_can_pause() \endlink | |
51 | + * pause feature. You can check it via ::snd_pcm_hw_params_can_pause() | |
52 | * function. | |
53 | */ | |
54 | int snd_pcm_pause(snd_pcm_t *pcm, int enable) | |
55 | @@ -1335,16 +1335,16 @@ | |
56 | * | |
57 | * This function fills the given poll descriptor structs for the specified | |
58 | * PCM handle. The poll desctiptor array should have the size returned by | |
59 | - * \link ::snd_pcm_poll_descriptors_count() \endlink function. | |
60 | + * ::snd_pcm_poll_descriptors_count() function. | |
61 | * | |
62 | * The result is intended for direct use with the poll() syscall. | |
63 | * | |
64 | * For reading the returned events of poll descriptor after poll() system | |
65 | - * call, use \link ::snd_pcm_poll_descriptors_revents() \endlink function. | |
66 | + * call, use ::snd_pcm_poll_descriptors_revents() function. | |
67 | * The field values in pollfd structs may be bogus regarding the stream | |
68 | * direction from the application perspective (POLLIN might not imply read | |
69 | * direction and POLLOUT might not imply write), but | |
70 | - * the \link ::snd_pcm_poll_descriptors_revents() \endlink function | |
71 | + * the ::snd_pcm_poll_descriptors_revents() function | |
72 | * does the right "demangling". | |
73 | * | |
74 | * You can use output from this function as arguments for the select() | |
75 | diff -urNad alsa-lib-1.0.12~/src/rawmidi/rawmidi.c alsa-lib-1.0.12/src/rawmidi/rawmidi.c | |
76 | --- alsa-lib-1.0.12~/src/rawmidi/rawmidi.c 2006-09-03 15:33:45.000000000 +0200 | |
77 | +++ alsa-lib-1.0.12/src/rawmidi/rawmidi.c 2006-09-03 15:32:36.000000000 +0200 | |
78 | @@ -82,7 +82,7 @@ | |
79 | ||
80 | The ALSA library uses a generic string representation for names of devices. | |
81 | The devices might be virtual, physical or a mix of both. The generic string | |
82 | -is passed to \link ::snd_rawmidi_open() \endlink or \link ::snd_rawmidi_open_lconf() \endlink. | |
83 | +is passed to ::snd_rawmidi_open() or ::snd_rawmidi_open_lconf(). | |
84 | It contains two parts: device name and arguments. Devices and arguments are described | |
85 | in configuration files. The usual place for default definitions is at /usr/share/alsa/alsa.conf. | |
86 |
0 | #! /bin/sh /usr/share/dpatch/dpatch-run | |
1 | ## 10_add-maintainer-mode.dpatch by Loic Minier <lool@dooz.org> | |
2 | ## | |
3 | ## All lines beginning with `## DP:' are a description of the patch. | |
4 | ## DP: No description. | |
5 | ||
6 | @DPATCH@ | |
7 | diff -urNad alsa-lib-1.0.11~/configure.in alsa-lib-1.0.11/configure.in | |
8 | --- alsa-lib-1.0.11~/configure.in 2006-05-26 10:32:27.000000000 +0200 | |
9 | +++ alsa-lib-1.0.11/configure.in 2006-05-26 10:32:43.000000000 +0200 | |
10 | @@ -15,6 +15,8 @@ | |
11 | AM_CONDITIONAL(INSTALL_M4, test -n "${ACLOCAL}") | |
12 | ||
13 | AC_PREFIX_DEFAULT(/usr) | |
14 | + | |
15 | +AM_MAINTAINER_MODE | |
16 | ||
17 | dnl Checks for programs. | |
18 |
0 | #! /bin/sh /usr/share/dpatch/dpatch-run | |
1 | ## 40_relibtoolize.dpatch by Loic Minier <lool@dooz.org> | |
2 | ## | |
3 | ## DP: Full relibtoolisation, generated by: | |
4 | ## DP: libtoolize -f -c && aclocal-1.9 && (cp config.sub and config.guess | |
5 | ## DP: from autotools-dev) && autoconf && automake-1.9 && | |
6 | ## DP: rm -rf config.sub config.guess autom4te.cache. | |
7 | ||
8 | @DPATCH@ | |
9 | diff -Naurd a/Makefile.in b/Makefile.in | |
10 | --- a/Makefile.in 2007-05-02 10:02:58.000000000 +0200 | |
11 | +++ b/Makefile.in 2007-05-06 11:05:15.000000000 +0200 | |
12 | @@ -198,6 +198,9 @@ | |
13 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
14 | LN_S = @LN_S@ | |
15 | LTLIBOBJS = @LTLIBOBJS@ | |
16 | +MAINT = @MAINT@ | |
17 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
18 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
19 | MAKEINFO = @MAKEINFO@ | |
20 | OBJEXT = @OBJEXT@ | |
21 | PACKAGE = @PACKAGE@ | |
22 | @@ -283,7 +286,7 @@ | |
23 | .SUFFIXES: | |
24 | am--refresh: | |
25 | @: | |
26 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
27 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
28 | @for dep in $?; do \ | |
29 | case '$(am__configure_deps)' in \ | |
30 | *$$dep*) \ | |
31 | @@ -310,9 +313,9 @@ | |
32 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
33 | $(SHELL) ./config.status --recheck | |
34 | ||
35 | -$(top_srcdir)/configure: $(am__configure_deps) | |
36 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
37 | cd $(srcdir) && $(AUTOCONF) | |
38 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
39 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
40 | cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) | |
41 | ||
42 | mostlyclean-libtool: | |
43 | diff -Naurd a/aclocal.m4 b/aclocal.m4 | |
44 | --- a/aclocal.m4 2007-05-02 10:02:50.000000000 +0200 | |
45 | +++ b/aclocal.m4 2007-05-06 11:05:01.000000000 +0200 | |
46 | @@ -13,7 +13,7 @@ | |
47 | ||
48 | # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- | |
49 | ||
50 | -# serial 48 AC_PROG_LIBTOOL | |
51 | +# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL | |
52 | ||
53 | ||
54 | # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) | |
55 | @@ -1397,18 +1397,6 @@ | |
56 | dynamic_linker=no | |
57 | ;; | |
58 | ||
59 | -kfreebsd*-gnu) | |
60 | - version_type=linux | |
61 | - need_lib_prefix=no | |
62 | - need_version=no | |
63 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | |
64 | - soname_spec='${libname}${release}${shared_ext}$major' | |
65 | - shlibpath_var=LD_LIBRARY_PATH | |
66 | - shlibpath_overrides_runpath=no | |
67 | - hardcode_into_libs=yes | |
68 | - dynamic_linker='GNU ld.so' | |
69 | - ;; | |
70 | - | |
71 | freebsd* | dragonfly*) | |
72 | # DragonFly does not have aout. When/if they implement a new | |
73 | # versioning mechanism, adjust this. | |
74 | @@ -1564,7 +1552,7 @@ | |
75 | ;; | |
76 | ||
77 | # This must be Linux ELF. | |
78 | -linux*) | |
79 | +linux* | k*bsd*-gnu) | |
80 | version_type=linux | |
81 | need_lib_prefix=no | |
82 | need_version=no | |
83 | @@ -1593,7 +1581,7 @@ | |
84 | dynamic_linker='GNU/Linux ld.so' | |
85 | ;; | |
86 | ||
87 | -knetbsd*-gnu) | |
88 | +netbsdelf*-gnu) | |
89 | version_type=linux | |
90 | need_lib_prefix=no | |
91 | need_version=no | |
92 | @@ -1602,7 +1590,7 @@ | |
93 | shlibpath_var=LD_LIBRARY_PATH | |
94 | shlibpath_overrides_runpath=no | |
95 | hardcode_into_libs=yes | |
96 | - dynamic_linker='GNU ld.so' | |
97 | + dynamic_linker='NetBSD ld.elf_so' | |
98 | ;; | |
99 | ||
100 | netbsd*) | |
101 | @@ -2310,7 +2298,7 @@ | |
102 | lt_cv_deplibs_check_method=pass_all | |
103 | ;; | |
104 | ||
105 | -freebsd* | kfreebsd*-gnu | dragonfly*) | |
106 | +freebsd* | dragonfly*) | |
107 | if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then | |
108 | case $host_cpu in | |
109 | i*86 ) | |
110 | @@ -2364,11 +2352,11 @@ | |
111 | ;; | |
112 | ||
113 | # This must be Linux ELF. | |
114 | -linux*) | |
115 | +linux* | k*bsd*-gnu) | |
116 | lt_cv_deplibs_check_method=pass_all | |
117 | ;; | |
118 | ||
119 | -netbsd*) | |
120 | +netbsd* | netbsdelf*-gnu) | |
121 | if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then | |
122 | lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' | |
123 | else | |
124 | @@ -3116,7 +3104,7 @@ | |
125 | freebsd-elf*) | |
126 | _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no | |
127 | ;; | |
128 | - freebsd* | kfreebsd*-gnu | dragonfly*) | |
129 | + freebsd* | dragonfly*) | |
130 | # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF | |
131 | # conventions | |
132 | _LT_AC_TAGVAR(ld_shlibs, $1)=yes | |
133 | @@ -3275,7 +3263,7 @@ | |
134 | _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' | |
135 | _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: | |
136 | ;; | |
137 | - linux*) | |
138 | + linux* | k*bsd*-gnu) | |
139 | case $cc_basename in | |
140 | KCC*) | |
141 | # Kuck and Associates, Inc. (KAI) C++ Compiler | |
142 | @@ -3377,7 +3365,7 @@ | |
143 | ;; | |
144 | esac | |
145 | ;; | |
146 | - netbsd*) | |
147 | + netbsd* | netbsdelf*-gnu) | |
148 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | |
149 | _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' | |
150 | wlarc= | |
151 | @@ -4642,7 +4630,7 @@ | |
152 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | |
153 | 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'" | |
154 | ;; | |
155 | -linux*) | |
156 | +linux* | k*bsd*-gnu) | |
157 | if test "$host_cpu" = ia64; then | |
158 | symcode='[[ABCDGIRSTW]]' | |
159 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | |
160 | @@ -4915,7 +4903,7 @@ | |
161 | ;; | |
162 | esac | |
163 | ;; | |
164 | - freebsd* | kfreebsd*-gnu | dragonfly*) | |
165 | + freebsd* | dragonfly*) | |
166 | # FreeBSD uses GNU C++ | |
167 | ;; | |
168 | hpux9* | hpux10* | hpux11*) | |
169 | @@ -4958,7 +4946,7 @@ | |
170 | ;; | |
171 | esac | |
172 | ;; | |
173 | - linux*) | |
174 | + linux* | k*bsd*-gnu) | |
175 | case $cc_basename in | |
176 | KCC*) | |
177 | # KAI C++ Compiler | |
178 | @@ -5001,7 +4989,7 @@ | |
179 | ;; | |
180 | esac | |
181 | ;; | |
182 | - netbsd*) | |
183 | + netbsd* | netbsdelf*-gnu) | |
184 | ;; | |
185 | osf3* | osf4* | osf5*) | |
186 | case $cc_basename in | |
187 | @@ -5212,7 +5200,7 @@ | |
188 | _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | |
189 | ;; | |
190 | ||
191 | - linux*) | |
192 | + linux* | k*bsd*-gnu) | |
193 | case $cc_basename in | |
194 | icc* | ecc*) | |
195 | _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' | |
196 | @@ -5353,6 +5341,9 @@ | |
197 | cygwin* | mingw*) | |
198 | _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' | |
199 | ;; | |
200 | + linux* | k*bsd*-gnu) | |
201 | + _LT_AC_TAGVAR(link_all_deplibs, $1)=no | |
202 | + ;; | |
203 | *) | |
204 | _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' | |
205 | ;; | |
206 | @@ -5523,7 +5514,7 @@ | |
207 | _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' | |
208 | ;; | |
209 | ||
210 | - linux*) | |
211 | + linux* | k*bsd*-gnu) | |
212 | if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then | |
213 | tmp_addflag= | |
214 | case $cc_basename,$host_cpu in | |
215 | @@ -5549,12 +5540,13 @@ | |
216 | $echo "local: *; };" >> $output_objdir/$libname.ver~ | |
217 | $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' | |
218 | fi | |
219 | + _LT_AC_TAGVAR(link_all_deplibs, $1)=no | |
220 | else | |
221 | _LT_AC_TAGVAR(ld_shlibs, $1)=no | |
222 | fi | |
223 | ;; | |
224 | ||
225 | - netbsd*) | |
226 | + netbsd* | netbsdelf*-gnu) | |
227 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | |
228 | _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | |
229 | wlarc= | |
230 | @@ -5884,7 +5876,7 @@ | |
231 | ;; | |
232 | ||
233 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | |
234 | - freebsd* | kfreebsd*-gnu | dragonfly*) | |
235 | + freebsd* | dragonfly*) | |
236 | _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' | |
237 | _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' | |
238 | _LT_AC_TAGVAR(hardcode_direct, $1)=yes | |
239 | @@ -5986,7 +5978,7 @@ | |
240 | _LT_AC_TAGVAR(link_all_deplibs, $1)=yes | |
241 | ;; | |
242 | ||
243 | - netbsd*) | |
244 | + netbsd* | netbsdelf*-gnu) | |
245 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | |
246 | _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out | |
247 | else | |
248 | @@ -6878,6 +6870,35 @@ | |
249 | rmdir .tst 2>/dev/null | |
250 | AC_SUBST([am__leading_dot])]) | |
251 | ||
252 | +# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- | |
253 | +# From Jim Meyering | |
254 | + | |
255 | +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 | |
256 | +# Free Software Foundation, Inc. | |
257 | +# | |
258 | +# This file is free software; the Free Software Foundation | |
259 | +# gives unlimited permission to copy and/or distribute it, | |
260 | +# with or without modifications, as long as this notice is preserved. | |
261 | + | |
262 | +# serial 4 | |
263 | + | |
264 | +AC_DEFUN([AM_MAINTAINER_MODE], | |
265 | +[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) | |
266 | + dnl maintainer-mode is disabled by default | |
267 | + AC_ARG_ENABLE(maintainer-mode, | |
268 | +[ --enable-maintainer-mode enable make rules and dependencies not useful | |
269 | + (and sometimes confusing) to the casual installer], | |
270 | + USE_MAINTAINER_MODE=$enableval, | |
271 | + USE_MAINTAINER_MODE=no) | |
272 | + AC_MSG_RESULT([$USE_MAINTAINER_MODE]) | |
273 | + AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) | |
274 | + MAINT=$MAINTAINER_MODE_TRUE | |
275 | + AC_SUBST(MAINT)dnl | |
276 | +] | |
277 | +) | |
278 | + | |
279 | +AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) | |
280 | + | |
281 | # Check to see how 'make' treats includes. -*- Autoconf -*- | |
282 | ||
283 | # Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. | |
284 | diff -Naurd a/alsalisp/Makefile.in b/alsalisp/Makefile.in | |
285 | --- a/alsalisp/Makefile.in 2007-05-02 10:02:54.000000000 +0200 | |
286 | +++ b/alsalisp/Makefile.in 2007-05-06 11:05:07.000000000 +0200 | |
287 | @@ -190,6 +190,9 @@ | |
288 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
289 | LN_S = @LN_S@ | |
290 | LTLIBOBJS = @LTLIBOBJS@ | |
291 | +MAINT = @MAINT@ | |
292 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
293 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
294 | MAKEINFO = @MAKEINFO@ | |
295 | OBJEXT = @OBJEXT@ | |
296 | PACKAGE = @PACKAGE@ | |
297 | @@ -272,7 +275,7 @@ | |
298 | ||
299 | .SUFFIXES: | |
300 | .SUFFIXES: .c .lo .o .obj | |
301 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
302 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
303 | @for dep in $?; do \ | |
304 | case '$(am__configure_deps)' in \ | |
305 | *$$dep*) \ | |
306 | @@ -281,9 +284,9 @@ | |
307 | exit 1;; \ | |
308 | esac; \ | |
309 | done; \ | |
310 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign alsalisp/Makefile'; \ | |
311 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu alsalisp/Makefile'; \ | |
312 | cd $(top_srcdir) && \ | |
313 | - $(AUTOMAKE) --foreign alsalisp/Makefile | |
314 | + $(AUTOMAKE) --gnu alsalisp/Makefile | |
315 | .PRECIOUS: Makefile | |
316 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
317 | @case '$?' in \ | |
318 | @@ -297,9 +300,9 @@ | |
319 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
320 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
321 | ||
322 | -$(top_srcdir)/configure: $(am__configure_deps) | |
323 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
324 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
325 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
326 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
327 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
328 | ||
329 | clean-noinstPROGRAMS: | |
330 | diff -Naurd a/aserver/Makefile.in b/aserver/Makefile.in | |
331 | --- a/aserver/Makefile.in 2007-05-02 10:02:54.000000000 +0200 | |
332 | +++ b/aserver/Makefile.in 2007-05-06 11:05:07.000000000 +0200 | |
333 | @@ -192,6 +192,9 @@ | |
334 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
335 | LN_S = @LN_S@ | |
336 | LTLIBOBJS = @LTLIBOBJS@ | |
337 | +MAINT = @MAINT@ | |
338 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
339 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
340 | MAKEINFO = @MAKEINFO@ | |
341 | OBJEXT = @OBJEXT@ | |
342 | PACKAGE = @PACKAGE@ | |
343 | @@ -275,7 +278,7 @@ | |
344 | ||
345 | .SUFFIXES: | |
346 | .SUFFIXES: .c .lo .o .obj | |
347 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
348 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
349 | @for dep in $?; do \ | |
350 | case '$(am__configure_deps)' in \ | |
351 | *$$dep*) \ | |
352 | @@ -284,9 +287,9 @@ | |
353 | exit 1;; \ | |
354 | esac; \ | |
355 | done; \ | |
356 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign aserver/Makefile'; \ | |
357 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu aserver/Makefile'; \ | |
358 | cd $(top_srcdir) && \ | |
359 | - $(AUTOMAKE) --foreign aserver/Makefile | |
360 | + $(AUTOMAKE) --gnu aserver/Makefile | |
361 | .PRECIOUS: Makefile | |
362 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
363 | @case '$?' in \ | |
364 | @@ -300,9 +303,9 @@ | |
365 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
366 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
367 | ||
368 | -$(top_srcdir)/configure: $(am__configure_deps) | |
369 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
370 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
371 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
372 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
373 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
374 | install-binPROGRAMS: $(bin_PROGRAMS) | |
375 | @$(NORMAL_INSTALL) | |
376 | diff -Naurd a/configure b/configure | |
377 | --- a/configure 2007-05-02 10:02:59.000000000 +0200 | |
378 | +++ b/configure 2007-05-06 11:05:05.000000000 +0200 | |
379 | @@ -1,6 +1,6 @@ | |
380 | #! /bin/sh | |
381 | # Guess values for system-dependent variables and create Makefiles. | |
382 | -# Generated by GNU Autoconf 2.60. | |
383 | +# Generated by GNU Autoconf 2.61. | |
384 | # | |
385 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, | |
386 | # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. | |
387 | @@ -10,7 +10,8 @@ | |
388 | ## M4sh Initialization. ## | |
389 | ## --------------------- ## | |
390 | ||
391 | -# Be Bourne compatible | |
392 | +# Be more Bourne compatible | |
393 | +DUALCASE=1; export DUALCASE # for MKS sh | |
394 | if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then | |
395 | emulate sh | |
396 | NULLCMD=: | |
397 | @@ -19,10 +20,13 @@ | |
398 | alias -g '${1+"$@"}'='"$@"' | |
399 | setopt NO_GLOB_SUBST | |
400 | else | |
401 | - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac | |
402 | + case `(set -o) 2>/dev/null` in | |
403 | + *posix*) set -o posix ;; | |
404 | +esac | |
405 | + | |
406 | fi | |
407 | -BIN_SH=xpg4; export BIN_SH # for Tru64 | |
408 | -DUALCASE=1; export DUALCASE # for MKS sh | |
409 | + | |
410 | + | |
411 | ||
412 | ||
413 | # PATH needs CR | |
414 | @@ -215,7 +219,7 @@ | |
415 | else | |
416 | as_candidate_shells= | |
417 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | |
418 | -for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH | |
419 | +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH | |
420 | do | |
421 | IFS=$as_save_IFS | |
422 | test -z "$as_dir" && as_dir=. | |
423 | @@ -233,7 +237,6 @@ | |
424 | # Try only shells that exist, to save several forks. | |
425 | if { test -f "$as_shell" || test -f "$as_shell.exe"; } && | |
426 | { ("$as_shell") 2> /dev/null <<\_ASEOF | |
427 | -# Be Bourne compatible | |
428 | if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then | |
429 | emulate sh | |
430 | NULLCMD=: | |
431 | @@ -242,10 +245,12 @@ | |
432 | alias -g '${1+"$@"}'='"$@"' | |
433 | setopt NO_GLOB_SUBST | |
434 | else | |
435 | - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac | |
436 | + case `(set -o) 2>/dev/null` in | |
437 | + *posix*) set -o posix ;; | |
438 | +esac | |
439 | + | |
440 | fi | |
441 | -BIN_SH=xpg4; export BIN_SH # for Tru64 | |
442 | -DUALCASE=1; export DUALCASE # for MKS sh | |
443 | + | |
444 | ||
445 | : | |
446 | _ASEOF | |
447 | @@ -253,7 +258,6 @@ | |
448 | CONFIG_SHELL=$as_shell | |
449 | as_have_required=yes | |
450 | if { "$as_shell" 2> /dev/null <<\_ASEOF | |
451 | -# Be Bourne compatible | |
452 | if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then | |
453 | emulate sh | |
454 | NULLCMD=: | |
455 | @@ -262,10 +266,12 @@ | |
456 | alias -g '${1+"$@"}'='"$@"' | |
457 | setopt NO_GLOB_SUBST | |
458 | else | |
459 | - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac | |
460 | + case `(set -o) 2>/dev/null` in | |
461 | + *posix*) set -o posix ;; | |
462 | +esac | |
463 | + | |
464 | fi | |
465 | -BIN_SH=xpg4; export BIN_SH # for Tru64 | |
466 | -DUALCASE=1; export DUALCASE # for MKS sh | |
467 | + | |
468 | ||
469 | : | |
470 | (as_func_return () { | |
471 | @@ -512,19 +518,28 @@ | |
472 | as_mkdir_p=false | |
473 | fi | |
474 | ||
475 | -# Find out whether ``test -x'' works. Don't use a zero-byte file, as | |
476 | -# systems may use methods other than mode bits to determine executability. | |
477 | -cat >conf$$.file <<_ASEOF | |
478 | -#! /bin/sh | |
479 | -exit 0 | |
480 | -_ASEOF | |
481 | -chmod +x conf$$.file | |
482 | -if test -x conf$$.file >/dev/null 2>&1; then | |
483 | - as_executable_p="test -x" | |
484 | +if test -x / >/dev/null 2>&1; then | |
485 | + as_test_x='test -x' | |
486 | else | |
487 | - as_executable_p=: | |
488 | + if ls -dL / >/dev/null 2>&1; then | |
489 | + as_ls_L_option=L | |
490 | + else | |
491 | + as_ls_L_option= | |
492 | + fi | |
493 | + as_test_x=' | |
494 | + eval sh -c '\'' | |
495 | + if test -d "$1"; then | |
496 | + test -d "$1/."; | |
497 | + else | |
498 | + case $1 in | |
499 | + -*)set "./$1";; | |
500 | + esac; | |
501 | + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in | |
502 | + ???[sx]*):;;*)false;;esac;fi | |
503 | + '\'' sh | |
504 | + ' | |
505 | fi | |
506 | -rm -f conf$$.file | |
507 | +as_executable_p=$as_test_x | |
508 | ||
509 | # Sed expression to map a string onto a valid CPP name. | |
510 | as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" | |
511 | @@ -720,36 +735,36 @@ | |
512 | # Factoring default headers for most tests. | |
513 | ac_includes_default="\ | |
514 | #include <stdio.h> | |
515 | -#if HAVE_SYS_TYPES_H | |
516 | +#ifdef HAVE_SYS_TYPES_H | |
517 | # include <sys/types.h> | |
518 | #endif | |
519 | -#if HAVE_SYS_STAT_H | |
520 | +#ifdef HAVE_SYS_STAT_H | |
521 | # include <sys/stat.h> | |
522 | #endif | |
523 | -#if STDC_HEADERS | |
524 | +#ifdef STDC_HEADERS | |
525 | # include <stdlib.h> | |
526 | # include <stddef.h> | |
527 | #else | |
528 | -# if HAVE_STDLIB_H | |
529 | +# ifdef HAVE_STDLIB_H | |
530 | # include <stdlib.h> | |
531 | # endif | |
532 | #endif | |
533 | -#if HAVE_STRING_H | |
534 | -# if !STDC_HEADERS && HAVE_MEMORY_H | |
535 | +#ifdef HAVE_STRING_H | |
536 | +# if !defined STDC_HEADERS && defined HAVE_MEMORY_H | |
537 | # include <memory.h> | |
538 | # endif | |
539 | # include <string.h> | |
540 | #endif | |
541 | -#if HAVE_STRINGS_H | |
542 | +#ifdef HAVE_STRINGS_H | |
543 | # include <strings.h> | |
544 | #endif | |
545 | -#if HAVE_INTTYPES_H | |
546 | +#ifdef HAVE_INTTYPES_H | |
547 | # include <inttypes.h> | |
548 | #endif | |
549 | -#if HAVE_STDINT_H | |
550 | +#ifdef HAVE_STDINT_H | |
551 | # include <stdint.h> | |
552 | #endif | |
553 | -#if HAVE_UNISTD_H | |
554 | +#ifdef HAVE_UNISTD_H | |
555 | # include <unistd.h> | |
556 | #endif" | |
557 | ||
558 | @@ -825,6 +840,9 @@ | |
559 | am__untar | |
560 | INSTALL_M4_TRUE | |
561 | INSTALL_M4_FALSE | |
562 | +MAINTAINER_MODE_TRUE | |
563 | +MAINTAINER_MODE_FALSE | |
564 | +MAINT | |
565 | CC | |
566 | CFLAGS | |
567 | LDFLAGS | |
568 | @@ -958,6 +976,7 @@ | |
569 | CC | |
570 | CFLAGS | |
571 | LDFLAGS | |
572 | +LIBS | |
573 | CPPFLAGS | |
574 | CPP | |
575 | CXX | |
576 | @@ -1071,10 +1090,10 @@ | |
577 | -disable-* | --disable-*) | |
578 | ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` | |
579 | # Reject names that are not valid shell variable names. | |
580 | - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && | |
581 | + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && | |
582 | { echo "$as_me: error: invalid feature name: $ac_feature" >&2 | |
583 | { (exit 1); exit 1; }; } | |
584 | - ac_feature=`echo $ac_feature | sed 's/-/_/g'` | |
585 | + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` | |
586 | eval enable_$ac_feature=no ;; | |
587 | ||
588 | -docdir | --docdir | --docdi | --doc | --do) | |
589 | @@ -1090,10 +1109,10 @@ | |
590 | -enable-* | --enable-*) | |
591 | ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` | |
592 | # Reject names that are not valid shell variable names. | |
593 | - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && | |
594 | + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && | |
595 | { echo "$as_me: error: invalid feature name: $ac_feature" >&2 | |
596 | { (exit 1); exit 1; }; } | |
597 | - ac_feature=`echo $ac_feature | sed 's/-/_/g'` | |
598 | + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` | |
599 | eval enable_$ac_feature=\$ac_optarg ;; | |
600 | ||
601 | -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | |
602 | @@ -1287,19 +1306,19 @@ | |
603 | -with-* | --with-*) | |
604 | ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` | |
605 | # Reject names that are not valid shell variable names. | |
606 | - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && | |
607 | + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && | |
608 | { echo "$as_me: error: invalid package name: $ac_package" >&2 | |
609 | { (exit 1); exit 1; }; } | |
610 | - ac_package=`echo $ac_package| sed 's/-/_/g'` | |
611 | + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` | |
612 | eval with_$ac_package=\$ac_optarg ;; | |
613 | ||
614 | -without-* | --without-*) | |
615 | ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` | |
616 | # Reject names that are not valid shell variable names. | |
617 | - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && | |
618 | + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && | |
619 | { echo "$as_me: error: invalid package name: $ac_package" >&2 | |
620 | { (exit 1); exit 1; }; } | |
621 | - ac_package=`echo $ac_package | sed 's/-/_/g'` | |
622 | + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` | |
623 | eval with_$ac_package=no ;; | |
624 | ||
625 | --x) | |
626 | @@ -1544,6 +1563,8 @@ | |
627 | Optional Features: | |
628 | --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) | |
629 | --enable-FEATURE[=ARG] include FEATURE [ARG=yes] | |
630 | + --enable-maintainer-mode enable make rules and dependencies not useful | |
631 | + (and sometimes confusing) to the casual installer | |
632 | --disable-dependency-tracking speeds up one-time build | |
633 | --enable-dependency-tracking do not reject slow dependency extractors | |
634 | --enable-static[=PKGS] build static libraries [default=no] | |
635 | @@ -1592,6 +1613,7 @@ | |
636 | CFLAGS C compiler flags | |
637 | LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a | |
638 | nonstandard directory <lib dir> | |
639 | + LIBS libraries to pass to the linker, e.g. -l<library> | |
640 | CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if | |
641 | you have headers in a nonstandard directory <include dir> | |
642 | CPP C preprocessor | |
643 | @@ -1665,7 +1687,7 @@ | |
644 | if $ac_init_version; then | |
645 | cat <<\_ACEOF | |
646 | configure | |
647 | -generated by GNU Autoconf 2.60 | |
648 | +generated by GNU Autoconf 2.61 | |
649 | ||
650 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, | |
651 | 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. | |
652 | @@ -1679,7 +1701,7 @@ | |
653 | running configure, to aid debugging if configure makes a mistake. | |
654 | ||
655 | It was created by $as_me, which was | |
656 | -generated by GNU Autoconf 2.60. Invocation command line was | |
657 | +generated by GNU Autoconf 2.61. Invocation command line was | |
658 | ||
659 | $ $0 $@ | |
660 | ||
661 | @@ -2217,7 +2239,7 @@ | |
662 | # by default. | |
663 | for ac_prog in ginstall scoinst install; do | |
664 | for ac_exec_ext in '' $ac_executable_extensions; do | |
665 | - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then | |
666 | + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then | |
667 | if test $ac_prog = install && | |
668 | grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then | |
669 | # AIX install. It has an incompatible calling convention. | |
670 | @@ -2383,7 +2405,7 @@ | |
671 | IFS=$as_save_IFS | |
672 | test -z "$as_dir" && as_dir=. | |
673 | for ac_exec_ext in '' $ac_executable_extensions; do | |
674 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | |
675 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
676 | ac_cv_prog_AWK="$ac_prog" | |
677 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
678 | break 2 | |
679 | @@ -2518,7 +2540,7 @@ | |
680 | IFS=$as_save_IFS | |
681 | test -z "$as_dir" && as_dir=. | |
682 | for ac_exec_ext in '' $ac_executable_extensions; do | |
683 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | |
684 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
685 | ac_cv_prog_STRIP="${ac_tool_prefix}strip" | |
686 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
687 | break 2 | |
688 | @@ -2558,7 +2580,7 @@ | |
689 | IFS=$as_save_IFS | |
690 | test -z "$as_dir" && as_dir=. | |
691 | for ac_exec_ext in '' $ac_executable_extensions; do | |
692 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | |
693 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
694 | ac_cv_prog_ac_ct_STRIP="strip" | |
695 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
696 | break 2 | |
697 | @@ -2626,6 +2648,31 @@ | |
698 | ||
699 | ||
700 | ||
701 | +{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 | |
702 | +echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; } | |
703 | + # Check whether --enable-maintainer-mode was given. | |
704 | +if test "${enable_maintainer_mode+set}" = set; then | |
705 | + enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval | |
706 | +else | |
707 | + USE_MAINTAINER_MODE=no | |
708 | +fi | |
709 | + | |
710 | + { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 | |
711 | +echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; } | |
712 | + | |
713 | + | |
714 | +if test $USE_MAINTAINER_MODE = yes; then | |
715 | + MAINTAINER_MODE_TRUE= | |
716 | + MAINTAINER_MODE_FALSE='#' | |
717 | +else | |
718 | + MAINTAINER_MODE_TRUE='#' | |
719 | + MAINTAINER_MODE_FALSE= | |
720 | +fi | |
721 | + | |
722 | + MAINT=$MAINTAINER_MODE_TRUE | |
723 | + | |
724 | + | |
725 | + | |
726 | ||
727 | if test "x$target" != "x$host" -a -z "`echo $CC | grep -e '-gcc'`"; | |
728 | then | |
729 | @@ -2665,7 +2712,7 @@ | |
730 | IFS=$as_save_IFS | |
731 | test -z "$as_dir" && as_dir=. | |
732 | for ac_exec_ext in '' $ac_executable_extensions; do | |
733 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | |
734 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
735 | ac_cv_prog_CC="${ac_tool_prefix}gcc" | |
736 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
737 | break 2 | |
738 | @@ -2705,7 +2752,7 @@ | |
739 | IFS=$as_save_IFS | |
740 | test -z "$as_dir" && as_dir=. | |
741 | for ac_exec_ext in '' $ac_executable_extensions; do | |
742 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | |
743 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
744 | ac_cv_prog_ac_ct_CC="gcc" | |
745 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
746 | break 2 | |
747 | @@ -2762,7 +2809,7 @@ | |
748 | IFS=$as_save_IFS | |
749 | test -z "$as_dir" && as_dir=. | |
750 | for ac_exec_ext in '' $ac_executable_extensions; do | |
751 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | |
752 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
753 | ac_cv_prog_CC="${ac_tool_prefix}cc" | |
754 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
755 | break 2 | |
756 | @@ -2803,7 +2850,7 @@ | |
757 | IFS=$as_save_IFS | |
758 | test -z "$as_dir" && as_dir=. | |
759 | for ac_exec_ext in '' $ac_executable_extensions; do | |
760 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | |
761 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
762 | if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then | |
763 | ac_prog_rejected=yes | |
764 | continue | |
765 | @@ -2861,7 +2908,7 @@ | |
766 | IFS=$as_save_IFS | |
767 | test -z "$as_dir" && as_dir=. | |
768 | for ac_exec_ext in '' $ac_executable_extensions; do | |
769 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | |
770 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
771 | ac_cv_prog_CC="$ac_tool_prefix$ac_prog" | |
772 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
773 | break 2 | |
774 | @@ -2905,7 +2952,7 @@ | |
775 | IFS=$as_save_IFS | |
776 | test -z "$as_dir" && as_dir=. | |
777 | for ac_exec_ext in '' $ac_executable_extensions; do | |
778 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | |
779 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
780 | ac_cv_prog_ac_ct_CC="$ac_prog" | |
781 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
782 | break 2 | |
783 | @@ -3046,7 +3093,7 @@ | |
784 | # in a Makefile. We should not override ac_cv_exeext if it was cached, | |
785 | # so that the user can short-circuit this test for compilers unknown to | |
786 | # Autoconf. | |
787 | -for ac_file in $ac_files | |
788 | +for ac_file in $ac_files '' | |
789 | do | |
790 | test -f "$ac_file" || continue | |
791 | case $ac_file in | |
792 | @@ -3074,6 +3121,12 @@ | |
793 | test "$ac_cv_exeext" = no && ac_cv_exeext= | |
794 | ||
795 | else | |
796 | + ac_file='' | |
797 | +fi | |
798 | + | |
799 | +{ echo "$as_me:$LINENO: result: $ac_file" >&5 | |
800 | +echo "${ECHO_T}$ac_file" >&6; } | |
801 | +if test -z "$ac_file"; then | |
802 | echo "$as_me: failed program was:" >&5 | |
803 | sed 's/^/| /' conftest.$ac_ext >&5 | |
804 | ||
805 | @@ -3085,8 +3138,6 @@ | |
806 | fi | |
807 | ||
808 | ac_exeext=$ac_cv_exeext | |
809 | -{ echo "$as_me:$LINENO: result: $ac_file" >&5 | |
810 | -echo "${ECHO_T}$ac_file" >&6; } | |
811 | ||
812 | # Check that the compiler produces executables we can run. If not, either | |
813 | # the compiler is broken, or we cross compile. | |
814 | @@ -3264,27 +3315,10 @@ | |
815 | rm -f conftest.er1 | |
816 | cat conftest.err >&5 | |
817 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
818 | - (exit $ac_status); } && | |
819 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
820 | - { (case "(($ac_try" in | |
821 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
822 | - *) ac_try_echo=$ac_try;; | |
823 | -esac | |
824 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
825 | - (eval "$ac_try") 2>&5 | |
826 | - ac_status=$? | |
827 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
828 | - (exit $ac_status); }; } && | |
829 | - { ac_try='test -s conftest.$ac_objext' | |
830 | - { (case "(($ac_try" in | |
831 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
832 | - *) ac_try_echo=$ac_try;; | |
833 | -esac | |
834 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
835 | - (eval "$ac_try") 2>&5 | |
836 | - ac_status=$? | |
837 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
838 | - (exit $ac_status); }; }; then | |
839 | + (exit $ac_status); } && { | |
840 | + test -z "$ac_c_werror_flag" || | |
841 | + test ! -s conftest.err | |
842 | + } && test -s conftest.$ac_objext; then | |
843 | ac_compiler_gnu=yes | |
844 | else | |
845 | echo "$as_me: failed program was:" >&5 | |
846 | @@ -3339,27 +3373,10 @@ | |
847 | rm -f conftest.er1 | |
848 | cat conftest.err >&5 | |
849 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
850 | - (exit $ac_status); } && | |
851 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
852 | - { (case "(($ac_try" in | |
853 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
854 | - *) ac_try_echo=$ac_try;; | |
855 | -esac | |
856 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
857 | - (eval "$ac_try") 2>&5 | |
858 | - ac_status=$? | |
859 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
860 | - (exit $ac_status); }; } && | |
861 | - { ac_try='test -s conftest.$ac_objext' | |
862 | - { (case "(($ac_try" in | |
863 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
864 | - *) ac_try_echo=$ac_try;; | |
865 | -esac | |
866 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
867 | - (eval "$ac_try") 2>&5 | |
868 | - ac_status=$? | |
869 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
870 | - (exit $ac_status); }; }; then | |
871 | + (exit $ac_status); } && { | |
872 | + test -z "$ac_c_werror_flag" || | |
873 | + test ! -s conftest.err | |
874 | + } && test -s conftest.$ac_objext; then | |
875 | ac_cv_prog_cc_g=yes | |
876 | else | |
877 | echo "$as_me: failed program was:" >&5 | |
878 | @@ -3394,27 +3411,10 @@ | |
879 | rm -f conftest.er1 | |
880 | cat conftest.err >&5 | |
881 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
882 | - (exit $ac_status); } && | |
883 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
884 | - { (case "(($ac_try" in | |
885 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
886 | - *) ac_try_echo=$ac_try;; | |
887 | -esac | |
888 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
889 | - (eval "$ac_try") 2>&5 | |
890 | - ac_status=$? | |
891 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
892 | - (exit $ac_status); }; } && | |
893 | - { ac_try='test -s conftest.$ac_objext' | |
894 | - { (case "(($ac_try" in | |
895 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
896 | - *) ac_try_echo=$ac_try;; | |
897 | -esac | |
898 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
899 | - (eval "$ac_try") 2>&5 | |
900 | - ac_status=$? | |
901 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
902 | - (exit $ac_status); }; }; then | |
903 | + (exit $ac_status); } && { | |
904 | + test -z "$ac_c_werror_flag" || | |
905 | + test ! -s conftest.err | |
906 | + } && test -s conftest.$ac_objext; then | |
907 | : | |
908 | else | |
909 | echo "$as_me: failed program was:" >&5 | |
910 | @@ -3450,27 +3450,10 @@ | |
911 | rm -f conftest.er1 | |
912 | cat conftest.err >&5 | |
913 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
914 | - (exit $ac_status); } && | |
915 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
916 | - { (case "(($ac_try" in | |
917 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
918 | - *) ac_try_echo=$ac_try;; | |
919 | -esac | |
920 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
921 | - (eval "$ac_try") 2>&5 | |
922 | - ac_status=$? | |
923 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
924 | - (exit $ac_status); }; } && | |
925 | - { ac_try='test -s conftest.$ac_objext' | |
926 | - { (case "(($ac_try" in | |
927 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
928 | - *) ac_try_echo=$ac_try;; | |
929 | -esac | |
930 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
931 | - (eval "$ac_try") 2>&5 | |
932 | - ac_status=$? | |
933 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
934 | - (exit $ac_status); }; }; then | |
935 | + (exit $ac_status); } && { | |
936 | + test -z "$ac_c_werror_flag" || | |
937 | + test ! -s conftest.err | |
938 | + } && test -s conftest.$ac_objext; then | |
939 | ac_cv_prog_cc_g=yes | |
940 | else | |
941 | echo "$as_me: failed program was:" >&5 | |
942 | @@ -3586,27 +3569,10 @@ | |
943 | rm -f conftest.er1 | |
944 | cat conftest.err >&5 | |
945 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
946 | - (exit $ac_status); } && | |
947 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
948 | - { (case "(($ac_try" in | |
949 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
950 | - *) ac_try_echo=$ac_try;; | |
951 | -esac | |
952 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
953 | - (eval "$ac_try") 2>&5 | |
954 | - ac_status=$? | |
955 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
956 | - (exit $ac_status); }; } && | |
957 | - { ac_try='test -s conftest.$ac_objext' | |
958 | - { (case "(($ac_try" in | |
959 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
960 | - *) ac_try_echo=$ac_try;; | |
961 | -esac | |
962 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
963 | - (eval "$ac_try") 2>&5 | |
964 | - ac_status=$? | |
965 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
966 | - (exit $ac_status); }; }; then | |
967 | + (exit $ac_status); } && { | |
968 | + test -z "$ac_c_werror_flag" || | |
969 | + test ! -s conftest.err | |
970 | + } && test -s conftest.$ac_objext; then | |
971 | ac_cv_prog_cc_c89=$ac_arg | |
972 | else | |
973 | echo "$as_me: failed program was:" >&5 | |
974 | @@ -3869,17 +3835,10 @@ | |
975 | rm -f conftest.er1 | |
976 | cat conftest.err >&5 | |
977 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
978 | - (exit $ac_status); } >/dev/null; then | |
979 | - if test -s conftest.err; then | |
980 | - ac_cpp_err=$ac_c_preproc_warn_flag | |
981 | - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | |
982 | - else | |
983 | - ac_cpp_err= | |
984 | - fi | |
985 | -else | |
986 | - ac_cpp_err=yes | |
987 | -fi | |
988 | -if test -z "$ac_cpp_err"; then | |
989 | + (exit $ac_status); } >/dev/null && { | |
990 | + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | |
991 | + test ! -s conftest.err | |
992 | + }; then | |
993 | : | |
994 | else | |
995 | echo "$as_me: failed program was:" >&5 | |
996 | @@ -3913,17 +3872,10 @@ | |
997 | rm -f conftest.er1 | |
998 | cat conftest.err >&5 | |
999 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1000 | - (exit $ac_status); } >/dev/null; then | |
1001 | - if test -s conftest.err; then | |
1002 | - ac_cpp_err=$ac_c_preproc_warn_flag | |
1003 | - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | |
1004 | - else | |
1005 | - ac_cpp_err= | |
1006 | - fi | |
1007 | -else | |
1008 | - ac_cpp_err=yes | |
1009 | -fi | |
1010 | -if test -z "$ac_cpp_err"; then | |
1011 | + (exit $ac_status); } >/dev/null && { | |
1012 | + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | |
1013 | + test ! -s conftest.err | |
1014 | + }; then | |
1015 | # Broken: success on invalid input. | |
1016 | continue | |
1017 | else | |
1018 | @@ -3988,17 +3940,10 @@ | |
1019 | rm -f conftest.er1 | |
1020 | cat conftest.err >&5 | |
1021 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1022 | - (exit $ac_status); } >/dev/null; then | |
1023 | - if test -s conftest.err; then | |
1024 | - ac_cpp_err=$ac_c_preproc_warn_flag | |
1025 | - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | |
1026 | - else | |
1027 | - ac_cpp_err= | |
1028 | - fi | |
1029 | -else | |
1030 | - ac_cpp_err=yes | |
1031 | -fi | |
1032 | -if test -z "$ac_cpp_err"; then | |
1033 | + (exit $ac_status); } >/dev/null && { | |
1034 | + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | |
1035 | + test ! -s conftest.err | |
1036 | + }; then | |
1037 | : | |
1038 | else | |
1039 | echo "$as_me: failed program was:" >&5 | |
1040 | @@ -4032,17 +3977,10 @@ | |
1041 | rm -f conftest.er1 | |
1042 | cat conftest.err >&5 | |
1043 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1044 | - (exit $ac_status); } >/dev/null; then | |
1045 | - if test -s conftest.err; then | |
1046 | - ac_cpp_err=$ac_c_preproc_warn_flag | |
1047 | - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | |
1048 | - else | |
1049 | - ac_cpp_err= | |
1050 | - fi | |
1051 | -else | |
1052 | - ac_cpp_err=yes | |
1053 | -fi | |
1054 | -if test -z "$ac_cpp_err"; then | |
1055 | + (exit $ac_status); } >/dev/null && { | |
1056 | + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | |
1057 | + test ! -s conftest.err | |
1058 | + }; then | |
1059 | # Broken: success on invalid input. | |
1060 | continue | |
1061 | else | |
1062 | @@ -4111,7 +4049,7 @@ | |
1063 | # by default. | |
1064 | for ac_prog in ginstall scoinst install; do | |
1065 | for ac_exec_ext in '' $ac_executable_extensions; do | |
1066 | - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then | |
1067 | + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then | |
1068 | if test $ac_prog = install && | |
1069 | grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then | |
1070 | # AIX install. It has an incompatible calling convention. | |
1071 | @@ -4319,7 +4257,7 @@ | |
1072 | for ac_prog in grep ggrep; do | |
1073 | for ac_exec_ext in '' $ac_executable_extensions; do | |
1074 | ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" | |
1075 | - { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue | |
1076 | + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue | |
1077 | # Check for GNU ac_path_GREP and select it if it is found. | |
1078 | # Check for GNU $ac_path_GREP | |
1079 | case `"$ac_path_GREP" --version 2>&1` in | |
1080 | @@ -4401,7 +4339,7 @@ | |
1081 | for ac_prog in egrep; do | |
1082 | for ac_exec_ext in '' $ac_executable_extensions; do | |
1083 | ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" | |
1084 | - { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue | |
1085 | + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue | |
1086 | # Check for GNU ac_path_EGREP and select it if it is found. | |
1087 | # Check for GNU $ac_path_EGREP | |
1088 | case `"$ac_path_EGREP" --version 2>&1` in | |
1089 | @@ -4696,7 +4634,7 @@ | |
1090 | lt_cv_deplibs_check_method=pass_all | |
1091 | ;; | |
1092 | ||
1093 | -freebsd* | kfreebsd*-gnu | dragonfly*) | |
1094 | +freebsd* | dragonfly*) | |
1095 | if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then | |
1096 | case $host_cpu in | |
1097 | i*86 ) | |
1098 | @@ -4750,11 +4688,11 @@ | |
1099 | ;; | |
1100 | ||
1101 | # This must be Linux ELF. | |
1102 | -linux*) | |
1103 | +linux* | k*bsd*-gnu) | |
1104 | lt_cv_deplibs_check_method=pass_all | |
1105 | ;; | |
1106 | ||
1107 | -netbsd*) | |
1108 | +netbsd* | netbsdelf*-gnu) | |
1109 | if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then | |
1110 | lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' | |
1111 | else | |
1112 | @@ -4871,7 +4809,7 @@ | |
1113 | ;; | |
1114 | *-*-irix6*) | |
1115 | # Find out which ABI we are using. | |
1116 | - echo '#line 4874 "configure"' > conftest.$ac_ext | |
1117 | + echo '#line 4812 "configure"' > conftest.$ac_ext | |
1118 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
1119 | (eval $ac_compile) 2>&5 | |
1120 | ac_status=$? | |
1121 | @@ -4995,27 +4933,11 @@ | |
1122 | rm -f conftest.er1 | |
1123 | cat conftest.err >&5 | |
1124 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1125 | - (exit $ac_status); } && | |
1126 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
1127 | - { (case "(($ac_try" in | |
1128 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1129 | - *) ac_try_echo=$ac_try;; | |
1130 | -esac | |
1131 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1132 | - (eval "$ac_try") 2>&5 | |
1133 | - ac_status=$? | |
1134 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1135 | - (exit $ac_status); }; } && | |
1136 | - { ac_try='test -s conftest$ac_exeext' | |
1137 | - { (case "(($ac_try" in | |
1138 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1139 | - *) ac_try_echo=$ac_try;; | |
1140 | -esac | |
1141 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1142 | - (eval "$ac_try") 2>&5 | |
1143 | - ac_status=$? | |
1144 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1145 | - (exit $ac_status); }; }; then | |
1146 | + (exit $ac_status); } && { | |
1147 | + test -z "$ac_c_werror_flag" || | |
1148 | + test ! -s conftest.err | |
1149 | + } && test -s conftest$ac_exeext && | |
1150 | + $as_test_x conftest$ac_exeext; then | |
1151 | lt_cv_cc_needs_belf=yes | |
1152 | else | |
1153 | echo "$as_me: failed program was:" >&5 | |
1154 | @@ -5024,7 +4946,7 @@ | |
1155 | lt_cv_cc_needs_belf=no | |
1156 | fi | |
1157 | ||
1158 | -rm -f core conftest.err conftest.$ac_objext \ | |
1159 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
1160 | conftest$ac_exeext conftest.$ac_ext | |
1161 | ac_ext=c | |
1162 | ac_cpp='$CPP $CPPFLAGS' | |
1163 | @@ -5104,27 +5026,10 @@ | |
1164 | rm -f conftest.er1 | |
1165 | cat conftest.err >&5 | |
1166 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1167 | - (exit $ac_status); } && | |
1168 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
1169 | - { (case "(($ac_try" in | |
1170 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1171 | - *) ac_try_echo=$ac_try;; | |
1172 | -esac | |
1173 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1174 | - (eval "$ac_try") 2>&5 | |
1175 | - ac_status=$? | |
1176 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1177 | - (exit $ac_status); }; } && | |
1178 | - { ac_try='test -s conftest.$ac_objext' | |
1179 | - { (case "(($ac_try" in | |
1180 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1181 | - *) ac_try_echo=$ac_try;; | |
1182 | -esac | |
1183 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1184 | - (eval "$ac_try") 2>&5 | |
1185 | - ac_status=$? | |
1186 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1187 | - (exit $ac_status); }; }; then | |
1188 | + (exit $ac_status); } && { | |
1189 | + test -z "$ac_c_werror_flag" || | |
1190 | + test ! -s conftest.err | |
1191 | + } && test -s conftest.$ac_objext; then | |
1192 | ac_cv_header_stdc=yes | |
1193 | else | |
1194 | echo "$as_me: failed program was:" >&5 | |
1195 | @@ -5300,27 +5205,10 @@ | |
1196 | rm -f conftest.er1 | |
1197 | cat conftest.err >&5 | |
1198 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1199 | - (exit $ac_status); } && | |
1200 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
1201 | - { (case "(($ac_try" in | |
1202 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1203 | - *) ac_try_echo=$ac_try;; | |
1204 | -esac | |
1205 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1206 | - (eval "$ac_try") 2>&5 | |
1207 | - ac_status=$? | |
1208 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1209 | - (exit $ac_status); }; } && | |
1210 | - { ac_try='test -s conftest.$ac_objext' | |
1211 | - { (case "(($ac_try" in | |
1212 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1213 | - *) ac_try_echo=$ac_try;; | |
1214 | -esac | |
1215 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1216 | - (eval "$ac_try") 2>&5 | |
1217 | - ac_status=$? | |
1218 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1219 | - (exit $ac_status); }; }; then | |
1220 | + (exit $ac_status); } && { | |
1221 | + test -z "$ac_c_werror_flag" || | |
1222 | + test ! -s conftest.err | |
1223 | + } && test -s conftest.$ac_objext; then | |
1224 | eval "$as_ac_Header=yes" | |
1225 | else | |
1226 | echo "$as_me: failed program was:" >&5 | |
1227 | @@ -5383,27 +5271,10 @@ | |
1228 | rm -f conftest.er1 | |
1229 | cat conftest.err >&5 | |
1230 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1231 | - (exit $ac_status); } && | |
1232 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
1233 | - { (case "(($ac_try" in | |
1234 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1235 | - *) ac_try_echo=$ac_try;; | |
1236 | -esac | |
1237 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1238 | - (eval "$ac_try") 2>&5 | |
1239 | - ac_status=$? | |
1240 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1241 | - (exit $ac_status); }; } && | |
1242 | - { ac_try='test -s conftest.$ac_objext' | |
1243 | - { (case "(($ac_try" in | |
1244 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1245 | - *) ac_try_echo=$ac_try;; | |
1246 | -esac | |
1247 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1248 | - (eval "$ac_try") 2>&5 | |
1249 | - ac_status=$? | |
1250 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1251 | - (exit $ac_status); }; }; then | |
1252 | + (exit $ac_status); } && { | |
1253 | + test -z "$ac_c_werror_flag" || | |
1254 | + test ! -s conftest.err | |
1255 | + } && test -s conftest.$ac_objext; then | |
1256 | ac_header_compiler=yes | |
1257 | else | |
1258 | echo "$as_me: failed program was:" >&5 | |
1259 | @@ -5439,17 +5310,10 @@ | |
1260 | rm -f conftest.er1 | |
1261 | cat conftest.err >&5 | |
1262 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1263 | - (exit $ac_status); } >/dev/null; then | |
1264 | - if test -s conftest.err; then | |
1265 | - ac_cpp_err=$ac_c_preproc_warn_flag | |
1266 | - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | |
1267 | - else | |
1268 | - ac_cpp_err= | |
1269 | - fi | |
1270 | -else | |
1271 | - ac_cpp_err=yes | |
1272 | -fi | |
1273 | -if test -z "$ac_cpp_err"; then | |
1274 | + (exit $ac_status); } >/dev/null && { | |
1275 | + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | |
1276 | + test ! -s conftest.err | |
1277 | + }; then | |
1278 | ac_header_preproc=yes | |
1279 | else | |
1280 | echo "$as_me: failed program was:" >&5 | |
1281 | @@ -5536,7 +5400,7 @@ | |
1282 | IFS=$as_save_IFS | |
1283 | test -z "$as_dir" && as_dir=. | |
1284 | for ac_exec_ext in '' $ac_executable_extensions; do | |
1285 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | |
1286 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
1287 | ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" | |
1288 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
1289 | break 2 | |
1290 | @@ -5580,7 +5444,7 @@ | |
1291 | IFS=$as_save_IFS | |
1292 | test -z "$as_dir" && as_dir=. | |
1293 | for ac_exec_ext in '' $ac_executable_extensions; do | |
1294 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | |
1295 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
1296 | ac_cv_prog_ac_ct_CXX="$ac_prog" | |
1297 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
1298 | break 2 | |
1299 | @@ -5693,27 +5557,10 @@ | |
1300 | rm -f conftest.er1 | |
1301 | cat conftest.err >&5 | |
1302 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1303 | - (exit $ac_status); } && | |
1304 | - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' | |
1305 | - { (case "(($ac_try" in | |
1306 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1307 | - *) ac_try_echo=$ac_try;; | |
1308 | -esac | |
1309 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1310 | - (eval "$ac_try") 2>&5 | |
1311 | - ac_status=$? | |
1312 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1313 | - (exit $ac_status); }; } && | |
1314 | - { ac_try='test -s conftest.$ac_objext' | |
1315 | - { (case "(($ac_try" in | |
1316 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1317 | - *) ac_try_echo=$ac_try;; | |
1318 | -esac | |
1319 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1320 | - (eval "$ac_try") 2>&5 | |
1321 | - ac_status=$? | |
1322 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1323 | - (exit $ac_status); }; }; then | |
1324 | + (exit $ac_status); } && { | |
1325 | + test -z "$ac_cxx_werror_flag" || | |
1326 | + test ! -s conftest.err | |
1327 | + } && test -s conftest.$ac_objext; then | |
1328 | ac_compiler_gnu=yes | |
1329 | else | |
1330 | echo "$as_me: failed program was:" >&5 | |
1331 | @@ -5768,27 +5615,10 @@ | |
1332 | rm -f conftest.er1 | |
1333 | cat conftest.err >&5 | |
1334 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1335 | - (exit $ac_status); } && | |
1336 | - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' | |
1337 | - { (case "(($ac_try" in | |
1338 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1339 | - *) ac_try_echo=$ac_try;; | |
1340 | -esac | |
1341 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1342 | - (eval "$ac_try") 2>&5 | |
1343 | - ac_status=$? | |
1344 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1345 | - (exit $ac_status); }; } && | |
1346 | - { ac_try='test -s conftest.$ac_objext' | |
1347 | - { (case "(($ac_try" in | |
1348 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1349 | - *) ac_try_echo=$ac_try;; | |
1350 | -esac | |
1351 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1352 | - (eval "$ac_try") 2>&5 | |
1353 | - ac_status=$? | |
1354 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1355 | - (exit $ac_status); }; }; then | |
1356 | + (exit $ac_status); } && { | |
1357 | + test -z "$ac_cxx_werror_flag" || | |
1358 | + test ! -s conftest.err | |
1359 | + } && test -s conftest.$ac_objext; then | |
1360 | ac_cv_prog_cxx_g=yes | |
1361 | else | |
1362 | echo "$as_me: failed program was:" >&5 | |
1363 | @@ -5823,27 +5653,10 @@ | |
1364 | rm -f conftest.er1 | |
1365 | cat conftest.err >&5 | |
1366 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1367 | - (exit $ac_status); } && | |
1368 | - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' | |
1369 | - { (case "(($ac_try" in | |
1370 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1371 | - *) ac_try_echo=$ac_try;; | |
1372 | -esac | |
1373 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1374 | - (eval "$ac_try") 2>&5 | |
1375 | - ac_status=$? | |
1376 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1377 | - (exit $ac_status); }; } && | |
1378 | - { ac_try='test -s conftest.$ac_objext' | |
1379 | - { (case "(($ac_try" in | |
1380 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1381 | - *) ac_try_echo=$ac_try;; | |
1382 | -esac | |
1383 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1384 | - (eval "$ac_try") 2>&5 | |
1385 | - ac_status=$? | |
1386 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1387 | - (exit $ac_status); }; }; then | |
1388 | + (exit $ac_status); } && { | |
1389 | + test -z "$ac_cxx_werror_flag" || | |
1390 | + test ! -s conftest.err | |
1391 | + } && test -s conftest.$ac_objext; then | |
1392 | : | |
1393 | else | |
1394 | echo "$as_me: failed program was:" >&5 | |
1395 | @@ -5879,27 +5692,10 @@ | |
1396 | rm -f conftest.er1 | |
1397 | cat conftest.err >&5 | |
1398 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1399 | - (exit $ac_status); } && | |
1400 | - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' | |
1401 | - { (case "(($ac_try" in | |
1402 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1403 | - *) ac_try_echo=$ac_try;; | |
1404 | -esac | |
1405 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1406 | - (eval "$ac_try") 2>&5 | |
1407 | - ac_status=$? | |
1408 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1409 | - (exit $ac_status); }; } && | |
1410 | - { ac_try='test -s conftest.$ac_objext' | |
1411 | - { (case "(($ac_try" in | |
1412 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1413 | - *) ac_try_echo=$ac_try;; | |
1414 | -esac | |
1415 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1416 | - (eval "$ac_try") 2>&5 | |
1417 | - ac_status=$? | |
1418 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1419 | - (exit $ac_status); }; }; then | |
1420 | + (exit $ac_status); } && { | |
1421 | + test -z "$ac_cxx_werror_flag" || | |
1422 | + test ! -s conftest.err | |
1423 | + } && test -s conftest.$ac_objext; then | |
1424 | ac_cv_prog_cxx_g=yes | |
1425 | else | |
1426 | echo "$as_me: failed program was:" >&5 | |
1427 | @@ -6102,17 +5898,10 @@ | |
1428 | rm -f conftest.er1 | |
1429 | cat conftest.err >&5 | |
1430 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1431 | - (exit $ac_status); } >/dev/null; then | |
1432 | - if test -s conftest.err; then | |
1433 | - ac_cpp_err=$ac_cxx_preproc_warn_flag | |
1434 | - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag | |
1435 | - else | |
1436 | - ac_cpp_err= | |
1437 | - fi | |
1438 | -else | |
1439 | - ac_cpp_err=yes | |
1440 | -fi | |
1441 | -if test -z "$ac_cpp_err"; then | |
1442 | + (exit $ac_status); } >/dev/null && { | |
1443 | + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || | |
1444 | + test ! -s conftest.err | |
1445 | + }; then | |
1446 | : | |
1447 | else | |
1448 | echo "$as_me: failed program was:" >&5 | |
1449 | @@ -6146,17 +5935,10 @@ | |
1450 | rm -f conftest.er1 | |
1451 | cat conftest.err >&5 | |
1452 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1453 | - (exit $ac_status); } >/dev/null; then | |
1454 | - if test -s conftest.err; then | |
1455 | - ac_cpp_err=$ac_cxx_preproc_warn_flag | |
1456 | - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag | |
1457 | - else | |
1458 | - ac_cpp_err= | |
1459 | - fi | |
1460 | -else | |
1461 | - ac_cpp_err=yes | |
1462 | -fi | |
1463 | -if test -z "$ac_cpp_err"; then | |
1464 | + (exit $ac_status); } >/dev/null && { | |
1465 | + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || | |
1466 | + test ! -s conftest.err | |
1467 | + }; then | |
1468 | # Broken: success on invalid input. | |
1469 | continue | |
1470 | else | |
1471 | @@ -6221,17 +6003,10 @@ | |
1472 | rm -f conftest.er1 | |
1473 | cat conftest.err >&5 | |
1474 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1475 | - (exit $ac_status); } >/dev/null; then | |
1476 | - if test -s conftest.err; then | |
1477 | - ac_cpp_err=$ac_cxx_preproc_warn_flag | |
1478 | - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag | |
1479 | - else | |
1480 | - ac_cpp_err= | |
1481 | - fi | |
1482 | -else | |
1483 | - ac_cpp_err=yes | |
1484 | -fi | |
1485 | -if test -z "$ac_cpp_err"; then | |
1486 | + (exit $ac_status); } >/dev/null && { | |
1487 | + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || | |
1488 | + test ! -s conftest.err | |
1489 | + }; then | |
1490 | : | |
1491 | else | |
1492 | echo "$as_me: failed program was:" >&5 | |
1493 | @@ -6265,17 +6040,10 @@ | |
1494 | rm -f conftest.er1 | |
1495 | cat conftest.err >&5 | |
1496 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1497 | - (exit $ac_status); } >/dev/null; then | |
1498 | - if test -s conftest.err; then | |
1499 | - ac_cpp_err=$ac_cxx_preproc_warn_flag | |
1500 | - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag | |
1501 | - else | |
1502 | - ac_cpp_err= | |
1503 | - fi | |
1504 | -else | |
1505 | - ac_cpp_err=yes | |
1506 | -fi | |
1507 | -if test -z "$ac_cpp_err"; then | |
1508 | + (exit $ac_status); } >/dev/null && { | |
1509 | + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || | |
1510 | + test ! -s conftest.err | |
1511 | + }; then | |
1512 | # Broken: success on invalid input. | |
1513 | continue | |
1514 | else | |
1515 | @@ -6316,7 +6084,7 @@ | |
1516 | ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | |
1517 | ac_compiler_gnu=$ac_cv_f77_compiler_gnu | |
1518 | if test -n "$ac_tool_prefix"; then | |
1519 | - 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 | |
1520 | + 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 | |
1521 | do | |
1522 | # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | |
1523 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 | |
1524 | @@ -6334,7 +6102,7 @@ | |
1525 | IFS=$as_save_IFS | |
1526 | test -z "$as_dir" && as_dir=. | |
1527 | for ac_exec_ext in '' $ac_executable_extensions; do | |
1528 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | |
1529 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
1530 | ac_cv_prog_F77="$ac_tool_prefix$ac_prog" | |
1531 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
1532 | break 2 | |
1533 | @@ -6360,7 +6128,7 @@ | |
1534 | fi | |
1535 | if test -z "$F77"; then | |
1536 | ac_ct_F77=$F77 | |
1537 | - 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 | |
1538 | + 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 | |
1539 | do | |
1540 | # Extract the first word of "$ac_prog", so it can be a program name with args. | |
1541 | set dummy $ac_prog; ac_word=$2 | |
1542 | @@ -6378,7 +6146,7 @@ | |
1543 | IFS=$as_save_IFS | |
1544 | test -z "$as_dir" && as_dir=. | |
1545 | for ac_exec_ext in '' $ac_executable_extensions; do | |
1546 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | |
1547 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
1548 | ac_cv_prog_ac_ct_F77="$ac_prog" | |
1549 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
1550 | break 2 | |
1551 | @@ -6485,27 +6253,10 @@ | |
1552 | rm -f conftest.er1 | |
1553 | cat conftest.err >&5 | |
1554 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1555 | - (exit $ac_status); } && | |
1556 | - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' | |
1557 | - { (case "(($ac_try" in | |
1558 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1559 | - *) ac_try_echo=$ac_try;; | |
1560 | -esac | |
1561 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1562 | - (eval "$ac_try") 2>&5 | |
1563 | - ac_status=$? | |
1564 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1565 | - (exit $ac_status); }; } && | |
1566 | - { ac_try='test -s conftest.$ac_objext' | |
1567 | - { (case "(($ac_try" in | |
1568 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1569 | - *) ac_try_echo=$ac_try;; | |
1570 | -esac | |
1571 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1572 | - (eval "$ac_try") 2>&5 | |
1573 | - ac_status=$? | |
1574 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1575 | - (exit $ac_status); }; }; then | |
1576 | + (exit $ac_status); } && { | |
1577 | + test -z "$ac_f77_werror_flag" || | |
1578 | + test ! -s conftest.err | |
1579 | + } && test -s conftest.$ac_objext; then | |
1580 | ac_compiler_gnu=yes | |
1581 | else | |
1582 | echo "$as_me: failed program was:" >&5 | |
1583 | @@ -6548,27 +6299,10 @@ | |
1584 | rm -f conftest.er1 | |
1585 | cat conftest.err >&5 | |
1586 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1587 | - (exit $ac_status); } && | |
1588 | - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' | |
1589 | - { (case "(($ac_try" in | |
1590 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1591 | - *) ac_try_echo=$ac_try;; | |
1592 | -esac | |
1593 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1594 | - (eval "$ac_try") 2>&5 | |
1595 | - ac_status=$? | |
1596 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1597 | - (exit $ac_status); }; } && | |
1598 | - { ac_try='test -s conftest.$ac_objext' | |
1599 | - { (case "(($ac_try" in | |
1600 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1601 | - *) ac_try_echo=$ac_try;; | |
1602 | -esac | |
1603 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1604 | - (eval "$ac_try") 2>&5 | |
1605 | - ac_status=$? | |
1606 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1607 | - (exit $ac_status); }; }; then | |
1608 | + (exit $ac_status); } && { | |
1609 | + test -z "$ac_f77_werror_flag" || | |
1610 | + test ! -s conftest.err | |
1611 | + } && test -s conftest.$ac_objext; then | |
1612 | ac_cv_prog_f77_g=yes | |
1613 | else | |
1614 | echo "$as_me: failed program was:" >&5 | |
1615 | @@ -6766,7 +6500,7 @@ | |
1616 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | |
1617 | 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'" | |
1618 | ;; | |
1619 | -linux*) | |
1620 | +linux* | k*bsd*-gnu) | |
1621 | if test "$host_cpu" = ia64; then | |
1622 | symcode='[ABCDGIRSTW]' | |
1623 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | |
1624 | @@ -7023,7 +6757,7 @@ | |
1625 | IFS=$as_save_IFS | |
1626 | test -z "$as_dir" && as_dir=. | |
1627 | for ac_exec_ext in '' $ac_executable_extensions; do | |
1628 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | |
1629 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
1630 | ac_cv_prog_AR="${ac_tool_prefix}ar" | |
1631 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
1632 | break 2 | |
1633 | @@ -7063,7 +6797,7 @@ | |
1634 | IFS=$as_save_IFS | |
1635 | test -z "$as_dir" && as_dir=. | |
1636 | for ac_exec_ext in '' $ac_executable_extensions; do | |
1637 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | |
1638 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
1639 | ac_cv_prog_ac_ct_AR="ar" | |
1640 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
1641 | break 2 | |
1642 | @@ -7119,7 +6853,7 @@ | |
1643 | IFS=$as_save_IFS | |
1644 | test -z "$as_dir" && as_dir=. | |
1645 | for ac_exec_ext in '' $ac_executable_extensions; do | |
1646 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | |
1647 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
1648 | ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" | |
1649 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
1650 | break 2 | |
1651 | @@ -7159,7 +6893,7 @@ | |
1652 | IFS=$as_save_IFS | |
1653 | test -z "$as_dir" && as_dir=. | |
1654 | for ac_exec_ext in '' $ac_executable_extensions; do | |
1655 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | |
1656 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
1657 | ac_cv_prog_ac_ct_RANLIB="ranlib" | |
1658 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
1659 | break 2 | |
1660 | @@ -7215,7 +6949,7 @@ | |
1661 | IFS=$as_save_IFS | |
1662 | test -z "$as_dir" && as_dir=. | |
1663 | for ac_exec_ext in '' $ac_executable_extensions; do | |
1664 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | |
1665 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
1666 | ac_cv_prog_STRIP="${ac_tool_prefix}strip" | |
1667 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
1668 | break 2 | |
1669 | @@ -7255,7 +6989,7 @@ | |
1670 | IFS=$as_save_IFS | |
1671 | test -z "$as_dir" && as_dir=. | |
1672 | for ac_exec_ext in '' $ac_executable_extensions; do | |
1673 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | |
1674 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
1675 | ac_cv_prog_ac_ct_STRIP="strip" | |
1676 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
1677 | break 2 | |
1678 | @@ -7572,11 +7306,11 @@ | |
1679 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | |
1680 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | |
1681 | -e 's:$: $lt_compiler_flag:'` | |
1682 | - (eval echo "\"\$as_me:7575: $lt_compile\"" >&5) | |
1683 | + (eval echo "\"\$as_me:7309: $lt_compile\"" >&5) | |
1684 | (eval "$lt_compile" 2>conftest.err) | |
1685 | ac_status=$? | |
1686 | cat conftest.err >&5 | |
1687 | - echo "$as_me:7579: \$? = $ac_status" >&5 | |
1688 | + echo "$as_me:7313: \$? = $ac_status" >&5 | |
1689 | if (exit $ac_status) && test -s "$ac_outfile"; then | |
1690 | # The compiler can only warn and ignore the option if not recognized | |
1691 | # So say no if there are warnings other than the usual output. | |
1692 | @@ -7734,7 +7468,7 @@ | |
1693 | lt_prog_compiler_static='-Bstatic' | |
1694 | ;; | |
1695 | ||
1696 | - linux*) | |
1697 | + linux* | k*bsd*-gnu) | |
1698 | case $cc_basename in | |
1699 | icc* | ecc*) | |
1700 | lt_prog_compiler_wl='-Wl,' | |
1701 | @@ -7840,11 +7574,11 @@ | |
1702 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | |
1703 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | |
1704 | -e 's:$: $lt_compiler_flag:'` | |
1705 | - (eval echo "\"\$as_me:7843: $lt_compile\"" >&5) | |
1706 | + (eval echo "\"\$as_me:7577: $lt_compile\"" >&5) | |
1707 | (eval "$lt_compile" 2>conftest.err) | |
1708 | ac_status=$? | |
1709 | cat conftest.err >&5 | |
1710 | - echo "$as_me:7847: \$? = $ac_status" >&5 | |
1711 | + echo "$as_me:7581: \$? = $ac_status" >&5 | |
1712 | if (exit $ac_status) && test -s "$ac_outfile"; then | |
1713 | # The compiler can only warn and ignore the option if not recognized | |
1714 | # So say no if there are warnings other than the usual output. | |
1715 | @@ -7944,11 +7678,11 @@ | |
1716 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | |
1717 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | |
1718 | -e 's:$: $lt_compiler_flag:'` | |
1719 | - (eval echo "\"\$as_me:7947: $lt_compile\"" >&5) | |
1720 | + (eval echo "\"\$as_me:7681: $lt_compile\"" >&5) | |
1721 | (eval "$lt_compile" 2>out/conftest.err) | |
1722 | ac_status=$? | |
1723 | cat out/conftest.err >&5 | |
1724 | - echo "$as_me:7951: \$? = $ac_status" >&5 | |
1725 | + echo "$as_me:7685: \$? = $ac_status" >&5 | |
1726 | if (exit $ac_status) && test -s out/conftest2.$ac_objext | |
1727 | then | |
1728 | # The compiler can only warn and ignore the option if not recognized | |
1729 | @@ -8173,7 +7907,7 @@ | |
1730 | 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' | |
1731 | ;; | |
1732 | ||
1733 | - linux*) | |
1734 | + linux* | k*bsd*-gnu) | |
1735 | if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then | |
1736 | tmp_addflag= | |
1737 | case $cc_basename,$host_cpu in | |
1738 | @@ -8199,12 +7933,13 @@ | |
1739 | $echo "local: *; };" >> $output_objdir/$libname.ver~ | |
1740 | $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' | |
1741 | fi | |
1742 | + link_all_deplibs=no | |
1743 | else | |
1744 | ld_shlibs=no | |
1745 | fi | |
1746 | ;; | |
1747 | ||
1748 | - netbsd*) | |
1749 | + netbsd* | netbsdelf*-gnu) | |
1750 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | |
1751 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | |
1752 | wlarc= | |
1753 | @@ -8424,27 +8159,11 @@ | |
1754 | rm -f conftest.er1 | |
1755 | cat conftest.err >&5 | |
1756 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1757 | - (exit $ac_status); } && | |
1758 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
1759 | - { (case "(($ac_try" in | |
1760 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1761 | - *) ac_try_echo=$ac_try;; | |
1762 | -esac | |
1763 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1764 | - (eval "$ac_try") 2>&5 | |
1765 | - ac_status=$? | |
1766 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1767 | - (exit $ac_status); }; } && | |
1768 | - { ac_try='test -s conftest$ac_exeext' | |
1769 | - { (case "(($ac_try" in | |
1770 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1771 | - *) ac_try_echo=$ac_try;; | |
1772 | -esac | |
1773 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1774 | - (eval "$ac_try") 2>&5 | |
1775 | - ac_status=$? | |
1776 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1777 | - (exit $ac_status); }; }; then | |
1778 | + (exit $ac_status); } && { | |
1779 | + test -z "$ac_c_werror_flag" || | |
1780 | + test ! -s conftest.err | |
1781 | + } && test -s conftest$ac_exeext && | |
1782 | + $as_test_x conftest$ac_exeext; then | |
1783 | ||
1784 | aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } | |
1785 | }'` | |
1786 | @@ -8458,7 +8177,7 @@ | |
1787 | ||
1788 | fi | |
1789 | ||
1790 | -rm -f core conftest.err conftest.$ac_objext \ | |
1791 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
1792 | conftest$ac_exeext conftest.$ac_ext | |
1793 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | |
1794 | ||
1795 | @@ -8499,27 +8218,11 @@ | |
1796 | rm -f conftest.er1 | |
1797 | cat conftest.err >&5 | |
1798 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1799 | - (exit $ac_status); } && | |
1800 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
1801 | - { (case "(($ac_try" in | |
1802 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1803 | - *) ac_try_echo=$ac_try;; | |
1804 | -esac | |
1805 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1806 | - (eval "$ac_try") 2>&5 | |
1807 | - ac_status=$? | |
1808 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1809 | - (exit $ac_status); }; } && | |
1810 | - { ac_try='test -s conftest$ac_exeext' | |
1811 | - { (case "(($ac_try" in | |
1812 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1813 | - *) ac_try_echo=$ac_try;; | |
1814 | -esac | |
1815 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1816 | - (eval "$ac_try") 2>&5 | |
1817 | - ac_status=$? | |
1818 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1819 | - (exit $ac_status); }; }; then | |
1820 | + (exit $ac_status); } && { | |
1821 | + test -z "$ac_c_werror_flag" || | |
1822 | + test ! -s conftest.err | |
1823 | + } && test -s conftest$ac_exeext && | |
1824 | + $as_test_x conftest$ac_exeext; then | |
1825 | ||
1826 | aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } | |
1827 | }'` | |
1828 | @@ -8533,7 +8236,7 @@ | |
1829 | ||
1830 | fi | |
1831 | ||
1832 | -rm -f core conftest.err conftest.$ac_objext \ | |
1833 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
1834 | conftest$ac_exeext conftest.$ac_ext | |
1835 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | |
1836 | ||
1837 | @@ -8664,7 +8367,7 @@ | |
1838 | ;; | |
1839 | ||
1840 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | |
1841 | - freebsd* | kfreebsd*-gnu | dragonfly*) | |
1842 | + freebsd* | dragonfly*) | |
1843 | archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' | |
1844 | hardcode_libdir_flag_spec='-R$libdir' | |
1845 | hardcode_direct=yes | |
1846 | @@ -8766,7 +8469,7 @@ | |
1847 | link_all_deplibs=yes | |
1848 | ;; | |
1849 | ||
1850 | - netbsd*) | |
1851 | + netbsd* | netbsdelf*-gnu) | |
1852 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | |
1853 | archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out | |
1854 | else | |
1855 | @@ -9256,18 +8959,6 @@ | |
1856 | dynamic_linker=no | |
1857 | ;; | |
1858 | ||
1859 | -kfreebsd*-gnu) | |
1860 | - version_type=linux | |
1861 | - need_lib_prefix=no | |
1862 | - need_version=no | |
1863 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | |
1864 | - soname_spec='${libname}${release}${shared_ext}$major' | |
1865 | - shlibpath_var=LD_LIBRARY_PATH | |
1866 | - shlibpath_overrides_runpath=no | |
1867 | - hardcode_into_libs=yes | |
1868 | - dynamic_linker='GNU ld.so' | |
1869 | - ;; | |
1870 | - | |
1871 | freebsd* | dragonfly*) | |
1872 | # DragonFly does not have aout. When/if they implement a new | |
1873 | # versioning mechanism, adjust this. | |
1874 | @@ -9423,7 +9114,7 @@ | |
1875 | ;; | |
1876 | ||
1877 | # This must be Linux ELF. | |
1878 | -linux*) | |
1879 | +linux* | k*bsd*-gnu) | |
1880 | version_type=linux | |
1881 | need_lib_prefix=no | |
1882 | need_version=no | |
1883 | @@ -9452,7 +9143,7 @@ | |
1884 | dynamic_linker='GNU/Linux ld.so' | |
1885 | ;; | |
1886 | ||
1887 | -knetbsd*-gnu) | |
1888 | +netbsdelf*-gnu) | |
1889 | version_type=linux | |
1890 | need_lib_prefix=no | |
1891 | need_version=no | |
1892 | @@ -9461,7 +9152,7 @@ | |
1893 | shlibpath_var=LD_LIBRARY_PATH | |
1894 | shlibpath_overrides_runpath=no | |
1895 | hardcode_into_libs=yes | |
1896 | - dynamic_linker='GNU ld.so' | |
1897 | + dynamic_linker='NetBSD ld.elf_so' | |
1898 | ;; | |
1899 | ||
1900 | netbsd*) | |
1901 | @@ -9781,27 +9472,11 @@ | |
1902 | rm -f conftest.er1 | |
1903 | cat conftest.err >&5 | |
1904 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1905 | - (exit $ac_status); } && | |
1906 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
1907 | - { (case "(($ac_try" in | |
1908 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1909 | - *) ac_try_echo=$ac_try;; | |
1910 | -esac | |
1911 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1912 | - (eval "$ac_try") 2>&5 | |
1913 | - ac_status=$? | |
1914 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1915 | - (exit $ac_status); }; } && | |
1916 | - { ac_try='test -s conftest$ac_exeext' | |
1917 | - { (case "(($ac_try" in | |
1918 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1919 | - *) ac_try_echo=$ac_try;; | |
1920 | -esac | |
1921 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1922 | - (eval "$ac_try") 2>&5 | |
1923 | - ac_status=$? | |
1924 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1925 | - (exit $ac_status); }; }; then | |
1926 | + (exit $ac_status); } && { | |
1927 | + test -z "$ac_c_werror_flag" || | |
1928 | + test ! -s conftest.err | |
1929 | + } && test -s conftest$ac_exeext && | |
1930 | + $as_test_x conftest$ac_exeext; then | |
1931 | ac_cv_lib_dl_dlopen=yes | |
1932 | else | |
1933 | echo "$as_me: failed program was:" >&5 | |
1934 | @@ -9810,7 +9485,7 @@ | |
1935 | ac_cv_lib_dl_dlopen=no | |
1936 | fi | |
1937 | ||
1938 | -rm -f core conftest.err conftest.$ac_objext \ | |
1939 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
1940 | conftest$ac_exeext conftest.$ac_ext | |
1941 | LIBS=$ac_check_lib_save_LIBS | |
1942 | fi | |
1943 | @@ -9892,27 +9567,11 @@ | |
1944 | rm -f conftest.er1 | |
1945 | cat conftest.err >&5 | |
1946 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1947 | - (exit $ac_status); } && | |
1948 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
1949 | - { (case "(($ac_try" in | |
1950 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1951 | - *) ac_try_echo=$ac_try;; | |
1952 | -esac | |
1953 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1954 | - (eval "$ac_try") 2>&5 | |
1955 | - ac_status=$? | |
1956 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1957 | - (exit $ac_status); }; } && | |
1958 | - { ac_try='test -s conftest$ac_exeext' | |
1959 | - { (case "(($ac_try" in | |
1960 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1961 | - *) ac_try_echo=$ac_try;; | |
1962 | -esac | |
1963 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1964 | - (eval "$ac_try") 2>&5 | |
1965 | - ac_status=$? | |
1966 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1967 | - (exit $ac_status); }; }; then | |
1968 | + (exit $ac_status); } && { | |
1969 | + test -z "$ac_c_werror_flag" || | |
1970 | + test ! -s conftest.err | |
1971 | + } && test -s conftest$ac_exeext && | |
1972 | + $as_test_x conftest$ac_exeext; then | |
1973 | ac_cv_func_shl_load=yes | |
1974 | else | |
1975 | echo "$as_me: failed program was:" >&5 | |
1976 | @@ -9921,7 +9580,7 @@ | |
1977 | ac_cv_func_shl_load=no | |
1978 | fi | |
1979 | ||
1980 | -rm -f core conftest.err conftest.$ac_objext \ | |
1981 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
1982 | conftest$ac_exeext conftest.$ac_ext | |
1983 | fi | |
1984 | { echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 | |
1985 | @@ -9971,27 +9630,11 @@ | |
1986 | rm -f conftest.er1 | |
1987 | cat conftest.err >&5 | |
1988 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1989 | - (exit $ac_status); } && | |
1990 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
1991 | - { (case "(($ac_try" in | |
1992 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1993 | - *) ac_try_echo=$ac_try;; | |
1994 | -esac | |
1995 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1996 | - (eval "$ac_try") 2>&5 | |
1997 | - ac_status=$? | |
1998 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1999 | - (exit $ac_status); }; } && | |
2000 | - { ac_try='test -s conftest$ac_exeext' | |
2001 | - { (case "(($ac_try" in | |
2002 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2003 | - *) ac_try_echo=$ac_try;; | |
2004 | -esac | |
2005 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2006 | - (eval "$ac_try") 2>&5 | |
2007 | - ac_status=$? | |
2008 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2009 | - (exit $ac_status); }; }; then | |
2010 | + (exit $ac_status); } && { | |
2011 | + test -z "$ac_c_werror_flag" || | |
2012 | + test ! -s conftest.err | |
2013 | + } && test -s conftest$ac_exeext && | |
2014 | + $as_test_x conftest$ac_exeext; then | |
2015 | ac_cv_lib_dld_shl_load=yes | |
2016 | else | |
2017 | echo "$as_me: failed program was:" >&5 | |
2018 | @@ -10000,7 +9643,7 @@ | |
2019 | ac_cv_lib_dld_shl_load=no | |
2020 | fi | |
2021 | ||
2022 | -rm -f core conftest.err conftest.$ac_objext \ | |
2023 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
2024 | conftest$ac_exeext conftest.$ac_ext | |
2025 | LIBS=$ac_check_lib_save_LIBS | |
2026 | fi | |
2027 | @@ -10072,27 +9715,11 @@ | |
2028 | rm -f conftest.er1 | |
2029 | cat conftest.err >&5 | |
2030 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2031 | - (exit $ac_status); } && | |
2032 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
2033 | - { (case "(($ac_try" in | |
2034 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2035 | - *) ac_try_echo=$ac_try;; | |
2036 | -esac | |
2037 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2038 | - (eval "$ac_try") 2>&5 | |
2039 | - ac_status=$? | |
2040 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2041 | - (exit $ac_status); }; } && | |
2042 | - { ac_try='test -s conftest$ac_exeext' | |
2043 | - { (case "(($ac_try" in | |
2044 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2045 | - *) ac_try_echo=$ac_try;; | |
2046 | -esac | |
2047 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2048 | - (eval "$ac_try") 2>&5 | |
2049 | - ac_status=$? | |
2050 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2051 | - (exit $ac_status); }; }; then | |
2052 | + (exit $ac_status); } && { | |
2053 | + test -z "$ac_c_werror_flag" || | |
2054 | + test ! -s conftest.err | |
2055 | + } && test -s conftest$ac_exeext && | |
2056 | + $as_test_x conftest$ac_exeext; then | |
2057 | ac_cv_func_dlopen=yes | |
2058 | else | |
2059 | echo "$as_me: failed program was:" >&5 | |
2060 | @@ -10101,7 +9728,7 @@ | |
2061 | ac_cv_func_dlopen=no | |
2062 | fi | |
2063 | ||
2064 | -rm -f core conftest.err conftest.$ac_objext \ | |
2065 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
2066 | conftest$ac_exeext conftest.$ac_ext | |
2067 | fi | |
2068 | { echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 | |
2069 | @@ -10151,27 +9778,11 @@ | |
2070 | rm -f conftest.er1 | |
2071 | cat conftest.err >&5 | |
2072 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2073 | - (exit $ac_status); } && | |
2074 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
2075 | - { (case "(($ac_try" in | |
2076 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2077 | - *) ac_try_echo=$ac_try;; | |
2078 | -esac | |
2079 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2080 | - (eval "$ac_try") 2>&5 | |
2081 | - ac_status=$? | |
2082 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2083 | - (exit $ac_status); }; } && | |
2084 | - { ac_try='test -s conftest$ac_exeext' | |
2085 | - { (case "(($ac_try" in | |
2086 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2087 | - *) ac_try_echo=$ac_try;; | |
2088 | -esac | |
2089 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2090 | - (eval "$ac_try") 2>&5 | |
2091 | - ac_status=$? | |
2092 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2093 | - (exit $ac_status); }; }; then | |
2094 | + (exit $ac_status); } && { | |
2095 | + test -z "$ac_c_werror_flag" || | |
2096 | + test ! -s conftest.err | |
2097 | + } && test -s conftest$ac_exeext && | |
2098 | + $as_test_x conftest$ac_exeext; then | |
2099 | ac_cv_lib_dl_dlopen=yes | |
2100 | else | |
2101 | echo "$as_me: failed program was:" >&5 | |
2102 | @@ -10180,7 +9791,7 @@ | |
2103 | ac_cv_lib_dl_dlopen=no | |
2104 | fi | |
2105 | ||
2106 | -rm -f core conftest.err conftest.$ac_objext \ | |
2107 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
2108 | conftest$ac_exeext conftest.$ac_ext | |
2109 | LIBS=$ac_check_lib_save_LIBS | |
2110 | fi | |
2111 | @@ -10231,27 +9842,11 @@ | |
2112 | rm -f conftest.er1 | |
2113 | cat conftest.err >&5 | |
2114 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2115 | - (exit $ac_status); } && | |
2116 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
2117 | - { (case "(($ac_try" in | |
2118 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2119 | - *) ac_try_echo=$ac_try;; | |
2120 | -esac | |
2121 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2122 | - (eval "$ac_try") 2>&5 | |
2123 | - ac_status=$? | |
2124 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2125 | - (exit $ac_status); }; } && | |
2126 | - { ac_try='test -s conftest$ac_exeext' | |
2127 | - { (case "(($ac_try" in | |
2128 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2129 | - *) ac_try_echo=$ac_try;; | |
2130 | -esac | |
2131 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2132 | - (eval "$ac_try") 2>&5 | |
2133 | - ac_status=$? | |
2134 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2135 | - (exit $ac_status); }; }; then | |
2136 | + (exit $ac_status); } && { | |
2137 | + test -z "$ac_c_werror_flag" || | |
2138 | + test ! -s conftest.err | |
2139 | + } && test -s conftest$ac_exeext && | |
2140 | + $as_test_x conftest$ac_exeext; then | |
2141 | ac_cv_lib_svld_dlopen=yes | |
2142 | else | |
2143 | echo "$as_me: failed program was:" >&5 | |
2144 | @@ -10260,7 +9855,7 @@ | |
2145 | ac_cv_lib_svld_dlopen=no | |
2146 | fi | |
2147 | ||
2148 | -rm -f core conftest.err conftest.$ac_objext \ | |
2149 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
2150 | conftest$ac_exeext conftest.$ac_ext | |
2151 | LIBS=$ac_check_lib_save_LIBS | |
2152 | fi | |
2153 | @@ -10311,27 +9906,11 @@ | |
2154 | rm -f conftest.er1 | |
2155 | cat conftest.err >&5 | |
2156 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2157 | - (exit $ac_status); } && | |
2158 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
2159 | - { (case "(($ac_try" in | |
2160 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2161 | - *) ac_try_echo=$ac_try;; | |
2162 | -esac | |
2163 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2164 | - (eval "$ac_try") 2>&5 | |
2165 | - ac_status=$? | |
2166 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2167 | - (exit $ac_status); }; } && | |
2168 | - { ac_try='test -s conftest$ac_exeext' | |
2169 | - { (case "(($ac_try" in | |
2170 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2171 | - *) ac_try_echo=$ac_try;; | |
2172 | -esac | |
2173 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2174 | - (eval "$ac_try") 2>&5 | |
2175 | - ac_status=$? | |
2176 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2177 | - (exit $ac_status); }; }; then | |
2178 | + (exit $ac_status); } && { | |
2179 | + test -z "$ac_c_werror_flag" || | |
2180 | + test ! -s conftest.err | |
2181 | + } && test -s conftest$ac_exeext && | |
2182 | + $as_test_x conftest$ac_exeext; then | |
2183 | ac_cv_lib_dld_dld_link=yes | |
2184 | else | |
2185 | echo "$as_me: failed program was:" >&5 | |
2186 | @@ -10340,7 +9919,7 @@ | |
2187 | ac_cv_lib_dld_dld_link=no | |
2188 | fi | |
2189 | ||
2190 | -rm -f core conftest.err conftest.$ac_objext \ | |
2191 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
2192 | conftest$ac_exeext conftest.$ac_ext | |
2193 | LIBS=$ac_check_lib_save_LIBS | |
2194 | fi | |
2195 | @@ -10396,7 +9975,7 @@ | |
2196 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | |
2197 | lt_status=$lt_dlunknown | |
2198 | cat > conftest.$ac_ext <<EOF | |
2199 | -#line 10399 "configure" | |
2200 | +#line 9978 "configure" | |
2201 | #include "confdefs.h" | |
2202 | ||
2203 | #if HAVE_DLFCN_H | |
2204 | @@ -10496,7 +10075,7 @@ | |
2205 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | |
2206 | lt_status=$lt_dlunknown | |
2207 | cat > conftest.$ac_ext <<EOF | |
2208 | -#line 10499 "configure" | |
2209 | +#line 10078 "configure" | |
2210 | #include "confdefs.h" | |
2211 | ||
2212 | #if HAVE_DLFCN_H | |
2213 | @@ -11583,27 +11162,11 @@ | |
2214 | rm -f conftest.er1 | |
2215 | cat conftest.err >&5 | |
2216 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2217 | - (exit $ac_status); } && | |
2218 | - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' | |
2219 | - { (case "(($ac_try" in | |
2220 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2221 | - *) ac_try_echo=$ac_try;; | |
2222 | -esac | |
2223 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2224 | - (eval "$ac_try") 2>&5 | |
2225 | - ac_status=$? | |
2226 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2227 | - (exit $ac_status); }; } && | |
2228 | - { ac_try='test -s conftest$ac_exeext' | |
2229 | - { (case "(($ac_try" in | |
2230 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2231 | - *) ac_try_echo=$ac_try;; | |
2232 | -esac | |
2233 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2234 | - (eval "$ac_try") 2>&5 | |
2235 | - ac_status=$? | |
2236 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2237 | - (exit $ac_status); }; }; then | |
2238 | + (exit $ac_status); } && { | |
2239 | + test -z "$ac_cxx_werror_flag" || | |
2240 | + test ! -s conftest.err | |
2241 | + } && test -s conftest$ac_exeext && | |
2242 | + $as_test_x conftest$ac_exeext; then | |
2243 | ||
2244 | aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } | |
2245 | }'` | |
2246 | @@ -11617,7 +11180,7 @@ | |
2247 | ||
2248 | fi | |
2249 | ||
2250 | -rm -f core conftest.err conftest.$ac_objext \ | |
2251 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
2252 | conftest$ac_exeext conftest.$ac_ext | |
2253 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | |
2254 | ||
2255 | @@ -11659,27 +11222,11 @@ | |
2256 | rm -f conftest.er1 | |
2257 | cat conftest.err >&5 | |
2258 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2259 | - (exit $ac_status); } && | |
2260 | - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' | |
2261 | - { (case "(($ac_try" in | |
2262 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2263 | - *) ac_try_echo=$ac_try;; | |
2264 | -esac | |
2265 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2266 | - (eval "$ac_try") 2>&5 | |
2267 | - ac_status=$? | |
2268 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2269 | - (exit $ac_status); }; } && | |
2270 | - { ac_try='test -s conftest$ac_exeext' | |
2271 | - { (case "(($ac_try" in | |
2272 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2273 | - *) ac_try_echo=$ac_try;; | |
2274 | -esac | |
2275 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2276 | - (eval "$ac_try") 2>&5 | |
2277 | - ac_status=$? | |
2278 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2279 | - (exit $ac_status); }; }; then | |
2280 | + (exit $ac_status); } && { | |
2281 | + test -z "$ac_cxx_werror_flag" || | |
2282 | + test ! -s conftest.err | |
2283 | + } && test -s conftest$ac_exeext && | |
2284 | + $as_test_x conftest$ac_exeext; then | |
2285 | ||
2286 | aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } | |
2287 | }'` | |
2288 | @@ -11693,7 +11240,7 @@ | |
2289 | ||
2290 | fi | |
2291 | ||
2292 | -rm -f core conftest.err conftest.$ac_objext \ | |
2293 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
2294 | conftest$ac_exeext conftest.$ac_ext | |
2295 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | |
2296 | ||
2297 | @@ -11841,7 +11388,7 @@ | |
2298 | freebsd-elf*) | |
2299 | archive_cmds_need_lc_CXX=no | |
2300 | ;; | |
2301 | - freebsd* | kfreebsd*-gnu | dragonfly*) | |
2302 | + freebsd* | dragonfly*) | |
2303 | # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF | |
2304 | # conventions | |
2305 | ld_shlibs_CXX=yes | |
2306 | @@ -12000,7 +11547,7 @@ | |
2307 | hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' | |
2308 | hardcode_libdir_separator_CXX=: | |
2309 | ;; | |
2310 | - linux*) | |
2311 | + linux* | k*bsd*-gnu) | |
2312 | case $cc_basename in | |
2313 | KCC*) | |
2314 | # Kuck and Associates, Inc. (KAI) C++ Compiler | |
2315 | @@ -12102,7 +11649,7 @@ | |
2316 | ;; | |
2317 | esac | |
2318 | ;; | |
2319 | - netbsd*) | |
2320 | + netbsd* | netbsdelf*-gnu) | |
2321 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | |
2322 | archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' | |
2323 | wlarc= | |
2324 | @@ -12669,7 +12216,7 @@ | |
2325 | ;; | |
2326 | esac | |
2327 | ;; | |
2328 | - freebsd* | kfreebsd*-gnu | dragonfly*) | |
2329 | + freebsd* | dragonfly*) | |
2330 | # FreeBSD uses GNU C++ | |
2331 | ;; | |
2332 | hpux9* | hpux10* | hpux11*) | |
2333 | @@ -12712,7 +12259,7 @@ | |
2334 | ;; | |
2335 | esac | |
2336 | ;; | |
2337 | - linux*) | |
2338 | + linux* | k*bsd*-gnu) | |
2339 | case $cc_basename in | |
2340 | KCC*) | |
2341 | # KAI C++ Compiler | |
2342 | @@ -12755,7 +12302,7 @@ | |
2343 | ;; | |
2344 | esac | |
2345 | ;; | |
2346 | - netbsd*) | |
2347 | + netbsd* | netbsdelf*-gnu) | |
2348 | ;; | |
2349 | osf3* | osf4* | osf5*) | |
2350 | case $cc_basename in | |
2351 | @@ -12864,11 +12411,11 @@ | |
2352 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | |
2353 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | |
2354 | -e 's:$: $lt_compiler_flag:'` | |
2355 | - (eval echo "\"\$as_me:12867: $lt_compile\"" >&5) | |
2356 | + (eval echo "\"\$as_me:12414: $lt_compile\"" >&5) | |
2357 | (eval "$lt_compile" 2>conftest.err) | |
2358 | ac_status=$? | |
2359 | cat conftest.err >&5 | |
2360 | - echo "$as_me:12871: \$? = $ac_status" >&5 | |
2361 | + echo "$as_me:12418: \$? = $ac_status" >&5 | |
2362 | if (exit $ac_status) && test -s "$ac_outfile"; then | |
2363 | # The compiler can only warn and ignore the option if not recognized | |
2364 | # So say no if there are warnings other than the usual output. | |
2365 | @@ -12968,11 +12515,11 @@ | |
2366 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | |
2367 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | |
2368 | -e 's:$: $lt_compiler_flag:'` | |
2369 | - (eval echo "\"\$as_me:12971: $lt_compile\"" >&5) | |
2370 | + (eval echo "\"\$as_me:12518: $lt_compile\"" >&5) | |
2371 | (eval "$lt_compile" 2>out/conftest.err) | |
2372 | ac_status=$? | |
2373 | cat out/conftest.err >&5 | |
2374 | - echo "$as_me:12975: \$? = $ac_status" >&5 | |
2375 | + echo "$as_me:12522: \$? = $ac_status" >&5 | |
2376 | if (exit $ac_status) && test -s out/conftest2.$ac_objext | |
2377 | then | |
2378 | # The compiler can only warn and ignore the option if not recognized | |
2379 | @@ -13040,6 +12587,9 @@ | |
2380 | cygwin* | mingw*) | |
2381 | 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' | |
2382 | ;; | |
2383 | + linux* | k*bsd*-gnu) | |
2384 | + link_all_deplibs_CXX=no | |
2385 | + ;; | |
2386 | *) | |
2387 | export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' | |
2388 | ;; | |
2389 | @@ -13319,18 +12869,6 @@ | |
2390 | dynamic_linker=no | |
2391 | ;; | |
2392 | ||
2393 | -kfreebsd*-gnu) | |
2394 | - version_type=linux | |
2395 | - need_lib_prefix=no | |
2396 | - need_version=no | |
2397 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | |
2398 | - soname_spec='${libname}${release}${shared_ext}$major' | |
2399 | - shlibpath_var=LD_LIBRARY_PATH | |
2400 | - shlibpath_overrides_runpath=no | |
2401 | - hardcode_into_libs=yes | |
2402 | - dynamic_linker='GNU ld.so' | |
2403 | - ;; | |
2404 | - | |
2405 | freebsd* | dragonfly*) | |
2406 | # DragonFly does not have aout. When/if they implement a new | |
2407 | # versioning mechanism, adjust this. | |
2408 | @@ -13486,7 +13024,7 @@ | |
2409 | ;; | |
2410 | ||
2411 | # This must be Linux ELF. | |
2412 | -linux*) | |
2413 | +linux* | k*bsd*-gnu) | |
2414 | version_type=linux | |
2415 | need_lib_prefix=no | |
2416 | need_version=no | |
2417 | @@ -13515,7 +13053,7 @@ | |
2418 | dynamic_linker='GNU/Linux ld.so' | |
2419 | ;; | |
2420 | ||
2421 | -knetbsd*-gnu) | |
2422 | +netbsdelf*-gnu) | |
2423 | version_type=linux | |
2424 | need_lib_prefix=no | |
2425 | need_version=no | |
2426 | @@ -13524,7 +13062,7 @@ | |
2427 | shlibpath_var=LD_LIBRARY_PATH | |
2428 | shlibpath_overrides_runpath=no | |
2429 | hardcode_into_libs=yes | |
2430 | - dynamic_linker='GNU ld.so' | |
2431 | + dynamic_linker='NetBSD ld.elf_so' | |
2432 | ;; | |
2433 | ||
2434 | netbsd*) | |
2435 | @@ -14432,7 +13970,7 @@ | |
2436 | lt_prog_compiler_static_F77='-Bstatic' | |
2437 | ;; | |
2438 | ||
2439 | - linux*) | |
2440 | + linux* | k*bsd*-gnu) | |
2441 | case $cc_basename in | |
2442 | icc* | ecc*) | |
2443 | lt_prog_compiler_wl_F77='-Wl,' | |
2444 | @@ -14538,11 +14076,11 @@ | |
2445 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | |
2446 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | |
2447 | -e 's:$: $lt_compiler_flag:'` | |
2448 | - (eval echo "\"\$as_me:14541: $lt_compile\"" >&5) | |
2449 | + (eval echo "\"\$as_me:14079: $lt_compile\"" >&5) | |
2450 | (eval "$lt_compile" 2>conftest.err) | |
2451 | ac_status=$? | |
2452 | cat conftest.err >&5 | |
2453 | - echo "$as_me:14545: \$? = $ac_status" >&5 | |
2454 | + echo "$as_me:14083: \$? = $ac_status" >&5 | |
2455 | if (exit $ac_status) && test -s "$ac_outfile"; then | |
2456 | # The compiler can only warn and ignore the option if not recognized | |
2457 | # So say no if there are warnings other than the usual output. | |
2458 | @@ -14642,11 +14180,11 @@ | |
2459 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | |
2460 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | |
2461 | -e 's:$: $lt_compiler_flag:'` | |
2462 | - (eval echo "\"\$as_me:14645: $lt_compile\"" >&5) | |
2463 | + (eval echo "\"\$as_me:14183: $lt_compile\"" >&5) | |
2464 | (eval "$lt_compile" 2>out/conftest.err) | |
2465 | ac_status=$? | |
2466 | cat out/conftest.err >&5 | |
2467 | - echo "$as_me:14649: \$? = $ac_status" >&5 | |
2468 | + echo "$as_me:14187: \$? = $ac_status" >&5 | |
2469 | if (exit $ac_status) && test -s out/conftest2.$ac_objext | |
2470 | then | |
2471 | # The compiler can only warn and ignore the option if not recognized | |
2472 | @@ -14871,7 +14409,7 @@ | |
2473 | 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' | |
2474 | ;; | |
2475 | ||
2476 | - linux*) | |
2477 | + linux* | k*bsd*-gnu) | |
2478 | if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then | |
2479 | tmp_addflag= | |
2480 | case $cc_basename,$host_cpu in | |
2481 | @@ -14897,12 +14435,13 @@ | |
2482 | $echo "local: *; };" >> $output_objdir/$libname.ver~ | |
2483 | $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' | |
2484 | fi | |
2485 | + link_all_deplibs_F77=no | |
2486 | else | |
2487 | ld_shlibs_F77=no | |
2488 | fi | |
2489 | ;; | |
2490 | ||
2491 | - netbsd*) | |
2492 | + netbsd* | netbsdelf*-gnu) | |
2493 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | |
2494 | archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | |
2495 | wlarc= | |
2496 | @@ -15112,27 +14651,11 @@ | |
2497 | rm -f conftest.er1 | |
2498 | cat conftest.err >&5 | |
2499 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2500 | - (exit $ac_status); } && | |
2501 | - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' | |
2502 | - { (case "(($ac_try" in | |
2503 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2504 | - *) ac_try_echo=$ac_try;; | |
2505 | -esac | |
2506 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2507 | - (eval "$ac_try") 2>&5 | |
2508 | - ac_status=$? | |
2509 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2510 | - (exit $ac_status); }; } && | |
2511 | - { ac_try='test -s conftest$ac_exeext' | |
2512 | - { (case "(($ac_try" in | |
2513 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2514 | - *) ac_try_echo=$ac_try;; | |
2515 | -esac | |
2516 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2517 | - (eval "$ac_try") 2>&5 | |
2518 | - ac_status=$? | |
2519 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2520 | - (exit $ac_status); }; }; then | |
2521 | + (exit $ac_status); } && { | |
2522 | + test -z "$ac_f77_werror_flag" || | |
2523 | + test ! -s conftest.err | |
2524 | + } && test -s conftest$ac_exeext && | |
2525 | + $as_test_x conftest$ac_exeext; then | |
2526 | ||
2527 | aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } | |
2528 | }'` | |
2529 | @@ -15146,7 +14669,7 @@ | |
2530 | ||
2531 | fi | |
2532 | ||
2533 | -rm -f core conftest.err conftest.$ac_objext \ | |
2534 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
2535 | conftest$ac_exeext conftest.$ac_ext | |
2536 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | |
2537 | ||
2538 | @@ -15177,27 +14700,11 @@ | |
2539 | rm -f conftest.er1 | |
2540 | cat conftest.err >&5 | |
2541 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2542 | - (exit $ac_status); } && | |
2543 | - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' | |
2544 | - { (case "(($ac_try" in | |
2545 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2546 | - *) ac_try_echo=$ac_try;; | |
2547 | -esac | |
2548 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2549 | - (eval "$ac_try") 2>&5 | |
2550 | - ac_status=$? | |
2551 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2552 | - (exit $ac_status); }; } && | |
2553 | - { ac_try='test -s conftest$ac_exeext' | |
2554 | - { (case "(($ac_try" in | |
2555 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2556 | - *) ac_try_echo=$ac_try;; | |
2557 | -esac | |
2558 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2559 | - (eval "$ac_try") 2>&5 | |
2560 | - ac_status=$? | |
2561 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2562 | - (exit $ac_status); }; }; then | |
2563 | + (exit $ac_status); } && { | |
2564 | + test -z "$ac_f77_werror_flag" || | |
2565 | + test ! -s conftest.err | |
2566 | + } && test -s conftest$ac_exeext && | |
2567 | + $as_test_x conftest$ac_exeext; then | |
2568 | ||
2569 | aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } | |
2570 | }'` | |
2571 | @@ -15211,7 +14718,7 @@ | |
2572 | ||
2573 | fi | |
2574 | ||
2575 | -rm -f core conftest.err conftest.$ac_objext \ | |
2576 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
2577 | conftest$ac_exeext conftest.$ac_ext | |
2578 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | |
2579 | ||
2580 | @@ -15342,7 +14849,7 @@ | |
2581 | ;; | |
2582 | ||
2583 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | |
2584 | - freebsd* | kfreebsd*-gnu | dragonfly*) | |
2585 | + freebsd* | dragonfly*) | |
2586 | archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' | |
2587 | hardcode_libdir_flag_spec_F77='-R$libdir' | |
2588 | hardcode_direct_F77=yes | |
2589 | @@ -15444,7 +14951,7 @@ | |
2590 | link_all_deplibs_F77=yes | |
2591 | ;; | |
2592 | ||
2593 | - netbsd*) | |
2594 | + netbsd* | netbsdelf*-gnu) | |
2595 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | |
2596 | archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out | |
2597 | else | |
2598 | @@ -15934,18 +15441,6 @@ | |
2599 | dynamic_linker=no | |
2600 | ;; | |
2601 | ||
2602 | -kfreebsd*-gnu) | |
2603 | - version_type=linux | |
2604 | - need_lib_prefix=no | |
2605 | - need_version=no | |
2606 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | |
2607 | - soname_spec='${libname}${release}${shared_ext}$major' | |
2608 | - shlibpath_var=LD_LIBRARY_PATH | |
2609 | - shlibpath_overrides_runpath=no | |
2610 | - hardcode_into_libs=yes | |
2611 | - dynamic_linker='GNU ld.so' | |
2612 | - ;; | |
2613 | - | |
2614 | freebsd* | dragonfly*) | |
2615 | # DragonFly does not have aout. When/if they implement a new | |
2616 | # versioning mechanism, adjust this. | |
2617 | @@ -16101,7 +15596,7 @@ | |
2618 | ;; | |
2619 | ||
2620 | # This must be Linux ELF. | |
2621 | -linux*) | |
2622 | +linux* | k*bsd*-gnu) | |
2623 | version_type=linux | |
2624 | need_lib_prefix=no | |
2625 | need_version=no | |
2626 | @@ -16130,7 +15625,7 @@ | |
2627 | dynamic_linker='GNU/Linux ld.so' | |
2628 | ;; | |
2629 | ||
2630 | -knetbsd*-gnu) | |
2631 | +netbsdelf*-gnu) | |
2632 | version_type=linux | |
2633 | need_lib_prefix=no | |
2634 | need_version=no | |
2635 | @@ -16139,7 +15634,7 @@ | |
2636 | shlibpath_var=LD_LIBRARY_PATH | |
2637 | shlibpath_overrides_runpath=no | |
2638 | hardcode_into_libs=yes | |
2639 | - dynamic_linker='GNU ld.so' | |
2640 | + dynamic_linker='NetBSD ld.elf_so' | |
2641 | ;; | |
2642 | ||
2643 | netbsd*) | |
2644 | @@ -16872,11 +16367,11 @@ | |
2645 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | |
2646 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | |
2647 | -e 's:$: $lt_compiler_flag:'` | |
2648 | - (eval echo "\"\$as_me:16875: $lt_compile\"" >&5) | |
2649 | + (eval echo "\"\$as_me:16370: $lt_compile\"" >&5) | |
2650 | (eval "$lt_compile" 2>conftest.err) | |
2651 | ac_status=$? | |
2652 | cat conftest.err >&5 | |
2653 | - echo "$as_me:16879: \$? = $ac_status" >&5 | |
2654 | + echo "$as_me:16374: \$? = $ac_status" >&5 | |
2655 | if (exit $ac_status) && test -s "$ac_outfile"; then | |
2656 | # The compiler can only warn and ignore the option if not recognized | |
2657 | # So say no if there are warnings other than the usual output. | |
2658 | @@ -17034,7 +16529,7 @@ | |
2659 | lt_prog_compiler_static_GCJ='-Bstatic' | |
2660 | ;; | |
2661 | ||
2662 | - linux*) | |
2663 | + linux* | k*bsd*-gnu) | |
2664 | case $cc_basename in | |
2665 | icc* | ecc*) | |
2666 | lt_prog_compiler_wl_GCJ='-Wl,' | |
2667 | @@ -17140,11 +16635,11 @@ | |
2668 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | |
2669 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | |
2670 | -e 's:$: $lt_compiler_flag:'` | |
2671 | - (eval echo "\"\$as_me:17143: $lt_compile\"" >&5) | |
2672 | + (eval echo "\"\$as_me:16638: $lt_compile\"" >&5) | |
2673 | (eval "$lt_compile" 2>conftest.err) | |
2674 | ac_status=$? | |
2675 | cat conftest.err >&5 | |
2676 | - echo "$as_me:17147: \$? = $ac_status" >&5 | |
2677 | + echo "$as_me:16642: \$? = $ac_status" >&5 | |
2678 | if (exit $ac_status) && test -s "$ac_outfile"; then | |
2679 | # The compiler can only warn and ignore the option if not recognized | |
2680 | # So say no if there are warnings other than the usual output. | |
2681 | @@ -17244,11 +16739,11 @@ | |
2682 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | |
2683 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | |
2684 | -e 's:$: $lt_compiler_flag:'` | |
2685 | - (eval echo "\"\$as_me:17247: $lt_compile\"" >&5) | |
2686 | + (eval echo "\"\$as_me:16742: $lt_compile\"" >&5) | |
2687 | (eval "$lt_compile" 2>out/conftest.err) | |
2688 | ac_status=$? | |
2689 | cat out/conftest.err >&5 | |
2690 | - echo "$as_me:17251: \$? = $ac_status" >&5 | |
2691 | + echo "$as_me:16746: \$? = $ac_status" >&5 | |
2692 | if (exit $ac_status) && test -s out/conftest2.$ac_objext | |
2693 | then | |
2694 | # The compiler can only warn and ignore the option if not recognized | |
2695 | @@ -17473,7 +16968,7 @@ | |
2696 | 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' | |
2697 | ;; | |
2698 | ||
2699 | - linux*) | |
2700 | + linux* | k*bsd*-gnu) | |
2701 | if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then | |
2702 | tmp_addflag= | |
2703 | case $cc_basename,$host_cpu in | |
2704 | @@ -17499,12 +16994,13 @@ | |
2705 | $echo "local: *; };" >> $output_objdir/$libname.ver~ | |
2706 | $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' | |
2707 | fi | |
2708 | + link_all_deplibs_GCJ=no | |
2709 | else | |
2710 | ld_shlibs_GCJ=no | |
2711 | fi | |
2712 | ;; | |
2713 | ||
2714 | - netbsd*) | |
2715 | + netbsd* | netbsdelf*-gnu) | |
2716 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | |
2717 | archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | |
2718 | wlarc= | |
2719 | @@ -17724,27 +17220,11 @@ | |
2720 | rm -f conftest.er1 | |
2721 | cat conftest.err >&5 | |
2722 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2723 | - (exit $ac_status); } && | |
2724 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
2725 | - { (case "(($ac_try" in | |
2726 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2727 | - *) ac_try_echo=$ac_try;; | |
2728 | -esac | |
2729 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2730 | - (eval "$ac_try") 2>&5 | |
2731 | - ac_status=$? | |
2732 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2733 | - (exit $ac_status); }; } && | |
2734 | - { ac_try='test -s conftest$ac_exeext' | |
2735 | - { (case "(($ac_try" in | |
2736 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2737 | - *) ac_try_echo=$ac_try;; | |
2738 | -esac | |
2739 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2740 | - (eval "$ac_try") 2>&5 | |
2741 | - ac_status=$? | |
2742 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2743 | - (exit $ac_status); }; }; then | |
2744 | + (exit $ac_status); } && { | |
2745 | + test -z "$ac_c_werror_flag" || | |
2746 | + test ! -s conftest.err | |
2747 | + } && test -s conftest$ac_exeext && | |
2748 | + $as_test_x conftest$ac_exeext; then | |
2749 | ||
2750 | aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } | |
2751 | }'` | |
2752 | @@ -17758,7 +17238,7 @@ | |
2753 | ||
2754 | fi | |
2755 | ||
2756 | -rm -f core conftest.err conftest.$ac_objext \ | |
2757 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
2758 | conftest$ac_exeext conftest.$ac_ext | |
2759 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | |
2760 | ||
2761 | @@ -17799,27 +17279,11 @@ | |
2762 | rm -f conftest.er1 | |
2763 | cat conftest.err >&5 | |
2764 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2765 | - (exit $ac_status); } && | |
2766 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
2767 | - { (case "(($ac_try" in | |
2768 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2769 | - *) ac_try_echo=$ac_try;; | |
2770 | -esac | |
2771 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2772 | - (eval "$ac_try") 2>&5 | |
2773 | - ac_status=$? | |
2774 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2775 | - (exit $ac_status); }; } && | |
2776 | - { ac_try='test -s conftest$ac_exeext' | |
2777 | - { (case "(($ac_try" in | |
2778 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2779 | - *) ac_try_echo=$ac_try;; | |
2780 | -esac | |
2781 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2782 | - (eval "$ac_try") 2>&5 | |
2783 | - ac_status=$? | |
2784 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2785 | - (exit $ac_status); }; }; then | |
2786 | + (exit $ac_status); } && { | |
2787 | + test -z "$ac_c_werror_flag" || | |
2788 | + test ! -s conftest.err | |
2789 | + } && test -s conftest$ac_exeext && | |
2790 | + $as_test_x conftest$ac_exeext; then | |
2791 | ||
2792 | aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } | |
2793 | }'` | |
2794 | @@ -17833,7 +17297,7 @@ | |
2795 | ||
2796 | fi | |
2797 | ||
2798 | -rm -f core conftest.err conftest.$ac_objext \ | |
2799 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
2800 | conftest$ac_exeext conftest.$ac_ext | |
2801 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | |
2802 | ||
2803 | @@ -17964,7 +17428,7 @@ | |
2804 | ;; | |
2805 | ||
2806 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | |
2807 | - freebsd* | kfreebsd*-gnu | dragonfly*) | |
2808 | + freebsd* | dragonfly*) | |
2809 | archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' | |
2810 | hardcode_libdir_flag_spec_GCJ='-R$libdir' | |
2811 | hardcode_direct_GCJ=yes | |
2812 | @@ -18066,7 +17530,7 @@ | |
2813 | link_all_deplibs_GCJ=yes | |
2814 | ;; | |
2815 | ||
2816 | - netbsd*) | |
2817 | + netbsd* | netbsdelf*-gnu) | |
2818 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | |
2819 | archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out | |
2820 | else | |
2821 | @@ -18556,18 +18020,6 @@ | |
2822 | dynamic_linker=no | |
2823 | ;; | |
2824 | ||
2825 | -kfreebsd*-gnu) | |
2826 | - version_type=linux | |
2827 | - need_lib_prefix=no | |
2828 | - need_version=no | |
2829 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | |
2830 | - soname_spec='${libname}${release}${shared_ext}$major' | |
2831 | - shlibpath_var=LD_LIBRARY_PATH | |
2832 | - shlibpath_overrides_runpath=no | |
2833 | - hardcode_into_libs=yes | |
2834 | - dynamic_linker='GNU ld.so' | |
2835 | - ;; | |
2836 | - | |
2837 | freebsd* | dragonfly*) | |
2838 | # DragonFly does not have aout. When/if they implement a new | |
2839 | # versioning mechanism, adjust this. | |
2840 | @@ -18723,7 +18175,7 @@ | |
2841 | ;; | |
2842 | ||
2843 | # This must be Linux ELF. | |
2844 | -linux*) | |
2845 | +linux* | k*bsd*-gnu) | |
2846 | version_type=linux | |
2847 | need_lib_prefix=no | |
2848 | need_version=no | |
2849 | @@ -18752,7 +18204,7 @@ | |
2850 | dynamic_linker='GNU/Linux ld.so' | |
2851 | ;; | |
2852 | ||
2853 | -knetbsd*-gnu) | |
2854 | +netbsdelf*-gnu) | |
2855 | version_type=linux | |
2856 | need_lib_prefix=no | |
2857 | need_version=no | |
2858 | @@ -18761,7 +18213,7 @@ | |
2859 | shlibpath_var=LD_LIBRARY_PATH | |
2860 | shlibpath_overrides_runpath=no | |
2861 | hardcode_into_libs=yes | |
2862 | - dynamic_linker='GNU ld.so' | |
2863 | + dynamic_linker='NetBSD ld.elf_so' | |
2864 | ;; | |
2865 | ||
2866 | netbsd*) | |
2867 | @@ -19976,27 +19428,10 @@ | |
2868 | rm -f conftest.er1 | |
2869 | cat conftest.err >&5 | |
2870 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2871 | - (exit $ac_status); } && | |
2872 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
2873 | - { (case "(($ac_try" in | |
2874 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2875 | - *) ac_try_echo=$ac_try;; | |
2876 | -esac | |
2877 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2878 | - (eval "$ac_try") 2>&5 | |
2879 | - ac_status=$? | |
2880 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2881 | - (exit $ac_status); }; } && | |
2882 | - { ac_try='test -s conftest.$ac_objext' | |
2883 | - { (case "(($ac_try" in | |
2884 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2885 | - *) ac_try_echo=$ac_try;; | |
2886 | -esac | |
2887 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2888 | - (eval "$ac_try") 2>&5 | |
2889 | - ac_status=$? | |
2890 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2891 | - (exit $ac_status); }; }; then | |
2892 | + (exit $ac_status); } && { | |
2893 | + test -z "$ac_c_werror_flag" || | |
2894 | + test ! -s conftest.err | |
2895 | + } && test -s conftest.$ac_objext; then | |
2896 | ac_cv_header_stdc=yes | |
2897 | else | |
2898 | echo "$as_me: failed program was:" >&5 | |
2899 | @@ -20153,10 +19588,10 @@ | |
2900 | #ifndef __cplusplus | |
2901 | /* Ultrix mips cc rejects this. */ | |
2902 | typedef int charset[2]; | |
2903 | - const charset x; | |
2904 | + const charset cs; | |
2905 | /* SunOS 4.1.1 cc rejects this. */ | |
2906 | - char const *const *ccp; | |
2907 | - char **p; | |
2908 | + char const *const *pcpcc; | |
2909 | + char **ppc; | |
2910 | /* NEC SVR4.0.2 mips cc rejects this. */ | |
2911 | struct point {int x, y;}; | |
2912 | static struct point const zero = {0,0}; | |
2913 | @@ -20165,11 +19600,11 @@ | |
2914 | an arm of an if-expression whose if-part is not a constant | |
2915 | expression */ | |
2916 | const char *g = "string"; | |
2917 | - ccp = &g + (g ? g-g : 0); | |
2918 | + pcpcc = &g + (g ? g-g : 0); | |
2919 | /* HPUX 7.0 cc rejects these. */ | |
2920 | - ++ccp; | |
2921 | - p = (char**) ccp; | |
2922 | - ccp = (char const *const *) p; | |
2923 | + ++pcpcc; | |
2924 | + ppc = (char**) pcpcc; | |
2925 | + pcpcc = (char const *const *) ppc; | |
2926 | { /* SCO 3.2v4 cc rejects this. */ | |
2927 | char *t; | |
2928 | char const *s = 0 ? (char *) 0 : (char const *) 0; | |
2929 | @@ -20196,7 +19631,7 @@ | |
2930 | const int foo = 10; | |
2931 | if (!foo) return 0; | |
2932 | } | |
2933 | - return !x[0] && !zero.x; | |
2934 | + return !cs[0] && !zero.x; | |
2935 | #endif | |
2936 | ||
2937 | ; | |
2938 | @@ -20216,27 +19651,10 @@ | |
2939 | rm -f conftest.er1 | |
2940 | cat conftest.err >&5 | |
2941 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2942 | - (exit $ac_status); } && | |
2943 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
2944 | - { (case "(($ac_try" in | |
2945 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2946 | - *) ac_try_echo=$ac_try;; | |
2947 | -esac | |
2948 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2949 | - (eval "$ac_try") 2>&5 | |
2950 | - ac_status=$? | |
2951 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2952 | - (exit $ac_status); }; } && | |
2953 | - { ac_try='test -s conftest.$ac_objext' | |
2954 | - { (case "(($ac_try" in | |
2955 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2956 | - *) ac_try_echo=$ac_try;; | |
2957 | -esac | |
2958 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2959 | - (eval "$ac_try") 2>&5 | |
2960 | - ac_status=$? | |
2961 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2962 | - (exit $ac_status); }; }; then | |
2963 | + (exit $ac_status); } && { | |
2964 | + test -z "$ac_c_werror_flag" || | |
2965 | + test ! -s conftest.err | |
2966 | + } && test -s conftest.$ac_objext; then | |
2967 | ac_cv_c_const=yes | |
2968 | else | |
2969 | echo "$as_me: failed program was:" >&5 | |
2970 | @@ -20290,27 +19708,10 @@ | |
2971 | rm -f conftest.er1 | |
2972 | cat conftest.err >&5 | |
2973 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2974 | - (exit $ac_status); } && | |
2975 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
2976 | - { (case "(($ac_try" in | |
2977 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2978 | - *) ac_try_echo=$ac_try;; | |
2979 | -esac | |
2980 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2981 | - (eval "$ac_try") 2>&5 | |
2982 | - ac_status=$? | |
2983 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2984 | - (exit $ac_status); }; } && | |
2985 | - { ac_try='test -s conftest.$ac_objext' | |
2986 | - { (case "(($ac_try" in | |
2987 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2988 | - *) ac_try_echo=$ac_try;; | |
2989 | -esac | |
2990 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2991 | - (eval "$ac_try") 2>&5 | |
2992 | - ac_status=$? | |
2993 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2994 | - (exit $ac_status); }; }; then | |
2995 | + (exit $ac_status); } && { | |
2996 | + test -z "$ac_c_werror_flag" || | |
2997 | + test ! -s conftest.err | |
2998 | + } && test -s conftest.$ac_objext; then | |
2999 | ac_cv_c_inline=$ac_kw | |
3000 | else | |
3001 | echo "$as_me: failed program was:" >&5 | |
3002 | @@ -20380,27 +19781,10 @@ | |
3003 | rm -f conftest.er1 | |
3004 | cat conftest.err >&5 | |
3005 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3006 | - (exit $ac_status); } && | |
3007 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
3008 | - { (case "(($ac_try" in | |
3009 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
3010 | - *) ac_try_echo=$ac_try;; | |
3011 | -esac | |
3012 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
3013 | - (eval "$ac_try") 2>&5 | |
3014 | - ac_status=$? | |
3015 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3016 | - (exit $ac_status); }; } && | |
3017 | - { ac_try='test -s conftest.$ac_objext' | |
3018 | - { (case "(($ac_try" in | |
3019 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
3020 | - *) ac_try_echo=$ac_try;; | |
3021 | -esac | |
3022 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
3023 | - (eval "$ac_try") 2>&5 | |
3024 | - ac_status=$? | |
3025 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3026 | - (exit $ac_status); }; }; then | |
3027 | + (exit $ac_status); } && { | |
3028 | + test -z "$ac_c_werror_flag" || | |
3029 | + test ! -s conftest.err | |
3030 | + } && test -s conftest.$ac_objext; then | |
3031 | ac_cv_header_time=yes | |
3032 | else | |
3033 | echo "$as_me: failed program was:" >&5 | |
3034 | @@ -20535,27 +19919,11 @@ | |
3035 | rm -f conftest.er1 | |
3036 | cat conftest.err >&5 | |
3037 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3038 | - (exit $ac_status); } && | |
3039 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
3040 | - { (case "(($ac_try" in | |
3041 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
3042 | - *) ac_try_echo=$ac_try;; | |
3043 | -esac | |
3044 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
3045 | - (eval "$ac_try") 2>&5 | |
3046 | - ac_status=$? | |
3047 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3048 | - (exit $ac_status); }; } && | |
3049 | - { ac_try='test -s conftest$ac_exeext' | |
3050 | - { (case "(($ac_try" in | |
3051 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
3052 | - *) ac_try_echo=$ac_try;; | |
3053 | -esac | |
3054 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
3055 | - (eval "$ac_try") 2>&5 | |
3056 | - ac_status=$? | |
3057 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3058 | - (exit $ac_status); }; }; then | |
3059 | + (exit $ac_status); } && { | |
3060 | + test -z "$ac_c_werror_flag" || | |
3061 | + test ! -s conftest.err | |
3062 | + } && test -s conftest$ac_exeext && | |
3063 | + $as_test_x conftest$ac_exeext; then | |
3064 | ac_cv_func_hsearch_r=yes | |
3065 | else | |
3066 | echo "$as_me: failed program was:" >&5 | |
3067 | @@ -20564,7 +19932,7 @@ | |
3068 | ac_cv_func_hsearch_r=no | |
3069 | fi | |
3070 | ||
3071 | -rm -f core conftest.err conftest.$ac_objext \ | |
3072 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
3073 | conftest$ac_exeext conftest.$ac_ext | |
3074 | fi | |
3075 | { echo "$as_me:$LINENO: result: $ac_cv_func_hsearch_r" >&5 | |
3076 | @@ -20860,27 +20228,11 @@ | |
3077 | rm -f conftest.er1 | |
3078 | cat conftest.err >&5 | |
3079 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3080 | - (exit $ac_status); } && | |
3081 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
3082 | - { (case "(($ac_try" in | |
3083 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
3084 | - *) ac_try_echo=$ac_try;; | |
3085 | -esac | |
3086 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
3087 | - (eval "$ac_try") 2>&5 | |
3088 | - ac_status=$? | |
3089 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3090 | - (exit $ac_status); }; } && | |
3091 | - { ac_try='test -s conftest$ac_exeext' | |
3092 | - { (case "(($ac_try" in | |
3093 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
3094 | - *) ac_try_echo=$ac_try;; | |
3095 | -esac | |
3096 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
3097 | - (eval "$ac_try") 2>&5 | |
3098 | - ac_status=$? | |
3099 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3100 | - (exit $ac_status); }; }; then | |
3101 | + (exit $ac_status); } && { | |
3102 | + test -z "$ac_c_werror_flag" || | |
3103 | + test ! -s conftest.err | |
3104 | + } && test -s conftest$ac_exeext && | |
3105 | + $as_test_x conftest$ac_exeext; then | |
3106 | ac_cv_lib_dl_dlsym=yes | |
3107 | else | |
3108 | echo "$as_me: failed program was:" >&5 | |
3109 | @@ -20889,7 +20241,7 @@ | |
3110 | ac_cv_lib_dl_dlsym=no | |
3111 | fi | |
3112 | ||
3113 | -rm -f core conftest.err conftest.$ac_objext \ | |
3114 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
3115 | conftest$ac_exeext conftest.$ac_ext | |
3116 | LIBS=$ac_check_lib_save_LIBS | |
3117 | fi | |
3118 | @@ -20975,27 +20327,11 @@ | |
3119 | rm -f conftest.er1 | |
3120 | cat conftest.err >&5 | |
3121 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3122 | - (exit $ac_status); } && | |
3123 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
3124 | - { (case "(($ac_try" in | |
3125 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
3126 | - *) ac_try_echo=$ac_try;; | |
3127 | -esac | |
3128 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
3129 | - (eval "$ac_try") 2>&5 | |
3130 | - ac_status=$? | |
3131 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3132 | - (exit $ac_status); }; } && | |
3133 | - { ac_try='test -s conftest$ac_exeext' | |
3134 | - { (case "(($ac_try" in | |
3135 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
3136 | - *) ac_try_echo=$ac_try;; | |
3137 | -esac | |
3138 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
3139 | - (eval "$ac_try") 2>&5 | |
3140 | - ac_status=$? | |
3141 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3142 | - (exit $ac_status); }; }; then | |
3143 | + (exit $ac_status); } && { | |
3144 | + test -z "$ac_c_werror_flag" || | |
3145 | + test ! -s conftest.err | |
3146 | + } && test -s conftest$ac_exeext && | |
3147 | + $as_test_x conftest$ac_exeext; then | |
3148 | ac_cv_lib_pthread_pthread_join=yes | |
3149 | else | |
3150 | echo "$as_me: failed program was:" >&5 | |
3151 | @@ -21004,7 +20340,7 @@ | |
3152 | ac_cv_lib_pthread_pthread_join=no | |
3153 | fi | |
3154 | ||
3155 | -rm -f core conftest.err conftest.$ac_objext \ | |
3156 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
3157 | conftest$ac_exeext conftest.$ac_ext | |
3158 | LIBS=$ac_check_lib_save_LIBS | |
3159 | fi | |
3160 | @@ -21110,27 +20446,10 @@ | |
3161 | rm -f conftest.er1 | |
3162 | cat conftest.err >&5 | |
3163 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3164 | - (exit $ac_status); } && | |
3165 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
3166 | - { (case "(($ac_try" in | |
3167 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
3168 | - *) ac_try_echo=$ac_try;; | |
3169 | -esac | |
3170 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
3171 | - (eval "$ac_try") 2>&5 | |
3172 | - ac_status=$? | |
3173 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3174 | - (exit $ac_status); }; } && | |
3175 | - { ac_try='test -s conftest.$ac_objext' | |
3176 | - { (case "(($ac_try" in | |
3177 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
3178 | - *) ac_try_echo=$ac_try;; | |
3179 | -esac | |
3180 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
3181 | - (eval "$ac_try") 2>&5 | |
3182 | - ac_status=$? | |
3183 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3184 | - (exit $ac_status); }; }; then | |
3185 | + (exit $ac_status); } && { | |
3186 | + test -z "$ac_c_werror_flag" || | |
3187 | + test ! -s conftest.err | |
3188 | + } && test -s conftest.$ac_objext; then | |
3189 | ac_header_compiler=yes | |
3190 | else | |
3191 | echo "$as_me: failed program was:" >&5 | |
3192 | @@ -21166,17 +20485,10 @@ | |
3193 | rm -f conftest.er1 | |
3194 | cat conftest.err >&5 | |
3195 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3196 | - (exit $ac_status); } >/dev/null; then | |
3197 | - if test -s conftest.err; then | |
3198 | - ac_cpp_err=$ac_c_preproc_warn_flag | |
3199 | - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | |
3200 | - else | |
3201 | - ac_cpp_err= | |
3202 | - fi | |
3203 | -else | |
3204 | - ac_cpp_err=yes | |
3205 | -fi | |
3206 | -if test -z "$ac_cpp_err"; then | |
3207 | + (exit $ac_status); } >/dev/null && { | |
3208 | + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | |
3209 | + test ! -s conftest.err | |
3210 | + }; then | |
3211 | ac_header_preproc=yes | |
3212 | else | |
3213 | echo "$as_me: failed program was:" >&5 | |
3214 | @@ -21291,27 +20603,11 @@ | |
3215 | rm -f conftest.er1 | |
3216 | cat conftest.err >&5 | |
3217 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3218 | - (exit $ac_status); } && | |
3219 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
3220 | - { (case "(($ac_try" in | |
3221 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
3222 | - *) ac_try_echo=$ac_try;; | |
3223 | -esac | |
3224 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
3225 | - (eval "$ac_try") 2>&5 | |
3226 | - ac_status=$? | |
3227 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3228 | - (exit $ac_status); }; } && | |
3229 | - { ac_try='test -s conftest$ac_exeext' | |
3230 | - { (case "(($ac_try" in | |
3231 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
3232 | - *) ac_try_echo=$ac_try;; | |
3233 | -esac | |
3234 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
3235 | - (eval "$ac_try") 2>&5 | |
3236 | - ac_status=$? | |
3237 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3238 | - (exit $ac_status); }; }; then | |
3239 | + (exit $ac_status); } && { | |
3240 | + test -z "$ac_c_werror_flag" || | |
3241 | + test ! -s conftest.err | |
3242 | + } && test -s conftest$ac_exeext && | |
3243 | + $as_test_x conftest$ac_exeext; then | |
3244 | ac_cv_lib_resmgr_rsm_open_device=yes | |
3245 | else | |
3246 | echo "$as_me: failed program was:" >&5 | |
3247 | @@ -21320,7 +20616,7 @@ | |
3248 | ac_cv_lib_resmgr_rsm_open_device=no | |
3249 | fi | |
3250 | ||
3251 | -rm -f core conftest.err conftest.$ac_objext \ | |
3252 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
3253 | conftest$ac_exeext conftest.$ac_ext | |
3254 | LIBS=$ac_check_lib_save_LIBS | |
3255 | fi | |
3256 | @@ -22123,6 +21419,13 @@ | |
3257 | Usually this means the macro was only invoked conditionally." >&2;} | |
3258 | { (exit 1); exit 1; }; } | |
3259 | fi | |
3260 | +if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then | |
3261 | + { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. | |
3262 | +Usually this means the macro was only invoked conditionally." >&5 | |
3263 | +echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. | |
3264 | +Usually this means the macro was only invoked conditionally." >&2;} | |
3265 | + { (exit 1); exit 1; }; } | |
3266 | +fi | |
3267 | if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then | |
3268 | { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. | |
3269 | Usually this means the macro was only invoked conditionally." >&5 | |
3270 | @@ -22455,7 +21758,8 @@ | |
3271 | ## M4sh Initialization. ## | |
3272 | ## --------------------- ## | |
3273 | ||
3274 | -# Be Bourne compatible | |
3275 | +# Be more Bourne compatible | |
3276 | +DUALCASE=1; export DUALCASE # for MKS sh | |
3277 | if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then | |
3278 | emulate sh | |
3279 | NULLCMD=: | |
3280 | @@ -22464,10 +21768,13 @@ | |
3281 | alias -g '${1+"$@"}'='"$@"' | |
3282 | setopt NO_GLOB_SUBST | |
3283 | else | |
3284 | - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac | |
3285 | + case `(set -o) 2>/dev/null` in | |
3286 | + *posix*) set -o posix ;; | |
3287 | +esac | |
3288 | + | |
3289 | fi | |
3290 | -BIN_SH=xpg4; export BIN_SH # for Tru64 | |
3291 | -DUALCASE=1; export DUALCASE # for MKS sh | |
3292 | + | |
3293 | + | |
3294 | ||
3295 | ||
3296 | # PATH needs CR | |
3297 | @@ -22691,19 +21998,28 @@ | |
3298 | as_mkdir_p=false | |
3299 | fi | |
3300 | ||
3301 | -# Find out whether ``test -x'' works. Don't use a zero-byte file, as | |
3302 | -# systems may use methods other than mode bits to determine executability. | |
3303 | -cat >conf$$.file <<_ASEOF | |
3304 | -#! /bin/sh | |
3305 | -exit 0 | |
3306 | -_ASEOF | |
3307 | -chmod +x conf$$.file | |
3308 | -if test -x conf$$.file >/dev/null 2>&1; then | |
3309 | - as_executable_p="test -x" | |
3310 | +if test -x / >/dev/null 2>&1; then | |
3311 | + as_test_x='test -x' | |
3312 | else | |
3313 | - as_executable_p=: | |
3314 | + if ls -dL / >/dev/null 2>&1; then | |
3315 | + as_ls_L_option=L | |
3316 | + else | |
3317 | + as_ls_L_option= | |
3318 | + fi | |
3319 | + as_test_x=' | |
3320 | + eval sh -c '\'' | |
3321 | + if test -d "$1"; then | |
3322 | + test -d "$1/."; | |
3323 | + else | |
3324 | + case $1 in | |
3325 | + -*)set "./$1";; | |
3326 | + esac; | |
3327 | + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in | |
3328 | + ???[sx]*):;;*)false;;esac;fi | |
3329 | + '\'' sh | |
3330 | + ' | |
3331 | fi | |
3332 | -rm -f conf$$.file | |
3333 | +as_executable_p=$as_test_x | |
3334 | ||
3335 | # Sed expression to map a string onto a valid CPP name. | |
3336 | as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" | |
3337 | @@ -22719,7 +22035,7 @@ | |
3338 | # values after options handling. | |
3339 | ac_log=" | |
3340 | This file was extended by $as_me, which was | |
3341 | -generated by GNU Autoconf 2.60. Invocation command line was | |
3342 | +generated by GNU Autoconf 2.61. Invocation command line was | |
3343 | ||
3344 | CONFIG_FILES = $CONFIG_FILES | |
3345 | CONFIG_HEADERS = $CONFIG_HEADERS | |
3346 | @@ -22748,7 +22064,7 @@ | |
3347 | Usage: $0 [OPTIONS] [FILE]... | |
3348 | ||
3349 | -h, --help print this help, then exit | |
3350 | - -V, --version print version number, then exit | |
3351 | + -V, --version print version number and configuration settings, then exit | |
3352 | -q, --quiet do not print progress messages | |
3353 | -d, --debug don't remove temporary files | |
3354 | --recheck update $as_me by reconfiguring in the same conditions | |
3355 | @@ -22772,7 +22088,7 @@ | |
3356 | cat >>$CONFIG_STATUS <<_ACEOF | |
3357 | ac_cs_version="\\ | |
3358 | config.status | |
3359 | -configured by $0, generated by GNU Autoconf 2.60, | |
3360 | +configured by $0, generated by GNU Autoconf 2.61, | |
3361 | with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" | |
3362 | ||
3363 | Copyright (C) 2006 Free Software Foundation, Inc. | |
3364 | @@ -23050,6 +22366,9 @@ | |
3365 | am__untar!$am__untar$ac_delim | |
3366 | INSTALL_M4_TRUE!$INSTALL_M4_TRUE$ac_delim | |
3367 | INSTALL_M4_FALSE!$INSTALL_M4_FALSE$ac_delim | |
3368 | +MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim | |
3369 | +MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim | |
3370 | +MAINT!$MAINT$ac_delim | |
3371 | CC!$CC$ac_delim | |
3372 | CFLAGS!$CFLAGS$ac_delim | |
3373 | LDFLAGS!$LDFLAGS$ac_delim | |
3374 | @@ -23072,9 +22391,6 @@ | |
3375 | EGREP!$EGREP$ac_delim | |
3376 | ECHO!$ECHO$ac_delim | |
3377 | AR!$AR$ac_delim | |
3378 | -RANLIB!$RANLIB$ac_delim | |
3379 | -CXX!$CXX$ac_delim | |
3380 | -CXXFLAGS!$CXXFLAGS$ac_delim | |
3381 | _ACEOF | |
3382 | ||
3383 | if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then | |
3384 | @@ -23116,6 +22432,9 @@ | |
3385 | ac_delim='%!_!# ' | |
3386 | for ac_last_try in false false false false false :; do | |
3387 | cat >conf$$subs.sed <<_ACEOF | |
3388 | +RANLIB!$RANLIB$ac_delim | |
3389 | +CXX!$CXX$ac_delim | |
3390 | +CXXFLAGS!$CXXFLAGS$ac_delim | |
3391 | ac_ct_CXX!$ac_ct_CXX$ac_delim | |
3392 | CXXDEPMODE!$CXXDEPMODE$ac_delim | |
3393 | am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim | |
3394 | @@ -23210,9 +22529,6 @@ | |
3395 | BUILD_PCM_PLUGIN_IOPLUG_TRUE!$BUILD_PCM_PLUGIN_IOPLUG_TRUE$ac_delim | |
3396 | BUILD_PCM_PLUGIN_IOPLUG_FALSE!$BUILD_PCM_PLUGIN_IOPLUG_FALSE$ac_delim | |
3397 | BUILD_CTL_PLUGIN_TRUE!$BUILD_CTL_PLUGIN_TRUE$ac_delim | |
3398 | -BUILD_CTL_PLUGIN_FALSE!$BUILD_CTL_PLUGIN_FALSE$ac_delim | |
3399 | -BUILD_CTL_PLUGIN_SHM_TRUE!$BUILD_CTL_PLUGIN_SHM_TRUE$ac_delim | |
3400 | -BUILD_CTL_PLUGIN_SHM_FALSE!$BUILD_CTL_PLUGIN_SHM_FALSE$ac_delim | |
3401 | _ACEOF | |
3402 | ||
3403 | if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then | |
3404 | @@ -23254,13 +22570,16 @@ | |
3405 | ac_delim='%!_!# ' | |
3406 | for ac_last_try in false false false false false :; do | |
3407 | cat >conf$$subs.sed <<_ACEOF | |
3408 | +BUILD_CTL_PLUGIN_FALSE!$BUILD_CTL_PLUGIN_FALSE$ac_delim | |
3409 | +BUILD_CTL_PLUGIN_SHM_TRUE!$BUILD_CTL_PLUGIN_SHM_TRUE$ac_delim | |
3410 | +BUILD_CTL_PLUGIN_SHM_FALSE!$BUILD_CTL_PLUGIN_SHM_FALSE$ac_delim | |
3411 | BUILD_CTL_PLUGIN_EXT_TRUE!$BUILD_CTL_PLUGIN_EXT_TRUE$ac_delim | |
3412 | BUILD_CTL_PLUGIN_EXT_FALSE!$BUILD_CTL_PLUGIN_EXT_FALSE$ac_delim | |
3413 | LIBOBJS!$LIBOBJS$ac_delim | |
3414 | LTLIBOBJS!$LTLIBOBJS$ac_delim | |
3415 | _ACEOF | |
3416 | ||
3417 | - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 4; then | |
3418 | + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 7; then | |
3419 | break | |
3420 | elif $ac_last_try; then | |
3421 | { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 | |
3422 | diff -Naurd a/doc/Makefile.in b/doc/Makefile.in | |
3423 | --- a/doc/Makefile.in 2007-05-02 10:02:55.000000000 +0200 | |
3424 | +++ b/doc/Makefile.in 2007-05-06 11:05:08.000000000 +0200 | |
3425 | @@ -180,6 +180,9 @@ | |
3426 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
3427 | LN_S = @LN_S@ | |
3428 | LTLIBOBJS = @LTLIBOBJS@ | |
3429 | +MAINT = @MAINT@ | |
3430 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
3431 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
3432 | MAKEINFO = @MAKEINFO@ | |
3433 | OBJEXT = @OBJEXT@ | |
3434 | PACKAGE = @PACKAGE@ | |
3435 | @@ -261,7 +264,7 @@ | |
3436 | all: all-recursive | |
3437 | ||
3438 | .SUFFIXES: | |
3439 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
3440 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
3441 | @for dep in $?; do \ | |
3442 | case '$(am__configure_deps)' in \ | |
3443 | *$$dep*) \ | |
3444 | @@ -270,9 +273,9 @@ | |
3445 | exit 1;; \ | |
3446 | esac; \ | |
3447 | done; \ | |
3448 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \ | |
3449 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ | |
3450 | cd $(top_srcdir) && \ | |
3451 | - $(AUTOMAKE) --foreign doc/Makefile | |
3452 | + $(AUTOMAKE) --gnu doc/Makefile | |
3453 | .PRECIOUS: Makefile | |
3454 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
3455 | @case '$?' in \ | |
3456 | @@ -286,9 +289,9 @@ | |
3457 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
3458 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3459 | ||
3460 | -$(top_srcdir)/configure: $(am__configure_deps) | |
3461 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
3462 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3463 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
3464 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
3465 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3466 | ||
3467 | mostlyclean-libtool: | |
3468 | diff -Naurd a/doc/pictures/Makefile.in b/doc/pictures/Makefile.in | |
3469 | --- a/doc/pictures/Makefile.in 2007-05-02 10:02:55.000000000 +0200 | |
3470 | +++ b/doc/pictures/Makefile.in 2007-05-06 11:05:08.000000000 +0200 | |
3471 | @@ -171,6 +171,9 @@ | |
3472 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
3473 | LN_S = @LN_S@ | |
3474 | LTLIBOBJS = @LTLIBOBJS@ | |
3475 | +MAINT = @MAINT@ | |
3476 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
3477 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
3478 | MAKEINFO = @MAKEINFO@ | |
3479 | OBJEXT = @OBJEXT@ | |
3480 | PACKAGE = @PACKAGE@ | |
3481 | @@ -250,7 +253,7 @@ | |
3482 | all: all-am | |
3483 | ||
3484 | .SUFFIXES: | |
3485 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
3486 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
3487 | @for dep in $?; do \ | |
3488 | case '$(am__configure_deps)' in \ | |
3489 | *$$dep*) \ | |
3490 | @@ -259,9 +262,9 @@ | |
3491 | exit 1;; \ | |
3492 | esac; \ | |
3493 | done; \ | |
3494 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/pictures/Makefile'; \ | |
3495 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/pictures/Makefile'; \ | |
3496 | cd $(top_srcdir) && \ | |
3497 | - $(AUTOMAKE) --foreign doc/pictures/Makefile | |
3498 | + $(AUTOMAKE) --gnu doc/pictures/Makefile | |
3499 | .PRECIOUS: Makefile | |
3500 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
3501 | @case '$?' in \ | |
3502 | @@ -275,9 +278,9 @@ | |
3503 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
3504 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3505 | ||
3506 | -$(top_srcdir)/configure: $(am__configure_deps) | |
3507 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
3508 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3509 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
3510 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
3511 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3512 | ||
3513 | mostlyclean-libtool: | |
3514 | diff -Naurd a/include/Makefile.in b/include/Makefile.in | |
3515 | --- a/include/Makefile.in 2007-05-02 10:02:55.000000000 +0200 | |
3516 | +++ b/include/Makefile.in 2007-05-06 11:05:08.000000000 +0200 | |
3517 | @@ -192,6 +192,9 @@ | |
3518 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
3519 | LN_S = @LN_S@ | |
3520 | LTLIBOBJS = @LTLIBOBJS@ | |
3521 | +MAINT = @MAINT@ | |
3522 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
3523 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
3524 | MAKEINFO = @MAKEINFO@ | |
3525 | OBJEXT = @OBJEXT@ | |
3526 | PACKAGE = @PACKAGE@ | |
3527 | @@ -286,7 +289,7 @@ | |
3528 | $(MAKE) $(AM_MAKEFLAGS) all-recursive | |
3529 | ||
3530 | .SUFFIXES: | |
3531 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
3532 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
3533 | @for dep in $?; do \ | |
3534 | case '$(am__configure_deps)' in \ | |
3535 | *$$dep*) \ | |
3536 | @@ -295,9 +298,9 @@ | |
3537 | exit 1;; \ | |
3538 | esac; \ | |
3539 | done; \ | |
3540 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/Makefile'; \ | |
3541 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/Makefile'; \ | |
3542 | cd $(top_srcdir) && \ | |
3543 | - $(AUTOMAKE) --foreign include/Makefile | |
3544 | + $(AUTOMAKE) --gnu include/Makefile | |
3545 | .PRECIOUS: Makefile | |
3546 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
3547 | @case '$?' in \ | |
3548 | @@ -311,9 +314,9 @@ | |
3549 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
3550 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3551 | ||
3552 | -$(top_srcdir)/configure: $(am__configure_deps) | |
3553 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
3554 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3555 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
3556 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
3557 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3558 | ||
3559 | config.h: stamp-h1 | |
3560 | @@ -325,7 +328,7 @@ | |
3561 | stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status | |
3562 | @rm -f stamp-h1 | |
3563 | cd $(top_builddir) && $(SHELL) ./config.status include/config.h | |
3564 | -$(srcdir)/config.h.in: $(am__configure_deps) | |
3565 | +$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
3566 | cd $(top_srcdir) && $(AUTOHEADER) | |
3567 | rm -f stamp-h1 | |
3568 | touch $@ | |
3569 | diff -Naurd a/include/sound/Makefile.in b/include/sound/Makefile.in | |
3570 | --- a/include/sound/Makefile.in 2007-05-02 10:02:55.000000000 +0200 | |
3571 | +++ b/include/sound/Makefile.in 2007-05-06 11:05:08.000000000 +0200 | |
3572 | @@ -184,6 +184,9 @@ | |
3573 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
3574 | LN_S = @LN_S@ | |
3575 | LTLIBOBJS = @LTLIBOBJS@ | |
3576 | +MAINT = @MAINT@ | |
3577 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
3578 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
3579 | MAKEINFO = @MAKEINFO@ | |
3580 | OBJEXT = @OBJEXT@ | |
3581 | PACKAGE = @PACKAGE@ | |
3582 | @@ -268,7 +271,7 @@ | |
3583 | all: all-am | |
3584 | ||
3585 | .SUFFIXES: | |
3586 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
3587 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
3588 | @for dep in $?; do \ | |
3589 | case '$(am__configure_deps)' in \ | |
3590 | *$$dep*) \ | |
3591 | @@ -277,9 +280,9 @@ | |
3592 | exit 1;; \ | |
3593 | esac; \ | |
3594 | done; \ | |
3595 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/sound/Makefile'; \ | |
3596 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/sound/Makefile'; \ | |
3597 | cd $(top_srcdir) && \ | |
3598 | - $(AUTOMAKE) --foreign include/sound/Makefile | |
3599 | + $(AUTOMAKE) --gnu include/sound/Makefile | |
3600 | .PRECIOUS: Makefile | |
3601 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
3602 | @case '$?' in \ | |
3603 | @@ -293,9 +296,9 @@ | |
3604 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
3605 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3606 | ||
3607 | -$(top_srcdir)/configure: $(am__configure_deps) | |
3608 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
3609 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3610 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
3611 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
3612 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3613 | ||
3614 | mostlyclean-libtool: | |
3615 | diff -Naurd a/ltmain.sh b/ltmain.sh | |
3616 | --- a/ltmain.sh 2006-11-25 12:04:27.000000000 +0100 | |
3617 | +++ b/ltmain.sh 2006-03-11 20:40:23.000000000 +0100 | |
3618 | @@ -43,7 +43,7 @@ | |
3619 | ||
3620 | PROGRAM=ltmain.sh | |
3621 | PACKAGE=libtool | |
3622 | -VERSION=1.5.22 | |
3623 | +VERSION="1.5.22 Debian 1.5.22-4" | |
3624 | TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)" | |
3625 | ||
3626 | # See if we are running on zsh, and set the options which allow our | |
3627 | @@ -2082,7 +2082,10 @@ | |
3628 | case $pass in | |
3629 | dlopen) libs="$dlfiles" ;; | |
3630 | dlpreopen) libs="$dlprefiles" ;; | |
3631 | - link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; | |
3632 | + link) | |
3633 | + libs="$deplibs %DEPLIBS%" | |
3634 | + test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" | |
3635 | + ;; | |
3636 | esac | |
3637 | fi | |
3638 | if test "$pass" = dlopen; then | |
3639 | @@ -3201,6 +3204,11 @@ | |
3640 | age="$number_minor" | |
3641 | revision="$number_minor" | |
3642 | ;; | |
3643 | + *) | |
3644 | + $echo "$modename: unknown library version type \`$version_type'" 1>&2 | |
3645 | + $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 | |
3646 | + exit $EXIT_FAILURE | |
3647 | + ;; | |
3648 | esac | |
3649 | ;; | |
3650 | no) | |
3651 | diff -Naurd a/modules/Makefile.in b/modules/Makefile.in | |
3652 | --- a/modules/Makefile.in 2007-05-02 10:02:55.000000000 +0200 | |
3653 | +++ b/modules/Makefile.in 2007-05-06 11:05:09.000000000 +0200 | |
3654 | @@ -180,6 +180,9 @@ | |
3655 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
3656 | LN_S = @LN_S@ | |
3657 | LTLIBOBJS = @LTLIBOBJS@ | |
3658 | +MAINT = @MAINT@ | |
3659 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
3660 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
3661 | MAKEINFO = @MAKEINFO@ | |
3662 | OBJEXT = @OBJEXT@ | |
3663 | PACKAGE = @PACKAGE@ | |
3664 | @@ -259,7 +262,7 @@ | |
3665 | all: all-recursive | |
3666 | ||
3667 | .SUFFIXES: | |
3668 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
3669 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
3670 | @for dep in $?; do \ | |
3671 | case '$(am__configure_deps)' in \ | |
3672 | *$$dep*) \ | |
3673 | @@ -268,9 +271,9 @@ | |
3674 | exit 1;; \ | |
3675 | esac; \ | |
3676 | done; \ | |
3677 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign modules/Makefile'; \ | |
3678 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/Makefile'; \ | |
3679 | cd $(top_srcdir) && \ | |
3680 | - $(AUTOMAKE) --foreign modules/Makefile | |
3681 | + $(AUTOMAKE) --gnu modules/Makefile | |
3682 | .PRECIOUS: Makefile | |
3683 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
3684 | @case '$?' in \ | |
3685 | @@ -284,9 +287,9 @@ | |
3686 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
3687 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3688 | ||
3689 | -$(top_srcdir)/configure: $(am__configure_deps) | |
3690 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
3691 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3692 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
3693 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
3694 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3695 | ||
3696 | mostlyclean-libtool: | |
3697 | diff -Naurd a/modules/mixer/Makefile.in b/modules/mixer/Makefile.in | |
3698 | --- a/modules/mixer/Makefile.in 2007-05-02 10:02:55.000000000 +0200 | |
3699 | +++ b/modules/mixer/Makefile.in 2007-05-06 11:05:09.000000000 +0200 | |
3700 | @@ -180,6 +180,9 @@ | |
3701 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
3702 | LN_S = @LN_S@ | |
3703 | LTLIBOBJS = @LTLIBOBJS@ | |
3704 | +MAINT = @MAINT@ | |
3705 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
3706 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
3707 | MAKEINFO = @MAKEINFO@ | |
3708 | OBJEXT = @OBJEXT@ | |
3709 | PACKAGE = @PACKAGE@ | |
3710 | @@ -259,7 +262,7 @@ | |
3711 | all: all-recursive | |
3712 | ||
3713 | .SUFFIXES: | |
3714 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
3715 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
3716 | @for dep in $?; do \ | |
3717 | case '$(am__configure_deps)' in \ | |
3718 | *$$dep*) \ | |
3719 | @@ -268,9 +271,9 @@ | |
3720 | exit 1;; \ | |
3721 | esac; \ | |
3722 | done; \ | |
3723 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign modules/mixer/Makefile'; \ | |
3724 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/mixer/Makefile'; \ | |
3725 | cd $(top_srcdir) && \ | |
3726 | - $(AUTOMAKE) --foreign modules/mixer/Makefile | |
3727 | + $(AUTOMAKE) --gnu modules/mixer/Makefile | |
3728 | .PRECIOUS: Makefile | |
3729 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
3730 | @case '$?' in \ | |
3731 | @@ -284,9 +287,9 @@ | |
3732 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
3733 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3734 | ||
3735 | -$(top_srcdir)/configure: $(am__configure_deps) | |
3736 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
3737 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3738 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
3739 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
3740 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3741 | ||
3742 | mostlyclean-libtool: | |
3743 | diff -Naurd a/modules/mixer/simple/Makefile.in b/modules/mixer/simple/Makefile.in | |
3744 | --- a/modules/mixer/simple/Makefile.in 2007-05-02 10:02:55.000000000 +0200 | |
3745 | +++ b/modules/mixer/simple/Makefile.in 2007-05-06 11:05:09.000000000 +0200 | |
3746 | @@ -208,6 +208,9 @@ | |
3747 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
3748 | LN_S = @LN_S@ | |
3749 | LTLIBOBJS = @LTLIBOBJS@ | |
3750 | +MAINT = @MAINT@ | |
3751 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
3752 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
3753 | MAKEINFO = @MAKEINFO@ | |
3754 | OBJEXT = @OBJEXT@ | |
3755 | PACKAGE = @PACKAGE@ | |
3756 | @@ -303,7 +306,7 @@ | |
3757 | ||
3758 | .SUFFIXES: | |
3759 | .SUFFIXES: .c .lo .o .obj | |
3760 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
3761 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
3762 | @for dep in $?; do \ | |
3763 | case '$(am__configure_deps)' in \ | |
3764 | *$$dep*) \ | |
3765 | @@ -312,9 +315,9 @@ | |
3766 | exit 1;; \ | |
3767 | esac; \ | |
3768 | done; \ | |
3769 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign modules/mixer/simple/Makefile'; \ | |
3770 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/mixer/simple/Makefile'; \ | |
3771 | cd $(top_srcdir) && \ | |
3772 | - $(AUTOMAKE) --foreign modules/mixer/simple/Makefile | |
3773 | + $(AUTOMAKE) --gnu modules/mixer/simple/Makefile | |
3774 | .PRECIOUS: Makefile | |
3775 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
3776 | @case '$?' in \ | |
3777 | @@ -328,9 +331,9 @@ | |
3778 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
3779 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3780 | ||
3781 | -$(top_srcdir)/configure: $(am__configure_deps) | |
3782 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
3783 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3784 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
3785 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
3786 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3787 | install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) | |
3788 | @$(NORMAL_INSTALL) | |
3789 | diff -Naurd a/src/Makefile.in b/src/Makefile.in | |
3790 | --- a/src/Makefile.in 2007-05-02 10:02:55.000000000 +0200 | |
3791 | +++ b/src/Makefile.in 2007-05-06 11:05:09.000000000 +0200 | |
3792 | @@ -233,6 +233,9 @@ | |
3793 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
3794 | LN_S = @LN_S@ | |
3795 | LTLIBOBJS = @LTLIBOBJS@ | |
3796 | +MAINT = @MAINT@ | |
3797 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
3798 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
3799 | MAKEINFO = @MAKEINFO@ | |
3800 | OBJEXT = @OBJEXT@ | |
3801 | PACKAGE = @PACKAGE@ | |
3802 | @@ -329,7 +332,7 @@ | |
3803 | ||
3804 | .SUFFIXES: | |
3805 | .SUFFIXES: .c .lo .o .obj | |
3806 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
3807 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
3808 | @for dep in $?; do \ | |
3809 | case '$(am__configure_deps)' in \ | |
3810 | *$$dep*) \ | |
3811 | @@ -338,9 +341,9 @@ | |
3812 | exit 1;; \ | |
3813 | esac; \ | |
3814 | done; \ | |
3815 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \ | |
3816 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ | |
3817 | cd $(top_srcdir) && \ | |
3818 | - $(AUTOMAKE) --foreign src/Makefile | |
3819 | + $(AUTOMAKE) --gnu src/Makefile | |
3820 | .PRECIOUS: Makefile | |
3821 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
3822 | @case '$?' in \ | |
3823 | @@ -354,9 +357,9 @@ | |
3824 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
3825 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3826 | ||
3827 | -$(top_srcdir)/configure: $(am__configure_deps) | |
3828 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
3829 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3830 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
3831 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
3832 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3833 | Versions: $(top_builddir)/config.status $(srcdir)/Versions.in | |
3834 | cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ | |
3835 | diff -Naurd a/src/alisp/Makefile.in b/src/alisp/Makefile.in | |
3836 | --- a/src/alisp/Makefile.in 2007-05-02 10:02:56.000000000 +0200 | |
3837 | +++ b/src/alisp/Makefile.in 2007-05-06 11:05:10.000000000 +0200 | |
3838 | @@ -190,6 +190,9 @@ | |
3839 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
3840 | LN_S = @LN_S@ | |
3841 | LTLIBOBJS = @LTLIBOBJS@ | |
3842 | +MAINT = @MAINT@ | |
3843 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
3844 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
3845 | MAKEINFO = @MAKEINFO@ | |
3846 | OBJEXT = @OBJEXT@ | |
3847 | PACKAGE = @PACKAGE@ | |
3848 | @@ -274,7 +277,7 @@ | |
3849 | ||
3850 | .SUFFIXES: | |
3851 | .SUFFIXES: .c .lo .o .obj | |
3852 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
3853 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
3854 | @for dep in $?; do \ | |
3855 | case '$(am__configure_deps)' in \ | |
3856 | *$$dep*) \ | |
3857 | @@ -283,9 +286,9 @@ | |
3858 | exit 1;; \ | |
3859 | esac; \ | |
3860 | done; \ | |
3861 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/alisp/Makefile'; \ | |
3862 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/alisp/Makefile'; \ | |
3863 | cd $(top_srcdir) && \ | |
3864 | - $(AUTOMAKE) --foreign src/alisp/Makefile | |
3865 | + $(AUTOMAKE) --gnu src/alisp/Makefile | |
3866 | .PRECIOUS: Makefile | |
3867 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
3868 | @case '$?' in \ | |
3869 | @@ -299,9 +302,9 @@ | |
3870 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
3871 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3872 | ||
3873 | -$(top_srcdir)/configure: $(am__configure_deps) | |
3874 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
3875 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3876 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
3877 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
3878 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3879 | libalisp.la: $(libalisp_la_OBJECTS) $(libalisp_la_DEPENDENCIES) | |
3880 | $(LINK) $(libalisp_la_LDFLAGS) $(libalisp_la_OBJECTS) $(libalisp_la_LIBADD) $(LIBS) | |
3881 | diff -Naurd a/src/compat/Makefile.in b/src/compat/Makefile.in | |
3882 | --- a/src/compat/Makefile.in 2007-05-02 10:02:56.000000000 +0200 | |
3883 | +++ b/src/compat/Makefile.in 2007-05-06 11:05:10.000000000 +0200 | |
3884 | @@ -192,6 +192,9 @@ | |
3885 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
3886 | LN_S = @LN_S@ | |
3887 | LTLIBOBJS = @LTLIBOBJS@ | |
3888 | +MAINT = @MAINT@ | |
3889 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
3890 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
3891 | MAKEINFO = @MAKEINFO@ | |
3892 | OBJEXT = @OBJEXT@ | |
3893 | PACKAGE = @PACKAGE@ | |
3894 | @@ -275,7 +278,7 @@ | |
3895 | ||
3896 | .SUFFIXES: | |
3897 | .SUFFIXES: .c .lo .o .obj | |
3898 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
3899 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
3900 | @for dep in $?; do \ | |
3901 | case '$(am__configure_deps)' in \ | |
3902 | *$$dep*) \ | |
3903 | @@ -284,9 +287,9 @@ | |
3904 | exit 1;; \ | |
3905 | esac; \ | |
3906 | done; \ | |
3907 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/compat/Makefile'; \ | |
3908 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/compat/Makefile'; \ | |
3909 | cd $(top_srcdir) && \ | |
3910 | - $(AUTOMAKE) --foreign src/compat/Makefile | |
3911 | + $(AUTOMAKE) --gnu src/compat/Makefile | |
3912 | .PRECIOUS: Makefile | |
3913 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
3914 | @case '$?' in \ | |
3915 | @@ -300,9 +303,9 @@ | |
3916 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
3917 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3918 | ||
3919 | -$(top_srcdir)/configure: $(am__configure_deps) | |
3920 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
3921 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3922 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
3923 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
3924 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3925 | ||
3926 | clean-noinstLTLIBRARIES: | |
3927 | diff -Naurd a/src/conf/Makefile.in b/src/conf/Makefile.in | |
3928 | --- a/src/conf/Makefile.in 2007-05-02 10:02:56.000000000 +0200 | |
3929 | +++ b/src/conf/Makefile.in 2007-05-06 11:05:10.000000000 +0200 | |
3930 | @@ -192,6 +192,9 @@ | |
3931 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
3932 | LN_S = @LN_S@ | |
3933 | LTLIBOBJS = @LTLIBOBJS@ | |
3934 | +MAINT = @MAINT@ | |
3935 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
3936 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
3937 | MAKEINFO = @MAKEINFO@ | |
3938 | OBJEXT = @OBJEXT@ | |
3939 | PACKAGE = @PACKAGE@ | |
3940 | @@ -275,7 +278,7 @@ | |
3941 | all: all-recursive | |
3942 | ||
3943 | .SUFFIXES: | |
3944 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
3945 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
3946 | @for dep in $?; do \ | |
3947 | case '$(am__configure_deps)' in \ | |
3948 | *$$dep*) \ | |
3949 | @@ -284,9 +287,9 @@ | |
3950 | exit 1;; \ | |
3951 | esac; \ | |
3952 | done; \ | |
3953 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/conf/Makefile'; \ | |
3954 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/conf/Makefile'; \ | |
3955 | cd $(top_srcdir) && \ | |
3956 | - $(AUTOMAKE) --foreign src/conf/Makefile | |
3957 | + $(AUTOMAKE) --gnu src/conf/Makefile | |
3958 | .PRECIOUS: Makefile | |
3959 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
3960 | @case '$?' in \ | |
3961 | @@ -300,9 +303,9 @@ | |
3962 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
3963 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3964 | ||
3965 | -$(top_srcdir)/configure: $(am__configure_deps) | |
3966 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
3967 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3968 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
3969 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
3970 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3971 | ||
3972 | mostlyclean-libtool: | |
3973 | diff -Naurd a/src/conf/cards/Makefile.in b/src/conf/cards/Makefile.in | |
3974 | --- a/src/conf/cards/Makefile.in 2007-05-02 10:02:56.000000000 +0200 | |
3975 | +++ b/src/conf/cards/Makefile.in 2007-05-06 11:05:11.000000000 +0200 | |
3976 | @@ -183,6 +183,9 @@ | |
3977 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
3978 | LN_S = @LN_S@ | |
3979 | LTLIBOBJS = @LTLIBOBJS@ | |
3980 | +MAINT = @MAINT@ | |
3981 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
3982 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
3983 | MAKEINFO = @MAKEINFO@ | |
3984 | OBJEXT = @OBJEXT@ | |
3985 | PACKAGE = @PACKAGE@ | |
3986 | @@ -286,7 +289,7 @@ | |
3987 | all: all-am | |
3988 | ||
3989 | .SUFFIXES: | |
3990 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
3991 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
3992 | @for dep in $?; do \ | |
3993 | case '$(am__configure_deps)' in \ | |
3994 | *$$dep*) \ | |
3995 | @@ -295,9 +298,9 @@ | |
3996 | exit 1;; \ | |
3997 | esac; \ | |
3998 | done; \ | |
3999 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/conf/cards/Makefile'; \ | |
4000 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/conf/cards/Makefile'; \ | |
4001 | cd $(top_srcdir) && \ | |
4002 | - $(AUTOMAKE) --foreign src/conf/cards/Makefile | |
4003 | + $(AUTOMAKE) --gnu src/conf/cards/Makefile | |
4004 | .PRECIOUS: Makefile | |
4005 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
4006 | @case '$?' in \ | |
4007 | @@ -311,9 +314,9 @@ | |
4008 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
4009 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4010 | ||
4011 | -$(top_srcdir)/configure: $(am__configure_deps) | |
4012 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
4013 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4014 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
4015 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
4016 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4017 | ||
4018 | mostlyclean-libtool: | |
4019 | diff -Naurd a/src/conf/pcm/Makefile.in b/src/conf/pcm/Makefile.in | |
4020 | --- a/src/conf/pcm/Makefile.in 2007-05-02 10:02:56.000000000 +0200 | |
4021 | +++ b/src/conf/pcm/Makefile.in 2007-05-06 11:05:11.000000000 +0200 | |
4022 | @@ -181,6 +181,9 @@ | |
4023 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
4024 | LN_S = @LN_S@ | |
4025 | LTLIBOBJS = @LTLIBOBJS@ | |
4026 | +MAINT = @MAINT@ | |
4027 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
4028 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
4029 | MAKEINFO = @MAKEINFO@ | |
4030 | OBJEXT = @OBJEXT@ | |
4031 | PACKAGE = @PACKAGE@ | |
4032 | @@ -269,7 +272,7 @@ | |
4033 | all: all-am | |
4034 | ||
4035 | .SUFFIXES: | |
4036 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
4037 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
4038 | @for dep in $?; do \ | |
4039 | case '$(am__configure_deps)' in \ | |
4040 | *$$dep*) \ | |
4041 | @@ -278,9 +281,9 @@ | |
4042 | exit 1;; \ | |
4043 | esac; \ | |
4044 | done; \ | |
4045 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/conf/pcm/Makefile'; \ | |
4046 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/conf/pcm/Makefile'; \ | |
4047 | cd $(top_srcdir) && \ | |
4048 | - $(AUTOMAKE) --foreign src/conf/pcm/Makefile | |
4049 | + $(AUTOMAKE) --gnu src/conf/pcm/Makefile | |
4050 | .PRECIOUS: Makefile | |
4051 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
4052 | @case '$?' in \ | |
4053 | @@ -294,9 +297,9 @@ | |
4054 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
4055 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4056 | ||
4057 | -$(top_srcdir)/configure: $(am__configure_deps) | |
4058 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
4059 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4060 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
4061 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
4062 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4063 | ||
4064 | mostlyclean-libtool: | |
4065 | diff -Naurd a/src/control/Makefile.in b/src/control/Makefile.in | |
4066 | --- a/src/control/Makefile.in 2007-05-02 10:02:56.000000000 +0200 | |
4067 | +++ b/src/control/Makefile.in 2007-05-06 11:05:11.000000000 +0200 | |
4068 | @@ -199,6 +199,9 @@ | |
4069 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
4070 | LN_S = @LN_S@ | |
4071 | LTLIBOBJS = @LTLIBOBJS@ | |
4072 | +MAINT = @MAINT@ | |
4073 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
4074 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
4075 | MAKEINFO = @MAKEINFO@ | |
4076 | OBJEXT = @OBJEXT@ | |
4077 | PACKAGE = @PACKAGE@ | |
4078 | @@ -284,7 +287,7 @@ | |
4079 | ||
4080 | .SUFFIXES: | |
4081 | .SUFFIXES: .c .lo .o .obj | |
4082 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
4083 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
4084 | @for dep in $?; do \ | |
4085 | case '$(am__configure_deps)' in \ | |
4086 | *$$dep*) \ | |
4087 | @@ -293,9 +296,9 @@ | |
4088 | exit 1;; \ | |
4089 | esac; \ | |
4090 | done; \ | |
4091 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/control/Makefile'; \ | |
4092 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/control/Makefile'; \ | |
4093 | cd $(top_srcdir) && \ | |
4094 | - $(AUTOMAKE) --foreign src/control/Makefile | |
4095 | + $(AUTOMAKE) --gnu src/control/Makefile | |
4096 | .PRECIOUS: Makefile | |
4097 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
4098 | @case '$?' in \ | |
4099 | @@ -309,9 +312,9 @@ | |
4100 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
4101 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4102 | ||
4103 | -$(top_srcdir)/configure: $(am__configure_deps) | |
4104 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
4105 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4106 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
4107 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
4108 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4109 | libcontrol.la: $(libcontrol_la_OBJECTS) $(libcontrol_la_DEPENDENCIES) | |
4110 | $(LINK) $(libcontrol_la_LDFLAGS) $(libcontrol_la_OBJECTS) $(libcontrol_la_LIBADD) $(LIBS) | |
4111 | diff -Naurd a/src/hwdep/Makefile.in b/src/hwdep/Makefile.in | |
4112 | --- a/src/hwdep/Makefile.in 2007-05-02 10:02:56.000000000 +0200 | |
4113 | +++ b/src/hwdep/Makefile.in 2007-05-06 11:05:11.000000000 +0200 | |
4114 | @@ -190,6 +190,9 @@ | |
4115 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
4116 | LN_S = @LN_S@ | |
4117 | LTLIBOBJS = @LTLIBOBJS@ | |
4118 | +MAINT = @MAINT@ | |
4119 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
4120 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
4121 | MAKEINFO = @MAKEINFO@ | |
4122 | OBJEXT = @OBJEXT@ | |
4123 | PACKAGE = @PACKAGE@ | |
4124 | @@ -273,7 +276,7 @@ | |
4125 | ||
4126 | .SUFFIXES: | |
4127 | .SUFFIXES: .c .lo .o .obj | |
4128 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
4129 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
4130 | @for dep in $?; do \ | |
4131 | case '$(am__configure_deps)' in \ | |
4132 | *$$dep*) \ | |
4133 | @@ -282,9 +285,9 @@ | |
4134 | exit 1;; \ | |
4135 | esac; \ | |
4136 | done; \ | |
4137 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/hwdep/Makefile'; \ | |
4138 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/hwdep/Makefile'; \ | |
4139 | cd $(top_srcdir) && \ | |
4140 | - $(AUTOMAKE) --foreign src/hwdep/Makefile | |
4141 | + $(AUTOMAKE) --gnu src/hwdep/Makefile | |
4142 | .PRECIOUS: Makefile | |
4143 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
4144 | @case '$?' in \ | |
4145 | @@ -298,9 +301,9 @@ | |
4146 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
4147 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4148 | ||
4149 | -$(top_srcdir)/configure: $(am__configure_deps) | |
4150 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
4151 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4152 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
4153 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
4154 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4155 | libhwdep.la: $(libhwdep_la_OBJECTS) $(libhwdep_la_DEPENDENCIES) | |
4156 | $(LINK) $(libhwdep_la_LDFLAGS) $(libhwdep_la_OBJECTS) $(libhwdep_la_LIBADD) $(LIBS) | |
4157 | diff -Naurd a/src/instr/Makefile.in b/src/instr/Makefile.in | |
4158 | --- a/src/instr/Makefile.in 2007-05-02 10:02:57.000000000 +0200 | |
4159 | +++ b/src/instr/Makefile.in 2007-05-06 11:05:12.000000000 +0200 | |
4160 | @@ -187,6 +187,9 @@ | |
4161 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
4162 | LN_S = @LN_S@ | |
4163 | LTLIBOBJS = @LTLIBOBJS@ | |
4164 | +MAINT = @MAINT@ | |
4165 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
4166 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
4167 | MAKEINFO = @MAKEINFO@ | |
4168 | OBJEXT = @OBJEXT@ | |
4169 | PACKAGE = @PACKAGE@ | |
4170 | @@ -269,7 +272,7 @@ | |
4171 | ||
4172 | .SUFFIXES: | |
4173 | .SUFFIXES: .c .lo .o .obj | |
4174 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
4175 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
4176 | @for dep in $?; do \ | |
4177 | case '$(am__configure_deps)' in \ | |
4178 | *$$dep*) \ | |
4179 | @@ -278,9 +281,9 @@ | |
4180 | exit 1;; \ | |
4181 | esac; \ | |
4182 | done; \ | |
4183 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/instr/Makefile'; \ | |
4184 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/instr/Makefile'; \ | |
4185 | cd $(top_srcdir) && \ | |
4186 | - $(AUTOMAKE) --foreign src/instr/Makefile | |
4187 | + $(AUTOMAKE) --gnu src/instr/Makefile | |
4188 | .PRECIOUS: Makefile | |
4189 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
4190 | @case '$?' in \ | |
4191 | @@ -294,9 +297,9 @@ | |
4192 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
4193 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4194 | ||
4195 | -$(top_srcdir)/configure: $(am__configure_deps) | |
4196 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
4197 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4198 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
4199 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
4200 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4201 | libinstr.la: $(libinstr_la_OBJECTS) $(libinstr_la_DEPENDENCIES) | |
4202 | $(LINK) $(libinstr_la_LDFLAGS) $(libinstr_la_OBJECTS) $(libinstr_la_LIBADD) $(LIBS) | |
4203 | diff -Naurd a/src/mixer/Makefile.in b/src/mixer/Makefile.in | |
4204 | --- a/src/mixer/Makefile.in 2007-05-02 10:02:57.000000000 +0200 | |
4205 | +++ b/src/mixer/Makefile.in 2007-05-06 11:05:12.000000000 +0200 | |
4206 | @@ -191,6 +191,9 @@ | |
4207 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
4208 | LN_S = @LN_S@ | |
4209 | LTLIBOBJS = @LTLIBOBJS@ | |
4210 | +MAINT = @MAINT@ | |
4211 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
4212 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
4213 | MAKEINFO = @MAKEINFO@ | |
4214 | OBJEXT = @OBJEXT@ | |
4215 | PACKAGE = @PACKAGE@ | |
4216 | @@ -274,7 +277,7 @@ | |
4217 | ||
4218 | .SUFFIXES: | |
4219 | .SUFFIXES: .c .lo .o .obj | |
4220 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
4221 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
4222 | @for dep in $?; do \ | |
4223 | case '$(am__configure_deps)' in \ | |
4224 | *$$dep*) \ | |
4225 | @@ -283,9 +286,9 @@ | |
4226 | exit 1;; \ | |
4227 | esac; \ | |
4228 | done; \ | |
4229 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/mixer/Makefile'; \ | |
4230 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/mixer/Makefile'; \ | |
4231 | cd $(top_srcdir) && \ | |
4232 | - $(AUTOMAKE) --foreign src/mixer/Makefile | |
4233 | + $(AUTOMAKE) --gnu src/mixer/Makefile | |
4234 | .PRECIOUS: Makefile | |
4235 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
4236 | @case '$?' in \ | |
4237 | @@ -299,9 +302,9 @@ | |
4238 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
4239 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4240 | ||
4241 | -$(top_srcdir)/configure: $(am__configure_deps) | |
4242 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
4243 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4244 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
4245 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
4246 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4247 | libmixer.la: $(libmixer_la_OBJECTS) $(libmixer_la_DEPENDENCIES) | |
4248 | $(LINK) $(libmixer_la_LDFLAGS) $(libmixer_la_OBJECTS) $(libmixer_la_LIBADD) $(LIBS) | |
4249 | diff -Naurd a/src/pcm/Makefile.in b/src/pcm/Makefile.in | |
4250 | --- a/src/pcm/Makefile.in 2007-05-02 10:02:57.000000000 +0200 | |
4251 | +++ b/src/pcm/Makefile.in 2007-05-06 11:05:13.000000000 +0200 | |
4252 | @@ -278,6 +278,9 @@ | |
4253 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
4254 | LN_S = @LN_S@ | |
4255 | LTLIBOBJS = @LTLIBOBJS@ | |
4256 | +MAINT = @MAINT@ | |
4257 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
4258 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
4259 | MAKEINFO = @MAKEINFO@ | |
4260 | OBJEXT = @OBJEXT@ | |
4261 | PACKAGE = @PACKAGE@ | |
4262 | @@ -380,7 +383,7 @@ | |
4263 | ||
4264 | .SUFFIXES: | |
4265 | .SUFFIXES: .c .lo .o .obj | |
4266 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
4267 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
4268 | @for dep in $?; do \ | |
4269 | case '$(am__configure_deps)' in \ | |
4270 | *$$dep*) \ | |
4271 | @@ -389,9 +392,9 @@ | |
4272 | exit 1;; \ | |
4273 | esac; \ | |
4274 | done; \ | |
4275 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/pcm/Makefile'; \ | |
4276 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/pcm/Makefile'; \ | |
4277 | cd $(top_srcdir) && \ | |
4278 | - $(AUTOMAKE) --foreign src/pcm/Makefile | |
4279 | + $(AUTOMAKE) --gnu src/pcm/Makefile | |
4280 | .PRECIOUS: Makefile | |
4281 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
4282 | @case '$?' in \ | |
4283 | @@ -405,9 +408,9 @@ | |
4284 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
4285 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4286 | ||
4287 | -$(top_srcdir)/configure: $(am__configure_deps) | |
4288 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
4289 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4290 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
4291 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
4292 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4293 | libpcm.la: $(libpcm_la_OBJECTS) $(libpcm_la_DEPENDENCIES) | |
4294 | $(LINK) $(libpcm_la_LDFLAGS) $(libpcm_la_OBJECTS) $(libpcm_la_LIBADD) $(LIBS) | |
4295 | diff -Naurd a/src/pcm/scopes/Makefile.in b/src/pcm/scopes/Makefile.in | |
4296 | --- a/src/pcm/scopes/Makefile.in 2007-05-02 10:02:57.000000000 +0200 | |
4297 | +++ b/src/pcm/scopes/Makefile.in 2007-05-06 11:05:13.000000000 +0200 | |
4298 | @@ -197,6 +197,9 @@ | |
4299 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
4300 | LN_S = @LN_S@ | |
4301 | LTLIBOBJS = @LTLIBOBJS@ | |
4302 | +MAINT = @MAINT@ | |
4303 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
4304 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
4305 | MAKEINFO = @MAKEINFO@ | |
4306 | OBJEXT = @OBJEXT@ | |
4307 | PACKAGE = @PACKAGE@ | |
4308 | @@ -281,7 +284,7 @@ | |
4309 | ||
4310 | .SUFFIXES: | |
4311 | .SUFFIXES: .c .lo .o .obj | |
4312 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
4313 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
4314 | @for dep in $?; do \ | |
4315 | case '$(am__configure_deps)' in \ | |
4316 | *$$dep*) \ | |
4317 | @@ -290,9 +293,9 @@ | |
4318 | exit 1;; \ | |
4319 | esac; \ | |
4320 | done; \ | |
4321 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/pcm/scopes/Makefile'; \ | |
4322 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/pcm/scopes/Makefile'; \ | |
4323 | cd $(top_srcdir) && \ | |
4324 | - $(AUTOMAKE) --foreign src/pcm/scopes/Makefile | |
4325 | + $(AUTOMAKE) --gnu src/pcm/scopes/Makefile | |
4326 | .PRECIOUS: Makefile | |
4327 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
4328 | @case '$?' in \ | |
4329 | @@ -306,9 +309,9 @@ | |
4330 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
4331 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4332 | ||
4333 | -$(top_srcdir)/configure: $(am__configure_deps) | |
4334 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
4335 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4336 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
4337 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
4338 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4339 | install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) | |
4340 | @$(NORMAL_INSTALL) | |
4341 | diff -Naurd a/src/rawmidi/Makefile.in b/src/rawmidi/Makefile.in | |
4342 | --- a/src/rawmidi/Makefile.in 2007-05-02 10:02:57.000000000 +0200 | |
4343 | +++ b/src/rawmidi/Makefile.in 2007-05-06 11:05:13.000000000 +0200 | |
4344 | @@ -195,6 +195,9 @@ | |
4345 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
4346 | LN_S = @LN_S@ | |
4347 | LTLIBOBJS = @LTLIBOBJS@ | |
4348 | +MAINT = @MAINT@ | |
4349 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
4350 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
4351 | MAKEINFO = @MAKEINFO@ | |
4352 | OBJEXT = @OBJEXT@ | |
4353 | PACKAGE = @PACKAGE@ | |
4354 | @@ -279,7 +282,7 @@ | |
4355 | ||
4356 | .SUFFIXES: | |
4357 | .SUFFIXES: .c .lo .o .obj | |
4358 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
4359 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
4360 | @for dep in $?; do \ | |
4361 | case '$(am__configure_deps)' in \ | |
4362 | *$$dep*) \ | |
4363 | @@ -288,9 +291,9 @@ | |
4364 | exit 1;; \ | |
4365 | esac; \ | |
4366 | done; \ | |
4367 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/rawmidi/Makefile'; \ | |
4368 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/rawmidi/Makefile'; \ | |
4369 | cd $(top_srcdir) && \ | |
4370 | - $(AUTOMAKE) --foreign src/rawmidi/Makefile | |
4371 | + $(AUTOMAKE) --gnu src/rawmidi/Makefile | |
4372 | .PRECIOUS: Makefile | |
4373 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
4374 | @case '$?' in \ | |
4375 | @@ -304,9 +307,9 @@ | |
4376 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
4377 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4378 | ||
4379 | -$(top_srcdir)/configure: $(am__configure_deps) | |
4380 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
4381 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4382 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
4383 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
4384 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4385 | librawmidi.la: $(librawmidi_la_OBJECTS) $(librawmidi_la_DEPENDENCIES) | |
4386 | $(LINK) $(librawmidi_la_LDFLAGS) $(librawmidi_la_OBJECTS) $(librawmidi_la_LIBADD) $(LIBS) | |
4387 | diff -Naurd a/src/seq/Makefile.in b/src/seq/Makefile.in | |
4388 | --- a/src/seq/Makefile.in 2007-05-02 10:02:57.000000000 +0200 | |
4389 | +++ b/src/seq/Makefile.in 2007-05-06 11:05:14.000000000 +0200 | |
4390 | @@ -191,6 +191,9 @@ | |
4391 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
4392 | LN_S = @LN_S@ | |
4393 | LTLIBOBJS = @LTLIBOBJS@ | |
4394 | +MAINT = @MAINT@ | |
4395 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
4396 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
4397 | MAKEINFO = @MAKEINFO@ | |
4398 | OBJEXT = @OBJEXT@ | |
4399 | PACKAGE = @PACKAGE@ | |
4400 | @@ -276,7 +279,7 @@ | |
4401 | ||
4402 | .SUFFIXES: | |
4403 | .SUFFIXES: .c .lo .o .obj | |
4404 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
4405 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
4406 | @for dep in $?; do \ | |
4407 | case '$(am__configure_deps)' in \ | |
4408 | *$$dep*) \ | |
4409 | @@ -285,9 +288,9 @@ | |
4410 | exit 1;; \ | |
4411 | esac; \ | |
4412 | done; \ | |
4413 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/seq/Makefile'; \ | |
4414 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/seq/Makefile'; \ | |
4415 | cd $(top_srcdir) && \ | |
4416 | - $(AUTOMAKE) --foreign src/seq/Makefile | |
4417 | + $(AUTOMAKE) --gnu src/seq/Makefile | |
4418 | .PRECIOUS: Makefile | |
4419 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
4420 | @case '$?' in \ | |
4421 | @@ -301,9 +304,9 @@ | |
4422 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
4423 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4424 | ||
4425 | -$(top_srcdir)/configure: $(am__configure_deps) | |
4426 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
4427 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4428 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
4429 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
4430 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4431 | libseq.la: $(libseq_la_OBJECTS) $(libseq_la_DEPENDENCIES) | |
4432 | $(LINK) $(libseq_la_LDFLAGS) $(libseq_la_OBJECTS) $(libseq_la_LIBADD) $(LIBS) | |
4433 | diff -Naurd a/src/timer/Makefile.in b/src/timer/Makefile.in | |
4434 | --- a/src/timer/Makefile.in 2007-05-02 10:02:57.000000000 +0200 | |
4435 | +++ b/src/timer/Makefile.in 2007-05-06 11:05:14.000000000 +0200 | |
4436 | @@ -191,6 +191,9 @@ | |
4437 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
4438 | LN_S = @LN_S@ | |
4439 | LTLIBOBJS = @LTLIBOBJS@ | |
4440 | +MAINT = @MAINT@ | |
4441 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
4442 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
4443 | MAKEINFO = @MAKEINFO@ | |
4444 | OBJEXT = @OBJEXT@ | |
4445 | PACKAGE = @PACKAGE@ | |
4446 | @@ -276,7 +279,7 @@ | |
4447 | ||
4448 | .SUFFIXES: | |
4449 | .SUFFIXES: .c .lo .o .obj | |
4450 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
4451 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
4452 | @for dep in $?; do \ | |
4453 | case '$(am__configure_deps)' in \ | |
4454 | *$$dep*) \ | |
4455 | @@ -285,9 +288,9 @@ | |
4456 | exit 1;; \ | |
4457 | esac; \ | |
4458 | done; \ | |
4459 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/timer/Makefile'; \ | |
4460 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/timer/Makefile'; \ | |
4461 | cd $(top_srcdir) && \ | |
4462 | - $(AUTOMAKE) --foreign src/timer/Makefile | |
4463 | + $(AUTOMAKE) --gnu src/timer/Makefile | |
4464 | .PRECIOUS: Makefile | |
4465 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
4466 | @case '$?' in \ | |
4467 | @@ -301,9 +304,9 @@ | |
4468 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
4469 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4470 | ||
4471 | -$(top_srcdir)/configure: $(am__configure_deps) | |
4472 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
4473 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4474 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
4475 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
4476 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4477 | libtimer.la: $(libtimer_la_OBJECTS) $(libtimer_la_DEPENDENCIES) | |
4478 | $(LINK) $(libtimer_la_LDFLAGS) $(libtimer_la_OBJECTS) $(libtimer_la_LIBADD) $(LIBS) | |
4479 | diff -Naurd a/test/Makefile.in b/test/Makefile.in | |
4480 | --- a/test/Makefile.in 2007-05-02 10:02:58.000000000 +0200 | |
4481 | +++ b/test/Makefile.in 2007-05-06 11:05:14.000000000 +0200 | |
4482 | @@ -227,6 +227,9 @@ | |
4483 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
4484 | LN_S = @LN_S@ | |
4485 | LTLIBOBJS = @LTLIBOBJS@ | |
4486 | +MAINT = @MAINT@ | |
4487 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
4488 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
4489 | MAKEINFO = @MAKEINFO@ | |
4490 | OBJEXT = @OBJEXT@ | |
4491 | PACKAGE = @PACKAGE@ | |
4492 | @@ -322,7 +325,7 @@ | |
4493 | ||
4494 | .SUFFIXES: | |
4495 | .SUFFIXES: .c .lo .o .obj | |
4496 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
4497 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
4498 | @for dep in $?; do \ | |
4499 | case '$(am__configure_deps)' in \ | |
4500 | *$$dep*) \ | |
4501 | @@ -331,9 +334,9 @@ | |
4502 | exit 1;; \ | |
4503 | esac; \ | |
4504 | done; \ | |
4505 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/Makefile'; \ | |
4506 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test/Makefile'; \ | |
4507 | cd $(top_srcdir) && \ | |
4508 | - $(AUTOMAKE) --foreign test/Makefile | |
4509 | + $(AUTOMAKE) --gnu test/Makefile | |
4510 | .PRECIOUS: Makefile | |
4511 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
4512 | @case '$?' in \ | |
4513 | @@ -347,9 +350,9 @@ | |
4514 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
4515 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4516 | ||
4517 | -$(top_srcdir)/configure: $(am__configure_deps) | |
4518 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
4519 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4520 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
4521 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
4522 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4523 | ||
4524 | clean-checkPROGRAMS: | |
4525 | diff -Naurd a/utils/Makefile.in b/utils/Makefile.in | |
4526 | --- a/utils/Makefile.in 2007-05-02 10:02:58.000000000 +0200 | |
4527 | +++ b/utils/Makefile.in 2007-05-06 11:05:14.000000000 +0200 | |
4528 | @@ -184,6 +184,9 @@ | |
4529 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
4530 | LN_S = @LN_S@ | |
4531 | LTLIBOBJS = @LTLIBOBJS@ | |
4532 | +MAINT = @MAINT@ | |
4533 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
4534 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
4535 | MAKEINFO = @MAKEINFO@ | |
4536 | OBJEXT = @OBJEXT@ | |
4537 | PACKAGE = @PACKAGE@ | |
4538 | @@ -268,7 +271,7 @@ | |
4539 | all: all-am | |
4540 | ||
4541 | .SUFFIXES: | |
4542 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
4543 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
4544 | @for dep in $?; do \ | |
4545 | case '$(am__configure_deps)' in \ | |
4546 | *$$dep*) \ | |
4547 | @@ -277,9 +280,9 @@ | |
4548 | exit 1;; \ | |
4549 | esac; \ | |
4550 | done; \ | |
4551 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign utils/Makefile'; \ | |
4552 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu utils/Makefile'; \ | |
4553 | cd $(top_srcdir) && \ | |
4554 | - $(AUTOMAKE) --foreign utils/Makefile | |
4555 | + $(AUTOMAKE) --gnu utils/Makefile | |
4556 | .PRECIOUS: Makefile | |
4557 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
4558 | @case '$?' in \ | |
4559 | @@ -293,9 +296,9 @@ | |
4560 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
4561 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4562 | ||
4563 | -$(top_srcdir)/configure: $(am__configure_deps) | |
4564 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
4565 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4566 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
4567 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
4568 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4569 | alsa-lib.spec: $(top_builddir)/config.status $(srcdir)/alsa-lib.spec.in | |
4570 | cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ |
0 | #! /bin/sh /usr/share/dpatch/dpatch-run | |
1 | ## 41_configure_cross_compile.dpatch by Loic Minier <lool@dooz.org> | |
2 | ## | |
3 | ## DP: Remove check that the compiler produces executables we can run. | |
4 | ||
5 | @DPATCH@ | |
6 | diff -urNad alsa-lib-1.0.12~/configure alsa-lib-1.0.12/configure | |
7 | --- alsa-lib-1.0.12~/configure 2006-09-03 15:43:47.000000000 +0200 | |
8 | +++ alsa-lib-1.0.12/configure 2006-09-03 15:43:02.000000000 +0200 | |
9 | @@ -3145,7 +3145,7 @@ | |
10 | echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } | |
11 | # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 | |
12 | # If not cross compiling, check that we can run a simple program. | |
13 | -if test "$cross_compiling" != yes; then | |
14 | +if false && test "$cross_compiling" != yes; then | |
15 | if { ac_try='./$ac_file' | |
16 | { (case "(($ac_try" in | |
17 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
0 | # aclocal_libs_fix.patch by Jordi Mallach <jordi@debian.org> | |
1 | # Don't modify LIBS if there's no need to. Patch from Josip Rodin. | |
2 | diff -urNad alsa-lib-1.0.12~/utils/alsa.m4 alsa-lib-1.0.12/utils/alsa.m4 | |
3 | --- alsa-lib-1.0.12~/utils/alsa.m4 2006-09-03 15:28:21.000000000 +0200 | |
4 | +++ alsa-lib-1.0.12/utils/alsa.m4 2006-09-03 15:27:35.000000000 +0200 | |
5 | @@ -43,6 +43,7 @@ | |
6 | CFLAGS="$CFLAGS -I$alsa_inc_prefix" | |
7 | fi | |
8 | AC_MSG_RESULT($ALSA_CFLAGS) | |
9 | +CFLAGS="$alsa_save_CFLAGS" | |
10 | ||
11 | dnl add any special lib dirs | |
12 | AC_MSG_CHECKING(for ALSA LDFLAGS) | |
13 | @@ -119,19 +120,15 @@ | |
14 | ) | |
15 | fi | |
16 | ||
17 | +LDFLAGS="$alsa_save_LDFLAGS" | |
18 | +LIBS="$alsa_save_LIBS" | |
19 | + | |
20 | if test "x$alsa_found" = "xyes" ; then | |
21 | ifelse([$2], , :, [$2]) | |
22 | - LIBS=`echo $LIBS | sed 's/-lasound//g'` | |
23 | - LIBS=`echo $LIBS | sed 's/ //'` | |
24 | - LIBS="-lasound $LIBS" | |
25 | -fi | |
26 | -if test "x$alsa_found" = "xno" ; then | |
27 | - ifelse([$3], , :, [$3]) | |
28 | - CFLAGS="$alsa_save_CFLAGS" | |
29 | - LDFLAGS="$alsa_save_LDFLAGS" | |
30 | - LIBS="$alsa_save_LIBS" | |
31 | +else | |
32 | ALSA_CFLAGS="" | |
33 | ALSA_LIBS="" | |
34 | + ifelse([$3], , :, [$3]) | |
35 | fi | |
36 | ||
37 | dnl That should be it. Now just export out symbols: |
0 | #add-maintainer-mode.patch by Loic Minier <lool@dooz.org> | |
1 | diff -urNad alsa-lib-1.0.11~/configure.in alsa-lib-1.0.11/configure.in | |
2 | --- alsa-lib-1.0.11~/configure.in 2006-05-26 10:32:27.000000000 +0200 | |
3 | +++ alsa-lib-1.0.11/configure.in 2006-05-26 10:32:43.000000000 +0200 | |
4 | @@ -15,6 +15,8 @@ | |
5 | AM_CONDITIONAL(INSTALL_M4, test -n "${ACLOCAL}") | |
6 | ||
7 | AC_PREFIX_DEFAULT(/usr) | |
8 | + | |
9 | +AM_MAINTAINER_MODE | |
10 | ||
11 | dnl Checks for programs. | |
12 |
0 | # alpha_versioned_symbols.patch by Jordi Mallach <jordi@debian.org> | |
1 | diff -urNad a/include/alsa-symbols.h b/include/alsa-symbols.h | |
2 | --- a/include/alsa-symbols.h 2006-09-29 21:12:43.000000000 +0200 | |
3 | +++ b/include/alsa-symbols.h 2006-09-29 21:12:01.000000000 +0200 | |
4 | @@ -43,7 +43,7 @@ | |
5 | __asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@@" #version) | |
6 | #endif | |
7 | ||
8 | -#ifdef USE_VERSIONED_SYMBOLS | |
9 | +#if defined(USE_VERSIONED_SYMBOLS) || defined(__alpha__) | |
10 | #define use_symbol_version(real, name, version) \ | |
11 | symbol_version(real, name, version) | |
12 | #define use_default_symbol_version(real, name, version) \ |
0 | # configure_cross_compile.patch by Loic Minier <lool@dooz.org> | |
1 | # Remove check that the compiler produces executables we can run. | |
2 | Index: alsa-lib-1.0.14/configure | |
3 | =================================================================== | |
4 | --- alsa-lib-1.0.14.orig/configure 2007-06-04 20:00:05.000000000 +0200 | |
5 | +++ alsa-lib-1.0.14/configure 2007-06-04 20:00:05.000000000 +0200 | |
6 | @@ -3149,7 +3149,7 @@ | |
7 | echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } | |
8 | # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 | |
9 | # If not cross compiling, check that we can run a simple program. | |
10 | -if test "$cross_compiling" != yes; then | |
11 | +if false && test "$cross_compiling" != yes; then | |
12 | if { ac_try='./$ac_file' | |
13 | { (case "(($ac_try" in | |
14 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
0 | # doxygen_links.patch by <mikma@users.sourceforge.net> | |
1 | # Fix broken doxygen links in pcm.c and rawmidi.c. | |
2 | diff -urNad alsa-lib-1.0.12~/src/pcm/pcm.c alsa-lib-1.0.12/src/pcm/pcm.c | |
3 | --- alsa-lib-1.0.12~/src/pcm/pcm.c 2006-09-03 15:33:45.000000000 +0200 | |
4 | +++ alsa-lib-1.0.12/src/pcm/pcm.c 2006-09-03 15:32:36.000000000 +0200 | |
5 | @@ -925,7 +925,7 @@ | |
6 | * \return PCM state #snd_pcm_state_t of given PCM handle | |
7 | * | |
8 | * This is a faster way to obtain only the PCM state without calling | |
9 | - * \link ::snd_pcm_status() \endlink. | |
10 | + * ::snd_pcm_status(). | |
11 | */ | |
12 | snd_pcm_state_t snd_pcm_state(snd_pcm_t *pcm) | |
13 | { | |
14 | @@ -987,7 +987,7 @@ | |
15 | * | |
16 | * This function can be used when the stream is in the suspend state | |
17 | * to do the fine resume from this state. Not all hardware supports | |
18 | - * this feature, when an -ENOSYS error is returned, use the \link ::snd_pcm_prepare() \endlink | |
19 | + * this feature, when an -ENOSYS error is returned, use the ::snd_pcm_prepare() | |
20 | * function to recovery. | |
21 | */ | |
22 | int snd_pcm_resume(snd_pcm_t *pcm) | |
23 | @@ -1055,7 +1055,7 @@ | |
24 | * This function stops the PCM <i>immediately</i>. | |
25 | * The pending samples on the buffer are ignored. | |
26 | * | |
27 | - * For processing all pending samples, use \link ::snd_pcm_drain() \endlink | |
28 | + * For processing all pending samples, use ::snd_pcm_drain() | |
29 | * instead. | |
30 | */ | |
31 | int snd_pcm_drop(snd_pcm_t *pcm) | |
32 | @@ -1078,7 +1078,7 @@ | |
33 | * the PCM. | |
34 | * For capture stop PCM permitting to retrieve residual frames. | |
35 | * | |
36 | - * For stopping the PCM stream immediately, use \link ::snd_pcm_drop() \endlink | |
37 | + * For stopping the PCM stream immediately, use ::snd_pcm_drop() | |
38 | * instead. | |
39 | */ | |
40 | int snd_pcm_drain(snd_pcm_t *pcm) | |
41 | @@ -1098,7 +1098,7 @@ | |
42 | * \return 0 on success otherwise a negative error code | |
43 | * | |
44 | * Note that this function works only on the hardware which supports | |
45 | - * pause feature. You can check it via \link ::snd_pcm_hw_params_can_pause() \endlink | |
46 | + * pause feature. You can check it via ::snd_pcm_hw_params_can_pause() | |
47 | * function. | |
48 | */ | |
49 | int snd_pcm_pause(snd_pcm_t *pcm, int enable) | |
50 | @@ -1335,16 +1335,16 @@ | |
51 | * | |
52 | * This function fills the given poll descriptor structs for the specified | |
53 | * PCM handle. The poll desctiptor array should have the size returned by | |
54 | - * \link ::snd_pcm_poll_descriptors_count() \endlink function. | |
55 | + * ::snd_pcm_poll_descriptors_count() function. | |
56 | * | |
57 | * The result is intended for direct use with the poll() syscall. | |
58 | * | |
59 | * For reading the returned events of poll descriptor after poll() system | |
60 | - * call, use \link ::snd_pcm_poll_descriptors_revents() \endlink function. | |
61 | + * call, use ::snd_pcm_poll_descriptors_revents() function. | |
62 | * The field values in pollfd structs may be bogus regarding the stream | |
63 | * direction from the application perspective (POLLIN might not imply read | |
64 | * direction and POLLOUT might not imply write), but | |
65 | - * the \link ::snd_pcm_poll_descriptors_revents() \endlink function | |
66 | + * the ::snd_pcm_poll_descriptors_revents() function | |
67 | * does the right "demangling". | |
68 | * | |
69 | * You can use output from this function as arguments for the select() | |
70 | diff -urNad alsa-lib-1.0.12~/src/rawmidi/rawmidi.c alsa-lib-1.0.12/src/rawmidi/rawmidi.c | |
71 | --- alsa-lib-1.0.12~/src/rawmidi/rawmidi.c 2006-09-03 15:33:45.000000000 +0200 | |
72 | +++ alsa-lib-1.0.12/src/rawmidi/rawmidi.c 2006-09-03 15:32:36.000000000 +0200 | |
73 | @@ -82,7 +82,7 @@ | |
74 | ||
75 | The ALSA library uses a generic string representation for names of devices. | |
76 | The devices might be virtual, physical or a mix of both. The generic string | |
77 | -is passed to \link ::snd_rawmidi_open() \endlink or \link ::snd_rawmidi_open_lconf() \endlink. | |
78 | +is passed to ::snd_rawmidi_open() or ::snd_rawmidi_open_lconf(). | |
79 | It contains two parts: device name and arguments. Devices and arguments are described | |
80 | in configuration files. The usual place for default definitions is at /usr/share/alsa/alsa.conf. | |
81 |
0 | # relibtoolize.patch by Loic Minier <lool@dooz.org> | |
1 | # | |
2 | # Full relibtoolisation, generated by: | |
3 | # libtoolize -f -c && aclocal-1.9 && (cp config.sub and config.guess | |
4 | # from autotools-dev) && autoconf && automake-1.9 && | |
5 | # rm -rf config.sub config.guess autom4te.cache. | |
6 | diff -Naurd alsa-lib-1.0.14~/Makefile.in alsa-lib-1.0.14/Makefile.in | |
7 | --- alsa-lib-1.0.14~/Makefile.in 2007-06-04 17:39:47.000000000 +0200 | |
8 | +++ alsa-lib-1.0.14/Makefile.in 2007-06-04 17:42:49.000000000 +0200 | |
9 | @@ -200,6 +200,9 @@ | |
10 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
11 | LN_S = @LN_S@ | |
12 | LTLIBOBJS = @LTLIBOBJS@ | |
13 | +MAINT = @MAINT@ | |
14 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
15 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
16 | MAKEINFO = @MAKEINFO@ | |
17 | OBJEXT = @OBJEXT@ | |
18 | PACKAGE = @PACKAGE@ | |
19 | @@ -285,7 +288,7 @@ | |
20 | .SUFFIXES: | |
21 | am--refresh: | |
22 | @: | |
23 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
24 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
25 | @for dep in $?; do \ | |
26 | case '$(am__configure_deps)' in \ | |
27 | *$$dep*) \ | |
28 | @@ -312,9 +315,9 @@ | |
29 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
30 | $(SHELL) ./config.status --recheck | |
31 | ||
32 | -$(top_srcdir)/configure: $(am__configure_deps) | |
33 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
34 | cd $(srcdir) && $(AUTOCONF) | |
35 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
36 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
37 | cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) | |
38 | ||
39 | mostlyclean-libtool: | |
40 | diff -Naurd alsa-lib-1.0.14~/aclocal.m4 alsa-lib-1.0.14/aclocal.m4 | |
41 | --- alsa-lib-1.0.14~/aclocal.m4 2007-06-04 17:39:47.000000000 +0200 | |
42 | +++ alsa-lib-1.0.14/aclocal.m4 2007-06-04 17:42:35.000000000 +0200 | |
43 | @@ -13,7 +13,7 @@ | |
44 | ||
45 | # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- | |
46 | ||
47 | -# serial 48 AC_PROG_LIBTOOL | |
48 | +# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL | |
49 | ||
50 | ||
51 | # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) | |
52 | @@ -1397,18 +1397,6 @@ | |
53 | dynamic_linker=no | |
54 | ;; | |
55 | ||
56 | -kfreebsd*-gnu) | |
57 | - version_type=linux | |
58 | - need_lib_prefix=no | |
59 | - need_version=no | |
60 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | |
61 | - soname_spec='${libname}${release}${shared_ext}$major' | |
62 | - shlibpath_var=LD_LIBRARY_PATH | |
63 | - shlibpath_overrides_runpath=no | |
64 | - hardcode_into_libs=yes | |
65 | - dynamic_linker='GNU ld.so' | |
66 | - ;; | |
67 | - | |
68 | freebsd* | dragonfly*) | |
69 | # DragonFly does not have aout. When/if they implement a new | |
70 | # versioning mechanism, adjust this. | |
71 | @@ -1564,7 +1552,7 @@ | |
72 | ;; | |
73 | ||
74 | # This must be Linux ELF. | |
75 | -linux*) | |
76 | +linux* | k*bsd*-gnu) | |
77 | version_type=linux | |
78 | need_lib_prefix=no | |
79 | need_version=no | |
80 | @@ -1593,7 +1581,7 @@ | |
81 | dynamic_linker='GNU/Linux ld.so' | |
82 | ;; | |
83 | ||
84 | -knetbsd*-gnu) | |
85 | +netbsdelf*-gnu) | |
86 | version_type=linux | |
87 | need_lib_prefix=no | |
88 | need_version=no | |
89 | @@ -1602,7 +1590,7 @@ | |
90 | shlibpath_var=LD_LIBRARY_PATH | |
91 | shlibpath_overrides_runpath=no | |
92 | hardcode_into_libs=yes | |
93 | - dynamic_linker='GNU ld.so' | |
94 | + dynamic_linker='NetBSD ld.elf_so' | |
95 | ;; | |
96 | ||
97 | netbsd*) | |
98 | @@ -2310,7 +2298,7 @@ | |
99 | lt_cv_deplibs_check_method=pass_all | |
100 | ;; | |
101 | ||
102 | -freebsd* | kfreebsd*-gnu | dragonfly*) | |
103 | +freebsd* | dragonfly*) | |
104 | if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then | |
105 | case $host_cpu in | |
106 | i*86 ) | |
107 | @@ -2364,11 +2352,11 @@ | |
108 | ;; | |
109 | ||
110 | # This must be Linux ELF. | |
111 | -linux*) | |
112 | +linux* | k*bsd*-gnu) | |
113 | lt_cv_deplibs_check_method=pass_all | |
114 | ;; | |
115 | ||
116 | -netbsd*) | |
117 | +netbsd* | netbsdelf*-gnu) | |
118 | if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then | |
119 | lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' | |
120 | else | |
121 | @@ -3116,7 +3104,7 @@ | |
122 | freebsd-elf*) | |
123 | _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no | |
124 | ;; | |
125 | - freebsd* | kfreebsd*-gnu | dragonfly*) | |
126 | + freebsd* | dragonfly*) | |
127 | # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF | |
128 | # conventions | |
129 | _LT_AC_TAGVAR(ld_shlibs, $1)=yes | |
130 | @@ -3275,7 +3263,7 @@ | |
131 | _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' | |
132 | _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: | |
133 | ;; | |
134 | - linux*) | |
135 | + linux* | k*bsd*-gnu) | |
136 | case $cc_basename in | |
137 | KCC*) | |
138 | # Kuck and Associates, Inc. (KAI) C++ Compiler | |
139 | @@ -3377,7 +3365,7 @@ | |
140 | ;; | |
141 | esac | |
142 | ;; | |
143 | - netbsd*) | |
144 | + netbsd* | netbsdelf*-gnu) | |
145 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | |
146 | _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' | |
147 | wlarc= | |
148 | @@ -4642,7 +4630,7 @@ | |
149 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | |
150 | 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'" | |
151 | ;; | |
152 | -linux*) | |
153 | +linux* | k*bsd*-gnu) | |
154 | if test "$host_cpu" = ia64; then | |
155 | symcode='[[ABCDGIRSTW]]' | |
156 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | |
157 | @@ -4915,7 +4903,7 @@ | |
158 | ;; | |
159 | esac | |
160 | ;; | |
161 | - freebsd* | kfreebsd*-gnu | dragonfly*) | |
162 | + freebsd* | dragonfly*) | |
163 | # FreeBSD uses GNU C++ | |
164 | ;; | |
165 | hpux9* | hpux10* | hpux11*) | |
166 | @@ -4958,7 +4946,7 @@ | |
167 | ;; | |
168 | esac | |
169 | ;; | |
170 | - linux*) | |
171 | + linux* | k*bsd*-gnu) | |
172 | case $cc_basename in | |
173 | KCC*) | |
174 | # KAI C++ Compiler | |
175 | @@ -5001,7 +4989,7 @@ | |
176 | ;; | |
177 | esac | |
178 | ;; | |
179 | - netbsd*) | |
180 | + netbsd* | netbsdelf*-gnu) | |
181 | ;; | |
182 | osf3* | osf4* | osf5*) | |
183 | case $cc_basename in | |
184 | @@ -5212,7 +5200,7 @@ | |
185 | _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | |
186 | ;; | |
187 | ||
188 | - linux*) | |
189 | + linux* | k*bsd*-gnu) | |
190 | case $cc_basename in | |
191 | icc* | ecc*) | |
192 | _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' | |
193 | @@ -5353,6 +5341,9 @@ | |
194 | cygwin* | mingw*) | |
195 | _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' | |
196 | ;; | |
197 | + linux* | k*bsd*-gnu) | |
198 | + _LT_AC_TAGVAR(link_all_deplibs, $1)=no | |
199 | + ;; | |
200 | *) | |
201 | _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' | |
202 | ;; | |
203 | @@ -5523,7 +5514,7 @@ | |
204 | _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' | |
205 | ;; | |
206 | ||
207 | - linux*) | |
208 | + linux* | k*bsd*-gnu) | |
209 | if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then | |
210 | tmp_addflag= | |
211 | case $cc_basename,$host_cpu in | |
212 | @@ -5549,12 +5540,13 @@ | |
213 | $echo "local: *; };" >> $output_objdir/$libname.ver~ | |
214 | $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' | |
215 | fi | |
216 | + _LT_AC_TAGVAR(link_all_deplibs, $1)=no | |
217 | else | |
218 | _LT_AC_TAGVAR(ld_shlibs, $1)=no | |
219 | fi | |
220 | ;; | |
221 | ||
222 | - netbsd*) | |
223 | + netbsd* | netbsdelf*-gnu) | |
224 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | |
225 | _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | |
226 | wlarc= | |
227 | @@ -5884,7 +5876,7 @@ | |
228 | ;; | |
229 | ||
230 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | |
231 | - freebsd* | kfreebsd*-gnu | dragonfly*) | |
232 | + freebsd* | dragonfly*) | |
233 | _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' | |
234 | _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' | |
235 | _LT_AC_TAGVAR(hardcode_direct, $1)=yes | |
236 | @@ -5986,7 +5978,7 @@ | |
237 | _LT_AC_TAGVAR(link_all_deplibs, $1)=yes | |
238 | ;; | |
239 | ||
240 | - netbsd*) | |
241 | + netbsd* | netbsdelf*-gnu) | |
242 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | |
243 | _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out | |
244 | else | |
245 | @@ -6878,6 +6870,35 @@ | |
246 | rmdir .tst 2>/dev/null | |
247 | AC_SUBST([am__leading_dot])]) | |
248 | ||
249 | +# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- | |
250 | +# From Jim Meyering | |
251 | + | |
252 | +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 | |
253 | +# Free Software Foundation, Inc. | |
254 | +# | |
255 | +# This file is free software; the Free Software Foundation | |
256 | +# gives unlimited permission to copy and/or distribute it, | |
257 | +# with or without modifications, as long as this notice is preserved. | |
258 | + | |
259 | +# serial 4 | |
260 | + | |
261 | +AC_DEFUN([AM_MAINTAINER_MODE], | |
262 | +[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) | |
263 | + dnl maintainer-mode is disabled by default | |
264 | + AC_ARG_ENABLE(maintainer-mode, | |
265 | +[ --enable-maintainer-mode enable make rules and dependencies not useful | |
266 | + (and sometimes confusing) to the casual installer], | |
267 | + USE_MAINTAINER_MODE=$enableval, | |
268 | + USE_MAINTAINER_MODE=no) | |
269 | + AC_MSG_RESULT([$USE_MAINTAINER_MODE]) | |
270 | + AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) | |
271 | + MAINT=$MAINTAINER_MODE_TRUE | |
272 | + AC_SUBST(MAINT)dnl | |
273 | +] | |
274 | +) | |
275 | + | |
276 | +AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) | |
277 | + | |
278 | # Check to see how 'make' treats includes. -*- Autoconf -*- | |
279 | ||
280 | # Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. | |
281 | diff -Naurd alsa-lib-1.0.14~/alsalisp/Makefile.in alsa-lib-1.0.14/alsalisp/Makefile.in | |
282 | --- alsa-lib-1.0.14~/alsalisp/Makefile.in 2007-06-04 17:39:47.000000000 +0200 | |
283 | +++ alsa-lib-1.0.14/alsalisp/Makefile.in 2007-06-04 17:42:41.000000000 +0200 | |
284 | @@ -192,6 +192,9 @@ | |
285 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
286 | LN_S = @LN_S@ | |
287 | LTLIBOBJS = @LTLIBOBJS@ | |
288 | +MAINT = @MAINT@ | |
289 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
290 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
291 | MAKEINFO = @MAKEINFO@ | |
292 | OBJEXT = @OBJEXT@ | |
293 | PACKAGE = @PACKAGE@ | |
294 | @@ -274,7 +277,7 @@ | |
295 | ||
296 | .SUFFIXES: | |
297 | .SUFFIXES: .c .lo .o .obj | |
298 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
299 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
300 | @for dep in $?; do \ | |
301 | case '$(am__configure_deps)' in \ | |
302 | *$$dep*) \ | |
303 | @@ -283,9 +286,9 @@ | |
304 | exit 1;; \ | |
305 | esac; \ | |
306 | done; \ | |
307 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign alsalisp/Makefile'; \ | |
308 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu alsalisp/Makefile'; \ | |
309 | cd $(top_srcdir) && \ | |
310 | - $(AUTOMAKE) --foreign alsalisp/Makefile | |
311 | + $(AUTOMAKE) --gnu alsalisp/Makefile | |
312 | .PRECIOUS: Makefile | |
313 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
314 | @case '$?' in \ | |
315 | @@ -299,9 +302,9 @@ | |
316 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
317 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
318 | ||
319 | -$(top_srcdir)/configure: $(am__configure_deps) | |
320 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
321 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
322 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
323 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
324 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
325 | ||
326 | clean-noinstPROGRAMS: | |
327 | diff -Naurd alsa-lib-1.0.14~/aserver/Makefile.in alsa-lib-1.0.14/aserver/Makefile.in | |
328 | --- alsa-lib-1.0.14~/aserver/Makefile.in 2007-06-04 17:39:47.000000000 +0200 | |
329 | +++ alsa-lib-1.0.14/aserver/Makefile.in 2007-06-04 17:42:41.000000000 +0200 | |
330 | @@ -194,6 +194,9 @@ | |
331 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
332 | LN_S = @LN_S@ | |
333 | LTLIBOBJS = @LTLIBOBJS@ | |
334 | +MAINT = @MAINT@ | |
335 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
336 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
337 | MAKEINFO = @MAKEINFO@ | |
338 | OBJEXT = @OBJEXT@ | |
339 | PACKAGE = @PACKAGE@ | |
340 | @@ -277,7 +280,7 @@ | |
341 | ||
342 | .SUFFIXES: | |
343 | .SUFFIXES: .c .lo .o .obj | |
344 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
345 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
346 | @for dep in $?; do \ | |
347 | case '$(am__configure_deps)' in \ | |
348 | *$$dep*) \ | |
349 | @@ -286,9 +289,9 @@ | |
350 | exit 1;; \ | |
351 | esac; \ | |
352 | done; \ | |
353 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign aserver/Makefile'; \ | |
354 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu aserver/Makefile'; \ | |
355 | cd $(top_srcdir) && \ | |
356 | - $(AUTOMAKE) --foreign aserver/Makefile | |
357 | + $(AUTOMAKE) --gnu aserver/Makefile | |
358 | .PRECIOUS: Makefile | |
359 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
360 | @case '$?' in \ | |
361 | @@ -302,9 +305,9 @@ | |
362 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
363 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
364 | ||
365 | -$(top_srcdir)/configure: $(am__configure_deps) | |
366 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
367 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
368 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
369 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
370 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
371 | install-binPROGRAMS: $(bin_PROGRAMS) | |
372 | @$(NORMAL_INSTALL) | |
373 | diff -Naurd alsa-lib-1.0.14~/configure alsa-lib-1.0.14/configure | |
374 | --- alsa-lib-1.0.14~/configure 2007-06-04 17:39:47.000000000 +0200 | |
375 | +++ alsa-lib-1.0.14/configure 2007-06-04 17:42:39.000000000 +0200 | |
376 | @@ -1,6 +1,6 @@ | |
377 | #! /bin/sh | |
378 | # Guess values for system-dependent variables and create Makefiles. | |
379 | -# Generated by GNU Autoconf 2.60. | |
380 | +# Generated by GNU Autoconf 2.61. | |
381 | # | |
382 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, | |
383 | # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. | |
384 | @@ -10,7 +10,8 @@ | |
385 | ## M4sh Initialization. ## | |
386 | ## --------------------- ## | |
387 | ||
388 | -# Be Bourne compatible | |
389 | +# Be more Bourne compatible | |
390 | +DUALCASE=1; export DUALCASE # for MKS sh | |
391 | if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then | |
392 | emulate sh | |
393 | NULLCMD=: | |
394 | @@ -19,10 +20,13 @@ | |
395 | alias -g '${1+"$@"}'='"$@"' | |
396 | setopt NO_GLOB_SUBST | |
397 | else | |
398 | - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac | |
399 | + case `(set -o) 2>/dev/null` in | |
400 | + *posix*) set -o posix ;; | |
401 | +esac | |
402 | + | |
403 | fi | |
404 | -BIN_SH=xpg4; export BIN_SH # for Tru64 | |
405 | -DUALCASE=1; export DUALCASE # for MKS sh | |
406 | + | |
407 | + | |
408 | ||
409 | ||
410 | # PATH needs CR | |
411 | @@ -215,7 +219,7 @@ | |
412 | else | |
413 | as_candidate_shells= | |
414 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | |
415 | -for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH | |
416 | +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH | |
417 | do | |
418 | IFS=$as_save_IFS | |
419 | test -z "$as_dir" && as_dir=. | |
420 | @@ -233,7 +237,6 @@ | |
421 | # Try only shells that exist, to save several forks. | |
422 | if { test -f "$as_shell" || test -f "$as_shell.exe"; } && | |
423 | { ("$as_shell") 2> /dev/null <<\_ASEOF | |
424 | -# Be Bourne compatible | |
425 | if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then | |
426 | emulate sh | |
427 | NULLCMD=: | |
428 | @@ -242,10 +245,12 @@ | |
429 | alias -g '${1+"$@"}'='"$@"' | |
430 | setopt NO_GLOB_SUBST | |
431 | else | |
432 | - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac | |
433 | + case `(set -o) 2>/dev/null` in | |
434 | + *posix*) set -o posix ;; | |
435 | +esac | |
436 | + | |
437 | fi | |
438 | -BIN_SH=xpg4; export BIN_SH # for Tru64 | |
439 | -DUALCASE=1; export DUALCASE # for MKS sh | |
440 | + | |
441 | ||
442 | : | |
443 | _ASEOF | |
444 | @@ -253,7 +258,6 @@ | |
445 | CONFIG_SHELL=$as_shell | |
446 | as_have_required=yes | |
447 | if { "$as_shell" 2> /dev/null <<\_ASEOF | |
448 | -# Be Bourne compatible | |
449 | if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then | |
450 | emulate sh | |
451 | NULLCMD=: | |
452 | @@ -262,10 +266,12 @@ | |
453 | alias -g '${1+"$@"}'='"$@"' | |
454 | setopt NO_GLOB_SUBST | |
455 | else | |
456 | - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac | |
457 | + case `(set -o) 2>/dev/null` in | |
458 | + *posix*) set -o posix ;; | |
459 | +esac | |
460 | + | |
461 | fi | |
462 | -BIN_SH=xpg4; export BIN_SH # for Tru64 | |
463 | -DUALCASE=1; export DUALCASE # for MKS sh | |
464 | + | |
465 | ||
466 | : | |
467 | (as_func_return () { | |
468 | @@ -512,19 +518,28 @@ | |
469 | as_mkdir_p=false | |
470 | fi | |
471 | ||
472 | -# Find out whether ``test -x'' works. Don't use a zero-byte file, as | |
473 | -# systems may use methods other than mode bits to determine executability. | |
474 | -cat >conf$$.file <<_ASEOF | |
475 | -#! /bin/sh | |
476 | -exit 0 | |
477 | -_ASEOF | |
478 | -chmod +x conf$$.file | |
479 | -if test -x conf$$.file >/dev/null 2>&1; then | |
480 | - as_executable_p="test -x" | |
481 | +if test -x / >/dev/null 2>&1; then | |
482 | + as_test_x='test -x' | |
483 | else | |
484 | - as_executable_p=: | |
485 | + if ls -dL / >/dev/null 2>&1; then | |
486 | + as_ls_L_option=L | |
487 | + else | |
488 | + as_ls_L_option= | |
489 | + fi | |
490 | + as_test_x=' | |
491 | + eval sh -c '\'' | |
492 | + if test -d "$1"; then | |
493 | + test -d "$1/."; | |
494 | + else | |
495 | + case $1 in | |
496 | + -*)set "./$1";; | |
497 | + esac; | |
498 | + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in | |
499 | + ???[sx]*):;;*)false;;esac;fi | |
500 | + '\'' sh | |
501 | + ' | |
502 | fi | |
503 | -rm -f conf$$.file | |
504 | +as_executable_p=$as_test_x | |
505 | ||
506 | # Sed expression to map a string onto a valid CPP name. | |
507 | as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" | |
508 | @@ -720,36 +735,36 @@ | |
509 | # Factoring default headers for most tests. | |
510 | ac_includes_default="\ | |
511 | #include <stdio.h> | |
512 | -#if HAVE_SYS_TYPES_H | |
513 | +#ifdef HAVE_SYS_TYPES_H | |
514 | # include <sys/types.h> | |
515 | #endif | |
516 | -#if HAVE_SYS_STAT_H | |
517 | +#ifdef HAVE_SYS_STAT_H | |
518 | # include <sys/stat.h> | |
519 | #endif | |
520 | -#if STDC_HEADERS | |
521 | +#ifdef STDC_HEADERS | |
522 | # include <stdlib.h> | |
523 | # include <stddef.h> | |
524 | #else | |
525 | -# if HAVE_STDLIB_H | |
526 | +# ifdef HAVE_STDLIB_H | |
527 | # include <stdlib.h> | |
528 | # endif | |
529 | #endif | |
530 | -#if HAVE_STRING_H | |
531 | -# if !STDC_HEADERS && HAVE_MEMORY_H | |
532 | +#ifdef HAVE_STRING_H | |
533 | +# if !defined STDC_HEADERS && defined HAVE_MEMORY_H | |
534 | # include <memory.h> | |
535 | # endif | |
536 | # include <string.h> | |
537 | #endif | |
538 | -#if HAVE_STRINGS_H | |
539 | +#ifdef HAVE_STRINGS_H | |
540 | # include <strings.h> | |
541 | #endif | |
542 | -#if HAVE_INTTYPES_H | |
543 | +#ifdef HAVE_INTTYPES_H | |
544 | # include <inttypes.h> | |
545 | #endif | |
546 | -#if HAVE_STDINT_H | |
547 | +#ifdef HAVE_STDINT_H | |
548 | # include <stdint.h> | |
549 | #endif | |
550 | -#if HAVE_UNISTD_H | |
551 | +#ifdef HAVE_UNISTD_H | |
552 | # include <unistd.h> | |
553 | #endif" | |
554 | ||
555 | @@ -825,6 +840,9 @@ | |
556 | am__untar | |
557 | INSTALL_M4_TRUE | |
558 | INSTALL_M4_FALSE | |
559 | +MAINTAINER_MODE_TRUE | |
560 | +MAINTAINER_MODE_FALSE | |
561 | +MAINT | |
562 | CC | |
563 | CFLAGS | |
564 | LDFLAGS | |
565 | @@ -960,6 +978,7 @@ | |
566 | CC | |
567 | CFLAGS | |
568 | LDFLAGS | |
569 | +LIBS | |
570 | CPPFLAGS | |
571 | CPP | |
572 | CXX | |
573 | @@ -1073,10 +1092,10 @@ | |
574 | -disable-* | --disable-*) | |
575 | ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` | |
576 | # Reject names that are not valid shell variable names. | |
577 | - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && | |
578 | + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && | |
579 | { echo "$as_me: error: invalid feature name: $ac_feature" >&2 | |
580 | { (exit 1); exit 1; }; } | |
581 | - ac_feature=`echo $ac_feature | sed 's/-/_/g'` | |
582 | + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` | |
583 | eval enable_$ac_feature=no ;; | |
584 | ||
585 | -docdir | --docdir | --docdi | --doc | --do) | |
586 | @@ -1092,10 +1111,10 @@ | |
587 | -enable-* | --enable-*) | |
588 | ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` | |
589 | # Reject names that are not valid shell variable names. | |
590 | - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && | |
591 | + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && | |
592 | { echo "$as_me: error: invalid feature name: $ac_feature" >&2 | |
593 | { (exit 1); exit 1; }; } | |
594 | - ac_feature=`echo $ac_feature | sed 's/-/_/g'` | |
595 | + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` | |
596 | eval enable_$ac_feature=\$ac_optarg ;; | |
597 | ||
598 | -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | |
599 | @@ -1289,19 +1308,19 @@ | |
600 | -with-* | --with-*) | |
601 | ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` | |
602 | # Reject names that are not valid shell variable names. | |
603 | - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && | |
604 | + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && | |
605 | { echo "$as_me: error: invalid package name: $ac_package" >&2 | |
606 | { (exit 1); exit 1; }; } | |
607 | - ac_package=`echo $ac_package| sed 's/-/_/g'` | |
608 | + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` | |
609 | eval with_$ac_package=\$ac_optarg ;; | |
610 | ||
611 | -without-* | --without-*) | |
612 | ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` | |
613 | # Reject names that are not valid shell variable names. | |
614 | - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && | |
615 | + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && | |
616 | { echo "$as_me: error: invalid package name: $ac_package" >&2 | |
617 | { (exit 1); exit 1; }; } | |
618 | - ac_package=`echo $ac_package | sed 's/-/_/g'` | |
619 | + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` | |
620 | eval with_$ac_package=no ;; | |
621 | ||
622 | --x) | |
623 | @@ -1546,6 +1565,8 @@ | |
624 | Optional Features: | |
625 | --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) | |
626 | --enable-FEATURE[=ARG] include FEATURE [ARG=yes] | |
627 | + --enable-maintainer-mode enable make rules and dependencies not useful | |
628 | + (and sometimes confusing) to the casual installer | |
629 | --disable-dependency-tracking speeds up one-time build | |
630 | --enable-dependency-tracking do not reject slow dependency extractors | |
631 | --enable-static[=PKGS] build static libraries [default=no] | |
632 | @@ -1596,6 +1617,7 @@ | |
633 | CFLAGS C compiler flags | |
634 | LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a | |
635 | nonstandard directory <lib dir> | |
636 | + LIBS libraries to pass to the linker, e.g. -l<library> | |
637 | CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if | |
638 | you have headers in a nonstandard directory <include dir> | |
639 | CPP C preprocessor | |
640 | @@ -1669,7 +1691,7 @@ | |
641 | if $ac_init_version; then | |
642 | cat <<\_ACEOF | |
643 | configure | |
644 | -generated by GNU Autoconf 2.60 | |
645 | +generated by GNU Autoconf 2.61 | |
646 | ||
647 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, | |
648 | 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. | |
649 | @@ -1683,7 +1705,7 @@ | |
650 | running configure, to aid debugging if configure makes a mistake. | |
651 | ||
652 | It was created by $as_me, which was | |
653 | -generated by GNU Autoconf 2.60. Invocation command line was | |
654 | +generated by GNU Autoconf 2.61. Invocation command line was | |
655 | ||
656 | $ $0 $@ | |
657 | ||
658 | @@ -2221,7 +2243,7 @@ | |
659 | # by default. | |
660 | for ac_prog in ginstall scoinst install; do | |
661 | for ac_exec_ext in '' $ac_executable_extensions; do | |
662 | - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then | |
663 | + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then | |
664 | if test $ac_prog = install && | |
665 | grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then | |
666 | # AIX install. It has an incompatible calling convention. | |
667 | @@ -2387,7 +2409,7 @@ | |
668 | IFS=$as_save_IFS | |
669 | test -z "$as_dir" && as_dir=. | |
670 | for ac_exec_ext in '' $ac_executable_extensions; do | |
671 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | |
672 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
673 | ac_cv_prog_AWK="$ac_prog" | |
674 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
675 | break 2 | |
676 | @@ -2522,7 +2544,7 @@ | |
677 | IFS=$as_save_IFS | |
678 | test -z "$as_dir" && as_dir=. | |
679 | for ac_exec_ext in '' $ac_executable_extensions; do | |
680 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | |
681 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
682 | ac_cv_prog_STRIP="${ac_tool_prefix}strip" | |
683 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
684 | break 2 | |
685 | @@ -2562,7 +2584,7 @@ | |
686 | IFS=$as_save_IFS | |
687 | test -z "$as_dir" && as_dir=. | |
688 | for ac_exec_ext in '' $ac_executable_extensions; do | |
689 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | |
690 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
691 | ac_cv_prog_ac_ct_STRIP="strip" | |
692 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
693 | break 2 | |
694 | @@ -2630,6 +2652,31 @@ | |
695 | ||
696 | ||
697 | ||
698 | +{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 | |
699 | +echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; } | |
700 | + # Check whether --enable-maintainer-mode was given. | |
701 | +if test "${enable_maintainer_mode+set}" = set; then | |
702 | + enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval | |
703 | +else | |
704 | + USE_MAINTAINER_MODE=no | |
705 | +fi | |
706 | + | |
707 | + { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 | |
708 | +echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; } | |
709 | + | |
710 | + | |
711 | +if test $USE_MAINTAINER_MODE = yes; then | |
712 | + MAINTAINER_MODE_TRUE= | |
713 | + MAINTAINER_MODE_FALSE='#' | |
714 | +else | |
715 | + MAINTAINER_MODE_TRUE='#' | |
716 | + MAINTAINER_MODE_FALSE= | |
717 | +fi | |
718 | + | |
719 | + MAINT=$MAINTAINER_MODE_TRUE | |
720 | + | |
721 | + | |
722 | + | |
723 | ||
724 | if test "x$target" != "x$host" -a -z "`echo $CC | grep -e '-gcc'`"; | |
725 | then | |
726 | @@ -2669,7 +2716,7 @@ | |
727 | IFS=$as_save_IFS | |
728 | test -z "$as_dir" && as_dir=. | |
729 | for ac_exec_ext in '' $ac_executable_extensions; do | |
730 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | |
731 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
732 | ac_cv_prog_CC="${ac_tool_prefix}gcc" | |
733 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
734 | break 2 | |
735 | @@ -2709,7 +2756,7 @@ | |
736 | IFS=$as_save_IFS | |
737 | test -z "$as_dir" && as_dir=. | |
738 | for ac_exec_ext in '' $ac_executable_extensions; do | |
739 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | |
740 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
741 | ac_cv_prog_ac_ct_CC="gcc" | |
742 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
743 | break 2 | |
744 | @@ -2766,7 +2813,7 @@ | |
745 | IFS=$as_save_IFS | |
746 | test -z "$as_dir" && as_dir=. | |
747 | for ac_exec_ext in '' $ac_executable_extensions; do | |
748 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | |
749 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
750 | ac_cv_prog_CC="${ac_tool_prefix}cc" | |
751 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
752 | break 2 | |
753 | @@ -2807,7 +2854,7 @@ | |
754 | IFS=$as_save_IFS | |
755 | test -z "$as_dir" && as_dir=. | |
756 | for ac_exec_ext in '' $ac_executable_extensions; do | |
757 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | |
758 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
759 | if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then | |
760 | ac_prog_rejected=yes | |
761 | continue | |
762 | @@ -2865,7 +2912,7 @@ | |
763 | IFS=$as_save_IFS | |
764 | test -z "$as_dir" && as_dir=. | |
765 | for ac_exec_ext in '' $ac_executable_extensions; do | |
766 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | |
767 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
768 | ac_cv_prog_CC="$ac_tool_prefix$ac_prog" | |
769 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
770 | break 2 | |
771 | @@ -2909,7 +2956,7 @@ | |
772 | IFS=$as_save_IFS | |
773 | test -z "$as_dir" && as_dir=. | |
774 | for ac_exec_ext in '' $ac_executable_extensions; do | |
775 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | |
776 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
777 | ac_cv_prog_ac_ct_CC="$ac_prog" | |
778 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
779 | break 2 | |
780 | @@ -3050,7 +3097,7 @@ | |
781 | # in a Makefile. We should not override ac_cv_exeext if it was cached, | |
782 | # so that the user can short-circuit this test for compilers unknown to | |
783 | # Autoconf. | |
784 | -for ac_file in $ac_files | |
785 | +for ac_file in $ac_files '' | |
786 | do | |
787 | test -f "$ac_file" || continue | |
788 | case $ac_file in | |
789 | @@ -3078,6 +3125,12 @@ | |
790 | test "$ac_cv_exeext" = no && ac_cv_exeext= | |
791 | ||
792 | else | |
793 | + ac_file='' | |
794 | +fi | |
795 | + | |
796 | +{ echo "$as_me:$LINENO: result: $ac_file" >&5 | |
797 | +echo "${ECHO_T}$ac_file" >&6; } | |
798 | +if test -z "$ac_file"; then | |
799 | echo "$as_me: failed program was:" >&5 | |
800 | sed 's/^/| /' conftest.$ac_ext >&5 | |
801 | ||
802 | @@ -3089,8 +3142,6 @@ | |
803 | fi | |
804 | ||
805 | ac_exeext=$ac_cv_exeext | |
806 | -{ echo "$as_me:$LINENO: result: $ac_file" >&5 | |
807 | -echo "${ECHO_T}$ac_file" >&6; } | |
808 | ||
809 | # Check that the compiler produces executables we can run. If not, either | |
810 | # the compiler is broken, or we cross compile. | |
811 | @@ -3268,27 +3319,10 @@ | |
812 | rm -f conftest.er1 | |
813 | cat conftest.err >&5 | |
814 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
815 | - (exit $ac_status); } && | |
816 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
817 | - { (case "(($ac_try" in | |
818 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
819 | - *) ac_try_echo=$ac_try;; | |
820 | -esac | |
821 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
822 | - (eval "$ac_try") 2>&5 | |
823 | - ac_status=$? | |
824 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
825 | - (exit $ac_status); }; } && | |
826 | - { ac_try='test -s conftest.$ac_objext' | |
827 | - { (case "(($ac_try" in | |
828 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
829 | - *) ac_try_echo=$ac_try;; | |
830 | -esac | |
831 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
832 | - (eval "$ac_try") 2>&5 | |
833 | - ac_status=$? | |
834 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
835 | - (exit $ac_status); }; }; then | |
836 | + (exit $ac_status); } && { | |
837 | + test -z "$ac_c_werror_flag" || | |
838 | + test ! -s conftest.err | |
839 | + } && test -s conftest.$ac_objext; then | |
840 | ac_compiler_gnu=yes | |
841 | else | |
842 | echo "$as_me: failed program was:" >&5 | |
843 | @@ -3343,27 +3377,10 @@ | |
844 | rm -f conftest.er1 | |
845 | cat conftest.err >&5 | |
846 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
847 | - (exit $ac_status); } && | |
848 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
849 | - { (case "(($ac_try" in | |
850 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
851 | - *) ac_try_echo=$ac_try;; | |
852 | -esac | |
853 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
854 | - (eval "$ac_try") 2>&5 | |
855 | - ac_status=$? | |
856 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
857 | - (exit $ac_status); }; } && | |
858 | - { ac_try='test -s conftest.$ac_objext' | |
859 | - { (case "(($ac_try" in | |
860 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
861 | - *) ac_try_echo=$ac_try;; | |
862 | -esac | |
863 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
864 | - (eval "$ac_try") 2>&5 | |
865 | - ac_status=$? | |
866 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
867 | - (exit $ac_status); }; }; then | |
868 | + (exit $ac_status); } && { | |
869 | + test -z "$ac_c_werror_flag" || | |
870 | + test ! -s conftest.err | |
871 | + } && test -s conftest.$ac_objext; then | |
872 | ac_cv_prog_cc_g=yes | |
873 | else | |
874 | echo "$as_me: failed program was:" >&5 | |
875 | @@ -3398,27 +3415,10 @@ | |
876 | rm -f conftest.er1 | |
877 | cat conftest.err >&5 | |
878 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
879 | - (exit $ac_status); } && | |
880 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
881 | - { (case "(($ac_try" in | |
882 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
883 | - *) ac_try_echo=$ac_try;; | |
884 | -esac | |
885 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
886 | - (eval "$ac_try") 2>&5 | |
887 | - ac_status=$? | |
888 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
889 | - (exit $ac_status); }; } && | |
890 | - { ac_try='test -s conftest.$ac_objext' | |
891 | - { (case "(($ac_try" in | |
892 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
893 | - *) ac_try_echo=$ac_try;; | |
894 | -esac | |
895 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
896 | - (eval "$ac_try") 2>&5 | |
897 | - ac_status=$? | |
898 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
899 | - (exit $ac_status); }; }; then | |
900 | + (exit $ac_status); } && { | |
901 | + test -z "$ac_c_werror_flag" || | |
902 | + test ! -s conftest.err | |
903 | + } && test -s conftest.$ac_objext; then | |
904 | : | |
905 | else | |
906 | echo "$as_me: failed program was:" >&5 | |
907 | @@ -3454,27 +3454,10 @@ | |
908 | rm -f conftest.er1 | |
909 | cat conftest.err >&5 | |
910 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
911 | - (exit $ac_status); } && | |
912 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
913 | - { (case "(($ac_try" in | |
914 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
915 | - *) ac_try_echo=$ac_try;; | |
916 | -esac | |
917 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
918 | - (eval "$ac_try") 2>&5 | |
919 | - ac_status=$? | |
920 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
921 | - (exit $ac_status); }; } && | |
922 | - { ac_try='test -s conftest.$ac_objext' | |
923 | - { (case "(($ac_try" in | |
924 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
925 | - *) ac_try_echo=$ac_try;; | |
926 | -esac | |
927 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
928 | - (eval "$ac_try") 2>&5 | |
929 | - ac_status=$? | |
930 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
931 | - (exit $ac_status); }; }; then | |
932 | + (exit $ac_status); } && { | |
933 | + test -z "$ac_c_werror_flag" || | |
934 | + test ! -s conftest.err | |
935 | + } && test -s conftest.$ac_objext; then | |
936 | ac_cv_prog_cc_g=yes | |
937 | else | |
938 | echo "$as_me: failed program was:" >&5 | |
939 | @@ -3590,27 +3573,10 @@ | |
940 | rm -f conftest.er1 | |
941 | cat conftest.err >&5 | |
942 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
943 | - (exit $ac_status); } && | |
944 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
945 | - { (case "(($ac_try" in | |
946 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
947 | - *) ac_try_echo=$ac_try;; | |
948 | -esac | |
949 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
950 | - (eval "$ac_try") 2>&5 | |
951 | - ac_status=$? | |
952 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
953 | - (exit $ac_status); }; } && | |
954 | - { ac_try='test -s conftest.$ac_objext' | |
955 | - { (case "(($ac_try" in | |
956 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
957 | - *) ac_try_echo=$ac_try;; | |
958 | -esac | |
959 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
960 | - (eval "$ac_try") 2>&5 | |
961 | - ac_status=$? | |
962 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
963 | - (exit $ac_status); }; }; then | |
964 | + (exit $ac_status); } && { | |
965 | + test -z "$ac_c_werror_flag" || | |
966 | + test ! -s conftest.err | |
967 | + } && test -s conftest.$ac_objext; then | |
968 | ac_cv_prog_cc_c89=$ac_arg | |
969 | else | |
970 | echo "$as_me: failed program was:" >&5 | |
971 | @@ -3873,17 +3839,10 @@ | |
972 | rm -f conftest.er1 | |
973 | cat conftest.err >&5 | |
974 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
975 | - (exit $ac_status); } >/dev/null; then | |
976 | - if test -s conftest.err; then | |
977 | - ac_cpp_err=$ac_c_preproc_warn_flag | |
978 | - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | |
979 | - else | |
980 | - ac_cpp_err= | |
981 | - fi | |
982 | -else | |
983 | - ac_cpp_err=yes | |
984 | -fi | |
985 | -if test -z "$ac_cpp_err"; then | |
986 | + (exit $ac_status); } >/dev/null && { | |
987 | + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | |
988 | + test ! -s conftest.err | |
989 | + }; then | |
990 | : | |
991 | else | |
992 | echo "$as_me: failed program was:" >&5 | |
993 | @@ -3917,17 +3876,10 @@ | |
994 | rm -f conftest.er1 | |
995 | cat conftest.err >&5 | |
996 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
997 | - (exit $ac_status); } >/dev/null; then | |
998 | - if test -s conftest.err; then | |
999 | - ac_cpp_err=$ac_c_preproc_warn_flag | |
1000 | - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | |
1001 | - else | |
1002 | - ac_cpp_err= | |
1003 | - fi | |
1004 | -else | |
1005 | - ac_cpp_err=yes | |
1006 | -fi | |
1007 | -if test -z "$ac_cpp_err"; then | |
1008 | + (exit $ac_status); } >/dev/null && { | |
1009 | + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | |
1010 | + test ! -s conftest.err | |
1011 | + }; then | |
1012 | # Broken: success on invalid input. | |
1013 | continue | |
1014 | else | |
1015 | @@ -3992,17 +3944,10 @@ | |
1016 | rm -f conftest.er1 | |
1017 | cat conftest.err >&5 | |
1018 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1019 | - (exit $ac_status); } >/dev/null; then | |
1020 | - if test -s conftest.err; then | |
1021 | - ac_cpp_err=$ac_c_preproc_warn_flag | |
1022 | - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | |
1023 | - else | |
1024 | - ac_cpp_err= | |
1025 | - fi | |
1026 | -else | |
1027 | - ac_cpp_err=yes | |
1028 | -fi | |
1029 | -if test -z "$ac_cpp_err"; then | |
1030 | + (exit $ac_status); } >/dev/null && { | |
1031 | + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | |
1032 | + test ! -s conftest.err | |
1033 | + }; then | |
1034 | : | |
1035 | else | |
1036 | echo "$as_me: failed program was:" >&5 | |
1037 | @@ -4036,17 +3981,10 @@ | |
1038 | rm -f conftest.er1 | |
1039 | cat conftest.err >&5 | |
1040 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1041 | - (exit $ac_status); } >/dev/null; then | |
1042 | - if test -s conftest.err; then | |
1043 | - ac_cpp_err=$ac_c_preproc_warn_flag | |
1044 | - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | |
1045 | - else | |
1046 | - ac_cpp_err= | |
1047 | - fi | |
1048 | -else | |
1049 | - ac_cpp_err=yes | |
1050 | -fi | |
1051 | -if test -z "$ac_cpp_err"; then | |
1052 | + (exit $ac_status); } >/dev/null && { | |
1053 | + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | |
1054 | + test ! -s conftest.err | |
1055 | + }; then | |
1056 | # Broken: success on invalid input. | |
1057 | continue | |
1058 | else | |
1059 | @@ -4115,7 +4053,7 @@ | |
1060 | # by default. | |
1061 | for ac_prog in ginstall scoinst install; do | |
1062 | for ac_exec_ext in '' $ac_executable_extensions; do | |
1063 | - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then | |
1064 | + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then | |
1065 | if test $ac_prog = install && | |
1066 | grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then | |
1067 | # AIX install. It has an incompatible calling convention. | |
1068 | @@ -4323,7 +4261,7 @@ | |
1069 | for ac_prog in grep ggrep; do | |
1070 | for ac_exec_ext in '' $ac_executable_extensions; do | |
1071 | ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" | |
1072 | - { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue | |
1073 | + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue | |
1074 | # Check for GNU ac_path_GREP and select it if it is found. | |
1075 | # Check for GNU $ac_path_GREP | |
1076 | case `"$ac_path_GREP" --version 2>&1` in | |
1077 | @@ -4405,7 +4343,7 @@ | |
1078 | for ac_prog in egrep; do | |
1079 | for ac_exec_ext in '' $ac_executable_extensions; do | |
1080 | ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" | |
1081 | - { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue | |
1082 | + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue | |
1083 | # Check for GNU ac_path_EGREP and select it if it is found. | |
1084 | # Check for GNU $ac_path_EGREP | |
1085 | case `"$ac_path_EGREP" --version 2>&1` in | |
1086 | @@ -4700,7 +4638,7 @@ | |
1087 | lt_cv_deplibs_check_method=pass_all | |
1088 | ;; | |
1089 | ||
1090 | -freebsd* | kfreebsd*-gnu | dragonfly*) | |
1091 | +freebsd* | dragonfly*) | |
1092 | if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then | |
1093 | case $host_cpu in | |
1094 | i*86 ) | |
1095 | @@ -4754,11 +4692,11 @@ | |
1096 | ;; | |
1097 | ||
1098 | # This must be Linux ELF. | |
1099 | -linux*) | |
1100 | +linux* | k*bsd*-gnu) | |
1101 | lt_cv_deplibs_check_method=pass_all | |
1102 | ;; | |
1103 | ||
1104 | -netbsd*) | |
1105 | +netbsd* | netbsdelf*-gnu) | |
1106 | if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then | |
1107 | lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' | |
1108 | else | |
1109 | @@ -4875,7 +4813,7 @@ | |
1110 | ;; | |
1111 | *-*-irix6*) | |
1112 | # Find out which ABI we are using. | |
1113 | - echo '#line 4878 "configure"' > conftest.$ac_ext | |
1114 | + echo '#line 4816 "configure"' > conftest.$ac_ext | |
1115 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
1116 | (eval $ac_compile) 2>&5 | |
1117 | ac_status=$? | |
1118 | @@ -4999,27 +4937,11 @@ | |
1119 | rm -f conftest.er1 | |
1120 | cat conftest.err >&5 | |
1121 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1122 | - (exit $ac_status); } && | |
1123 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
1124 | - { (case "(($ac_try" in | |
1125 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1126 | - *) ac_try_echo=$ac_try;; | |
1127 | -esac | |
1128 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1129 | - (eval "$ac_try") 2>&5 | |
1130 | - ac_status=$? | |
1131 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1132 | - (exit $ac_status); }; } && | |
1133 | - { ac_try='test -s conftest$ac_exeext' | |
1134 | - { (case "(($ac_try" in | |
1135 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1136 | - *) ac_try_echo=$ac_try;; | |
1137 | -esac | |
1138 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1139 | - (eval "$ac_try") 2>&5 | |
1140 | - ac_status=$? | |
1141 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1142 | - (exit $ac_status); }; }; then | |
1143 | + (exit $ac_status); } && { | |
1144 | + test -z "$ac_c_werror_flag" || | |
1145 | + test ! -s conftest.err | |
1146 | + } && test -s conftest$ac_exeext && | |
1147 | + $as_test_x conftest$ac_exeext; then | |
1148 | lt_cv_cc_needs_belf=yes | |
1149 | else | |
1150 | echo "$as_me: failed program was:" >&5 | |
1151 | @@ -5028,7 +4950,7 @@ | |
1152 | lt_cv_cc_needs_belf=no | |
1153 | fi | |
1154 | ||
1155 | -rm -f core conftest.err conftest.$ac_objext \ | |
1156 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
1157 | conftest$ac_exeext conftest.$ac_ext | |
1158 | ac_ext=c | |
1159 | ac_cpp='$CPP $CPPFLAGS' | |
1160 | @@ -5108,27 +5030,10 @@ | |
1161 | rm -f conftest.er1 | |
1162 | cat conftest.err >&5 | |
1163 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1164 | - (exit $ac_status); } && | |
1165 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
1166 | - { (case "(($ac_try" in | |
1167 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1168 | - *) ac_try_echo=$ac_try;; | |
1169 | -esac | |
1170 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1171 | - (eval "$ac_try") 2>&5 | |
1172 | - ac_status=$? | |
1173 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1174 | - (exit $ac_status); }; } && | |
1175 | - { ac_try='test -s conftest.$ac_objext' | |
1176 | - { (case "(($ac_try" in | |
1177 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1178 | - *) ac_try_echo=$ac_try;; | |
1179 | -esac | |
1180 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1181 | - (eval "$ac_try") 2>&5 | |
1182 | - ac_status=$? | |
1183 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1184 | - (exit $ac_status); }; }; then | |
1185 | + (exit $ac_status); } && { | |
1186 | + test -z "$ac_c_werror_flag" || | |
1187 | + test ! -s conftest.err | |
1188 | + } && test -s conftest.$ac_objext; then | |
1189 | ac_cv_header_stdc=yes | |
1190 | else | |
1191 | echo "$as_me: failed program was:" >&5 | |
1192 | @@ -5304,27 +5209,10 @@ | |
1193 | rm -f conftest.er1 | |
1194 | cat conftest.err >&5 | |
1195 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1196 | - (exit $ac_status); } && | |
1197 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
1198 | - { (case "(($ac_try" in | |
1199 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1200 | - *) ac_try_echo=$ac_try;; | |
1201 | -esac | |
1202 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1203 | - (eval "$ac_try") 2>&5 | |
1204 | - ac_status=$? | |
1205 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1206 | - (exit $ac_status); }; } && | |
1207 | - { ac_try='test -s conftest.$ac_objext' | |
1208 | - { (case "(($ac_try" in | |
1209 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1210 | - *) ac_try_echo=$ac_try;; | |
1211 | -esac | |
1212 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1213 | - (eval "$ac_try") 2>&5 | |
1214 | - ac_status=$? | |
1215 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1216 | - (exit $ac_status); }; }; then | |
1217 | + (exit $ac_status); } && { | |
1218 | + test -z "$ac_c_werror_flag" || | |
1219 | + test ! -s conftest.err | |
1220 | + } && test -s conftest.$ac_objext; then | |
1221 | eval "$as_ac_Header=yes" | |
1222 | else | |
1223 | echo "$as_me: failed program was:" >&5 | |
1224 | @@ -5387,27 +5275,10 @@ | |
1225 | rm -f conftest.er1 | |
1226 | cat conftest.err >&5 | |
1227 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1228 | - (exit $ac_status); } && | |
1229 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
1230 | - { (case "(($ac_try" in | |
1231 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1232 | - *) ac_try_echo=$ac_try;; | |
1233 | -esac | |
1234 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1235 | - (eval "$ac_try") 2>&5 | |
1236 | - ac_status=$? | |
1237 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1238 | - (exit $ac_status); }; } && | |
1239 | - { ac_try='test -s conftest.$ac_objext' | |
1240 | - { (case "(($ac_try" in | |
1241 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1242 | - *) ac_try_echo=$ac_try;; | |
1243 | -esac | |
1244 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1245 | - (eval "$ac_try") 2>&5 | |
1246 | - ac_status=$? | |
1247 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1248 | - (exit $ac_status); }; }; then | |
1249 | + (exit $ac_status); } && { | |
1250 | + test -z "$ac_c_werror_flag" || | |
1251 | + test ! -s conftest.err | |
1252 | + } && test -s conftest.$ac_objext; then | |
1253 | ac_header_compiler=yes | |
1254 | else | |
1255 | echo "$as_me: failed program was:" >&5 | |
1256 | @@ -5443,17 +5314,10 @@ | |
1257 | rm -f conftest.er1 | |
1258 | cat conftest.err >&5 | |
1259 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1260 | - (exit $ac_status); } >/dev/null; then | |
1261 | - if test -s conftest.err; then | |
1262 | - ac_cpp_err=$ac_c_preproc_warn_flag | |
1263 | - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | |
1264 | - else | |
1265 | - ac_cpp_err= | |
1266 | - fi | |
1267 | -else | |
1268 | - ac_cpp_err=yes | |
1269 | -fi | |
1270 | -if test -z "$ac_cpp_err"; then | |
1271 | + (exit $ac_status); } >/dev/null && { | |
1272 | + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | |
1273 | + test ! -s conftest.err | |
1274 | + }; then | |
1275 | ac_header_preproc=yes | |
1276 | else | |
1277 | echo "$as_me: failed program was:" >&5 | |
1278 | @@ -5540,7 +5404,7 @@ | |
1279 | IFS=$as_save_IFS | |
1280 | test -z "$as_dir" && as_dir=. | |
1281 | for ac_exec_ext in '' $ac_executable_extensions; do | |
1282 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | |
1283 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
1284 | ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" | |
1285 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
1286 | break 2 | |
1287 | @@ -5584,7 +5448,7 @@ | |
1288 | IFS=$as_save_IFS | |
1289 | test -z "$as_dir" && as_dir=. | |
1290 | for ac_exec_ext in '' $ac_executable_extensions; do | |
1291 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | |
1292 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
1293 | ac_cv_prog_ac_ct_CXX="$ac_prog" | |
1294 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
1295 | break 2 | |
1296 | @@ -5697,27 +5561,10 @@ | |
1297 | rm -f conftest.er1 | |
1298 | cat conftest.err >&5 | |
1299 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1300 | - (exit $ac_status); } && | |
1301 | - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' | |
1302 | - { (case "(($ac_try" in | |
1303 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1304 | - *) ac_try_echo=$ac_try;; | |
1305 | -esac | |
1306 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1307 | - (eval "$ac_try") 2>&5 | |
1308 | - ac_status=$? | |
1309 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1310 | - (exit $ac_status); }; } && | |
1311 | - { ac_try='test -s conftest.$ac_objext' | |
1312 | - { (case "(($ac_try" in | |
1313 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1314 | - *) ac_try_echo=$ac_try;; | |
1315 | -esac | |
1316 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1317 | - (eval "$ac_try") 2>&5 | |
1318 | - ac_status=$? | |
1319 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1320 | - (exit $ac_status); }; }; then | |
1321 | + (exit $ac_status); } && { | |
1322 | + test -z "$ac_cxx_werror_flag" || | |
1323 | + test ! -s conftest.err | |
1324 | + } && test -s conftest.$ac_objext; then | |
1325 | ac_compiler_gnu=yes | |
1326 | else | |
1327 | echo "$as_me: failed program was:" >&5 | |
1328 | @@ -5772,27 +5619,10 @@ | |
1329 | rm -f conftest.er1 | |
1330 | cat conftest.err >&5 | |
1331 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1332 | - (exit $ac_status); } && | |
1333 | - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' | |
1334 | - { (case "(($ac_try" in | |
1335 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1336 | - *) ac_try_echo=$ac_try;; | |
1337 | -esac | |
1338 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1339 | - (eval "$ac_try") 2>&5 | |
1340 | - ac_status=$? | |
1341 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1342 | - (exit $ac_status); }; } && | |
1343 | - { ac_try='test -s conftest.$ac_objext' | |
1344 | - { (case "(($ac_try" in | |
1345 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1346 | - *) ac_try_echo=$ac_try;; | |
1347 | -esac | |
1348 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1349 | - (eval "$ac_try") 2>&5 | |
1350 | - ac_status=$? | |
1351 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1352 | - (exit $ac_status); }; }; then | |
1353 | + (exit $ac_status); } && { | |
1354 | + test -z "$ac_cxx_werror_flag" || | |
1355 | + test ! -s conftest.err | |
1356 | + } && test -s conftest.$ac_objext; then | |
1357 | ac_cv_prog_cxx_g=yes | |
1358 | else | |
1359 | echo "$as_me: failed program was:" >&5 | |
1360 | @@ -5827,27 +5657,10 @@ | |
1361 | rm -f conftest.er1 | |
1362 | cat conftest.err >&5 | |
1363 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1364 | - (exit $ac_status); } && | |
1365 | - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' | |
1366 | - { (case "(($ac_try" in | |
1367 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1368 | - *) ac_try_echo=$ac_try;; | |
1369 | -esac | |
1370 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1371 | - (eval "$ac_try") 2>&5 | |
1372 | - ac_status=$? | |
1373 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1374 | - (exit $ac_status); }; } && | |
1375 | - { ac_try='test -s conftest.$ac_objext' | |
1376 | - { (case "(($ac_try" in | |
1377 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1378 | - *) ac_try_echo=$ac_try;; | |
1379 | -esac | |
1380 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1381 | - (eval "$ac_try") 2>&5 | |
1382 | - ac_status=$? | |
1383 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1384 | - (exit $ac_status); }; }; then | |
1385 | + (exit $ac_status); } && { | |
1386 | + test -z "$ac_cxx_werror_flag" || | |
1387 | + test ! -s conftest.err | |
1388 | + } && test -s conftest.$ac_objext; then | |
1389 | : | |
1390 | else | |
1391 | echo "$as_me: failed program was:" >&5 | |
1392 | @@ -5883,27 +5696,10 @@ | |
1393 | rm -f conftest.er1 | |
1394 | cat conftest.err >&5 | |
1395 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1396 | - (exit $ac_status); } && | |
1397 | - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' | |
1398 | - { (case "(($ac_try" in | |
1399 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1400 | - *) ac_try_echo=$ac_try;; | |
1401 | -esac | |
1402 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1403 | - (eval "$ac_try") 2>&5 | |
1404 | - ac_status=$? | |
1405 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1406 | - (exit $ac_status); }; } && | |
1407 | - { ac_try='test -s conftest.$ac_objext' | |
1408 | - { (case "(($ac_try" in | |
1409 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1410 | - *) ac_try_echo=$ac_try;; | |
1411 | -esac | |
1412 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1413 | - (eval "$ac_try") 2>&5 | |
1414 | - ac_status=$? | |
1415 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1416 | - (exit $ac_status); }; }; then | |
1417 | + (exit $ac_status); } && { | |
1418 | + test -z "$ac_cxx_werror_flag" || | |
1419 | + test ! -s conftest.err | |
1420 | + } && test -s conftest.$ac_objext; then | |
1421 | ac_cv_prog_cxx_g=yes | |
1422 | else | |
1423 | echo "$as_me: failed program was:" >&5 | |
1424 | @@ -6106,17 +5902,10 @@ | |
1425 | rm -f conftest.er1 | |
1426 | cat conftest.err >&5 | |
1427 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1428 | - (exit $ac_status); } >/dev/null; then | |
1429 | - if test -s conftest.err; then | |
1430 | - ac_cpp_err=$ac_cxx_preproc_warn_flag | |
1431 | - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag | |
1432 | - else | |
1433 | - ac_cpp_err= | |
1434 | - fi | |
1435 | -else | |
1436 | - ac_cpp_err=yes | |
1437 | -fi | |
1438 | -if test -z "$ac_cpp_err"; then | |
1439 | + (exit $ac_status); } >/dev/null && { | |
1440 | + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || | |
1441 | + test ! -s conftest.err | |
1442 | + }; then | |
1443 | : | |
1444 | else | |
1445 | echo "$as_me: failed program was:" >&5 | |
1446 | @@ -6150,17 +5939,10 @@ | |
1447 | rm -f conftest.er1 | |
1448 | cat conftest.err >&5 | |
1449 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1450 | - (exit $ac_status); } >/dev/null; then | |
1451 | - if test -s conftest.err; then | |
1452 | - ac_cpp_err=$ac_cxx_preproc_warn_flag | |
1453 | - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag | |
1454 | - else | |
1455 | - ac_cpp_err= | |
1456 | - fi | |
1457 | -else | |
1458 | - ac_cpp_err=yes | |
1459 | -fi | |
1460 | -if test -z "$ac_cpp_err"; then | |
1461 | + (exit $ac_status); } >/dev/null && { | |
1462 | + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || | |
1463 | + test ! -s conftest.err | |
1464 | + }; then | |
1465 | # Broken: success on invalid input. | |
1466 | continue | |
1467 | else | |
1468 | @@ -6225,17 +6007,10 @@ | |
1469 | rm -f conftest.er1 | |
1470 | cat conftest.err >&5 | |
1471 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1472 | - (exit $ac_status); } >/dev/null; then | |
1473 | - if test -s conftest.err; then | |
1474 | - ac_cpp_err=$ac_cxx_preproc_warn_flag | |
1475 | - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag | |
1476 | - else | |
1477 | - ac_cpp_err= | |
1478 | - fi | |
1479 | -else | |
1480 | - ac_cpp_err=yes | |
1481 | -fi | |
1482 | -if test -z "$ac_cpp_err"; then | |
1483 | + (exit $ac_status); } >/dev/null && { | |
1484 | + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || | |
1485 | + test ! -s conftest.err | |
1486 | + }; then | |
1487 | : | |
1488 | else | |
1489 | echo "$as_me: failed program was:" >&5 | |
1490 | @@ -6269,17 +6044,10 @@ | |
1491 | rm -f conftest.er1 | |
1492 | cat conftest.err >&5 | |
1493 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1494 | - (exit $ac_status); } >/dev/null; then | |
1495 | - if test -s conftest.err; then | |
1496 | - ac_cpp_err=$ac_cxx_preproc_warn_flag | |
1497 | - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag | |
1498 | - else | |
1499 | - ac_cpp_err= | |
1500 | - fi | |
1501 | -else | |
1502 | - ac_cpp_err=yes | |
1503 | -fi | |
1504 | -if test -z "$ac_cpp_err"; then | |
1505 | + (exit $ac_status); } >/dev/null && { | |
1506 | + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || | |
1507 | + test ! -s conftest.err | |
1508 | + }; then | |
1509 | # Broken: success on invalid input. | |
1510 | continue | |
1511 | else | |
1512 | @@ -6320,7 +6088,7 @@ | |
1513 | ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | |
1514 | ac_compiler_gnu=$ac_cv_f77_compiler_gnu | |
1515 | if test -n "$ac_tool_prefix"; then | |
1516 | - 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 | |
1517 | + 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 | |
1518 | do | |
1519 | # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | |
1520 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 | |
1521 | @@ -6338,7 +6106,7 @@ | |
1522 | IFS=$as_save_IFS | |
1523 | test -z "$as_dir" && as_dir=. | |
1524 | for ac_exec_ext in '' $ac_executable_extensions; do | |
1525 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | |
1526 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
1527 | ac_cv_prog_F77="$ac_tool_prefix$ac_prog" | |
1528 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
1529 | break 2 | |
1530 | @@ -6364,7 +6132,7 @@ | |
1531 | fi | |
1532 | if test -z "$F77"; then | |
1533 | ac_ct_F77=$F77 | |
1534 | - 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 | |
1535 | + 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 | |
1536 | do | |
1537 | # Extract the first word of "$ac_prog", so it can be a program name with args. | |
1538 | set dummy $ac_prog; ac_word=$2 | |
1539 | @@ -6382,7 +6150,7 @@ | |
1540 | IFS=$as_save_IFS | |
1541 | test -z "$as_dir" && as_dir=. | |
1542 | for ac_exec_ext in '' $ac_executable_extensions; do | |
1543 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | |
1544 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
1545 | ac_cv_prog_ac_ct_F77="$ac_prog" | |
1546 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
1547 | break 2 | |
1548 | @@ -6489,27 +6257,10 @@ | |
1549 | rm -f conftest.er1 | |
1550 | cat conftest.err >&5 | |
1551 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1552 | - (exit $ac_status); } && | |
1553 | - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' | |
1554 | - { (case "(($ac_try" in | |
1555 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1556 | - *) ac_try_echo=$ac_try;; | |
1557 | -esac | |
1558 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1559 | - (eval "$ac_try") 2>&5 | |
1560 | - ac_status=$? | |
1561 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1562 | - (exit $ac_status); }; } && | |
1563 | - { ac_try='test -s conftest.$ac_objext' | |
1564 | - { (case "(($ac_try" in | |
1565 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1566 | - *) ac_try_echo=$ac_try;; | |
1567 | -esac | |
1568 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1569 | - (eval "$ac_try") 2>&5 | |
1570 | - ac_status=$? | |
1571 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1572 | - (exit $ac_status); }; }; then | |
1573 | + (exit $ac_status); } && { | |
1574 | + test -z "$ac_f77_werror_flag" || | |
1575 | + test ! -s conftest.err | |
1576 | + } && test -s conftest.$ac_objext; then | |
1577 | ac_compiler_gnu=yes | |
1578 | else | |
1579 | echo "$as_me: failed program was:" >&5 | |
1580 | @@ -6552,27 +6303,10 @@ | |
1581 | rm -f conftest.er1 | |
1582 | cat conftest.err >&5 | |
1583 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1584 | - (exit $ac_status); } && | |
1585 | - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' | |
1586 | - { (case "(($ac_try" in | |
1587 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1588 | - *) ac_try_echo=$ac_try;; | |
1589 | -esac | |
1590 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1591 | - (eval "$ac_try") 2>&5 | |
1592 | - ac_status=$? | |
1593 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1594 | - (exit $ac_status); }; } && | |
1595 | - { ac_try='test -s conftest.$ac_objext' | |
1596 | - { (case "(($ac_try" in | |
1597 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1598 | - *) ac_try_echo=$ac_try;; | |
1599 | -esac | |
1600 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1601 | - (eval "$ac_try") 2>&5 | |
1602 | - ac_status=$? | |
1603 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1604 | - (exit $ac_status); }; }; then | |
1605 | + (exit $ac_status); } && { | |
1606 | + test -z "$ac_f77_werror_flag" || | |
1607 | + test ! -s conftest.err | |
1608 | + } && test -s conftest.$ac_objext; then | |
1609 | ac_cv_prog_f77_g=yes | |
1610 | else | |
1611 | echo "$as_me: failed program was:" >&5 | |
1612 | @@ -6770,7 +6504,7 @@ | |
1613 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | |
1614 | 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'" | |
1615 | ;; | |
1616 | -linux*) | |
1617 | +linux* | k*bsd*-gnu) | |
1618 | if test "$host_cpu" = ia64; then | |
1619 | symcode='[ABCDGIRSTW]' | |
1620 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | |
1621 | @@ -7027,7 +6761,7 @@ | |
1622 | IFS=$as_save_IFS | |
1623 | test -z "$as_dir" && as_dir=. | |
1624 | for ac_exec_ext in '' $ac_executable_extensions; do | |
1625 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | |
1626 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
1627 | ac_cv_prog_AR="${ac_tool_prefix}ar" | |
1628 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
1629 | break 2 | |
1630 | @@ -7067,7 +6801,7 @@ | |
1631 | IFS=$as_save_IFS | |
1632 | test -z "$as_dir" && as_dir=. | |
1633 | for ac_exec_ext in '' $ac_executable_extensions; do | |
1634 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | |
1635 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
1636 | ac_cv_prog_ac_ct_AR="ar" | |
1637 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
1638 | break 2 | |
1639 | @@ -7123,7 +6857,7 @@ | |
1640 | IFS=$as_save_IFS | |
1641 | test -z "$as_dir" && as_dir=. | |
1642 | for ac_exec_ext in '' $ac_executable_extensions; do | |
1643 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | |
1644 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
1645 | ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" | |
1646 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
1647 | break 2 | |
1648 | @@ -7163,7 +6897,7 @@ | |
1649 | IFS=$as_save_IFS | |
1650 | test -z "$as_dir" && as_dir=. | |
1651 | for ac_exec_ext in '' $ac_executable_extensions; do | |
1652 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | |
1653 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
1654 | ac_cv_prog_ac_ct_RANLIB="ranlib" | |
1655 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
1656 | break 2 | |
1657 | @@ -7219,7 +6953,7 @@ | |
1658 | IFS=$as_save_IFS | |
1659 | test -z "$as_dir" && as_dir=. | |
1660 | for ac_exec_ext in '' $ac_executable_extensions; do | |
1661 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | |
1662 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
1663 | ac_cv_prog_STRIP="${ac_tool_prefix}strip" | |
1664 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
1665 | break 2 | |
1666 | @@ -7259,7 +6993,7 @@ | |
1667 | IFS=$as_save_IFS | |
1668 | test -z "$as_dir" && as_dir=. | |
1669 | for ac_exec_ext in '' $ac_executable_extensions; do | |
1670 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | |
1671 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
1672 | ac_cv_prog_ac_ct_STRIP="strip" | |
1673 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
1674 | break 2 | |
1675 | @@ -7576,11 +7310,11 @@ | |
1676 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | |
1677 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | |
1678 | -e 's:$: $lt_compiler_flag:'` | |
1679 | - (eval echo "\"\$as_me:7579: $lt_compile\"" >&5) | |
1680 | + (eval echo "\"\$as_me:7313: $lt_compile\"" >&5) | |
1681 | (eval "$lt_compile" 2>conftest.err) | |
1682 | ac_status=$? | |
1683 | cat conftest.err >&5 | |
1684 | - echo "$as_me:7583: \$? = $ac_status" >&5 | |
1685 | + echo "$as_me:7317: \$? = $ac_status" >&5 | |
1686 | if (exit $ac_status) && test -s "$ac_outfile"; then | |
1687 | # The compiler can only warn and ignore the option if not recognized | |
1688 | # So say no if there are warnings other than the usual output. | |
1689 | @@ -7738,7 +7472,7 @@ | |
1690 | lt_prog_compiler_static='-Bstatic' | |
1691 | ;; | |
1692 | ||
1693 | - linux*) | |
1694 | + linux* | k*bsd*-gnu) | |
1695 | case $cc_basename in | |
1696 | icc* | ecc*) | |
1697 | lt_prog_compiler_wl='-Wl,' | |
1698 | @@ -7844,11 +7578,11 @@ | |
1699 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | |
1700 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | |
1701 | -e 's:$: $lt_compiler_flag:'` | |
1702 | - (eval echo "\"\$as_me:7847: $lt_compile\"" >&5) | |
1703 | + (eval echo "\"\$as_me:7581: $lt_compile\"" >&5) | |
1704 | (eval "$lt_compile" 2>conftest.err) | |
1705 | ac_status=$? | |
1706 | cat conftest.err >&5 | |
1707 | - echo "$as_me:7851: \$? = $ac_status" >&5 | |
1708 | + echo "$as_me:7585: \$? = $ac_status" >&5 | |
1709 | if (exit $ac_status) && test -s "$ac_outfile"; then | |
1710 | # The compiler can only warn and ignore the option if not recognized | |
1711 | # So say no if there are warnings other than the usual output. | |
1712 | @@ -7948,11 +7682,11 @@ | |
1713 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | |
1714 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | |
1715 | -e 's:$: $lt_compiler_flag:'` | |
1716 | - (eval echo "\"\$as_me:7951: $lt_compile\"" >&5) | |
1717 | + (eval echo "\"\$as_me:7685: $lt_compile\"" >&5) | |
1718 | (eval "$lt_compile" 2>out/conftest.err) | |
1719 | ac_status=$? | |
1720 | cat out/conftest.err >&5 | |
1721 | - echo "$as_me:7955: \$? = $ac_status" >&5 | |
1722 | + echo "$as_me:7689: \$? = $ac_status" >&5 | |
1723 | if (exit $ac_status) && test -s out/conftest2.$ac_objext | |
1724 | then | |
1725 | # The compiler can only warn and ignore the option if not recognized | |
1726 | @@ -8177,7 +7911,7 @@ | |
1727 | 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' | |
1728 | ;; | |
1729 | ||
1730 | - linux*) | |
1731 | + linux* | k*bsd*-gnu) | |
1732 | if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then | |
1733 | tmp_addflag= | |
1734 | case $cc_basename,$host_cpu in | |
1735 | @@ -8203,12 +7937,13 @@ | |
1736 | $echo "local: *; };" >> $output_objdir/$libname.ver~ | |
1737 | $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' | |
1738 | fi | |
1739 | + link_all_deplibs=no | |
1740 | else | |
1741 | ld_shlibs=no | |
1742 | fi | |
1743 | ;; | |
1744 | ||
1745 | - netbsd*) | |
1746 | + netbsd* | netbsdelf*-gnu) | |
1747 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | |
1748 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | |
1749 | wlarc= | |
1750 | @@ -8428,27 +8163,11 @@ | |
1751 | rm -f conftest.er1 | |
1752 | cat conftest.err >&5 | |
1753 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1754 | - (exit $ac_status); } && | |
1755 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
1756 | - { (case "(($ac_try" in | |
1757 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1758 | - *) ac_try_echo=$ac_try;; | |
1759 | -esac | |
1760 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1761 | - (eval "$ac_try") 2>&5 | |
1762 | - ac_status=$? | |
1763 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1764 | - (exit $ac_status); }; } && | |
1765 | - { ac_try='test -s conftest$ac_exeext' | |
1766 | - { (case "(($ac_try" in | |
1767 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1768 | - *) ac_try_echo=$ac_try;; | |
1769 | -esac | |
1770 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1771 | - (eval "$ac_try") 2>&5 | |
1772 | - ac_status=$? | |
1773 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1774 | - (exit $ac_status); }; }; then | |
1775 | + (exit $ac_status); } && { | |
1776 | + test -z "$ac_c_werror_flag" || | |
1777 | + test ! -s conftest.err | |
1778 | + } && test -s conftest$ac_exeext && | |
1779 | + $as_test_x conftest$ac_exeext; then | |
1780 | ||
1781 | aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } | |
1782 | }'` | |
1783 | @@ -8462,7 +8181,7 @@ | |
1784 | ||
1785 | fi | |
1786 | ||
1787 | -rm -f core conftest.err conftest.$ac_objext \ | |
1788 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
1789 | conftest$ac_exeext conftest.$ac_ext | |
1790 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | |
1791 | ||
1792 | @@ -8503,27 +8222,11 @@ | |
1793 | rm -f conftest.er1 | |
1794 | cat conftest.err >&5 | |
1795 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1796 | - (exit $ac_status); } && | |
1797 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
1798 | - { (case "(($ac_try" in | |
1799 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1800 | - *) ac_try_echo=$ac_try;; | |
1801 | -esac | |
1802 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1803 | - (eval "$ac_try") 2>&5 | |
1804 | - ac_status=$? | |
1805 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1806 | - (exit $ac_status); }; } && | |
1807 | - { ac_try='test -s conftest$ac_exeext' | |
1808 | - { (case "(($ac_try" in | |
1809 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1810 | - *) ac_try_echo=$ac_try;; | |
1811 | -esac | |
1812 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1813 | - (eval "$ac_try") 2>&5 | |
1814 | - ac_status=$? | |
1815 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1816 | - (exit $ac_status); }; }; then | |
1817 | + (exit $ac_status); } && { | |
1818 | + test -z "$ac_c_werror_flag" || | |
1819 | + test ! -s conftest.err | |
1820 | + } && test -s conftest$ac_exeext && | |
1821 | + $as_test_x conftest$ac_exeext; then | |
1822 | ||
1823 | aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } | |
1824 | }'` | |
1825 | @@ -8537,7 +8240,7 @@ | |
1826 | ||
1827 | fi | |
1828 | ||
1829 | -rm -f core conftest.err conftest.$ac_objext \ | |
1830 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
1831 | conftest$ac_exeext conftest.$ac_ext | |
1832 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | |
1833 | ||
1834 | @@ -8668,7 +8371,7 @@ | |
1835 | ;; | |
1836 | ||
1837 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | |
1838 | - freebsd* | kfreebsd*-gnu | dragonfly*) | |
1839 | + freebsd* | dragonfly*) | |
1840 | archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' | |
1841 | hardcode_libdir_flag_spec='-R$libdir' | |
1842 | hardcode_direct=yes | |
1843 | @@ -8770,7 +8473,7 @@ | |
1844 | link_all_deplibs=yes | |
1845 | ;; | |
1846 | ||
1847 | - netbsd*) | |
1848 | + netbsd* | netbsdelf*-gnu) | |
1849 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | |
1850 | archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out | |
1851 | else | |
1852 | @@ -9260,18 +8963,6 @@ | |
1853 | dynamic_linker=no | |
1854 | ;; | |
1855 | ||
1856 | -kfreebsd*-gnu) | |
1857 | - version_type=linux | |
1858 | - need_lib_prefix=no | |
1859 | - need_version=no | |
1860 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | |
1861 | - soname_spec='${libname}${release}${shared_ext}$major' | |
1862 | - shlibpath_var=LD_LIBRARY_PATH | |
1863 | - shlibpath_overrides_runpath=no | |
1864 | - hardcode_into_libs=yes | |
1865 | - dynamic_linker='GNU ld.so' | |
1866 | - ;; | |
1867 | - | |
1868 | freebsd* | dragonfly*) | |
1869 | # DragonFly does not have aout. When/if they implement a new | |
1870 | # versioning mechanism, adjust this. | |
1871 | @@ -9427,7 +9118,7 @@ | |
1872 | ;; | |
1873 | ||
1874 | # This must be Linux ELF. | |
1875 | -linux*) | |
1876 | +linux* | k*bsd*-gnu) | |
1877 | version_type=linux | |
1878 | need_lib_prefix=no | |
1879 | need_version=no | |
1880 | @@ -9456,7 +9147,7 @@ | |
1881 | dynamic_linker='GNU/Linux ld.so' | |
1882 | ;; | |
1883 | ||
1884 | -knetbsd*-gnu) | |
1885 | +netbsdelf*-gnu) | |
1886 | version_type=linux | |
1887 | need_lib_prefix=no | |
1888 | need_version=no | |
1889 | @@ -9465,7 +9156,7 @@ | |
1890 | shlibpath_var=LD_LIBRARY_PATH | |
1891 | shlibpath_overrides_runpath=no | |
1892 | hardcode_into_libs=yes | |
1893 | - dynamic_linker='GNU ld.so' | |
1894 | + dynamic_linker='NetBSD ld.elf_so' | |
1895 | ;; | |
1896 | ||
1897 | netbsd*) | |
1898 | @@ -9785,27 +9476,11 @@ | |
1899 | rm -f conftest.er1 | |
1900 | cat conftest.err >&5 | |
1901 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1902 | - (exit $ac_status); } && | |
1903 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
1904 | - { (case "(($ac_try" in | |
1905 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1906 | - *) ac_try_echo=$ac_try;; | |
1907 | -esac | |
1908 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1909 | - (eval "$ac_try") 2>&5 | |
1910 | - ac_status=$? | |
1911 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1912 | - (exit $ac_status); }; } && | |
1913 | - { ac_try='test -s conftest$ac_exeext' | |
1914 | - { (case "(($ac_try" in | |
1915 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1916 | - *) ac_try_echo=$ac_try;; | |
1917 | -esac | |
1918 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1919 | - (eval "$ac_try") 2>&5 | |
1920 | - ac_status=$? | |
1921 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1922 | - (exit $ac_status); }; }; then | |
1923 | + (exit $ac_status); } && { | |
1924 | + test -z "$ac_c_werror_flag" || | |
1925 | + test ! -s conftest.err | |
1926 | + } && test -s conftest$ac_exeext && | |
1927 | + $as_test_x conftest$ac_exeext; then | |
1928 | ac_cv_lib_dl_dlopen=yes | |
1929 | else | |
1930 | echo "$as_me: failed program was:" >&5 | |
1931 | @@ -9814,7 +9489,7 @@ | |
1932 | ac_cv_lib_dl_dlopen=no | |
1933 | fi | |
1934 | ||
1935 | -rm -f core conftest.err conftest.$ac_objext \ | |
1936 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
1937 | conftest$ac_exeext conftest.$ac_ext | |
1938 | LIBS=$ac_check_lib_save_LIBS | |
1939 | fi | |
1940 | @@ -9896,27 +9571,11 @@ | |
1941 | rm -f conftest.er1 | |
1942 | cat conftest.err >&5 | |
1943 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1944 | - (exit $ac_status); } && | |
1945 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
1946 | - { (case "(($ac_try" in | |
1947 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1948 | - *) ac_try_echo=$ac_try;; | |
1949 | -esac | |
1950 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1951 | - (eval "$ac_try") 2>&5 | |
1952 | - ac_status=$? | |
1953 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1954 | - (exit $ac_status); }; } && | |
1955 | - { ac_try='test -s conftest$ac_exeext' | |
1956 | - { (case "(($ac_try" in | |
1957 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1958 | - *) ac_try_echo=$ac_try;; | |
1959 | -esac | |
1960 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1961 | - (eval "$ac_try") 2>&5 | |
1962 | - ac_status=$? | |
1963 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1964 | - (exit $ac_status); }; }; then | |
1965 | + (exit $ac_status); } && { | |
1966 | + test -z "$ac_c_werror_flag" || | |
1967 | + test ! -s conftest.err | |
1968 | + } && test -s conftest$ac_exeext && | |
1969 | + $as_test_x conftest$ac_exeext; then | |
1970 | ac_cv_func_shl_load=yes | |
1971 | else | |
1972 | echo "$as_me: failed program was:" >&5 | |
1973 | @@ -9925,7 +9584,7 @@ | |
1974 | ac_cv_func_shl_load=no | |
1975 | fi | |
1976 | ||
1977 | -rm -f core conftest.err conftest.$ac_objext \ | |
1978 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
1979 | conftest$ac_exeext conftest.$ac_ext | |
1980 | fi | |
1981 | { echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 | |
1982 | @@ -9975,27 +9634,11 @@ | |
1983 | rm -f conftest.er1 | |
1984 | cat conftest.err >&5 | |
1985 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1986 | - (exit $ac_status); } && | |
1987 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
1988 | - { (case "(($ac_try" in | |
1989 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1990 | - *) ac_try_echo=$ac_try;; | |
1991 | -esac | |
1992 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1993 | - (eval "$ac_try") 2>&5 | |
1994 | - ac_status=$? | |
1995 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1996 | - (exit $ac_status); }; } && | |
1997 | - { ac_try='test -s conftest$ac_exeext' | |
1998 | - { (case "(($ac_try" in | |
1999 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2000 | - *) ac_try_echo=$ac_try;; | |
2001 | -esac | |
2002 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2003 | - (eval "$ac_try") 2>&5 | |
2004 | - ac_status=$? | |
2005 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2006 | - (exit $ac_status); }; }; then | |
2007 | + (exit $ac_status); } && { | |
2008 | + test -z "$ac_c_werror_flag" || | |
2009 | + test ! -s conftest.err | |
2010 | + } && test -s conftest$ac_exeext && | |
2011 | + $as_test_x conftest$ac_exeext; then | |
2012 | ac_cv_lib_dld_shl_load=yes | |
2013 | else | |
2014 | echo "$as_me: failed program was:" >&5 | |
2015 | @@ -10004,7 +9647,7 @@ | |
2016 | ac_cv_lib_dld_shl_load=no | |
2017 | fi | |
2018 | ||
2019 | -rm -f core conftest.err conftest.$ac_objext \ | |
2020 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
2021 | conftest$ac_exeext conftest.$ac_ext | |
2022 | LIBS=$ac_check_lib_save_LIBS | |
2023 | fi | |
2024 | @@ -10076,27 +9719,11 @@ | |
2025 | rm -f conftest.er1 | |
2026 | cat conftest.err >&5 | |
2027 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2028 | - (exit $ac_status); } && | |
2029 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
2030 | - { (case "(($ac_try" in | |
2031 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2032 | - *) ac_try_echo=$ac_try;; | |
2033 | -esac | |
2034 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2035 | - (eval "$ac_try") 2>&5 | |
2036 | - ac_status=$? | |
2037 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2038 | - (exit $ac_status); }; } && | |
2039 | - { ac_try='test -s conftest$ac_exeext' | |
2040 | - { (case "(($ac_try" in | |
2041 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2042 | - *) ac_try_echo=$ac_try;; | |
2043 | -esac | |
2044 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2045 | - (eval "$ac_try") 2>&5 | |
2046 | - ac_status=$? | |
2047 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2048 | - (exit $ac_status); }; }; then | |
2049 | + (exit $ac_status); } && { | |
2050 | + test -z "$ac_c_werror_flag" || | |
2051 | + test ! -s conftest.err | |
2052 | + } && test -s conftest$ac_exeext && | |
2053 | + $as_test_x conftest$ac_exeext; then | |
2054 | ac_cv_func_dlopen=yes | |
2055 | else | |
2056 | echo "$as_me: failed program was:" >&5 | |
2057 | @@ -10105,7 +9732,7 @@ | |
2058 | ac_cv_func_dlopen=no | |
2059 | fi | |
2060 | ||
2061 | -rm -f core conftest.err conftest.$ac_objext \ | |
2062 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
2063 | conftest$ac_exeext conftest.$ac_ext | |
2064 | fi | |
2065 | { echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 | |
2066 | @@ -10155,27 +9782,11 @@ | |
2067 | rm -f conftest.er1 | |
2068 | cat conftest.err >&5 | |
2069 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2070 | - (exit $ac_status); } && | |
2071 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
2072 | - { (case "(($ac_try" in | |
2073 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2074 | - *) ac_try_echo=$ac_try;; | |
2075 | -esac | |
2076 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2077 | - (eval "$ac_try") 2>&5 | |
2078 | - ac_status=$? | |
2079 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2080 | - (exit $ac_status); }; } && | |
2081 | - { ac_try='test -s conftest$ac_exeext' | |
2082 | - { (case "(($ac_try" in | |
2083 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2084 | - *) ac_try_echo=$ac_try;; | |
2085 | -esac | |
2086 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2087 | - (eval "$ac_try") 2>&5 | |
2088 | - ac_status=$? | |
2089 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2090 | - (exit $ac_status); }; }; then | |
2091 | + (exit $ac_status); } && { | |
2092 | + test -z "$ac_c_werror_flag" || | |
2093 | + test ! -s conftest.err | |
2094 | + } && test -s conftest$ac_exeext && | |
2095 | + $as_test_x conftest$ac_exeext; then | |
2096 | ac_cv_lib_dl_dlopen=yes | |
2097 | else | |
2098 | echo "$as_me: failed program was:" >&5 | |
2099 | @@ -10184,7 +9795,7 @@ | |
2100 | ac_cv_lib_dl_dlopen=no | |
2101 | fi | |
2102 | ||
2103 | -rm -f core conftest.err conftest.$ac_objext \ | |
2104 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
2105 | conftest$ac_exeext conftest.$ac_ext | |
2106 | LIBS=$ac_check_lib_save_LIBS | |
2107 | fi | |
2108 | @@ -10235,27 +9846,11 @@ | |
2109 | rm -f conftest.er1 | |
2110 | cat conftest.err >&5 | |
2111 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2112 | - (exit $ac_status); } && | |
2113 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
2114 | - { (case "(($ac_try" in | |
2115 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2116 | - *) ac_try_echo=$ac_try;; | |
2117 | -esac | |
2118 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2119 | - (eval "$ac_try") 2>&5 | |
2120 | - ac_status=$? | |
2121 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2122 | - (exit $ac_status); }; } && | |
2123 | - { ac_try='test -s conftest$ac_exeext' | |
2124 | - { (case "(($ac_try" in | |
2125 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2126 | - *) ac_try_echo=$ac_try;; | |
2127 | -esac | |
2128 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2129 | - (eval "$ac_try") 2>&5 | |
2130 | - ac_status=$? | |
2131 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2132 | - (exit $ac_status); }; }; then | |
2133 | + (exit $ac_status); } && { | |
2134 | + test -z "$ac_c_werror_flag" || | |
2135 | + test ! -s conftest.err | |
2136 | + } && test -s conftest$ac_exeext && | |
2137 | + $as_test_x conftest$ac_exeext; then | |
2138 | ac_cv_lib_svld_dlopen=yes | |
2139 | else | |
2140 | echo "$as_me: failed program was:" >&5 | |
2141 | @@ -10264,7 +9859,7 @@ | |
2142 | ac_cv_lib_svld_dlopen=no | |
2143 | fi | |
2144 | ||
2145 | -rm -f core conftest.err conftest.$ac_objext \ | |
2146 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
2147 | conftest$ac_exeext conftest.$ac_ext | |
2148 | LIBS=$ac_check_lib_save_LIBS | |
2149 | fi | |
2150 | @@ -10315,27 +9910,11 @@ | |
2151 | rm -f conftest.er1 | |
2152 | cat conftest.err >&5 | |
2153 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2154 | - (exit $ac_status); } && | |
2155 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
2156 | - { (case "(($ac_try" in | |
2157 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2158 | - *) ac_try_echo=$ac_try;; | |
2159 | -esac | |
2160 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2161 | - (eval "$ac_try") 2>&5 | |
2162 | - ac_status=$? | |
2163 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2164 | - (exit $ac_status); }; } && | |
2165 | - { ac_try='test -s conftest$ac_exeext' | |
2166 | - { (case "(($ac_try" in | |
2167 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2168 | - *) ac_try_echo=$ac_try;; | |
2169 | -esac | |
2170 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2171 | - (eval "$ac_try") 2>&5 | |
2172 | - ac_status=$? | |
2173 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2174 | - (exit $ac_status); }; }; then | |
2175 | + (exit $ac_status); } && { | |
2176 | + test -z "$ac_c_werror_flag" || | |
2177 | + test ! -s conftest.err | |
2178 | + } && test -s conftest$ac_exeext && | |
2179 | + $as_test_x conftest$ac_exeext; then | |
2180 | ac_cv_lib_dld_dld_link=yes | |
2181 | else | |
2182 | echo "$as_me: failed program was:" >&5 | |
2183 | @@ -10344,7 +9923,7 @@ | |
2184 | ac_cv_lib_dld_dld_link=no | |
2185 | fi | |
2186 | ||
2187 | -rm -f core conftest.err conftest.$ac_objext \ | |
2188 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
2189 | conftest$ac_exeext conftest.$ac_ext | |
2190 | LIBS=$ac_check_lib_save_LIBS | |
2191 | fi | |
2192 | @@ -10400,7 +9979,7 @@ | |
2193 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | |
2194 | lt_status=$lt_dlunknown | |
2195 | cat > conftest.$ac_ext <<EOF | |
2196 | -#line 10403 "configure" | |
2197 | +#line 9982 "configure" | |
2198 | #include "confdefs.h" | |
2199 | ||
2200 | #if HAVE_DLFCN_H | |
2201 | @@ -10500,7 +10079,7 @@ | |
2202 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | |
2203 | lt_status=$lt_dlunknown | |
2204 | cat > conftest.$ac_ext <<EOF | |
2205 | -#line 10503 "configure" | |
2206 | +#line 10082 "configure" | |
2207 | #include "confdefs.h" | |
2208 | ||
2209 | #if HAVE_DLFCN_H | |
2210 | @@ -11587,27 +11166,11 @@ | |
2211 | rm -f conftest.er1 | |
2212 | cat conftest.err >&5 | |
2213 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2214 | - (exit $ac_status); } && | |
2215 | - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' | |
2216 | - { (case "(($ac_try" in | |
2217 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2218 | - *) ac_try_echo=$ac_try;; | |
2219 | -esac | |
2220 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2221 | - (eval "$ac_try") 2>&5 | |
2222 | - ac_status=$? | |
2223 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2224 | - (exit $ac_status); }; } && | |
2225 | - { ac_try='test -s conftest$ac_exeext' | |
2226 | - { (case "(($ac_try" in | |
2227 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2228 | - *) ac_try_echo=$ac_try;; | |
2229 | -esac | |
2230 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2231 | - (eval "$ac_try") 2>&5 | |
2232 | - ac_status=$? | |
2233 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2234 | - (exit $ac_status); }; }; then | |
2235 | + (exit $ac_status); } && { | |
2236 | + test -z "$ac_cxx_werror_flag" || | |
2237 | + test ! -s conftest.err | |
2238 | + } && test -s conftest$ac_exeext && | |
2239 | + $as_test_x conftest$ac_exeext; then | |
2240 | ||
2241 | aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } | |
2242 | }'` | |
2243 | @@ -11621,7 +11184,7 @@ | |
2244 | ||
2245 | fi | |
2246 | ||
2247 | -rm -f core conftest.err conftest.$ac_objext \ | |
2248 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
2249 | conftest$ac_exeext conftest.$ac_ext | |
2250 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | |
2251 | ||
2252 | @@ -11663,27 +11226,11 @@ | |
2253 | rm -f conftest.er1 | |
2254 | cat conftest.err >&5 | |
2255 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2256 | - (exit $ac_status); } && | |
2257 | - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' | |
2258 | - { (case "(($ac_try" in | |
2259 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2260 | - *) ac_try_echo=$ac_try;; | |
2261 | -esac | |
2262 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2263 | - (eval "$ac_try") 2>&5 | |
2264 | - ac_status=$? | |
2265 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2266 | - (exit $ac_status); }; } && | |
2267 | - { ac_try='test -s conftest$ac_exeext' | |
2268 | - { (case "(($ac_try" in | |
2269 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2270 | - *) ac_try_echo=$ac_try;; | |
2271 | -esac | |
2272 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2273 | - (eval "$ac_try") 2>&5 | |
2274 | - ac_status=$? | |
2275 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2276 | - (exit $ac_status); }; }; then | |
2277 | + (exit $ac_status); } && { | |
2278 | + test -z "$ac_cxx_werror_flag" || | |
2279 | + test ! -s conftest.err | |
2280 | + } && test -s conftest$ac_exeext && | |
2281 | + $as_test_x conftest$ac_exeext; then | |
2282 | ||
2283 | aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } | |
2284 | }'` | |
2285 | @@ -11697,7 +11244,7 @@ | |
2286 | ||
2287 | fi | |
2288 | ||
2289 | -rm -f core conftest.err conftest.$ac_objext \ | |
2290 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
2291 | conftest$ac_exeext conftest.$ac_ext | |
2292 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | |
2293 | ||
2294 | @@ -11845,7 +11392,7 @@ | |
2295 | freebsd-elf*) | |
2296 | archive_cmds_need_lc_CXX=no | |
2297 | ;; | |
2298 | - freebsd* | kfreebsd*-gnu | dragonfly*) | |
2299 | + freebsd* | dragonfly*) | |
2300 | # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF | |
2301 | # conventions | |
2302 | ld_shlibs_CXX=yes | |
2303 | @@ -12004,7 +11551,7 @@ | |
2304 | hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' | |
2305 | hardcode_libdir_separator_CXX=: | |
2306 | ;; | |
2307 | - linux*) | |
2308 | + linux* | k*bsd*-gnu) | |
2309 | case $cc_basename in | |
2310 | KCC*) | |
2311 | # Kuck and Associates, Inc. (KAI) C++ Compiler | |
2312 | @@ -12106,7 +11653,7 @@ | |
2313 | ;; | |
2314 | esac | |
2315 | ;; | |
2316 | - netbsd*) | |
2317 | + netbsd* | netbsdelf*-gnu) | |
2318 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | |
2319 | archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' | |
2320 | wlarc= | |
2321 | @@ -12673,7 +12220,7 @@ | |
2322 | ;; | |
2323 | esac | |
2324 | ;; | |
2325 | - freebsd* | kfreebsd*-gnu | dragonfly*) | |
2326 | + freebsd* | dragonfly*) | |
2327 | # FreeBSD uses GNU C++ | |
2328 | ;; | |
2329 | hpux9* | hpux10* | hpux11*) | |
2330 | @@ -12716,7 +12263,7 @@ | |
2331 | ;; | |
2332 | esac | |
2333 | ;; | |
2334 | - linux*) | |
2335 | + linux* | k*bsd*-gnu) | |
2336 | case $cc_basename in | |
2337 | KCC*) | |
2338 | # KAI C++ Compiler | |
2339 | @@ -12759,7 +12306,7 @@ | |
2340 | ;; | |
2341 | esac | |
2342 | ;; | |
2343 | - netbsd*) | |
2344 | + netbsd* | netbsdelf*-gnu) | |
2345 | ;; | |
2346 | osf3* | osf4* | osf5*) | |
2347 | case $cc_basename in | |
2348 | @@ -12868,11 +12415,11 @@ | |
2349 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | |
2350 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | |
2351 | -e 's:$: $lt_compiler_flag:'` | |
2352 | - (eval echo "\"\$as_me:12871: $lt_compile\"" >&5) | |
2353 | + (eval echo "\"\$as_me:12418: $lt_compile\"" >&5) | |
2354 | (eval "$lt_compile" 2>conftest.err) | |
2355 | ac_status=$? | |
2356 | cat conftest.err >&5 | |
2357 | - echo "$as_me:12875: \$? = $ac_status" >&5 | |
2358 | + echo "$as_me:12422: \$? = $ac_status" >&5 | |
2359 | if (exit $ac_status) && test -s "$ac_outfile"; then | |
2360 | # The compiler can only warn and ignore the option if not recognized | |
2361 | # So say no if there are warnings other than the usual output. | |
2362 | @@ -12972,11 +12519,11 @@ | |
2363 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | |
2364 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | |
2365 | -e 's:$: $lt_compiler_flag:'` | |
2366 | - (eval echo "\"\$as_me:12975: $lt_compile\"" >&5) | |
2367 | + (eval echo "\"\$as_me:12522: $lt_compile\"" >&5) | |
2368 | (eval "$lt_compile" 2>out/conftest.err) | |
2369 | ac_status=$? | |
2370 | cat out/conftest.err >&5 | |
2371 | - echo "$as_me:12979: \$? = $ac_status" >&5 | |
2372 | + echo "$as_me:12526: \$? = $ac_status" >&5 | |
2373 | if (exit $ac_status) && test -s out/conftest2.$ac_objext | |
2374 | then | |
2375 | # The compiler can only warn and ignore the option if not recognized | |
2376 | @@ -13044,6 +12591,9 @@ | |
2377 | cygwin* | mingw*) | |
2378 | 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' | |
2379 | ;; | |
2380 | + linux* | k*bsd*-gnu) | |
2381 | + link_all_deplibs_CXX=no | |
2382 | + ;; | |
2383 | *) | |
2384 | export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' | |
2385 | ;; | |
2386 | @@ -13323,18 +12873,6 @@ | |
2387 | dynamic_linker=no | |
2388 | ;; | |
2389 | ||
2390 | -kfreebsd*-gnu) | |
2391 | - version_type=linux | |
2392 | - need_lib_prefix=no | |
2393 | - need_version=no | |
2394 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | |
2395 | - soname_spec='${libname}${release}${shared_ext}$major' | |
2396 | - shlibpath_var=LD_LIBRARY_PATH | |
2397 | - shlibpath_overrides_runpath=no | |
2398 | - hardcode_into_libs=yes | |
2399 | - dynamic_linker='GNU ld.so' | |
2400 | - ;; | |
2401 | - | |
2402 | freebsd* | dragonfly*) | |
2403 | # DragonFly does not have aout. When/if they implement a new | |
2404 | # versioning mechanism, adjust this. | |
2405 | @@ -13490,7 +13028,7 @@ | |
2406 | ;; | |
2407 | ||
2408 | # This must be Linux ELF. | |
2409 | -linux*) | |
2410 | +linux* | k*bsd*-gnu) | |
2411 | version_type=linux | |
2412 | need_lib_prefix=no | |
2413 | need_version=no | |
2414 | @@ -13519,7 +13057,7 @@ | |
2415 | dynamic_linker='GNU/Linux ld.so' | |
2416 | ;; | |
2417 | ||
2418 | -knetbsd*-gnu) | |
2419 | +netbsdelf*-gnu) | |
2420 | version_type=linux | |
2421 | need_lib_prefix=no | |
2422 | need_version=no | |
2423 | @@ -13528,7 +13066,7 @@ | |
2424 | shlibpath_var=LD_LIBRARY_PATH | |
2425 | shlibpath_overrides_runpath=no | |
2426 | hardcode_into_libs=yes | |
2427 | - dynamic_linker='GNU ld.so' | |
2428 | + dynamic_linker='NetBSD ld.elf_so' | |
2429 | ;; | |
2430 | ||
2431 | netbsd*) | |
2432 | @@ -14436,7 +13974,7 @@ | |
2433 | lt_prog_compiler_static_F77='-Bstatic' | |
2434 | ;; | |
2435 | ||
2436 | - linux*) | |
2437 | + linux* | k*bsd*-gnu) | |
2438 | case $cc_basename in | |
2439 | icc* | ecc*) | |
2440 | lt_prog_compiler_wl_F77='-Wl,' | |
2441 | @@ -14542,11 +14080,11 @@ | |
2442 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | |
2443 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | |
2444 | -e 's:$: $lt_compiler_flag:'` | |
2445 | - (eval echo "\"\$as_me:14545: $lt_compile\"" >&5) | |
2446 | + (eval echo "\"\$as_me:14083: $lt_compile\"" >&5) | |
2447 | (eval "$lt_compile" 2>conftest.err) | |
2448 | ac_status=$? | |
2449 | cat conftest.err >&5 | |
2450 | - echo "$as_me:14549: \$? = $ac_status" >&5 | |
2451 | + echo "$as_me:14087: \$? = $ac_status" >&5 | |
2452 | if (exit $ac_status) && test -s "$ac_outfile"; then | |
2453 | # The compiler can only warn and ignore the option if not recognized | |
2454 | # So say no if there are warnings other than the usual output. | |
2455 | @@ -14646,11 +14184,11 @@ | |
2456 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | |
2457 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | |
2458 | -e 's:$: $lt_compiler_flag:'` | |
2459 | - (eval echo "\"\$as_me:14649: $lt_compile\"" >&5) | |
2460 | + (eval echo "\"\$as_me:14187: $lt_compile\"" >&5) | |
2461 | (eval "$lt_compile" 2>out/conftest.err) | |
2462 | ac_status=$? | |
2463 | cat out/conftest.err >&5 | |
2464 | - echo "$as_me:14653: \$? = $ac_status" >&5 | |
2465 | + echo "$as_me:14191: \$? = $ac_status" >&5 | |
2466 | if (exit $ac_status) && test -s out/conftest2.$ac_objext | |
2467 | then | |
2468 | # The compiler can only warn and ignore the option if not recognized | |
2469 | @@ -14875,7 +14413,7 @@ | |
2470 | 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' | |
2471 | ;; | |
2472 | ||
2473 | - linux*) | |
2474 | + linux* | k*bsd*-gnu) | |
2475 | if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then | |
2476 | tmp_addflag= | |
2477 | case $cc_basename,$host_cpu in | |
2478 | @@ -14901,12 +14439,13 @@ | |
2479 | $echo "local: *; };" >> $output_objdir/$libname.ver~ | |
2480 | $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' | |
2481 | fi | |
2482 | + link_all_deplibs_F77=no | |
2483 | else | |
2484 | ld_shlibs_F77=no | |
2485 | fi | |
2486 | ;; | |
2487 | ||
2488 | - netbsd*) | |
2489 | + netbsd* | netbsdelf*-gnu) | |
2490 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | |
2491 | archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | |
2492 | wlarc= | |
2493 | @@ -15116,27 +14655,11 @@ | |
2494 | rm -f conftest.er1 | |
2495 | cat conftest.err >&5 | |
2496 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2497 | - (exit $ac_status); } && | |
2498 | - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' | |
2499 | - { (case "(($ac_try" in | |
2500 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2501 | - *) ac_try_echo=$ac_try;; | |
2502 | -esac | |
2503 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2504 | - (eval "$ac_try") 2>&5 | |
2505 | - ac_status=$? | |
2506 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2507 | - (exit $ac_status); }; } && | |
2508 | - { ac_try='test -s conftest$ac_exeext' | |
2509 | - { (case "(($ac_try" in | |
2510 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2511 | - *) ac_try_echo=$ac_try;; | |
2512 | -esac | |
2513 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2514 | - (eval "$ac_try") 2>&5 | |
2515 | - ac_status=$? | |
2516 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2517 | - (exit $ac_status); }; }; then | |
2518 | + (exit $ac_status); } && { | |
2519 | + test -z "$ac_f77_werror_flag" || | |
2520 | + test ! -s conftest.err | |
2521 | + } && test -s conftest$ac_exeext && | |
2522 | + $as_test_x conftest$ac_exeext; then | |
2523 | ||
2524 | aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } | |
2525 | }'` | |
2526 | @@ -15150,7 +14673,7 @@ | |
2527 | ||
2528 | fi | |
2529 | ||
2530 | -rm -f core conftest.err conftest.$ac_objext \ | |
2531 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
2532 | conftest$ac_exeext conftest.$ac_ext | |
2533 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | |
2534 | ||
2535 | @@ -15181,27 +14704,11 @@ | |
2536 | rm -f conftest.er1 | |
2537 | cat conftest.err >&5 | |
2538 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2539 | - (exit $ac_status); } && | |
2540 | - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' | |
2541 | - { (case "(($ac_try" in | |
2542 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2543 | - *) ac_try_echo=$ac_try;; | |
2544 | -esac | |
2545 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2546 | - (eval "$ac_try") 2>&5 | |
2547 | - ac_status=$? | |
2548 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2549 | - (exit $ac_status); }; } && | |
2550 | - { ac_try='test -s conftest$ac_exeext' | |
2551 | - { (case "(($ac_try" in | |
2552 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2553 | - *) ac_try_echo=$ac_try;; | |
2554 | -esac | |
2555 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2556 | - (eval "$ac_try") 2>&5 | |
2557 | - ac_status=$? | |
2558 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2559 | - (exit $ac_status); }; }; then | |
2560 | + (exit $ac_status); } && { | |
2561 | + test -z "$ac_f77_werror_flag" || | |
2562 | + test ! -s conftest.err | |
2563 | + } && test -s conftest$ac_exeext && | |
2564 | + $as_test_x conftest$ac_exeext; then | |
2565 | ||
2566 | aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } | |
2567 | }'` | |
2568 | @@ -15215,7 +14722,7 @@ | |
2569 | ||
2570 | fi | |
2571 | ||
2572 | -rm -f core conftest.err conftest.$ac_objext \ | |
2573 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
2574 | conftest$ac_exeext conftest.$ac_ext | |
2575 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | |
2576 | ||
2577 | @@ -15346,7 +14853,7 @@ | |
2578 | ;; | |
2579 | ||
2580 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | |
2581 | - freebsd* | kfreebsd*-gnu | dragonfly*) | |
2582 | + freebsd* | dragonfly*) | |
2583 | archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' | |
2584 | hardcode_libdir_flag_spec_F77='-R$libdir' | |
2585 | hardcode_direct_F77=yes | |
2586 | @@ -15448,7 +14955,7 @@ | |
2587 | link_all_deplibs_F77=yes | |
2588 | ;; | |
2589 | ||
2590 | - netbsd*) | |
2591 | + netbsd* | netbsdelf*-gnu) | |
2592 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | |
2593 | archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out | |
2594 | else | |
2595 | @@ -15938,18 +15445,6 @@ | |
2596 | dynamic_linker=no | |
2597 | ;; | |
2598 | ||
2599 | -kfreebsd*-gnu) | |
2600 | - version_type=linux | |
2601 | - need_lib_prefix=no | |
2602 | - need_version=no | |
2603 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | |
2604 | - soname_spec='${libname}${release}${shared_ext}$major' | |
2605 | - shlibpath_var=LD_LIBRARY_PATH | |
2606 | - shlibpath_overrides_runpath=no | |
2607 | - hardcode_into_libs=yes | |
2608 | - dynamic_linker='GNU ld.so' | |
2609 | - ;; | |
2610 | - | |
2611 | freebsd* | dragonfly*) | |
2612 | # DragonFly does not have aout. When/if they implement a new | |
2613 | # versioning mechanism, adjust this. | |
2614 | @@ -16105,7 +15600,7 @@ | |
2615 | ;; | |
2616 | ||
2617 | # This must be Linux ELF. | |
2618 | -linux*) | |
2619 | +linux* | k*bsd*-gnu) | |
2620 | version_type=linux | |
2621 | need_lib_prefix=no | |
2622 | need_version=no | |
2623 | @@ -16134,7 +15629,7 @@ | |
2624 | dynamic_linker='GNU/Linux ld.so' | |
2625 | ;; | |
2626 | ||
2627 | -knetbsd*-gnu) | |
2628 | +netbsdelf*-gnu) | |
2629 | version_type=linux | |
2630 | need_lib_prefix=no | |
2631 | need_version=no | |
2632 | @@ -16143,7 +15638,7 @@ | |
2633 | shlibpath_var=LD_LIBRARY_PATH | |
2634 | shlibpath_overrides_runpath=no | |
2635 | hardcode_into_libs=yes | |
2636 | - dynamic_linker='GNU ld.so' | |
2637 | + dynamic_linker='NetBSD ld.elf_so' | |
2638 | ;; | |
2639 | ||
2640 | netbsd*) | |
2641 | @@ -16876,11 +16371,11 @@ | |
2642 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | |
2643 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | |
2644 | -e 's:$: $lt_compiler_flag:'` | |
2645 | - (eval echo "\"\$as_me:16879: $lt_compile\"" >&5) | |
2646 | + (eval echo "\"\$as_me:16374: $lt_compile\"" >&5) | |
2647 | (eval "$lt_compile" 2>conftest.err) | |
2648 | ac_status=$? | |
2649 | cat conftest.err >&5 | |
2650 | - echo "$as_me:16883: \$? = $ac_status" >&5 | |
2651 | + echo "$as_me:16378: \$? = $ac_status" >&5 | |
2652 | if (exit $ac_status) && test -s "$ac_outfile"; then | |
2653 | # The compiler can only warn and ignore the option if not recognized | |
2654 | # So say no if there are warnings other than the usual output. | |
2655 | @@ -17038,7 +16533,7 @@ | |
2656 | lt_prog_compiler_static_GCJ='-Bstatic' | |
2657 | ;; | |
2658 | ||
2659 | - linux*) | |
2660 | + linux* | k*bsd*-gnu) | |
2661 | case $cc_basename in | |
2662 | icc* | ecc*) | |
2663 | lt_prog_compiler_wl_GCJ='-Wl,' | |
2664 | @@ -17144,11 +16639,11 @@ | |
2665 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | |
2666 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | |
2667 | -e 's:$: $lt_compiler_flag:'` | |
2668 | - (eval echo "\"\$as_me:17147: $lt_compile\"" >&5) | |
2669 | + (eval echo "\"\$as_me:16642: $lt_compile\"" >&5) | |
2670 | (eval "$lt_compile" 2>conftest.err) | |
2671 | ac_status=$? | |
2672 | cat conftest.err >&5 | |
2673 | - echo "$as_me:17151: \$? = $ac_status" >&5 | |
2674 | + echo "$as_me:16646: \$? = $ac_status" >&5 | |
2675 | if (exit $ac_status) && test -s "$ac_outfile"; then | |
2676 | # The compiler can only warn and ignore the option if not recognized | |
2677 | # So say no if there are warnings other than the usual output. | |
2678 | @@ -17248,11 +16743,11 @@ | |
2679 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | |
2680 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | |
2681 | -e 's:$: $lt_compiler_flag:'` | |
2682 | - (eval echo "\"\$as_me:17251: $lt_compile\"" >&5) | |
2683 | + (eval echo "\"\$as_me:16746: $lt_compile\"" >&5) | |
2684 | (eval "$lt_compile" 2>out/conftest.err) | |
2685 | ac_status=$? | |
2686 | cat out/conftest.err >&5 | |
2687 | - echo "$as_me:17255: \$? = $ac_status" >&5 | |
2688 | + echo "$as_me:16750: \$? = $ac_status" >&5 | |
2689 | if (exit $ac_status) && test -s out/conftest2.$ac_objext | |
2690 | then | |
2691 | # The compiler can only warn and ignore the option if not recognized | |
2692 | @@ -17477,7 +16972,7 @@ | |
2693 | 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' | |
2694 | ;; | |
2695 | ||
2696 | - linux*) | |
2697 | + linux* | k*bsd*-gnu) | |
2698 | if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then | |
2699 | tmp_addflag= | |
2700 | case $cc_basename,$host_cpu in | |
2701 | @@ -17503,12 +16998,13 @@ | |
2702 | $echo "local: *; };" >> $output_objdir/$libname.ver~ | |
2703 | $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' | |
2704 | fi | |
2705 | + link_all_deplibs_GCJ=no | |
2706 | else | |
2707 | ld_shlibs_GCJ=no | |
2708 | fi | |
2709 | ;; | |
2710 | ||
2711 | - netbsd*) | |
2712 | + netbsd* | netbsdelf*-gnu) | |
2713 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | |
2714 | archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | |
2715 | wlarc= | |
2716 | @@ -17728,27 +17224,11 @@ | |
2717 | rm -f conftest.er1 | |
2718 | cat conftest.err >&5 | |
2719 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2720 | - (exit $ac_status); } && | |
2721 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
2722 | - { (case "(($ac_try" in | |
2723 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2724 | - *) ac_try_echo=$ac_try;; | |
2725 | -esac | |
2726 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2727 | - (eval "$ac_try") 2>&5 | |
2728 | - ac_status=$? | |
2729 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2730 | - (exit $ac_status); }; } && | |
2731 | - { ac_try='test -s conftest$ac_exeext' | |
2732 | - { (case "(($ac_try" in | |
2733 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2734 | - *) ac_try_echo=$ac_try;; | |
2735 | -esac | |
2736 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2737 | - (eval "$ac_try") 2>&5 | |
2738 | - ac_status=$? | |
2739 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2740 | - (exit $ac_status); }; }; then | |
2741 | + (exit $ac_status); } && { | |
2742 | + test -z "$ac_c_werror_flag" || | |
2743 | + test ! -s conftest.err | |
2744 | + } && test -s conftest$ac_exeext && | |
2745 | + $as_test_x conftest$ac_exeext; then | |
2746 | ||
2747 | aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } | |
2748 | }'` | |
2749 | @@ -17762,7 +17242,7 @@ | |
2750 | ||
2751 | fi | |
2752 | ||
2753 | -rm -f core conftest.err conftest.$ac_objext \ | |
2754 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
2755 | conftest$ac_exeext conftest.$ac_ext | |
2756 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | |
2757 | ||
2758 | @@ -17803,27 +17283,11 @@ | |
2759 | rm -f conftest.er1 | |
2760 | cat conftest.err >&5 | |
2761 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2762 | - (exit $ac_status); } && | |
2763 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
2764 | - { (case "(($ac_try" in | |
2765 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2766 | - *) ac_try_echo=$ac_try;; | |
2767 | -esac | |
2768 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2769 | - (eval "$ac_try") 2>&5 | |
2770 | - ac_status=$? | |
2771 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2772 | - (exit $ac_status); }; } && | |
2773 | - { ac_try='test -s conftest$ac_exeext' | |
2774 | - { (case "(($ac_try" in | |
2775 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2776 | - *) ac_try_echo=$ac_try;; | |
2777 | -esac | |
2778 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2779 | - (eval "$ac_try") 2>&5 | |
2780 | - ac_status=$? | |
2781 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2782 | - (exit $ac_status); }; }; then | |
2783 | + (exit $ac_status); } && { | |
2784 | + test -z "$ac_c_werror_flag" || | |
2785 | + test ! -s conftest.err | |
2786 | + } && test -s conftest$ac_exeext && | |
2787 | + $as_test_x conftest$ac_exeext; then | |
2788 | ||
2789 | aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } | |
2790 | }'` | |
2791 | @@ -17837,7 +17301,7 @@ | |
2792 | ||
2793 | fi | |
2794 | ||
2795 | -rm -f core conftest.err conftest.$ac_objext \ | |
2796 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
2797 | conftest$ac_exeext conftest.$ac_ext | |
2798 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | |
2799 | ||
2800 | @@ -17968,7 +17432,7 @@ | |
2801 | ;; | |
2802 | ||
2803 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | |
2804 | - freebsd* | kfreebsd*-gnu | dragonfly*) | |
2805 | + freebsd* | dragonfly*) | |
2806 | archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' | |
2807 | hardcode_libdir_flag_spec_GCJ='-R$libdir' | |
2808 | hardcode_direct_GCJ=yes | |
2809 | @@ -18070,7 +17534,7 @@ | |
2810 | link_all_deplibs_GCJ=yes | |
2811 | ;; | |
2812 | ||
2813 | - netbsd*) | |
2814 | + netbsd* | netbsdelf*-gnu) | |
2815 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | |
2816 | archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out | |
2817 | else | |
2818 | @@ -18560,18 +18024,6 @@ | |
2819 | dynamic_linker=no | |
2820 | ;; | |
2821 | ||
2822 | -kfreebsd*-gnu) | |
2823 | - version_type=linux | |
2824 | - need_lib_prefix=no | |
2825 | - need_version=no | |
2826 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | |
2827 | - soname_spec='${libname}${release}${shared_ext}$major' | |
2828 | - shlibpath_var=LD_LIBRARY_PATH | |
2829 | - shlibpath_overrides_runpath=no | |
2830 | - hardcode_into_libs=yes | |
2831 | - dynamic_linker='GNU ld.so' | |
2832 | - ;; | |
2833 | - | |
2834 | freebsd* | dragonfly*) | |
2835 | # DragonFly does not have aout. When/if they implement a new | |
2836 | # versioning mechanism, adjust this. | |
2837 | @@ -18727,7 +18179,7 @@ | |
2838 | ;; | |
2839 | ||
2840 | # This must be Linux ELF. | |
2841 | -linux*) | |
2842 | +linux* | k*bsd*-gnu) | |
2843 | version_type=linux | |
2844 | need_lib_prefix=no | |
2845 | need_version=no | |
2846 | @@ -18756,7 +18208,7 @@ | |
2847 | dynamic_linker='GNU/Linux ld.so' | |
2848 | ;; | |
2849 | ||
2850 | -knetbsd*-gnu) | |
2851 | +netbsdelf*-gnu) | |
2852 | version_type=linux | |
2853 | need_lib_prefix=no | |
2854 | need_version=no | |
2855 | @@ -18765,7 +18217,7 @@ | |
2856 | shlibpath_var=LD_LIBRARY_PATH | |
2857 | shlibpath_overrides_runpath=no | |
2858 | hardcode_into_libs=yes | |
2859 | - dynamic_linker='GNU ld.so' | |
2860 | + dynamic_linker='NetBSD ld.elf_so' | |
2861 | ;; | |
2862 | ||
2863 | netbsd*) | |
2864 | @@ -19980,27 +19432,10 @@ | |
2865 | rm -f conftest.er1 | |
2866 | cat conftest.err >&5 | |
2867 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2868 | - (exit $ac_status); } && | |
2869 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
2870 | - { (case "(($ac_try" in | |
2871 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2872 | - *) ac_try_echo=$ac_try;; | |
2873 | -esac | |
2874 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2875 | - (eval "$ac_try") 2>&5 | |
2876 | - ac_status=$? | |
2877 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2878 | - (exit $ac_status); }; } && | |
2879 | - { ac_try='test -s conftest.$ac_objext' | |
2880 | - { (case "(($ac_try" in | |
2881 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2882 | - *) ac_try_echo=$ac_try;; | |
2883 | -esac | |
2884 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2885 | - (eval "$ac_try") 2>&5 | |
2886 | - ac_status=$? | |
2887 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2888 | - (exit $ac_status); }; }; then | |
2889 | + (exit $ac_status); } && { | |
2890 | + test -z "$ac_c_werror_flag" || | |
2891 | + test ! -s conftest.err | |
2892 | + } && test -s conftest.$ac_objext; then | |
2893 | ac_cv_header_stdc=yes | |
2894 | else | |
2895 | echo "$as_me: failed program was:" >&5 | |
2896 | @@ -20157,10 +19592,10 @@ | |
2897 | #ifndef __cplusplus | |
2898 | /* Ultrix mips cc rejects this. */ | |
2899 | typedef int charset[2]; | |
2900 | - const charset x; | |
2901 | + const charset cs; | |
2902 | /* SunOS 4.1.1 cc rejects this. */ | |
2903 | - char const *const *ccp; | |
2904 | - char **p; | |
2905 | + char const *const *pcpcc; | |
2906 | + char **ppc; | |
2907 | /* NEC SVR4.0.2 mips cc rejects this. */ | |
2908 | struct point {int x, y;}; | |
2909 | static struct point const zero = {0,0}; | |
2910 | @@ -20169,11 +19604,11 @@ | |
2911 | an arm of an if-expression whose if-part is not a constant | |
2912 | expression */ | |
2913 | const char *g = "string"; | |
2914 | - ccp = &g + (g ? g-g : 0); | |
2915 | + pcpcc = &g + (g ? g-g : 0); | |
2916 | /* HPUX 7.0 cc rejects these. */ | |
2917 | - ++ccp; | |
2918 | - p = (char**) ccp; | |
2919 | - ccp = (char const *const *) p; | |
2920 | + ++pcpcc; | |
2921 | + ppc = (char**) pcpcc; | |
2922 | + pcpcc = (char const *const *) ppc; | |
2923 | { /* SCO 3.2v4 cc rejects this. */ | |
2924 | char *t; | |
2925 | char const *s = 0 ? (char *) 0 : (char const *) 0; | |
2926 | @@ -20200,7 +19635,7 @@ | |
2927 | const int foo = 10; | |
2928 | if (!foo) return 0; | |
2929 | } | |
2930 | - return !x[0] && !zero.x; | |
2931 | + return !cs[0] && !zero.x; | |
2932 | #endif | |
2933 | ||
2934 | ; | |
2935 | @@ -20220,27 +19655,10 @@ | |
2936 | rm -f conftest.er1 | |
2937 | cat conftest.err >&5 | |
2938 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2939 | - (exit $ac_status); } && | |
2940 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
2941 | - { (case "(($ac_try" in | |
2942 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2943 | - *) ac_try_echo=$ac_try;; | |
2944 | -esac | |
2945 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2946 | - (eval "$ac_try") 2>&5 | |
2947 | - ac_status=$? | |
2948 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2949 | - (exit $ac_status); }; } && | |
2950 | - { ac_try='test -s conftest.$ac_objext' | |
2951 | - { (case "(($ac_try" in | |
2952 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2953 | - *) ac_try_echo=$ac_try;; | |
2954 | -esac | |
2955 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2956 | - (eval "$ac_try") 2>&5 | |
2957 | - ac_status=$? | |
2958 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2959 | - (exit $ac_status); }; }; then | |
2960 | + (exit $ac_status); } && { | |
2961 | + test -z "$ac_c_werror_flag" || | |
2962 | + test ! -s conftest.err | |
2963 | + } && test -s conftest.$ac_objext; then | |
2964 | ac_cv_c_const=yes | |
2965 | else | |
2966 | echo "$as_me: failed program was:" >&5 | |
2967 | @@ -20294,27 +19712,10 @@ | |
2968 | rm -f conftest.er1 | |
2969 | cat conftest.err >&5 | |
2970 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2971 | - (exit $ac_status); } && | |
2972 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
2973 | - { (case "(($ac_try" in | |
2974 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2975 | - *) ac_try_echo=$ac_try;; | |
2976 | -esac | |
2977 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2978 | - (eval "$ac_try") 2>&5 | |
2979 | - ac_status=$? | |
2980 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2981 | - (exit $ac_status); }; } && | |
2982 | - { ac_try='test -s conftest.$ac_objext' | |
2983 | - { (case "(($ac_try" in | |
2984 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2985 | - *) ac_try_echo=$ac_try;; | |
2986 | -esac | |
2987 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2988 | - (eval "$ac_try") 2>&5 | |
2989 | - ac_status=$? | |
2990 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2991 | - (exit $ac_status); }; }; then | |
2992 | + (exit $ac_status); } && { | |
2993 | + test -z "$ac_c_werror_flag" || | |
2994 | + test ! -s conftest.err | |
2995 | + } && test -s conftest.$ac_objext; then | |
2996 | ac_cv_c_inline=$ac_kw | |
2997 | else | |
2998 | echo "$as_me: failed program was:" >&5 | |
2999 | @@ -20384,27 +19785,10 @@ | |
3000 | rm -f conftest.er1 | |
3001 | cat conftest.err >&5 | |
3002 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3003 | - (exit $ac_status); } && | |
3004 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
3005 | - { (case "(($ac_try" in | |
3006 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
3007 | - *) ac_try_echo=$ac_try;; | |
3008 | -esac | |
3009 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
3010 | - (eval "$ac_try") 2>&5 | |
3011 | - ac_status=$? | |
3012 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3013 | - (exit $ac_status); }; } && | |
3014 | - { ac_try='test -s conftest.$ac_objext' | |
3015 | - { (case "(($ac_try" in | |
3016 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
3017 | - *) ac_try_echo=$ac_try;; | |
3018 | -esac | |
3019 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
3020 | - (eval "$ac_try") 2>&5 | |
3021 | - ac_status=$? | |
3022 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3023 | - (exit $ac_status); }; }; then | |
3024 | + (exit $ac_status); } && { | |
3025 | + test -z "$ac_c_werror_flag" || | |
3026 | + test ! -s conftest.err | |
3027 | + } && test -s conftest.$ac_objext; then | |
3028 | ac_cv_header_time=yes | |
3029 | else | |
3030 | echo "$as_me: failed program was:" >&5 | |
3031 | @@ -20539,27 +19923,11 @@ | |
3032 | rm -f conftest.er1 | |
3033 | cat conftest.err >&5 | |
3034 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3035 | - (exit $ac_status); } && | |
3036 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
3037 | - { (case "(($ac_try" in | |
3038 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
3039 | - *) ac_try_echo=$ac_try;; | |
3040 | -esac | |
3041 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
3042 | - (eval "$ac_try") 2>&5 | |
3043 | - ac_status=$? | |
3044 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3045 | - (exit $ac_status); }; } && | |
3046 | - { ac_try='test -s conftest$ac_exeext' | |
3047 | - { (case "(($ac_try" in | |
3048 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
3049 | - *) ac_try_echo=$ac_try;; | |
3050 | -esac | |
3051 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
3052 | - (eval "$ac_try") 2>&5 | |
3053 | - ac_status=$? | |
3054 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3055 | - (exit $ac_status); }; }; then | |
3056 | + (exit $ac_status); } && { | |
3057 | + test -z "$ac_c_werror_flag" || | |
3058 | + test ! -s conftest.err | |
3059 | + } && test -s conftest$ac_exeext && | |
3060 | + $as_test_x conftest$ac_exeext; then | |
3061 | ac_cv_func_hsearch_r=yes | |
3062 | else | |
3063 | echo "$as_me: failed program was:" >&5 | |
3064 | @@ -20568,7 +19936,7 @@ | |
3065 | ac_cv_func_hsearch_r=no | |
3066 | fi | |
3067 | ||
3068 | -rm -f core conftest.err conftest.$ac_objext \ | |
3069 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
3070 | conftest$ac_exeext conftest.$ac_ext | |
3071 | fi | |
3072 | { echo "$as_me:$LINENO: result: $ac_cv_func_hsearch_r" >&5 | |
3073 | @@ -20890,27 +20258,11 @@ | |
3074 | rm -f conftest.er1 | |
3075 | cat conftest.err >&5 | |
3076 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3077 | - (exit $ac_status); } && | |
3078 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
3079 | - { (case "(($ac_try" in | |
3080 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
3081 | - *) ac_try_echo=$ac_try;; | |
3082 | -esac | |
3083 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
3084 | - (eval "$ac_try") 2>&5 | |
3085 | - ac_status=$? | |
3086 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3087 | - (exit $ac_status); }; } && | |
3088 | - { ac_try='test -s conftest$ac_exeext' | |
3089 | - { (case "(($ac_try" in | |
3090 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
3091 | - *) ac_try_echo=$ac_try;; | |
3092 | -esac | |
3093 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
3094 | - (eval "$ac_try") 2>&5 | |
3095 | - ac_status=$? | |
3096 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3097 | - (exit $ac_status); }; }; then | |
3098 | + (exit $ac_status); } && { | |
3099 | + test -z "$ac_c_werror_flag" || | |
3100 | + test ! -s conftest.err | |
3101 | + } && test -s conftest$ac_exeext && | |
3102 | + $as_test_x conftest$ac_exeext; then | |
3103 | ac_cv_lib_dl_dlsym=yes | |
3104 | else | |
3105 | echo "$as_me: failed program was:" >&5 | |
3106 | @@ -20919,7 +20271,7 @@ | |
3107 | ac_cv_lib_dl_dlsym=no | |
3108 | fi | |
3109 | ||
3110 | -rm -f core conftest.err conftest.$ac_objext \ | |
3111 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
3112 | conftest$ac_exeext conftest.$ac_ext | |
3113 | LIBS=$ac_check_lib_save_LIBS | |
3114 | fi | |
3115 | @@ -21005,27 +20357,11 @@ | |
3116 | rm -f conftest.er1 | |
3117 | cat conftest.err >&5 | |
3118 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3119 | - (exit $ac_status); } && | |
3120 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
3121 | - { (case "(($ac_try" in | |
3122 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
3123 | - *) ac_try_echo=$ac_try;; | |
3124 | -esac | |
3125 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
3126 | - (eval "$ac_try") 2>&5 | |
3127 | - ac_status=$? | |
3128 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3129 | - (exit $ac_status); }; } && | |
3130 | - { ac_try='test -s conftest$ac_exeext' | |
3131 | - { (case "(($ac_try" in | |
3132 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
3133 | - *) ac_try_echo=$ac_try;; | |
3134 | -esac | |
3135 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
3136 | - (eval "$ac_try") 2>&5 | |
3137 | - ac_status=$? | |
3138 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3139 | - (exit $ac_status); }; }; then | |
3140 | + (exit $ac_status); } && { | |
3141 | + test -z "$ac_c_werror_flag" || | |
3142 | + test ! -s conftest.err | |
3143 | + } && test -s conftest$ac_exeext && | |
3144 | + $as_test_x conftest$ac_exeext; then | |
3145 | ac_cv_lib_pthread_pthread_join=yes | |
3146 | else | |
3147 | echo "$as_me: failed program was:" >&5 | |
3148 | @@ -21034,7 +20370,7 @@ | |
3149 | ac_cv_lib_pthread_pthread_join=no | |
3150 | fi | |
3151 | ||
3152 | -rm -f core conftest.err conftest.$ac_objext \ | |
3153 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
3154 | conftest$ac_exeext conftest.$ac_ext | |
3155 | LIBS=$ac_check_lib_save_LIBS | |
3156 | fi | |
3157 | @@ -21140,27 +20476,10 @@ | |
3158 | rm -f conftest.er1 | |
3159 | cat conftest.err >&5 | |
3160 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3161 | - (exit $ac_status); } && | |
3162 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
3163 | - { (case "(($ac_try" in | |
3164 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
3165 | - *) ac_try_echo=$ac_try;; | |
3166 | -esac | |
3167 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
3168 | - (eval "$ac_try") 2>&5 | |
3169 | - ac_status=$? | |
3170 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3171 | - (exit $ac_status); }; } && | |
3172 | - { ac_try='test -s conftest.$ac_objext' | |
3173 | - { (case "(($ac_try" in | |
3174 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
3175 | - *) ac_try_echo=$ac_try;; | |
3176 | -esac | |
3177 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
3178 | - (eval "$ac_try") 2>&5 | |
3179 | - ac_status=$? | |
3180 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3181 | - (exit $ac_status); }; }; then | |
3182 | + (exit $ac_status); } && { | |
3183 | + test -z "$ac_c_werror_flag" || | |
3184 | + test ! -s conftest.err | |
3185 | + } && test -s conftest.$ac_objext; then | |
3186 | ac_header_compiler=yes | |
3187 | else | |
3188 | echo "$as_me: failed program was:" >&5 | |
3189 | @@ -21196,17 +20515,10 @@ | |
3190 | rm -f conftest.er1 | |
3191 | cat conftest.err >&5 | |
3192 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3193 | - (exit $ac_status); } >/dev/null; then | |
3194 | - if test -s conftest.err; then | |
3195 | - ac_cpp_err=$ac_c_preproc_warn_flag | |
3196 | - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | |
3197 | - else | |
3198 | - ac_cpp_err= | |
3199 | - fi | |
3200 | -else | |
3201 | - ac_cpp_err=yes | |
3202 | -fi | |
3203 | -if test -z "$ac_cpp_err"; then | |
3204 | + (exit $ac_status); } >/dev/null && { | |
3205 | + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | |
3206 | + test ! -s conftest.err | |
3207 | + }; then | |
3208 | ac_header_preproc=yes | |
3209 | else | |
3210 | echo "$as_me: failed program was:" >&5 | |
3211 | @@ -21321,27 +20633,11 @@ | |
3212 | rm -f conftest.er1 | |
3213 | cat conftest.err >&5 | |
3214 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3215 | - (exit $ac_status); } && | |
3216 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | |
3217 | - { (case "(($ac_try" in | |
3218 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
3219 | - *) ac_try_echo=$ac_try;; | |
3220 | -esac | |
3221 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
3222 | - (eval "$ac_try") 2>&5 | |
3223 | - ac_status=$? | |
3224 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3225 | - (exit $ac_status); }; } && | |
3226 | - { ac_try='test -s conftest$ac_exeext' | |
3227 | - { (case "(($ac_try" in | |
3228 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
3229 | - *) ac_try_echo=$ac_try;; | |
3230 | -esac | |
3231 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
3232 | - (eval "$ac_try") 2>&5 | |
3233 | - ac_status=$? | |
3234 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3235 | - (exit $ac_status); }; }; then | |
3236 | + (exit $ac_status); } && { | |
3237 | + test -z "$ac_c_werror_flag" || | |
3238 | + test ! -s conftest.err | |
3239 | + } && test -s conftest$ac_exeext && | |
3240 | + $as_test_x conftest$ac_exeext; then | |
3241 | ac_cv_lib_resmgr_rsm_open_device=yes | |
3242 | else | |
3243 | echo "$as_me: failed program was:" >&5 | |
3244 | @@ -21350,7 +20646,7 @@ | |
3245 | ac_cv_lib_resmgr_rsm_open_device=no | |
3246 | fi | |
3247 | ||
3248 | -rm -f core conftest.err conftest.$ac_objext \ | |
3249 | +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
3250 | conftest$ac_exeext conftest.$ac_ext | |
3251 | LIBS=$ac_check_lib_save_LIBS | |
3252 | fi | |
3253 | @@ -22153,6 +21449,13 @@ | |
3254 | Usually this means the macro was only invoked conditionally." >&2;} | |
3255 | { (exit 1); exit 1; }; } | |
3256 | fi | |
3257 | +if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then | |
3258 | + { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. | |
3259 | +Usually this means the macro was only invoked conditionally." >&5 | |
3260 | +echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. | |
3261 | +Usually this means the macro was only invoked conditionally." >&2;} | |
3262 | + { (exit 1); exit 1; }; } | |
3263 | +fi | |
3264 | if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then | |
3265 | { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. | |
3266 | Usually this means the macro was only invoked conditionally." >&5 | |
3267 | @@ -22485,7 +21788,8 @@ | |
3268 | ## M4sh Initialization. ## | |
3269 | ## --------------------- ## | |
3270 | ||
3271 | -# Be Bourne compatible | |
3272 | +# Be more Bourne compatible | |
3273 | +DUALCASE=1; export DUALCASE # for MKS sh | |
3274 | if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then | |
3275 | emulate sh | |
3276 | NULLCMD=: | |
3277 | @@ -22494,10 +21798,13 @@ | |
3278 | alias -g '${1+"$@"}'='"$@"' | |
3279 | setopt NO_GLOB_SUBST | |
3280 | else | |
3281 | - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac | |
3282 | + case `(set -o) 2>/dev/null` in | |
3283 | + *posix*) set -o posix ;; | |
3284 | +esac | |
3285 | + | |
3286 | fi | |
3287 | -BIN_SH=xpg4; export BIN_SH # for Tru64 | |
3288 | -DUALCASE=1; export DUALCASE # for MKS sh | |
3289 | + | |
3290 | + | |
3291 | ||
3292 | ||
3293 | # PATH needs CR | |
3294 | @@ -22721,19 +22028,28 @@ | |
3295 | as_mkdir_p=false | |
3296 | fi | |
3297 | ||
3298 | -# Find out whether ``test -x'' works. Don't use a zero-byte file, as | |
3299 | -# systems may use methods other than mode bits to determine executability. | |
3300 | -cat >conf$$.file <<_ASEOF | |
3301 | -#! /bin/sh | |
3302 | -exit 0 | |
3303 | -_ASEOF | |
3304 | -chmod +x conf$$.file | |
3305 | -if test -x conf$$.file >/dev/null 2>&1; then | |
3306 | - as_executable_p="test -x" | |
3307 | +if test -x / >/dev/null 2>&1; then | |
3308 | + as_test_x='test -x' | |
3309 | else | |
3310 | - as_executable_p=: | |
3311 | + if ls -dL / >/dev/null 2>&1; then | |
3312 | + as_ls_L_option=L | |
3313 | + else | |
3314 | + as_ls_L_option= | |
3315 | + fi | |
3316 | + as_test_x=' | |
3317 | + eval sh -c '\'' | |
3318 | + if test -d "$1"; then | |
3319 | + test -d "$1/."; | |
3320 | + else | |
3321 | + case $1 in | |
3322 | + -*)set "./$1";; | |
3323 | + esac; | |
3324 | + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in | |
3325 | + ???[sx]*):;;*)false;;esac;fi | |
3326 | + '\'' sh | |
3327 | + ' | |
3328 | fi | |
3329 | -rm -f conf$$.file | |
3330 | +as_executable_p=$as_test_x | |
3331 | ||
3332 | # Sed expression to map a string onto a valid CPP name. | |
3333 | as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" | |
3334 | @@ -22749,7 +22065,7 @@ | |
3335 | # values after options handling. | |
3336 | ac_log=" | |
3337 | This file was extended by $as_me, which was | |
3338 | -generated by GNU Autoconf 2.60. Invocation command line was | |
3339 | +generated by GNU Autoconf 2.61. Invocation command line was | |
3340 | ||
3341 | CONFIG_FILES = $CONFIG_FILES | |
3342 | CONFIG_HEADERS = $CONFIG_HEADERS | |
3343 | @@ -22778,7 +22094,7 @@ | |
3344 | Usage: $0 [OPTIONS] [FILE]... | |
3345 | ||
3346 | -h, --help print this help, then exit | |
3347 | - -V, --version print version number, then exit | |
3348 | + -V, --version print version number and configuration settings, then exit | |
3349 | -q, --quiet do not print progress messages | |
3350 | -d, --debug don't remove temporary files | |
3351 | --recheck update $as_me by reconfiguring in the same conditions | |
3352 | @@ -22802,7 +22118,7 @@ | |
3353 | cat >>$CONFIG_STATUS <<_ACEOF | |
3354 | ac_cs_version="\\ | |
3355 | config.status | |
3356 | -configured by $0, generated by GNU Autoconf 2.60, | |
3357 | +configured by $0, generated by GNU Autoconf 2.61, | |
3358 | with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" | |
3359 | ||
3360 | Copyright (C) 2006 Free Software Foundation, Inc. | |
3361 | @@ -23080,6 +22396,9 @@ | |
3362 | am__untar!$am__untar$ac_delim | |
3363 | INSTALL_M4_TRUE!$INSTALL_M4_TRUE$ac_delim | |
3364 | INSTALL_M4_FALSE!$INSTALL_M4_FALSE$ac_delim | |
3365 | +MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim | |
3366 | +MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim | |
3367 | +MAINT!$MAINT$ac_delim | |
3368 | CC!$CC$ac_delim | |
3369 | CFLAGS!$CFLAGS$ac_delim | |
3370 | LDFLAGS!$LDFLAGS$ac_delim | |
3371 | @@ -23102,9 +22421,6 @@ | |
3372 | EGREP!$EGREP$ac_delim | |
3373 | ECHO!$ECHO$ac_delim | |
3374 | AR!$AR$ac_delim | |
3375 | -RANLIB!$RANLIB$ac_delim | |
3376 | -CXX!$CXX$ac_delim | |
3377 | -CXXFLAGS!$CXXFLAGS$ac_delim | |
3378 | _ACEOF | |
3379 | ||
3380 | if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then | |
3381 | @@ -23146,6 +22462,9 @@ | |
3382 | ac_delim='%!_!# ' | |
3383 | for ac_last_try in false false false false false :; do | |
3384 | cat >conf$$subs.sed <<_ACEOF | |
3385 | +RANLIB!$RANLIB$ac_delim | |
3386 | +CXX!$CXX$ac_delim | |
3387 | +CXXFLAGS!$CXXFLAGS$ac_delim | |
3388 | ac_ct_CXX!$ac_ct_CXX$ac_delim | |
3389 | CXXDEPMODE!$CXXDEPMODE$ac_delim | |
3390 | am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim | |
3391 | @@ -23240,9 +22559,6 @@ | |
3392 | BUILD_PCM_PLUGIN_EXTPLUG_TRUE!$BUILD_PCM_PLUGIN_EXTPLUG_TRUE$ac_delim | |
3393 | BUILD_PCM_PLUGIN_EXTPLUG_FALSE!$BUILD_PCM_PLUGIN_EXTPLUG_FALSE$ac_delim | |
3394 | BUILD_PCM_PLUGIN_IOPLUG_TRUE!$BUILD_PCM_PLUGIN_IOPLUG_TRUE$ac_delim | |
3395 | -BUILD_PCM_PLUGIN_IOPLUG_FALSE!$BUILD_PCM_PLUGIN_IOPLUG_FALSE$ac_delim | |
3396 | -BUILD_CTL_PLUGIN_TRUE!$BUILD_CTL_PLUGIN_TRUE$ac_delim | |
3397 | -BUILD_CTL_PLUGIN_FALSE!$BUILD_CTL_PLUGIN_FALSE$ac_delim | |
3398 | _ACEOF | |
3399 | ||
3400 | if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then | |
3401 | @@ -23284,6 +22600,9 @@ | |
3402 | ac_delim='%!_!# ' | |
3403 | for ac_last_try in false false false false false :; do | |
3404 | cat >conf$$subs.sed <<_ACEOF | |
3405 | +BUILD_PCM_PLUGIN_IOPLUG_FALSE!$BUILD_PCM_PLUGIN_IOPLUG_FALSE$ac_delim | |
3406 | +BUILD_CTL_PLUGIN_TRUE!$BUILD_CTL_PLUGIN_TRUE$ac_delim | |
3407 | +BUILD_CTL_PLUGIN_FALSE!$BUILD_CTL_PLUGIN_FALSE$ac_delim | |
3408 | BUILD_CTL_PLUGIN_SHM_TRUE!$BUILD_CTL_PLUGIN_SHM_TRUE$ac_delim | |
3409 | BUILD_CTL_PLUGIN_SHM_FALSE!$BUILD_CTL_PLUGIN_SHM_FALSE$ac_delim | |
3410 | BUILD_CTL_PLUGIN_EXT_TRUE!$BUILD_CTL_PLUGIN_EXT_TRUE$ac_delim | |
3411 | @@ -23292,7 +22611,7 @@ | |
3412 | LTLIBOBJS!$LTLIBOBJS$ac_delim | |
3413 | _ACEOF | |
3414 | ||
3415 | - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 6; then | |
3416 | + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 9; then | |
3417 | break | |
3418 | elif $ac_last_try; then | |
3419 | { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 | |
3420 | diff -Naurd alsa-lib-1.0.14~/doc/Makefile.in alsa-lib-1.0.14/doc/Makefile.in | |
3421 | --- alsa-lib-1.0.14~/doc/Makefile.in 2007-06-04 17:39:47.000000000 +0200 | |
3422 | +++ alsa-lib-1.0.14/doc/Makefile.in 2007-06-04 17:42:42.000000000 +0200 | |
3423 | @@ -182,6 +182,9 @@ | |
3424 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
3425 | LN_S = @LN_S@ | |
3426 | LTLIBOBJS = @LTLIBOBJS@ | |
3427 | +MAINT = @MAINT@ | |
3428 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
3429 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
3430 | MAKEINFO = @MAKEINFO@ | |
3431 | OBJEXT = @OBJEXT@ | |
3432 | PACKAGE = @PACKAGE@ | |
3433 | @@ -263,7 +266,7 @@ | |
3434 | all: all-recursive | |
3435 | ||
3436 | .SUFFIXES: | |
3437 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
3438 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
3439 | @for dep in $?; do \ | |
3440 | case '$(am__configure_deps)' in \ | |
3441 | *$$dep*) \ | |
3442 | @@ -272,9 +275,9 @@ | |
3443 | exit 1;; \ | |
3444 | esac; \ | |
3445 | done; \ | |
3446 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \ | |
3447 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ | |
3448 | cd $(top_srcdir) && \ | |
3449 | - $(AUTOMAKE) --foreign doc/Makefile | |
3450 | + $(AUTOMAKE) --gnu doc/Makefile | |
3451 | .PRECIOUS: Makefile | |
3452 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
3453 | @case '$?' in \ | |
3454 | @@ -288,9 +291,9 @@ | |
3455 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
3456 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3457 | ||
3458 | -$(top_srcdir)/configure: $(am__configure_deps) | |
3459 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
3460 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3461 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
3462 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
3463 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3464 | ||
3465 | mostlyclean-libtool: | |
3466 | diff -Naurd alsa-lib-1.0.14~/doc/pictures/Makefile.in alsa-lib-1.0.14/doc/pictures/Makefile.in | |
3467 | --- alsa-lib-1.0.14~/doc/pictures/Makefile.in 2007-06-04 17:39:47.000000000 +0200 | |
3468 | +++ alsa-lib-1.0.14/doc/pictures/Makefile.in 2007-06-04 17:42:42.000000000 +0200 | |
3469 | @@ -173,6 +173,9 @@ | |
3470 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
3471 | LN_S = @LN_S@ | |
3472 | LTLIBOBJS = @LTLIBOBJS@ | |
3473 | +MAINT = @MAINT@ | |
3474 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
3475 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
3476 | MAKEINFO = @MAKEINFO@ | |
3477 | OBJEXT = @OBJEXT@ | |
3478 | PACKAGE = @PACKAGE@ | |
3479 | @@ -252,7 +255,7 @@ | |
3480 | all: all-am | |
3481 | ||
3482 | .SUFFIXES: | |
3483 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
3484 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
3485 | @for dep in $?; do \ | |
3486 | case '$(am__configure_deps)' in \ | |
3487 | *$$dep*) \ | |
3488 | @@ -261,9 +264,9 @@ | |
3489 | exit 1;; \ | |
3490 | esac; \ | |
3491 | done; \ | |
3492 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/pictures/Makefile'; \ | |
3493 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/pictures/Makefile'; \ | |
3494 | cd $(top_srcdir) && \ | |
3495 | - $(AUTOMAKE) --foreign doc/pictures/Makefile | |
3496 | + $(AUTOMAKE) --gnu doc/pictures/Makefile | |
3497 | .PRECIOUS: Makefile | |
3498 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
3499 | @case '$?' in \ | |
3500 | @@ -277,9 +280,9 @@ | |
3501 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
3502 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3503 | ||
3504 | -$(top_srcdir)/configure: $(am__configure_deps) | |
3505 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
3506 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3507 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
3508 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
3509 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3510 | ||
3511 | mostlyclean-libtool: | |
3512 | diff -Naurd alsa-lib-1.0.14~/include/Makefile.in alsa-lib-1.0.14/include/Makefile.in | |
3513 | --- alsa-lib-1.0.14~/include/Makefile.in 2007-06-04 17:39:47.000000000 +0200 | |
3514 | +++ alsa-lib-1.0.14/include/Makefile.in 2007-06-04 17:42:42.000000000 +0200 | |
3515 | @@ -194,6 +194,9 @@ | |
3516 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
3517 | LN_S = @LN_S@ | |
3518 | LTLIBOBJS = @LTLIBOBJS@ | |
3519 | +MAINT = @MAINT@ | |
3520 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
3521 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
3522 | MAKEINFO = @MAKEINFO@ | |
3523 | OBJEXT = @OBJEXT@ | |
3524 | PACKAGE = @PACKAGE@ | |
3525 | @@ -288,7 +291,7 @@ | |
3526 | $(MAKE) $(AM_MAKEFLAGS) all-recursive | |
3527 | ||
3528 | .SUFFIXES: | |
3529 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
3530 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
3531 | @for dep in $?; do \ | |
3532 | case '$(am__configure_deps)' in \ | |
3533 | *$$dep*) \ | |
3534 | @@ -297,9 +300,9 @@ | |
3535 | exit 1;; \ | |
3536 | esac; \ | |
3537 | done; \ | |
3538 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/Makefile'; \ | |
3539 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/Makefile'; \ | |
3540 | cd $(top_srcdir) && \ | |
3541 | - $(AUTOMAKE) --foreign include/Makefile | |
3542 | + $(AUTOMAKE) --gnu include/Makefile | |
3543 | .PRECIOUS: Makefile | |
3544 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
3545 | @case '$?' in \ | |
3546 | @@ -313,9 +316,9 @@ | |
3547 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
3548 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3549 | ||
3550 | -$(top_srcdir)/configure: $(am__configure_deps) | |
3551 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
3552 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3553 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
3554 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
3555 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3556 | ||
3557 | config.h: stamp-h1 | |
3558 | @@ -327,7 +330,7 @@ | |
3559 | stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status | |
3560 | @rm -f stamp-h1 | |
3561 | cd $(top_builddir) && $(SHELL) ./config.status include/config.h | |
3562 | -$(srcdir)/config.h.in: $(am__configure_deps) | |
3563 | +$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
3564 | cd $(top_srcdir) && $(AUTOHEADER) | |
3565 | rm -f stamp-h1 | |
3566 | touch $@ | |
3567 | diff -Naurd alsa-lib-1.0.14~/include/sound/Makefile.in alsa-lib-1.0.14/include/sound/Makefile.in | |
3568 | --- alsa-lib-1.0.14~/include/sound/Makefile.in 2007-06-04 17:39:47.000000000 +0200 | |
3569 | +++ alsa-lib-1.0.14/include/sound/Makefile.in 2007-06-04 17:42:43.000000000 +0200 | |
3570 | @@ -186,6 +186,9 @@ | |
3571 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
3572 | LN_S = @LN_S@ | |
3573 | LTLIBOBJS = @LTLIBOBJS@ | |
3574 | +MAINT = @MAINT@ | |
3575 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
3576 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
3577 | MAKEINFO = @MAKEINFO@ | |
3578 | OBJEXT = @OBJEXT@ | |
3579 | PACKAGE = @PACKAGE@ | |
3580 | @@ -270,7 +273,7 @@ | |
3581 | all: all-am | |
3582 | ||
3583 | .SUFFIXES: | |
3584 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
3585 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
3586 | @for dep in $?; do \ | |
3587 | case '$(am__configure_deps)' in \ | |
3588 | *$$dep*) \ | |
3589 | @@ -279,9 +282,9 @@ | |
3590 | exit 1;; \ | |
3591 | esac; \ | |
3592 | done; \ | |
3593 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/sound/Makefile'; \ | |
3594 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/sound/Makefile'; \ | |
3595 | cd $(top_srcdir) && \ | |
3596 | - $(AUTOMAKE) --foreign include/sound/Makefile | |
3597 | + $(AUTOMAKE) --gnu include/sound/Makefile | |
3598 | .PRECIOUS: Makefile | |
3599 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
3600 | @case '$?' in \ | |
3601 | @@ -295,9 +298,9 @@ | |
3602 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
3603 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3604 | ||
3605 | -$(top_srcdir)/configure: $(am__configure_deps) | |
3606 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
3607 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3608 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
3609 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
3610 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3611 | ||
3612 | mostlyclean-libtool: | |
3613 | diff -Naurd alsa-lib-1.0.14~/ltmain.sh alsa-lib-1.0.14/ltmain.sh | |
3614 | --- alsa-lib-1.0.14~/ltmain.sh 2007-06-04 17:39:47.000000000 +0200 | |
3615 | +++ alsa-lib-1.0.14/ltmain.sh 2006-03-11 19:49:04.000000000 +0100 | |
3616 | @@ -43,7 +43,7 @@ | |
3617 | ||
3618 | PROGRAM=ltmain.sh | |
3619 | PACKAGE=libtool | |
3620 | -VERSION=1.5.22 | |
3621 | +VERSION="1.5.22 Debian 1.5.22-4" | |
3622 | TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)" | |
3623 | ||
3624 | # See if we are running on zsh, and set the options which allow our | |
3625 | @@ -2082,7 +2082,10 @@ | |
3626 | case $pass in | |
3627 | dlopen) libs="$dlfiles" ;; | |
3628 | dlpreopen) libs="$dlprefiles" ;; | |
3629 | - link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; | |
3630 | + link) | |
3631 | + libs="$deplibs %DEPLIBS%" | |
3632 | + test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" | |
3633 | + ;; | |
3634 | esac | |
3635 | fi | |
3636 | if test "$pass" = dlopen; then | |
3637 | @@ -3201,6 +3204,11 @@ | |
3638 | age="$number_minor" | |
3639 | revision="$number_minor" | |
3640 | ;; | |
3641 | + *) | |
3642 | + $echo "$modename: unknown library version type \`$version_type'" 1>&2 | |
3643 | + $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 | |
3644 | + exit $EXIT_FAILURE | |
3645 | + ;; | |
3646 | esac | |
3647 | ;; | |
3648 | no) | |
3649 | diff -Naurd alsa-lib-1.0.14~/modules/Makefile.in alsa-lib-1.0.14/modules/Makefile.in | |
3650 | --- alsa-lib-1.0.14~/modules/Makefile.in 2007-06-04 17:39:47.000000000 +0200 | |
3651 | +++ alsa-lib-1.0.14/modules/Makefile.in 2007-06-04 17:42:43.000000000 +0200 | |
3652 | @@ -182,6 +182,9 @@ | |
3653 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
3654 | LN_S = @LN_S@ | |
3655 | LTLIBOBJS = @LTLIBOBJS@ | |
3656 | +MAINT = @MAINT@ | |
3657 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
3658 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
3659 | MAKEINFO = @MAKEINFO@ | |
3660 | OBJEXT = @OBJEXT@ | |
3661 | PACKAGE = @PACKAGE@ | |
3662 | @@ -261,7 +264,7 @@ | |
3663 | all: all-recursive | |
3664 | ||
3665 | .SUFFIXES: | |
3666 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
3667 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
3668 | @for dep in $?; do \ | |
3669 | case '$(am__configure_deps)' in \ | |
3670 | *$$dep*) \ | |
3671 | @@ -270,9 +273,9 @@ | |
3672 | exit 1;; \ | |
3673 | esac; \ | |
3674 | done; \ | |
3675 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign modules/Makefile'; \ | |
3676 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/Makefile'; \ | |
3677 | cd $(top_srcdir) && \ | |
3678 | - $(AUTOMAKE) --foreign modules/Makefile | |
3679 | + $(AUTOMAKE) --gnu modules/Makefile | |
3680 | .PRECIOUS: Makefile | |
3681 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
3682 | @case '$?' in \ | |
3683 | @@ -286,9 +289,9 @@ | |
3684 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
3685 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3686 | ||
3687 | -$(top_srcdir)/configure: $(am__configure_deps) | |
3688 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
3689 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3690 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
3691 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
3692 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3693 | ||
3694 | mostlyclean-libtool: | |
3695 | diff -Naurd alsa-lib-1.0.14~/modules/mixer/Makefile.in alsa-lib-1.0.14/modules/mixer/Makefile.in | |
3696 | --- alsa-lib-1.0.14~/modules/mixer/Makefile.in 2007-06-04 17:39:47.000000000 +0200 | |
3697 | +++ alsa-lib-1.0.14/modules/mixer/Makefile.in 2007-06-04 17:42:43.000000000 +0200 | |
3698 | @@ -182,6 +182,9 @@ | |
3699 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
3700 | LN_S = @LN_S@ | |
3701 | LTLIBOBJS = @LTLIBOBJS@ | |
3702 | +MAINT = @MAINT@ | |
3703 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
3704 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
3705 | MAKEINFO = @MAKEINFO@ | |
3706 | OBJEXT = @OBJEXT@ | |
3707 | PACKAGE = @PACKAGE@ | |
3708 | @@ -261,7 +264,7 @@ | |
3709 | all: all-recursive | |
3710 | ||
3711 | .SUFFIXES: | |
3712 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
3713 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
3714 | @for dep in $?; do \ | |
3715 | case '$(am__configure_deps)' in \ | |
3716 | *$$dep*) \ | |
3717 | @@ -270,9 +273,9 @@ | |
3718 | exit 1;; \ | |
3719 | esac; \ | |
3720 | done; \ | |
3721 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign modules/mixer/Makefile'; \ | |
3722 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/mixer/Makefile'; \ | |
3723 | cd $(top_srcdir) && \ | |
3724 | - $(AUTOMAKE) --foreign modules/mixer/Makefile | |
3725 | + $(AUTOMAKE) --gnu modules/mixer/Makefile | |
3726 | .PRECIOUS: Makefile | |
3727 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
3728 | @case '$?' in \ | |
3729 | @@ -286,9 +289,9 @@ | |
3730 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
3731 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3732 | ||
3733 | -$(top_srcdir)/configure: $(am__configure_deps) | |
3734 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
3735 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3736 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
3737 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
3738 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3739 | ||
3740 | mostlyclean-libtool: | |
3741 | diff -Naurd alsa-lib-1.0.14~/modules/mixer/simple/Makefile.in alsa-lib-1.0.14/modules/mixer/simple/Makefile.in | |
3742 | --- alsa-lib-1.0.14~/modules/mixer/simple/Makefile.in 2007-06-04 17:39:47.000000000 +0200 | |
3743 | +++ alsa-lib-1.0.14/modules/mixer/simple/Makefile.in 2007-06-04 17:42:43.000000000 +0200 | |
3744 | @@ -210,6 +210,9 @@ | |
3745 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
3746 | LN_S = @LN_S@ | |
3747 | LTLIBOBJS = @LTLIBOBJS@ | |
3748 | +MAINT = @MAINT@ | |
3749 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
3750 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
3751 | MAKEINFO = @MAKEINFO@ | |
3752 | OBJEXT = @OBJEXT@ | |
3753 | PACKAGE = @PACKAGE@ | |
3754 | @@ -305,7 +308,7 @@ | |
3755 | ||
3756 | .SUFFIXES: | |
3757 | .SUFFIXES: .c .lo .o .obj | |
3758 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
3759 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
3760 | @for dep in $?; do \ | |
3761 | case '$(am__configure_deps)' in \ | |
3762 | *$$dep*) \ | |
3763 | @@ -314,9 +317,9 @@ | |
3764 | exit 1;; \ | |
3765 | esac; \ | |
3766 | done; \ | |
3767 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign modules/mixer/simple/Makefile'; \ | |
3768 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/mixer/simple/Makefile'; \ | |
3769 | cd $(top_srcdir) && \ | |
3770 | - $(AUTOMAKE) --foreign modules/mixer/simple/Makefile | |
3771 | + $(AUTOMAKE) --gnu modules/mixer/simple/Makefile | |
3772 | .PRECIOUS: Makefile | |
3773 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
3774 | @case '$?' in \ | |
3775 | @@ -330,9 +333,9 @@ | |
3776 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
3777 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3778 | ||
3779 | -$(top_srcdir)/configure: $(am__configure_deps) | |
3780 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
3781 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3782 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
3783 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
3784 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3785 | install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) | |
3786 | @$(NORMAL_INSTALL) | |
3787 | diff -Naurd alsa-lib-1.0.14~/src/Makefile.in alsa-lib-1.0.14/src/Makefile.in | |
3788 | --- alsa-lib-1.0.14~/src/Makefile.in 2007-06-04 17:39:47.000000000 +0200 | |
3789 | +++ alsa-lib-1.0.14/src/Makefile.in 2007-06-04 17:42:44.000000000 +0200 | |
3790 | @@ -235,6 +235,9 @@ | |
3791 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
3792 | LN_S = @LN_S@ | |
3793 | LTLIBOBJS = @LTLIBOBJS@ | |
3794 | +MAINT = @MAINT@ | |
3795 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
3796 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
3797 | MAKEINFO = @MAKEINFO@ | |
3798 | OBJEXT = @OBJEXT@ | |
3799 | PACKAGE = @PACKAGE@ | |
3800 | @@ -331,7 +334,7 @@ | |
3801 | ||
3802 | .SUFFIXES: | |
3803 | .SUFFIXES: .c .lo .o .obj | |
3804 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
3805 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
3806 | @for dep in $?; do \ | |
3807 | case '$(am__configure_deps)' in \ | |
3808 | *$$dep*) \ | |
3809 | @@ -340,9 +343,9 @@ | |
3810 | exit 1;; \ | |
3811 | esac; \ | |
3812 | done; \ | |
3813 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \ | |
3814 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ | |
3815 | cd $(top_srcdir) && \ | |
3816 | - $(AUTOMAKE) --foreign src/Makefile | |
3817 | + $(AUTOMAKE) --gnu src/Makefile | |
3818 | .PRECIOUS: Makefile | |
3819 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
3820 | @case '$?' in \ | |
3821 | @@ -356,9 +359,9 @@ | |
3822 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
3823 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3824 | ||
3825 | -$(top_srcdir)/configure: $(am__configure_deps) | |
3826 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
3827 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3828 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
3829 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
3830 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3831 | Versions: $(top_builddir)/config.status $(srcdir)/Versions.in | |
3832 | cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ | |
3833 | diff -Naurd alsa-lib-1.0.14~/src/alisp/Makefile.in alsa-lib-1.0.14/src/alisp/Makefile.in | |
3834 | --- alsa-lib-1.0.14~/src/alisp/Makefile.in 2007-06-04 17:39:47.000000000 +0200 | |
3835 | +++ alsa-lib-1.0.14/src/alisp/Makefile.in 2007-06-04 17:42:44.000000000 +0200 | |
3836 | @@ -192,6 +192,9 @@ | |
3837 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
3838 | LN_S = @LN_S@ | |
3839 | LTLIBOBJS = @LTLIBOBJS@ | |
3840 | +MAINT = @MAINT@ | |
3841 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
3842 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
3843 | MAKEINFO = @MAKEINFO@ | |
3844 | OBJEXT = @OBJEXT@ | |
3845 | PACKAGE = @PACKAGE@ | |
3846 | @@ -276,7 +279,7 @@ | |
3847 | ||
3848 | .SUFFIXES: | |
3849 | .SUFFIXES: .c .lo .o .obj | |
3850 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
3851 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
3852 | @for dep in $?; do \ | |
3853 | case '$(am__configure_deps)' in \ | |
3854 | *$$dep*) \ | |
3855 | @@ -285,9 +288,9 @@ | |
3856 | exit 1;; \ | |
3857 | esac; \ | |
3858 | done; \ | |
3859 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/alisp/Makefile'; \ | |
3860 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/alisp/Makefile'; \ | |
3861 | cd $(top_srcdir) && \ | |
3862 | - $(AUTOMAKE) --foreign src/alisp/Makefile | |
3863 | + $(AUTOMAKE) --gnu src/alisp/Makefile | |
3864 | .PRECIOUS: Makefile | |
3865 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
3866 | @case '$?' in \ | |
3867 | @@ -301,9 +304,9 @@ | |
3868 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
3869 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3870 | ||
3871 | -$(top_srcdir)/configure: $(am__configure_deps) | |
3872 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
3873 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3874 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
3875 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
3876 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3877 | libalisp.la: $(libalisp_la_OBJECTS) $(libalisp_la_DEPENDENCIES) | |
3878 | $(LINK) $(libalisp_la_LDFLAGS) $(libalisp_la_OBJECTS) $(libalisp_la_LIBADD) $(LIBS) | |
3879 | diff -Naurd alsa-lib-1.0.14~/src/compat/Makefile.in alsa-lib-1.0.14/src/compat/Makefile.in | |
3880 | --- alsa-lib-1.0.14~/src/compat/Makefile.in 2007-06-04 17:39:47.000000000 +0200 | |
3881 | +++ alsa-lib-1.0.14/src/compat/Makefile.in 2007-06-04 17:42:44.000000000 +0200 | |
3882 | @@ -194,6 +194,9 @@ | |
3883 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
3884 | LN_S = @LN_S@ | |
3885 | LTLIBOBJS = @LTLIBOBJS@ | |
3886 | +MAINT = @MAINT@ | |
3887 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
3888 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
3889 | MAKEINFO = @MAKEINFO@ | |
3890 | OBJEXT = @OBJEXT@ | |
3891 | PACKAGE = @PACKAGE@ | |
3892 | @@ -277,7 +280,7 @@ | |
3893 | ||
3894 | .SUFFIXES: | |
3895 | .SUFFIXES: .c .lo .o .obj | |
3896 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
3897 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
3898 | @for dep in $?; do \ | |
3899 | case '$(am__configure_deps)' in \ | |
3900 | *$$dep*) \ | |
3901 | @@ -286,9 +289,9 @@ | |
3902 | exit 1;; \ | |
3903 | esac; \ | |
3904 | done; \ | |
3905 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/compat/Makefile'; \ | |
3906 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/compat/Makefile'; \ | |
3907 | cd $(top_srcdir) && \ | |
3908 | - $(AUTOMAKE) --foreign src/compat/Makefile | |
3909 | + $(AUTOMAKE) --gnu src/compat/Makefile | |
3910 | .PRECIOUS: Makefile | |
3911 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
3912 | @case '$?' in \ | |
3913 | @@ -302,9 +305,9 @@ | |
3914 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
3915 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3916 | ||
3917 | -$(top_srcdir)/configure: $(am__configure_deps) | |
3918 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
3919 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3920 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
3921 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
3922 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3923 | ||
3924 | clean-noinstLTLIBRARIES: | |
3925 | diff -Naurd alsa-lib-1.0.14~/src/conf/Makefile.in alsa-lib-1.0.14/src/conf/Makefile.in | |
3926 | --- alsa-lib-1.0.14~/src/conf/Makefile.in 2007-06-04 17:39:47.000000000 +0200 | |
3927 | +++ alsa-lib-1.0.14/src/conf/Makefile.in 2007-06-04 17:42:45.000000000 +0200 | |
3928 | @@ -194,6 +194,9 @@ | |
3929 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
3930 | LN_S = @LN_S@ | |
3931 | LTLIBOBJS = @LTLIBOBJS@ | |
3932 | +MAINT = @MAINT@ | |
3933 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
3934 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
3935 | MAKEINFO = @MAKEINFO@ | |
3936 | OBJEXT = @OBJEXT@ | |
3937 | PACKAGE = @PACKAGE@ | |
3938 | @@ -277,7 +280,7 @@ | |
3939 | all: all-recursive | |
3940 | ||
3941 | .SUFFIXES: | |
3942 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
3943 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
3944 | @for dep in $?; do \ | |
3945 | case '$(am__configure_deps)' in \ | |
3946 | *$$dep*) \ | |
3947 | @@ -286,9 +289,9 @@ | |
3948 | exit 1;; \ | |
3949 | esac; \ | |
3950 | done; \ | |
3951 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/conf/Makefile'; \ | |
3952 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/conf/Makefile'; \ | |
3953 | cd $(top_srcdir) && \ | |
3954 | - $(AUTOMAKE) --foreign src/conf/Makefile | |
3955 | + $(AUTOMAKE) --gnu src/conf/Makefile | |
3956 | .PRECIOUS: Makefile | |
3957 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
3958 | @case '$?' in \ | |
3959 | @@ -302,9 +305,9 @@ | |
3960 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
3961 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3962 | ||
3963 | -$(top_srcdir)/configure: $(am__configure_deps) | |
3964 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
3965 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3966 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
3967 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
3968 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
3969 | ||
3970 | mostlyclean-libtool: | |
3971 | diff -Naurd alsa-lib-1.0.14~/src/conf/cards/Makefile.in alsa-lib-1.0.14/src/conf/cards/Makefile.in | |
3972 | --- alsa-lib-1.0.14~/src/conf/cards/Makefile.in 2007-06-04 17:39:47.000000000 +0200 | |
3973 | +++ alsa-lib-1.0.14/src/conf/cards/Makefile.in 2007-06-04 17:42:45.000000000 +0200 | |
3974 | @@ -185,6 +185,9 @@ | |
3975 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
3976 | LN_S = @LN_S@ | |
3977 | LTLIBOBJS = @LTLIBOBJS@ | |
3978 | +MAINT = @MAINT@ | |
3979 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
3980 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
3981 | MAKEINFO = @MAKEINFO@ | |
3982 | OBJEXT = @OBJEXT@ | |
3983 | PACKAGE = @PACKAGE@ | |
3984 | @@ -288,7 +291,7 @@ | |
3985 | all: all-am | |
3986 | ||
3987 | .SUFFIXES: | |
3988 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
3989 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
3990 | @for dep in $?; do \ | |
3991 | case '$(am__configure_deps)' in \ | |
3992 | *$$dep*) \ | |
3993 | @@ -297,9 +300,9 @@ | |
3994 | exit 1;; \ | |
3995 | esac; \ | |
3996 | done; \ | |
3997 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/conf/cards/Makefile'; \ | |
3998 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/conf/cards/Makefile'; \ | |
3999 | cd $(top_srcdir) && \ | |
4000 | - $(AUTOMAKE) --foreign src/conf/cards/Makefile | |
4001 | + $(AUTOMAKE) --gnu src/conf/cards/Makefile | |
4002 | .PRECIOUS: Makefile | |
4003 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
4004 | @case '$?' in \ | |
4005 | @@ -313,9 +316,9 @@ | |
4006 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
4007 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4008 | ||
4009 | -$(top_srcdir)/configure: $(am__configure_deps) | |
4010 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
4011 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4012 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
4013 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
4014 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4015 | ||
4016 | mostlyclean-libtool: | |
4017 | diff -Naurd alsa-lib-1.0.14~/src/conf/pcm/Makefile.in alsa-lib-1.0.14/src/conf/pcm/Makefile.in | |
4018 | --- alsa-lib-1.0.14~/src/conf/pcm/Makefile.in 2007-06-04 17:39:47.000000000 +0200 | |
4019 | +++ alsa-lib-1.0.14/src/conf/pcm/Makefile.in 2007-06-04 17:42:45.000000000 +0200 | |
4020 | @@ -183,6 +183,9 @@ | |
4021 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
4022 | LN_S = @LN_S@ | |
4023 | LTLIBOBJS = @LTLIBOBJS@ | |
4024 | +MAINT = @MAINT@ | |
4025 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
4026 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
4027 | MAKEINFO = @MAKEINFO@ | |
4028 | OBJEXT = @OBJEXT@ | |
4029 | PACKAGE = @PACKAGE@ | |
4030 | @@ -271,7 +274,7 @@ | |
4031 | all: all-am | |
4032 | ||
4033 | .SUFFIXES: | |
4034 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
4035 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
4036 | @for dep in $?; do \ | |
4037 | case '$(am__configure_deps)' in \ | |
4038 | *$$dep*) \ | |
4039 | @@ -280,9 +283,9 @@ | |
4040 | exit 1;; \ | |
4041 | esac; \ | |
4042 | done; \ | |
4043 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/conf/pcm/Makefile'; \ | |
4044 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/conf/pcm/Makefile'; \ | |
4045 | cd $(top_srcdir) && \ | |
4046 | - $(AUTOMAKE) --foreign src/conf/pcm/Makefile | |
4047 | + $(AUTOMAKE) --gnu src/conf/pcm/Makefile | |
4048 | .PRECIOUS: Makefile | |
4049 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
4050 | @case '$?' in \ | |
4051 | @@ -296,9 +299,9 @@ | |
4052 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
4053 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4054 | ||
4055 | -$(top_srcdir)/configure: $(am__configure_deps) | |
4056 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
4057 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4058 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
4059 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
4060 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4061 | ||
4062 | mostlyclean-libtool: | |
4063 | diff -Naurd alsa-lib-1.0.14~/src/control/Makefile.in alsa-lib-1.0.14/src/control/Makefile.in | |
4064 | --- alsa-lib-1.0.14~/src/control/Makefile.in 2007-06-04 17:39:47.000000000 +0200 | |
4065 | +++ alsa-lib-1.0.14/src/control/Makefile.in 2007-06-04 17:42:46.000000000 +0200 | |
4066 | @@ -201,6 +201,9 @@ | |
4067 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
4068 | LN_S = @LN_S@ | |
4069 | LTLIBOBJS = @LTLIBOBJS@ | |
4070 | +MAINT = @MAINT@ | |
4071 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
4072 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
4073 | MAKEINFO = @MAKEINFO@ | |
4074 | OBJEXT = @OBJEXT@ | |
4075 | PACKAGE = @PACKAGE@ | |
4076 | @@ -286,7 +289,7 @@ | |
4077 | ||
4078 | .SUFFIXES: | |
4079 | .SUFFIXES: .c .lo .o .obj | |
4080 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
4081 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
4082 | @for dep in $?; do \ | |
4083 | case '$(am__configure_deps)' in \ | |
4084 | *$$dep*) \ | |
4085 | @@ -295,9 +298,9 @@ | |
4086 | exit 1;; \ | |
4087 | esac; \ | |
4088 | done; \ | |
4089 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/control/Makefile'; \ | |
4090 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/control/Makefile'; \ | |
4091 | cd $(top_srcdir) && \ | |
4092 | - $(AUTOMAKE) --foreign src/control/Makefile | |
4093 | + $(AUTOMAKE) --gnu src/control/Makefile | |
4094 | .PRECIOUS: Makefile | |
4095 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
4096 | @case '$?' in \ | |
4097 | @@ -311,9 +314,9 @@ | |
4098 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
4099 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4100 | ||
4101 | -$(top_srcdir)/configure: $(am__configure_deps) | |
4102 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
4103 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4104 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
4105 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
4106 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4107 | libcontrol.la: $(libcontrol_la_OBJECTS) $(libcontrol_la_DEPENDENCIES) | |
4108 | $(LINK) $(libcontrol_la_LDFLAGS) $(libcontrol_la_OBJECTS) $(libcontrol_la_LIBADD) $(LIBS) | |
4109 | diff -Naurd alsa-lib-1.0.14~/src/hwdep/Makefile.in alsa-lib-1.0.14/src/hwdep/Makefile.in | |
4110 | --- alsa-lib-1.0.14~/src/hwdep/Makefile.in 2007-06-04 17:39:47.000000000 +0200 | |
4111 | +++ alsa-lib-1.0.14/src/hwdep/Makefile.in 2007-06-04 17:42:46.000000000 +0200 | |
4112 | @@ -192,6 +192,9 @@ | |
4113 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
4114 | LN_S = @LN_S@ | |
4115 | LTLIBOBJS = @LTLIBOBJS@ | |
4116 | +MAINT = @MAINT@ | |
4117 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
4118 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
4119 | MAKEINFO = @MAKEINFO@ | |
4120 | OBJEXT = @OBJEXT@ | |
4121 | PACKAGE = @PACKAGE@ | |
4122 | @@ -275,7 +278,7 @@ | |
4123 | ||
4124 | .SUFFIXES: | |
4125 | .SUFFIXES: .c .lo .o .obj | |
4126 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
4127 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
4128 | @for dep in $?; do \ | |
4129 | case '$(am__configure_deps)' in \ | |
4130 | *$$dep*) \ | |
4131 | @@ -284,9 +287,9 @@ | |
4132 | exit 1;; \ | |
4133 | esac; \ | |
4134 | done; \ | |
4135 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/hwdep/Makefile'; \ | |
4136 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/hwdep/Makefile'; \ | |
4137 | cd $(top_srcdir) && \ | |
4138 | - $(AUTOMAKE) --foreign src/hwdep/Makefile | |
4139 | + $(AUTOMAKE) --gnu src/hwdep/Makefile | |
4140 | .PRECIOUS: Makefile | |
4141 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
4142 | @case '$?' in \ | |
4143 | @@ -300,9 +303,9 @@ | |
4144 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
4145 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4146 | ||
4147 | -$(top_srcdir)/configure: $(am__configure_deps) | |
4148 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
4149 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4150 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
4151 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
4152 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4153 | libhwdep.la: $(libhwdep_la_OBJECTS) $(libhwdep_la_DEPENDENCIES) | |
4154 | $(LINK) $(libhwdep_la_LDFLAGS) $(libhwdep_la_OBJECTS) $(libhwdep_la_LIBADD) $(LIBS) | |
4155 | diff -Naurd alsa-lib-1.0.14~/src/instr/Makefile.in alsa-lib-1.0.14/src/instr/Makefile.in | |
4156 | --- alsa-lib-1.0.14~/src/instr/Makefile.in 2007-06-04 17:39:47.000000000 +0200 | |
4157 | +++ alsa-lib-1.0.14/src/instr/Makefile.in 2007-06-04 17:42:46.000000000 +0200 | |
4158 | @@ -189,6 +189,9 @@ | |
4159 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
4160 | LN_S = @LN_S@ | |
4161 | LTLIBOBJS = @LTLIBOBJS@ | |
4162 | +MAINT = @MAINT@ | |
4163 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
4164 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
4165 | MAKEINFO = @MAKEINFO@ | |
4166 | OBJEXT = @OBJEXT@ | |
4167 | PACKAGE = @PACKAGE@ | |
4168 | @@ -271,7 +274,7 @@ | |
4169 | ||
4170 | .SUFFIXES: | |
4171 | .SUFFIXES: .c .lo .o .obj | |
4172 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
4173 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
4174 | @for dep in $?; do \ | |
4175 | case '$(am__configure_deps)' in \ | |
4176 | *$$dep*) \ | |
4177 | @@ -280,9 +283,9 @@ | |
4178 | exit 1;; \ | |
4179 | esac; \ | |
4180 | done; \ | |
4181 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/instr/Makefile'; \ | |
4182 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/instr/Makefile'; \ | |
4183 | cd $(top_srcdir) && \ | |
4184 | - $(AUTOMAKE) --foreign src/instr/Makefile | |
4185 | + $(AUTOMAKE) --gnu src/instr/Makefile | |
4186 | .PRECIOUS: Makefile | |
4187 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
4188 | @case '$?' in \ | |
4189 | @@ -296,9 +299,9 @@ | |
4190 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
4191 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4192 | ||
4193 | -$(top_srcdir)/configure: $(am__configure_deps) | |
4194 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
4195 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4196 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
4197 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
4198 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4199 | libinstr.la: $(libinstr_la_OBJECTS) $(libinstr_la_DEPENDENCIES) | |
4200 | $(LINK) $(libinstr_la_LDFLAGS) $(libinstr_la_OBJECTS) $(libinstr_la_LIBADD) $(LIBS) | |
4201 | diff -Naurd alsa-lib-1.0.14~/src/mixer/Makefile.in alsa-lib-1.0.14/src/mixer/Makefile.in | |
4202 | --- alsa-lib-1.0.14~/src/mixer/Makefile.in 2007-06-04 17:39:47.000000000 +0200 | |
4203 | +++ alsa-lib-1.0.14/src/mixer/Makefile.in 2007-06-04 17:42:46.000000000 +0200 | |
4204 | @@ -193,6 +193,9 @@ | |
4205 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
4206 | LN_S = @LN_S@ | |
4207 | LTLIBOBJS = @LTLIBOBJS@ | |
4208 | +MAINT = @MAINT@ | |
4209 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
4210 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
4211 | MAKEINFO = @MAKEINFO@ | |
4212 | OBJEXT = @OBJEXT@ | |
4213 | PACKAGE = @PACKAGE@ | |
4214 | @@ -276,7 +279,7 @@ | |
4215 | ||
4216 | .SUFFIXES: | |
4217 | .SUFFIXES: .c .lo .o .obj | |
4218 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
4219 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
4220 | @for dep in $?; do \ | |
4221 | case '$(am__configure_deps)' in \ | |
4222 | *$$dep*) \ | |
4223 | @@ -285,9 +288,9 @@ | |
4224 | exit 1;; \ | |
4225 | esac; \ | |
4226 | done; \ | |
4227 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/mixer/Makefile'; \ | |
4228 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/mixer/Makefile'; \ | |
4229 | cd $(top_srcdir) && \ | |
4230 | - $(AUTOMAKE) --foreign src/mixer/Makefile | |
4231 | + $(AUTOMAKE) --gnu src/mixer/Makefile | |
4232 | .PRECIOUS: Makefile | |
4233 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
4234 | @case '$?' in \ | |
4235 | @@ -301,9 +304,9 @@ | |
4236 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
4237 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4238 | ||
4239 | -$(top_srcdir)/configure: $(am__configure_deps) | |
4240 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
4241 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4242 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
4243 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
4244 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4245 | libmixer.la: $(libmixer_la_OBJECTS) $(libmixer_la_DEPENDENCIES) | |
4246 | $(LINK) $(libmixer_la_LDFLAGS) $(libmixer_la_OBJECTS) $(libmixer_la_LIBADD) $(LIBS) | |
4247 | diff -Naurd alsa-lib-1.0.14~/src/pcm/Makefile.in alsa-lib-1.0.14/src/pcm/Makefile.in | |
4248 | --- alsa-lib-1.0.14~/src/pcm/Makefile.in 2007-06-04 17:39:47.000000000 +0200 | |
4249 | +++ alsa-lib-1.0.14/src/pcm/Makefile.in 2007-06-04 17:42:47.000000000 +0200 | |
4250 | @@ -280,6 +280,9 @@ | |
4251 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
4252 | LN_S = @LN_S@ | |
4253 | LTLIBOBJS = @LTLIBOBJS@ | |
4254 | +MAINT = @MAINT@ | |
4255 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
4256 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
4257 | MAKEINFO = @MAKEINFO@ | |
4258 | OBJEXT = @OBJEXT@ | |
4259 | PACKAGE = @PACKAGE@ | |
4260 | @@ -382,7 +385,7 @@ | |
4261 | ||
4262 | .SUFFIXES: | |
4263 | .SUFFIXES: .c .lo .o .obj | |
4264 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
4265 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
4266 | @for dep in $?; do \ | |
4267 | case '$(am__configure_deps)' in \ | |
4268 | *$$dep*) \ | |
4269 | @@ -391,9 +394,9 @@ | |
4270 | exit 1;; \ | |
4271 | esac; \ | |
4272 | done; \ | |
4273 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/pcm/Makefile'; \ | |
4274 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/pcm/Makefile'; \ | |
4275 | cd $(top_srcdir) && \ | |
4276 | - $(AUTOMAKE) --foreign src/pcm/Makefile | |
4277 | + $(AUTOMAKE) --gnu src/pcm/Makefile | |
4278 | .PRECIOUS: Makefile | |
4279 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
4280 | @case '$?' in \ | |
4281 | @@ -407,9 +410,9 @@ | |
4282 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
4283 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4284 | ||
4285 | -$(top_srcdir)/configure: $(am__configure_deps) | |
4286 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
4287 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4288 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
4289 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
4290 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4291 | libpcm.la: $(libpcm_la_OBJECTS) $(libpcm_la_DEPENDENCIES) | |
4292 | $(LINK) $(libpcm_la_LDFLAGS) $(libpcm_la_OBJECTS) $(libpcm_la_LIBADD) $(LIBS) | |
4293 | diff -Naurd alsa-lib-1.0.14~/src/pcm/scopes/Makefile.in alsa-lib-1.0.14/src/pcm/scopes/Makefile.in | |
4294 | --- alsa-lib-1.0.14~/src/pcm/scopes/Makefile.in 2007-06-04 17:39:47.000000000 +0200 | |
4295 | +++ alsa-lib-1.0.14/src/pcm/scopes/Makefile.in 2007-06-04 17:42:47.000000000 +0200 | |
4296 | @@ -199,6 +199,9 @@ | |
4297 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
4298 | LN_S = @LN_S@ | |
4299 | LTLIBOBJS = @LTLIBOBJS@ | |
4300 | +MAINT = @MAINT@ | |
4301 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
4302 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
4303 | MAKEINFO = @MAKEINFO@ | |
4304 | OBJEXT = @OBJEXT@ | |
4305 | PACKAGE = @PACKAGE@ | |
4306 | @@ -283,7 +286,7 @@ | |
4307 | ||
4308 | .SUFFIXES: | |
4309 | .SUFFIXES: .c .lo .o .obj | |
4310 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
4311 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
4312 | @for dep in $?; do \ | |
4313 | case '$(am__configure_deps)' in \ | |
4314 | *$$dep*) \ | |
4315 | @@ -292,9 +295,9 @@ | |
4316 | exit 1;; \ | |
4317 | esac; \ | |
4318 | done; \ | |
4319 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/pcm/scopes/Makefile'; \ | |
4320 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/pcm/scopes/Makefile'; \ | |
4321 | cd $(top_srcdir) && \ | |
4322 | - $(AUTOMAKE) --foreign src/pcm/scopes/Makefile | |
4323 | + $(AUTOMAKE) --gnu src/pcm/scopes/Makefile | |
4324 | .PRECIOUS: Makefile | |
4325 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
4326 | @case '$?' in \ | |
4327 | @@ -308,9 +311,9 @@ | |
4328 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
4329 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4330 | ||
4331 | -$(top_srcdir)/configure: $(am__configure_deps) | |
4332 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
4333 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4334 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
4335 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
4336 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4337 | install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) | |
4338 | @$(NORMAL_INSTALL) | |
4339 | diff -Naurd alsa-lib-1.0.14~/src/rawmidi/Makefile.in alsa-lib-1.0.14/src/rawmidi/Makefile.in | |
4340 | --- alsa-lib-1.0.14~/src/rawmidi/Makefile.in 2007-06-04 17:39:47.000000000 +0200 | |
4341 | +++ alsa-lib-1.0.14/src/rawmidi/Makefile.in 2007-06-04 17:42:47.000000000 +0200 | |
4342 | @@ -197,6 +197,9 @@ | |
4343 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
4344 | LN_S = @LN_S@ | |
4345 | LTLIBOBJS = @LTLIBOBJS@ | |
4346 | +MAINT = @MAINT@ | |
4347 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
4348 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
4349 | MAKEINFO = @MAKEINFO@ | |
4350 | OBJEXT = @OBJEXT@ | |
4351 | PACKAGE = @PACKAGE@ | |
4352 | @@ -281,7 +284,7 @@ | |
4353 | ||
4354 | .SUFFIXES: | |
4355 | .SUFFIXES: .c .lo .o .obj | |
4356 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
4357 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
4358 | @for dep in $?; do \ | |
4359 | case '$(am__configure_deps)' in \ | |
4360 | *$$dep*) \ | |
4361 | @@ -290,9 +293,9 @@ | |
4362 | exit 1;; \ | |
4363 | esac; \ | |
4364 | done; \ | |
4365 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/rawmidi/Makefile'; \ | |
4366 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/rawmidi/Makefile'; \ | |
4367 | cd $(top_srcdir) && \ | |
4368 | - $(AUTOMAKE) --foreign src/rawmidi/Makefile | |
4369 | + $(AUTOMAKE) --gnu src/rawmidi/Makefile | |
4370 | .PRECIOUS: Makefile | |
4371 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
4372 | @case '$?' in \ | |
4373 | @@ -306,9 +309,9 @@ | |
4374 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
4375 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4376 | ||
4377 | -$(top_srcdir)/configure: $(am__configure_deps) | |
4378 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
4379 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4380 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
4381 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
4382 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4383 | librawmidi.la: $(librawmidi_la_OBJECTS) $(librawmidi_la_DEPENDENCIES) | |
4384 | $(LINK) $(librawmidi_la_LDFLAGS) $(librawmidi_la_OBJECTS) $(librawmidi_la_LIBADD) $(LIBS) | |
4385 | diff -Naurd alsa-lib-1.0.14~/src/seq/Makefile.in alsa-lib-1.0.14/src/seq/Makefile.in | |
4386 | --- alsa-lib-1.0.14~/src/seq/Makefile.in 2007-06-04 17:39:47.000000000 +0200 | |
4387 | +++ alsa-lib-1.0.14/src/seq/Makefile.in 2007-06-04 17:42:48.000000000 +0200 | |
4388 | @@ -193,6 +193,9 @@ | |
4389 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
4390 | LN_S = @LN_S@ | |
4391 | LTLIBOBJS = @LTLIBOBJS@ | |
4392 | +MAINT = @MAINT@ | |
4393 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
4394 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
4395 | MAKEINFO = @MAKEINFO@ | |
4396 | OBJEXT = @OBJEXT@ | |
4397 | PACKAGE = @PACKAGE@ | |
4398 | @@ -278,7 +281,7 @@ | |
4399 | ||
4400 | .SUFFIXES: | |
4401 | .SUFFIXES: .c .lo .o .obj | |
4402 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
4403 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
4404 | @for dep in $?; do \ | |
4405 | case '$(am__configure_deps)' in \ | |
4406 | *$$dep*) \ | |
4407 | @@ -287,9 +290,9 @@ | |
4408 | exit 1;; \ | |
4409 | esac; \ | |
4410 | done; \ | |
4411 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/seq/Makefile'; \ | |
4412 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/seq/Makefile'; \ | |
4413 | cd $(top_srcdir) && \ | |
4414 | - $(AUTOMAKE) --foreign src/seq/Makefile | |
4415 | + $(AUTOMAKE) --gnu src/seq/Makefile | |
4416 | .PRECIOUS: Makefile | |
4417 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
4418 | @case '$?' in \ | |
4419 | @@ -303,9 +306,9 @@ | |
4420 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
4421 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4422 | ||
4423 | -$(top_srcdir)/configure: $(am__configure_deps) | |
4424 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
4425 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4426 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
4427 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
4428 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4429 | libseq.la: $(libseq_la_OBJECTS) $(libseq_la_DEPENDENCIES) | |
4430 | $(LINK) $(libseq_la_LDFLAGS) $(libseq_la_OBJECTS) $(libseq_la_LIBADD) $(LIBS) | |
4431 | diff -Naurd alsa-lib-1.0.14~/src/timer/Makefile.in alsa-lib-1.0.14/src/timer/Makefile.in | |
4432 | --- alsa-lib-1.0.14~/src/timer/Makefile.in 2007-06-04 17:39:47.000000000 +0200 | |
4433 | +++ alsa-lib-1.0.14/src/timer/Makefile.in 2007-06-04 17:42:48.000000000 +0200 | |
4434 | @@ -193,6 +193,9 @@ | |
4435 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
4436 | LN_S = @LN_S@ | |
4437 | LTLIBOBJS = @LTLIBOBJS@ | |
4438 | +MAINT = @MAINT@ | |
4439 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
4440 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
4441 | MAKEINFO = @MAKEINFO@ | |
4442 | OBJEXT = @OBJEXT@ | |
4443 | PACKAGE = @PACKAGE@ | |
4444 | @@ -278,7 +281,7 @@ | |
4445 | ||
4446 | .SUFFIXES: | |
4447 | .SUFFIXES: .c .lo .o .obj | |
4448 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
4449 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
4450 | @for dep in $?; do \ | |
4451 | case '$(am__configure_deps)' in \ | |
4452 | *$$dep*) \ | |
4453 | @@ -287,9 +290,9 @@ | |
4454 | exit 1;; \ | |
4455 | esac; \ | |
4456 | done; \ | |
4457 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/timer/Makefile'; \ | |
4458 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/timer/Makefile'; \ | |
4459 | cd $(top_srcdir) && \ | |
4460 | - $(AUTOMAKE) --foreign src/timer/Makefile | |
4461 | + $(AUTOMAKE) --gnu src/timer/Makefile | |
4462 | .PRECIOUS: Makefile | |
4463 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
4464 | @case '$?' in \ | |
4465 | @@ -303,9 +306,9 @@ | |
4466 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
4467 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4468 | ||
4469 | -$(top_srcdir)/configure: $(am__configure_deps) | |
4470 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
4471 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4472 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
4473 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
4474 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4475 | libtimer.la: $(libtimer_la_OBJECTS) $(libtimer_la_DEPENDENCIES) | |
4476 | $(LINK) $(libtimer_la_LDFLAGS) $(libtimer_la_OBJECTS) $(libtimer_la_LIBADD) $(LIBS) | |
4477 | diff -Naurd alsa-lib-1.0.14~/test/Makefile.in alsa-lib-1.0.14/test/Makefile.in | |
4478 | --- alsa-lib-1.0.14~/test/Makefile.in 2007-06-04 17:39:47.000000000 +0200 | |
4479 | +++ alsa-lib-1.0.14/test/Makefile.in 2007-06-04 17:42:48.000000000 +0200 | |
4480 | @@ -229,6 +229,9 @@ | |
4481 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
4482 | LN_S = @LN_S@ | |
4483 | LTLIBOBJS = @LTLIBOBJS@ | |
4484 | +MAINT = @MAINT@ | |
4485 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
4486 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
4487 | MAKEINFO = @MAKEINFO@ | |
4488 | OBJEXT = @OBJEXT@ | |
4489 | PACKAGE = @PACKAGE@ | |
4490 | @@ -324,7 +327,7 @@ | |
4491 | ||
4492 | .SUFFIXES: | |
4493 | .SUFFIXES: .c .lo .o .obj | |
4494 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
4495 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
4496 | @for dep in $?; do \ | |
4497 | case '$(am__configure_deps)' in \ | |
4498 | *$$dep*) \ | |
4499 | @@ -333,9 +336,9 @@ | |
4500 | exit 1;; \ | |
4501 | esac; \ | |
4502 | done; \ | |
4503 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/Makefile'; \ | |
4504 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test/Makefile'; \ | |
4505 | cd $(top_srcdir) && \ | |
4506 | - $(AUTOMAKE) --foreign test/Makefile | |
4507 | + $(AUTOMAKE) --gnu test/Makefile | |
4508 | .PRECIOUS: Makefile | |
4509 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
4510 | @case '$?' in \ | |
4511 | @@ -349,9 +352,9 @@ | |
4512 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
4513 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4514 | ||
4515 | -$(top_srcdir)/configure: $(am__configure_deps) | |
4516 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
4517 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4518 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
4519 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
4520 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4521 | ||
4522 | clean-checkPROGRAMS: | |
4523 | diff -Naurd alsa-lib-1.0.14~/utils/Makefile.in alsa-lib-1.0.14/utils/Makefile.in | |
4524 | --- alsa-lib-1.0.14~/utils/Makefile.in 2007-06-04 17:39:47.000000000 +0200 | |
4525 | +++ alsa-lib-1.0.14/utils/Makefile.in 2007-06-04 17:42:49.000000000 +0200 | |
4526 | @@ -186,6 +186,9 @@ | |
4527 | LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ | |
4528 | LN_S = @LN_S@ | |
4529 | LTLIBOBJS = @LTLIBOBJS@ | |
4530 | +MAINT = @MAINT@ | |
4531 | +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ | |
4532 | +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ | |
4533 | MAKEINFO = @MAKEINFO@ | |
4534 | OBJEXT = @OBJEXT@ | |
4535 | PACKAGE = @PACKAGE@ | |
4536 | @@ -270,7 +273,7 @@ | |
4537 | all: all-am | |
4538 | ||
4539 | .SUFFIXES: | |
4540 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
4541 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
4542 | @for dep in $?; do \ | |
4543 | case '$(am__configure_deps)' in \ | |
4544 | *$$dep*) \ | |
4545 | @@ -279,9 +282,9 @@ | |
4546 | exit 1;; \ | |
4547 | esac; \ | |
4548 | done; \ | |
4549 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign utils/Makefile'; \ | |
4550 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu utils/Makefile'; \ | |
4551 | cd $(top_srcdir) && \ | |
4552 | - $(AUTOMAKE) --foreign utils/Makefile | |
4553 | + $(AUTOMAKE) --gnu utils/Makefile | |
4554 | .PRECIOUS: Makefile | |
4555 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
4556 | @case '$?' in \ | |
4557 | @@ -295,9 +298,9 @@ | |
4558 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
4559 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4560 | ||
4561 | -$(top_srcdir)/configure: $(am__configure_deps) | |
4562 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | |
4563 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4564 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
4565 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | |
4566 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
4567 | alsa-lib.spec: $(top_builddir)/config.status $(srcdir)/alsa-lib.spec.in | |
4568 | cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ |
0 | alpha_versioned_symbols.patch | |
1 | aclocal_libs_fix.patch | |
2 | doxygen_links.patch | |
3 | add-maintainer-mode.patch | |
4 | relibtoolise.patch | |
5 | configure_cross_compile.patch |
3 | 3 | export DH_VERBOSE=1 |
4 | 4 | |
5 | 5 | PACKAGE:= alsa-lib |
6 | include /usr/share/dpatch/dpatch.make | |
6 | include /usr/share/quilt/quilt.make | |
7 | 7 | |
8 | 8 | export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) |
9 | 9 | export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) |
44 | 44 | CFLAGS += -O2 |
45 | 45 | endif |
46 | 46 | |
47 | configure-stamp: patch-stamp $(configure_biarch_stamp) | |
47 | configure-stamp: debian/stamp-patched $(configure_biarch_stamp) | |
48 | 48 | dh_testdir |
49 | 49 | -rm -f config.sub config.guess |
50 | 50 | ln -s /usr/share/misc/config.sub config.sub |
57 | 57 | --enable-static --disable-maintainer-mode |
58 | 58 | touch configure-stamp |
59 | 59 | |
60 | configure-biarch-stamp: patch-stamp | |
60 | configure-biarch-stamp: debian/stamp-patched | |
61 | 61 | dh_testdir |
62 | 62 | -rm -f config.sub config.guess |
63 | 63 | ln -s /usr/share/misc/config.sub config.sub |
184 | 184 | rm -f include/alsa |
185 | 185 | dh_clean |
186 | 186 | |
187 | .PHONY: configure build-arch build-indep build install-arch install-indep binary-arch binary-indep binary clean | |
187 | .PHONY: configure build-arch build-indep build install-arch install-indep binary-arch binary-indep binary clean stamp-patched |